java/code/src/com/redhat/rhn/domain/channel/ChannelFactory.java
| 2 +-
java/code/src/com/redhat/rhn/frontend/action/channel/manage/DistChannelMapSetupAction.java
| 3 ++-
java/code/src/com/redhat/rhn/frontend/xmlrpc/distchannel/DistChannelHandler.java
| 4 +++-
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/DistChannelMapSerializer.java
| 2 +-
java/spacewalk-java.spec
| 5 ++++-
rel-eng/packages/spacewalk-java
| 2 +-
6 files changed, 12 insertions(+), 6 deletions(-)
New commits:
commit 9063bfe299b6bc39447f9878c0e4bff5a209c9cf
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Tue Oct 30 17:10:56 2012 +0100
Automatic commit of package [spacewalk-java] release [1.8.176-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index b0a3ffe..a9cc64e 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -23,7 +23,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.8.175
+Version: 1.8.176
Release: 1%{?dist}
URL:
https://fedorahosted.org/spacewalk
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -616,6 +616,9 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Tue Oct 30 2012 Tomas Lestach <tlestach(a)redhat.com> 1.8.176-1
+- fixing checkstyle
+
* Tue Oct 30 2012 Tomas Lestach <tlestach(a)redhat.com> 1.8.175-1
- rewrite distchannel APIs
- fix distchannel.listDefaultMaps API
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 29e16d0..dce263e 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.8.175-1 java/
+1.8.176-1 java/
commit 3f955c36fb96bcec3741ef925ea1a5c81330eed7
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Tue Oct 30 16:58:09 2012 +0100
fixing checkstyle
addressing:
/builddir/build/BUILD/spacewalk-java-1.8.175/./code/src/com/redhat/rhn/frontend/action/channel/manage/DistChannelMapSetupAction.java:59:
Line is longer than 92 characters.
/builddir/build/BUILD/spacewalk-java-1.8.175/./code/src/com/redhat/rhn/frontend/xmlrpc/distchannel/DistChannelHandler.java:90:63:
Expected @param tag for 'orgId'.
/builddir/build/BUILD/spacewalk-java-1.8.175/./code/src/com/redhat/rhn/frontend/xmlrpc/distchannel/DistChannelHandler.java:147:53:
'{' is not preceded with whitespace.
/builddir/build/BUILD/spacewalk-java-1.8.175/./code/src/com/redhat/rhn/frontend/xmlrpc/serializer/DistChannelMapSerializer.java:63:78:
')' is preceded with whitespace.
/builddir/build/BUILD/spacewalk-java-1.8.175/./code/src/com/redhat/rhn/domain/channel/ChannelFactory.java:828:8:
Unused @param tag for 'user'.
/builddir/build/BUILD/spacewalk-java-1.8.175/./code/src/com/redhat/rhn/domain/channel/ChannelFactory.java:831:72:
Expected @param tag for 'org'.
diff --git a/java/code/src/com/redhat/rhn/domain/channel/ChannelFactory.java
b/java/code/src/com/redhat/rhn/domain/channel/ChannelFactory.java
index 9b68a13..4e4e7cc 100644
--- a/java/code/src/com/redhat/rhn/domain/channel/ChannelFactory.java
+++ b/java/code/src/com/redhat/rhn/domain/channel/ChannelFactory.java
@@ -825,7 +825,7 @@ public class ChannelFactory extends HibernateFactory {
/**
* Lists all dist channel maps for an user organization
- * @param user user
+ * @param org organization
* @return list of dist channel maps
*/
public static List<DistChannelMap> listAllDistChannelMapsByOrg(Org org) {
diff --git
a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/DistChannelMapSetupAction.java
b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/DistChannelMapSetupAction.java
index dadc57e..2150cb7 100644
---
a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/DistChannelMapSetupAction.java
+++
b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/DistChannelMapSetupAction.java
@@ -56,6 +56,7 @@ public class DistChannelMapSetupAction extends RhnAction implements
Listable {
*/
public DataResult getResult(RequestContext context) {
return new DataResult(
-
ChannelFactory.listAllDistChannelMapsByOrg(context.getLoggedInUser().getOrg()));
+ ChannelFactory.listAllDistChannelMapsByOrg(
+ context.getLoggedInUser().getOrg()));
}
}
diff --git
a/java/code/src/com/redhat/rhn/frontend/xmlrpc/distchannel/DistChannelHandler.java
b/java/code/src/com/redhat/rhn/frontend/xmlrpc/distchannel/DistChannelHandler.java
index 2a3f0f6..0a93319 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/distchannel/DistChannelHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/distchannel/DistChannelHandler.java
@@ -77,11 +77,13 @@ public class DistChannelHandler extends BaseHandler {
* Lists distribution channel maps valid for an organization,
* satellite admin right needed
* @param sessionKey session key
+ * @param orgId organization id
* @return List of dist channel maps
*
* @xmlrpc.doc Lists distribution channel maps valid for an organization,
* satellite admin right needed
* @xmlrpc.param #session_key()
+ * @xmlrpc.param #param("int", "orgId")
* @xmlrpc.returntype
* #array("dist channel map")
* $DistChannelMapSerializer
@@ -144,7 +146,7 @@ public class DistChannelHandler extends BaseHandler {
if (channel == null) {
// remove
- if (dcm == null || dcm.getOrg() == null){
+ if (dcm == null || dcm.getOrg() == null) {
throw new NoSuchDistChannelMapException();
}
ChannelFactory.remove(dcm);
diff --git
a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/DistChannelMapSerializer.java
b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/DistChannelMapSerializer.java
index 7345cdf..85a6b29 100644
---
a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/DistChannelMapSerializer.java
+++
b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/DistChannelMapSerializer.java
@@ -60,7 +60,7 @@ public class DistChannelMapSerializer implements XmlRpcCustomSerializer
{
helper.add("release", dstChannelMap.getRelease());
helper.add("arch_name", dstChannelMap.getChannelArch().getName());
helper.add("channel_label", dstChannelMap.getChannel().getLabel());
- helper.add("org_specific", dstChannelMap.getOrg() == null ?
"N" : "Y" );
+ helper.add("org_specific", dstChannelMap.getOrg() == null ?
"N" : "Y");
helper.writeTo(output);
}