java/code/src/com/redhat/rhn/domain/iss/IssMaster.java
| 2 -
java/code/src/com/redhat/rhn/domain/iss/IssMasterOrg.java
| 2 -
java/code/src/com/redhat/rhn/domain/iss/IssSlave.java
| 2 -
java/code/src/com/redhat/rhn/frontend/action/iss/AllowSlaveOrgsAction.java
| 2 -
java/code/src/com/redhat/rhn/frontend/action/iss/DeleteSlaveAction.java
| 2 -
java/code/src/com/redhat/rhn/frontend/action/iss/EditSlaveAction.java
| 2 -
java/code/src/com/redhat/rhn/frontend/action/iss/EditSlaveSetupAction.java
| 2 -
java/code/src/com/redhat/rhn/frontend/action/iss/MapOrgsAction.java
| 2 -
java/code/src/com/redhat/rhn/frontend/action/iss/MasterAction.java
| 2 -
java/code/src/com/redhat/rhn/frontend/action/iss/RemoveMastersAction.java
| 2 -
java/code/src/com/redhat/rhn/frontend/action/iss/RemoveSlavesAction.java
| 2 -
java/code/src/com/redhat/rhn/frontend/action/iss/SlaveAction.java
| 2 -
java/code/src/com/redhat/rhn/frontend/action/iss/test/IssEditSlaveActionTest.java
| 4 --
java/code/src/com/redhat/rhn/frontend/action/iss/test/IssMapOrgsActionTest.java
| 4 --
java/code/src/com/redhat/rhn/frontend/action/iss/test/IssMasterActionTest.java
| 4 --
java/code/src/com/redhat/rhn/frontend/action/iss/test/IssSlaveActionTest.java
| 4 --
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/test/IssMasterSerializerTest.java
| 15 ++++++++++
java/code/src/com/redhat/rhn/frontend/xmlrpc/sync/master/MasterHandler.java
| 2 -
18 files changed, 20 insertions(+), 37 deletions(-)
New commits:
commit fd711e2eb1cd158434fdeb8aa46acb8d4ee2f7f3
Author: Grant Gainey <ggainey(a)redhat.com>
Date: Tue Jun 25 18:32:47 2013 -0400
Fix checkstyle issues
diff --git a/java/code/src/com/redhat/rhn/domain/iss/IssMaster.java
b/java/code/src/com/redhat/rhn/domain/iss/IssMaster.java
index 3978846..7eab4cd 100644
--- a/java/code/src/com/redhat/rhn/domain/iss/IssMaster.java
+++ b/java/code/src/com/redhat/rhn/domain/iss/IssMaster.java
@@ -1,6 +1,5 @@
/**
* Copyright (c) 2013 Red Hat, Inc.
- * All Rights Reserved.
*
* This software is licensed to you under the GNU General Public License,
* version 2 (GPLv2). There is NO WARRANTY for this software, express or
@@ -12,7 +11,6 @@
* Red Hat trademarks are not licensed under GPLv2. No permission is
* granted to use or replicate Red Hat trademarks that are incorporated
* in this software or its documentation.
- *
*/
package com.redhat.rhn.domain.iss;
diff --git a/java/code/src/com/redhat/rhn/domain/iss/IssMasterOrg.java
b/java/code/src/com/redhat/rhn/domain/iss/IssMasterOrg.java
index b372bef..b9046af 100644
--- a/java/code/src/com/redhat/rhn/domain/iss/IssMasterOrg.java
+++ b/java/code/src/com/redhat/rhn/domain/iss/IssMasterOrg.java
@@ -1,6 +1,5 @@
/**
* Copyright (c) 2013 Red Hat, Inc.
- * All Rights Reserved.
*
* This software is licensed to you under the GNU General Public License,
* version 2 (GPLv2). There is NO WARRANTY for this software, express or
@@ -12,7 +11,6 @@
* Red Hat trademarks are not licensed under GPLv2. No permission is
* granted to use or replicate Red Hat trademarks that are incorporated
* in this software or its documentation.
- *
*/
package com.redhat.rhn.domain.iss;
diff --git a/java/code/src/com/redhat/rhn/domain/iss/IssSlave.java
b/java/code/src/com/redhat/rhn/domain/iss/IssSlave.java
index 43c5379..0131bbb 100644
--- a/java/code/src/com/redhat/rhn/domain/iss/IssSlave.java
+++ b/java/code/src/com/redhat/rhn/domain/iss/IssSlave.java
@@ -1,6 +1,5 @@
/**
* Copyright (c) 2013 Red Hat, Inc.
- * All Rights Reserved.
*
* This software is licensed to you under the GNU General Public License,
* version 2 (GPLv2). There is NO WARRANTY for this software, express or
@@ -12,7 +11,6 @@
* Red Hat trademarks are not licensed under GPLv2. No permission is
* granted to use or replicate Red Hat trademarks that are incorporated
* in this software or its documentation.
- *
*/
package com.redhat.rhn.domain.iss;
diff --git a/java/code/src/com/redhat/rhn/frontend/action/iss/AllowSlaveOrgsAction.java
b/java/code/src/com/redhat/rhn/frontend/action/iss/AllowSlaveOrgsAction.java
index ba07512..198c574 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/iss/AllowSlaveOrgsAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/iss/AllowSlaveOrgsAction.java
@@ -1,6 +1,5 @@
/**
* Copyright (c) 2013 Red Hat, Inc.
- * All Rights Reserved.
*
* This software is licensed to you under the GNU General Public License,
* version 2 (GPLv2). There is NO WARRANTY for this software, express or
@@ -12,7 +11,6 @@
* Red Hat trademarks are not licensed under GPLv2. No permission is
* granted to use or replicate Red Hat trademarks that are incorporated
* in this software or its documentation.
- *
*/
package com.redhat.rhn.frontend.action.iss;
diff --git a/java/code/src/com/redhat/rhn/frontend/action/iss/DeleteSlaveAction.java
b/java/code/src/com/redhat/rhn/frontend/action/iss/DeleteSlaveAction.java
index f46e3c8..7cfcbfc 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/iss/DeleteSlaveAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/iss/DeleteSlaveAction.java
@@ -1,6 +1,5 @@
/**
* Copyright (c) 2013 Red Hat, Inc.
- * All Rights Reserved.
*
* This software is licensed to you under the GNU General Public License,
* version 2 (GPLv2). There is NO WARRANTY for this software, express or
@@ -12,7 +11,6 @@
* Red Hat trademarks are not licensed under GPLv2. No permission is
* granted to use or replicate Red Hat trademarks that are incorporated
* in this software or its documentation.
- *
*/
package com.redhat.rhn.frontend.action.iss;
diff --git a/java/code/src/com/redhat/rhn/frontend/action/iss/EditSlaveAction.java
b/java/code/src/com/redhat/rhn/frontend/action/iss/EditSlaveAction.java
index 8e784ae..6a1ad01 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/iss/EditSlaveAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/iss/EditSlaveAction.java
@@ -1,6 +1,5 @@
/**
* Copyright (c) 2013 Red Hat, Inc.
- * All Rights Reserved.
*
* This software is licensed to you under the GNU General Public License,
* version 2 (GPLv2). There is NO WARRANTY for this software, express or
@@ -12,7 +11,6 @@
* Red Hat trademarks are not licensed under GPLv2. No permission is
* granted to use or replicate Red Hat trademarks that are incorporated
* in this software or its documentation.
- *
*/
package com.redhat.rhn.frontend.action.iss;
diff --git a/java/code/src/com/redhat/rhn/frontend/action/iss/EditSlaveSetupAction.java
b/java/code/src/com/redhat/rhn/frontend/action/iss/EditSlaveSetupAction.java
index d1c2603..d5a5737 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/iss/EditSlaveSetupAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/iss/EditSlaveSetupAction.java
@@ -1,6 +1,5 @@
/**
* Copyright (c) 2013 Red Hat, Inc.
- * All Rights Reserved.
*
* This software is licensed to you under the GNU General Public License,
* version 2 (GPLv2). There is NO WARRANTY for this software, express or
@@ -12,7 +11,6 @@
* Red Hat trademarks are not licensed under GPLv2. No permission is
* granted to use or replicate Red Hat trademarks that are incorporated
* in this software or its documentation.
- *
*/
package com.redhat.rhn.frontend.action.iss;
diff --git a/java/code/src/com/redhat/rhn/frontend/action/iss/MapOrgsAction.java
b/java/code/src/com/redhat/rhn/frontend/action/iss/MapOrgsAction.java
index e979414..365cf65 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/iss/MapOrgsAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/iss/MapOrgsAction.java
@@ -1,6 +1,5 @@
/**
* Copyright (c) 2013 Red Hat, Inc.
- * All Rights Reserved.
*
* This software is licensed to you under the GNU General Public License,
* version 2 (GPLv2). There is NO WARRANTY for this software, express or
@@ -12,7 +11,6 @@
* Red Hat trademarks are not licensed under GPLv2. No permission is
* granted to use or replicate Red Hat trademarks that are incorporated
* in this software or its documentation.
- *
*/
package com.redhat.rhn.frontend.action.iss;
diff --git a/java/code/src/com/redhat/rhn/frontend/action/iss/MasterAction.java
b/java/code/src/com/redhat/rhn/frontend/action/iss/MasterAction.java
index f818a31..8cde808 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/iss/MasterAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/iss/MasterAction.java
@@ -1,6 +1,5 @@
/**
* Copyright (c) 2013 Red Hat, Inc.
- * All Rights Reserved.
*
* This software is licensed to you under the GNU General Public License,
* version 2 (GPLv2). There is NO WARRANTY for this software, express or
@@ -12,7 +11,6 @@
* Red Hat trademarks are not licensed under GPLv2. No permission is
* granted to use or replicate Red Hat trademarks that are incorporated
* in this software or its documentation.
- *
*/
package com.redhat.rhn.frontend.action.iss;
diff --git a/java/code/src/com/redhat/rhn/frontend/action/iss/RemoveMastersAction.java
b/java/code/src/com/redhat/rhn/frontend/action/iss/RemoveMastersAction.java
index 45b8bb8..b297b25 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/iss/RemoveMastersAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/iss/RemoveMastersAction.java
@@ -1,6 +1,5 @@
/**
* Copyright (c) 2013 Red Hat, Inc.
- * All Rights Reserved.
*
* This software is licensed to you under the GNU General Public License,
* version 2 (GPLv2). There is NO WARRANTY for this software, express or
@@ -12,7 +11,6 @@
* Red Hat trademarks are not licensed under GPLv2. No permission is
* granted to use or replicate Red Hat trademarks that are incorporated
* in this software or its documentation.
- *
*/
package com.redhat.rhn.frontend.action.iss;
diff --git a/java/code/src/com/redhat/rhn/frontend/action/iss/RemoveSlavesAction.java
b/java/code/src/com/redhat/rhn/frontend/action/iss/RemoveSlavesAction.java
index c089412..fa373a6 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/iss/RemoveSlavesAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/iss/RemoveSlavesAction.java
@@ -1,6 +1,5 @@
/**
* Copyright (c) 2013 Red Hat, Inc.
- * All Rights Reserved.
*
* This software is licensed to you under the GNU General Public License,
* version 2 (GPLv2). There is NO WARRANTY for this software, express or
@@ -12,7 +11,6 @@
* Red Hat trademarks are not licensed under GPLv2. No permission is
* granted to use or replicate Red Hat trademarks that are incorporated
* in this software or its documentation.
- *
*/
package com.redhat.rhn.frontend.action.iss;
diff --git a/java/code/src/com/redhat/rhn/frontend/action/iss/SlaveAction.java
b/java/code/src/com/redhat/rhn/frontend/action/iss/SlaveAction.java
index 57b8659..f03826e 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/iss/SlaveAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/iss/SlaveAction.java
@@ -1,6 +1,5 @@
/**
* Copyright (c) 2013 Red Hat, Inc.
- * All Rights Reserved.
*
* This software is licensed to you under the GNU General Public License,
* version 2 (GPLv2). There is NO WARRANTY for this software, express or
@@ -12,7 +11,6 @@
* Red Hat trademarks are not licensed under GPLv2. No permission is
* granted to use or replicate Red Hat trademarks that are incorporated
* in this software or its documentation.
- *
*/
package com.redhat.rhn.frontend.action.iss;
diff --git
a/java/code/src/com/redhat/rhn/frontend/action/iss/test/IssEditSlaveActionTest.java
b/java/code/src/com/redhat/rhn/frontend/action/iss/test/IssEditSlaveActionTest.java
index ca3498b..c0377e7 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/iss/test/IssEditSlaveActionTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/iss/test/IssEditSlaveActionTest.java
@@ -1,6 +1,5 @@
/**
- * Copyright (c) 2008--2012 Red Hat, Inc.
- * All Rights Reserved.
+ * Copyright (c) 2013 Red Hat, Inc.
*
* This software is licensed to you under the GNU General Public License,
* version 2 (GPLv2). There is NO WARRANTY for this software, express or
@@ -12,7 +11,6 @@
* Red Hat trademarks are not licensed under GPLv2. No permission is
* granted to use or replicate Red Hat trademarks that are incorporated
* in this software or its documentation.
- *
*/
package com.redhat.rhn.frontend.action.iss.test;
diff --git
a/java/code/src/com/redhat/rhn/frontend/action/iss/test/IssMapOrgsActionTest.java
b/java/code/src/com/redhat/rhn/frontend/action/iss/test/IssMapOrgsActionTest.java
index 274b6ef..1a6a7ed 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/iss/test/IssMapOrgsActionTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/iss/test/IssMapOrgsActionTest.java
@@ -1,6 +1,5 @@
/**
- * Copyright (c) 2008--2012 Red Hat, Inc.
- * All Rights Reserved.
+ * Copyright (c) 2013 Red Hat, Inc.
*
* This software is licensed to you under the GNU General Public License,
* version 2 (GPLv2). There is NO WARRANTY for this software, express or
@@ -12,7 +11,6 @@
* Red Hat trademarks are not licensed under GPLv2. No permission is
* granted to use or replicate Red Hat trademarks that are incorporated
* in this software or its documentation.
- *
*/
package com.redhat.rhn.frontend.action.iss.test;
diff --git
a/java/code/src/com/redhat/rhn/frontend/action/iss/test/IssMasterActionTest.java
b/java/code/src/com/redhat/rhn/frontend/action/iss/test/IssMasterActionTest.java
index a741a82..13c7b5b 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/iss/test/IssMasterActionTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/iss/test/IssMasterActionTest.java
@@ -1,6 +1,5 @@
/**
- * Copyright (c) 2008--2012 Red Hat, Inc.
- * All Rights Reserved.
+ * Copyright (c) 2013 Red Hat, Inc.
*
* This software is licensed to you under the GNU General Public License,
* version 2 (GPLv2). There is NO WARRANTY for this software, express or
@@ -12,7 +11,6 @@
* Red Hat trademarks are not licensed under GPLv2. No permission is
* granted to use or replicate Red Hat trademarks that are incorporated
* in this software or its documentation.
- *
*/
package com.redhat.rhn.frontend.action.iss.test;
diff --git a/java/code/src/com/redhat/rhn/frontend/action/iss/test/IssSlaveActionTest.java
b/java/code/src/com/redhat/rhn/frontend/action/iss/test/IssSlaveActionTest.java
index ffd3cdb..0034e53 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/iss/test/IssSlaveActionTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/iss/test/IssSlaveActionTest.java
@@ -1,6 +1,5 @@
/**
- * Copyright (c) 2008--2012 Red Hat, Inc.
- * All Rights Reserved.
+ * Copyright (c) 2013 Red Hat, Inc.
*
* This software is licensed to you under the GNU General Public License,
* version 2 (GPLv2). There is NO WARRANTY for this software, express or
@@ -12,7 +11,6 @@
* Red Hat trademarks are not licensed under GPLv2. No permission is
* granted to use or replicate Red Hat trademarks that are incorporated
* in this software or its documentation.
- *
*/
package com.redhat.rhn.frontend.action.iss.test;
diff --git
a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/test/IssMasterSerializerTest.java
b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/test/IssMasterSerializerTest.java
index 1aa5c83..697ac50 100644
---
a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/test/IssMasterSerializerTest.java
+++
b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/test/IssMasterSerializerTest.java
@@ -1,3 +1,18 @@
+/**
+ * Copyright (c) 2013 Red Hat, Inc.
+ *
+ * This software is licensed to you under the GNU General Public License,
+ * version 2 (GPLv2). There is NO WARRANTY for this software, express or
+ * implied, including the implied warranties of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
+ * along with this software; if not, see
+ *
http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
+ *
+ * Red Hat trademarks are not licensed under GPLv2. No permission is
+ * granted to use or replicate Red Hat trademarks that are incorporated
+ * in this software or its documentation.
+ */
+
package com.redhat.rhn.frontend.xmlrpc.serializer.test;
import java.io.IOException;
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/sync/master/MasterHandler.java
b/java/code/src/com/redhat/rhn/frontend/xmlrpc/sync/master/MasterHandler.java
index 31a197a..2b77372 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/sync/master/MasterHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/sync/master/MasterHandler.java
@@ -248,7 +248,7 @@ public class MasterHandler extends BaseHandler {
* exported to this Slave
* @xmlrpc.param #param("string", "sessionKey")
* @xmlrpc.param #param_desc("long", "id", "Id of the
desired Master")
- * @xmlrpc.param #param("newOrg",
+ * @xmlrpc.param
* #struct("master-org details")
* #prop("int", "masterOrgId")
* #prop("string", "masterOrgName")