Changes to 'refs/tags/spacewalk-schema-1.8.85-1'
by Jan Pazdziora
Tag 'spacewalk-schema-1.8.85-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-10-31 08:23 +0000
Tagging package [spacewalk-schema] version [1.8.85-1] in directory [schema/spacewalk/].
Changes since spacewalk-java-1.8.177-1:
Jan Pazdziora (2):
Fixing syntax.
Automatic commit of package [spacewalk-schema] release [1.8.85-1].
---
rel-eng/packages/spacewalk-schema | 2 +-
schema/spacewalk/common/views/rhnOrgDistChannelMap.sql | 8 ++++----
schema/spacewalk/spacewalk-schema.spec | 5 ++++-
schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/147-rhnOrgDistChannelMap.sql | 8 ++++----
4 files changed, 13 insertions(+), 10 deletions(-)
---
11 years, 6 months
rel-eng/packages schema/spacewalk
by Jan Pazdziora
rel-eng/packages/spacewalk-schema | 2 +-
schema/spacewalk/spacewalk-schema.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 98f7c5bb0532c1b379bc925d3f48d5d27446793b
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Oct 31 09:23:47 2012 +0100
Automatic commit of package [spacewalk-schema] release [1.8.85-1].
diff --git a/rel-eng/packages/spacewalk-schema b/rel-eng/packages/spacewalk-schema
index 4abeb86..129d1a8 100644
--- a/rel-eng/packages/spacewalk-schema
+++ b/rel-eng/packages/spacewalk-schema
@@ -1 +1 @@
-1.8.84-1 schema/spacewalk/
+1.8.85-1 schema/spacewalk/
diff --git a/schema/spacewalk/spacewalk-schema.spec b/schema/spacewalk/spacewalk-schema.spec
index 40fb0fa..8609dda 100644
--- a/schema/spacewalk/spacewalk-schema.spec
+++ b/schema/spacewalk/spacewalk-schema.spec
@@ -2,7 +2,7 @@ Name: spacewalk-schema
Group: Applications/Internet
Summary: Oracle SQL schema for Spacewalk server
-Version: 1.8.84
+Version: 1.8.85
Release: 1%{?dist}
Source0: %{name}-%{version}.tar.gz
@@ -68,6 +68,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/spacewalk-sql*
%changelog
+* Wed Oct 31 2012 Jan Pazdziora 1.8.85-1
+- Fixing syntax.
+
* Tue Oct 30 2012 Tomas Lestach <tlestach(a)redhat.com> 1.8.84-1
- channel permission shall be guaranteed by the rhnOrgDistChannelMap
- update rhn_channel package to use rhnOrgDistChannelMap
11 years, 6 months
schema/spacewalk
by Jan Pazdziora
schema/spacewalk/common/views/rhnOrgDistChannelMap.sql | 8 ++++----
schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/147-rhnOrgDistChannelMap.sql | 8 ++++----
2 files changed, 8 insertions(+), 8 deletions(-)
New commits:
commit 2f9e75ced2aaf3c67b45ef19b239ddc4d73bc7f7
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Oct 31 09:08:15 2012 +0100
Fixing syntax.
Addressing
CREATE VIEW
ERROR: syntax error at or near "release"
LINE 17: ... NOT NULL THEN dcm_o.release ELSE dcm_n.release END release,
^
diff --git a/schema/spacewalk/common/views/rhnOrgDistChannelMap.sql b/schema/spacewalk/common/views/rhnOrgDistChannelMap.sql
index 9777f4f..bbb6bd7 100644
--- a/schema/spacewalk/common/views/rhnOrgDistChannelMap.sql
+++ b/schema/spacewalk/common/views/rhnOrgDistChannelMap.sql
@@ -1,5 +1,5 @@
--
--- Copyright (c) 2008 Red Hat, Inc.
+-- Copyright (c) 2012 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
@@ -30,9 +30,9 @@ SELECT CASE WHEN dcm_o.org_id IS NOT NULL THEN dcm_o.id ELSE dcm_n.id END id,
o.id as for_org_id,
dcm_o.org_id,
CASE WHEN dcm_o.org_id IS NOT NULL THEN dcm_o.os ELSE dcm_n.os END os,
- CASE WHEN dcm_o.org_id IS NOT NULL THEN dcm_o.release ELSE dcm_n.release END release,
- CASE WHEN dcm_o.org_id IS NOT NULL THEN dcm_o.channel_arch_id ELSE dcm_n.channel_arch_id END channel_arch_id,
- CASE WHEN dcm_o.org_id IS NOT NULL THEN dcm_o.channel_id ELSE dcm_n.channel_id END channel_id
+ CASE WHEN dcm_o.org_id IS NOT NULL THEN dcm_o.release ELSE dcm_n.release END as release,
+ CASE WHEN dcm_o.org_id IS NOT NULL THEN dcm_o.channel_arch_id ELSE dcm_n.channel_arch_id END as channel_arch_id,
+ CASE WHEN dcm_o.org_id IS NOT NULL THEN dcm_o.channel_id ELSE dcm_n.channel_id END as channel_id
FROM web_customer o
JOIN (SELECT DISTINCT release, channel_arch_id from rhnDistChannelMap) dcm ON 1 = 1
LEFT JOIN rhnDistChannelMap dcm_n ON dcm_n.org_id IS NULL
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/147-rhnOrgDistChannelMap.sql b/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/147-rhnOrgDistChannelMap.sql
index 9777f4f..bbb6bd7 100644
--- a/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/147-rhnOrgDistChannelMap.sql
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/147-rhnOrgDistChannelMap.sql
@@ -1,5 +1,5 @@
--
--- Copyright (c) 2008 Red Hat, Inc.
+-- Copyright (c) 2012 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
@@ -30,9 +30,9 @@ SELECT CASE WHEN dcm_o.org_id IS NOT NULL THEN dcm_o.id ELSE dcm_n.id END id,
o.id as for_org_id,
dcm_o.org_id,
CASE WHEN dcm_o.org_id IS NOT NULL THEN dcm_o.os ELSE dcm_n.os END os,
- CASE WHEN dcm_o.org_id IS NOT NULL THEN dcm_o.release ELSE dcm_n.release END release,
- CASE WHEN dcm_o.org_id IS NOT NULL THEN dcm_o.channel_arch_id ELSE dcm_n.channel_arch_id END channel_arch_id,
- CASE WHEN dcm_o.org_id IS NOT NULL THEN dcm_o.channel_id ELSE dcm_n.channel_id END channel_id
+ CASE WHEN dcm_o.org_id IS NOT NULL THEN dcm_o.release ELSE dcm_n.release END as release,
+ CASE WHEN dcm_o.org_id IS NOT NULL THEN dcm_o.channel_arch_id ELSE dcm_n.channel_arch_id END as channel_arch_id,
+ CASE WHEN dcm_o.org_id IS NOT NULL THEN dcm_o.channel_id ELSE dcm_n.channel_id END as channel_id
FROM web_customer o
JOIN (SELECT DISTINCT release, channel_arch_id from rhnDistChannelMap) dcm ON 1 = 1
LEFT JOIN rhnDistChannelMap dcm_n ON dcm_n.org_id IS NULL
11 years, 6 months
Changes to 'refs/tags/spacewalk-java-1.8.177-1'
by Jan Pazdziora
Tag 'spacewalk-java-1.8.177-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-10-30 16:55 +0000
Tagging package [spacewalk-java] version [1.8.177-1] in directory [java/].
Changes since spacewalk-java-1.8.176-1:
Jan Pazdziora (2):
Using xmllint and grep or perl is faster.
Automatic commit of package [spacewalk-java] release [1.8.177-1].
---
java/spacewalk-java.spec | 10 +
java/xpath | 204 ----------------------------------------
rel-eng/packages/spacewalk-java | 2
3 files changed, 8 insertions(+), 208 deletions(-)
---
11 years, 6 months
java/spacewalk-java.spec rel-eng/packages
by Jan Pazdziora
java/spacewalk-java.spec | 5 ++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit fa5cef0ef18ac05b2a3e116fdaaceca6612209c4
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Oct 30 17:55:25 2012 +0100
Automatic commit of package [spacewalk-java] release [1.8.177-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index de1d738..a7dea71 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.176
+Version: 1.8.177
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -617,6 +617,9 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Tue Oct 30 2012 Jan Pazdziora 1.8.177-1
+- Using xmllint and grep or perl is faster.
+
* Tue Oct 30 2012 Tomas Lestach <tlestach(a)redhat.com> 1.8.176-1
- fixing checkstyle
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index dce263e..7297bff 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.8.176-1 java/
+1.8.177-1 java/
11 years, 6 months
java/spacewalk-java.spec java/xpath
by Jan Pazdziora
java/spacewalk-java.spec | 5 -
java/xpath | 204 -----------------------------------------------
2 files changed, 3 insertions(+), 206 deletions(-)
New commits:
commit 26c5c97975f588e5f0e46c5adcecf0e053a1551e
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Oct 30 17:42:43 2012 +0100
Using xmllint and grep or perl is faster.
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index a9cc64e..de1d738 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -109,7 +109,8 @@ BuildRequires: jpam
BuildRequires: tanukiwrapper
Requires: classpathx-mail
BuildRequires: classpathx-mail
-BuildRequires: perl(XML::XPath)
+BuildRequires: /usr/bin/xmllint
+BuildRequires: /usr/bin/perl
%if 0%{?run_checkstyle}
BuildRequires: checkstyle
%endif
@@ -325,7 +326,7 @@ fi
#check duplicate message keys in StringResource_*.xml files
find . -name 'StringResource_*.xml' | while read i ;
do echo $i
- CONTENT=$(./xpath -q -e '*//trans-unit/@id' "$i" | sort | uniq -d )
+ CONTENT=$(/usr/bin/xmllint --format "$i" | /usr/bin/perl -lne 'if (/<trans-unit( id=".+?")?/) { print $1 if $X{$1}++ }' )
if [ -n "$CONTENT" ]; then
echo ERROR - duplicate message keys: $CONTENT
exit 1
diff --git a/java/xpath b/java/xpath
deleted file mode 100755
index d4b5dcc..0000000
--- a/java/xpath
+++ /dev/null
@@ -1,204 +0,0 @@
-#!/usr/bin/perl -w
-
-eval 'exec /usr/bin/perl -w -S $0 ${1+"$@"}'
- if 0; # not running under some shell
-
-eval 'exec /usr/bin/perl -w -S $0 ${1+"$@"}'
- if 0; # not running under some shell
-use strict;
-
-$| = 1;
-
-use XML::XPath;
-
-my @paths;
-my $pipeline;
-my $SUFFIX = "\n";
-my $PREFIX = "";
-my $quiet = 0;
-
-
-PARSE: while ((@ARGV >= 1) && ($ARGV[0] =~ /^-./ )) {
- OPTIONS: {
- if ($ARGV[0] eq "-e") {
- shift;
- push @paths, shift;
- last OPTIONS;
- }
- if ($ARGV[0] eq "-p") {
- shift;
- $PREFIX = shift;
- last OPTIONS;
- }
- if ($ARGV[0] eq "-s") {
- shift;
- $SUFFIX = shift;
- last OPTIONS;
- }
- if ($ARGV[0] eq "-q") {
- $quiet = 1;
- shift;
- last OPTIONS;
- }
- print STDERR "Unknown option ignore: ", shift;
- }
-}
-
-unless (@paths >= 1) {
- print STDERR qq(Usage:
-$0 [options] -e query [-e query...] [filename...]
-
- If no filenams are given, supply XML on STDIN.
- You must provide at least one query. Each supplementary
- query is done in order, the previous query giving the
- context of the next one.
-
- Options:
-
- -q quiet. Only output the resulting PATH
- -s suffix use suffix instead of linefeed.
- -p postfix use prefix instead of nothing.
-);
- exit;
-}
-
-do
-{
- my $xpath;
- my @curpaths = @paths;
- my $filename;
- if (@ARGV >= 1) {
- $filename = shift @ARGV;
- $xpath = XML::XPath->new(filename => $filename);
- }
- else {
- $filename = 'stdin';
- $xpath = XML::XPath->new(ioref => \*STDIN);
- }
-
- my $nodes = $xpath->find(shift @curpaths);
-
- if ($nodes->isa('XML::XPath::NodeSet')) {
- while (@curpaths >= 1) {
- $nodes = find_more($xpath, shift @curpaths, $nodes);
- last unless $nodes->isa('XML::XPath::NodeSet');
- }
- }
-
- if ($nodes->isa('XML::XPath::NodeSet')) {
- if ($nodes->size) {
- print STDERR "Found ", $nodes->size, " nodes in $filename:\n" unless $quiet;
- foreach my $node ($nodes->get_nodelist) {
- print STDERR "-- NODE --\n" unless $quiet;
- print $PREFIX, $node->toString, $SUFFIX;
- }
- }
- else {
- print STDERR "No nodes found in $filename\n" unless $quiet;
- }
- }
- else {
- print STDERR "Query didn't return a nodeset. Value: ";
- print $nodes->value, "\n";
- }
-
-} until (@ARGV < 1);
-
-exit;
-
-sub find_more {
- my $xpath = shift;
- my $find = shift;
- my ($nodes) = @_;
-
- my $newnodes = XML::XPath::NodeSet->new;
-
- foreach my $node ($nodes->get_nodelist) {
- my $new = $xpath->find($find, $node);
- if ($new->isa('XML::XPath::NodeSet')) {
- $newnodes->append($new);
- }
- else {
- warn "Not a nodeset: ", $new->value, "\n";
- }
- }
-
- return $newnodes;
-}
-
-__END__
-
-=head1 NAME
-
-xpath - a script to query XPath statements in XML documents.
-
-=head1 SYNOPSIS
-
-B<xpath [-s suffix] [-p prefix] [-q] -e query [-e query] ... [file] ...>
-
-=head1 DESCRIPTION
-
-B<xpath> uses the L<XML::XPath|XML::XPath> perl module to make XPath queries
-to any XML document. The L<XML::XPath|XML::XPath> module aims to comply exactly
-to the XPath specification at C<http://www.w3.org/TR/xpath> and yet
-allows extensions to be added in the form of functions.
-
-The script takes any number of XPath pointers and tries to apply them
-to each XML document given on the command line. If no file arguments
-are given, the query is done using C<STDIN> as an XML document.
-
-When multiple queries exist, the result of the last query is used as
-context for the next query and only the result of the last one is output.
-The context of the first query is always the root of the current document.
-
-=head1 OPTIONS
-
-=head2 B<-q>
-
-Be quiet. Output only errors (and no separator) on stderr.
-
-=head2 B<-s suffix>
-
-Place C<suffix> at the end of each entry. Default is a linefeed.
-
-=head2 B<-p prefix>
-
-Place C<prefix> preceding each entry. Default is nothing.
-
-=head1 BUGS
-
-The author of this man page is not very fluant in english. Please,
-send him (L<fabien(a)tzone.org>) any corrections concerning this text.
-
-See also L<XML::XPath(3pm)>.
-
-=head1 SEE ALSO
-
-L<XML::XPath(3pm)>.
-
-=head1 HISTORY
-
-This module is copyright 2000 Fastnet Software Ltd. This is free
-software, and as such comes with NO WARRANTY. No dates are used in this
-module. You may distribute this module under the terms of either the
-Gnu GPL, or under specific licencing from Fastnet Software Ltd.
-Special free licencing consideration will be given to similarly free
-software. Please don't flame me for this licence - I've put a lot of
-hours into this code, and if someone uses my software in their product
-I expect them to have the courtesy to contact me first.
-
-Full support for this module is available from Fastnet Software Ltd on
-a pay per incident basis. Alternatively subscribe to the Perl-XML
-mailing list by mailing lyris(a)activestate.com with the text:
-
- SUBSCRIBE Perl-XML
-
-in the body of the message. There are lots of friendly people on the
-list, including myself, and we'll be glad to get you started.
-
-Matt Sergeant, matt(a)sergeant.org
-
-This man page was added as well as some serious modifications to the script
-by Fabien Ninoles <fabien(a)debian.org> for the Debian Project.
-
-=cut
11 years, 6 months
Changes to 'refs/tags/spacewalk-java-1.8.176-1'
by Tomas Lestach
Tag 'spacewalk-java-1.8.176-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2012-10-30 16:10 +0000
Tagging package [spacewalk-java] version [1.8.176-1] in directory [java/].
Changes since spacewalk-backend-1.8.84-1:
Tomas Lestach (2):
fixing checkstyle
Automatic commit of package [spacewalk-java] release [1.8.176-1].
---
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(-)
---
11 years, 6 months
2 commits - java/code java/spacewalk-java.spec rel-eng/packages
by Tomas Lestach
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);
}
11 years, 6 months
Changes to 'refs/tags/spacewalk-backend-1.8.84-1'
by Tomas Lestach
Tag 'spacewalk-backend-1.8.84-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2012-10-30 14:10 +0000
Tagging package [spacewalk-backend] version [1.8.84-1] in directory [backend/].
Changes since spacewalk-java-1.8.175-1:
Tomas Lestach (1):
Automatic commit of package [spacewalk-backend] release [1.8.84-1].
---
backend/spacewalk-backend.spec | 6 +++++-
rel-eng/packages/spacewalk-backend | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
---
11 years, 6 months
Changes to 'refs/tags/spacewalk-java-1.8.175-1'
by Tomas Lestach
Tag 'spacewalk-java-1.8.175-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2012-10-30 14:09 +0000
Tagging package [spacewalk-java] version [1.8.175-1] in directory [java/].
Changes since spacewalk-schema-1.8.84-1:
Tomas Lestach (1):
Automatic commit of package [spacewalk-java] release [1.8.175-1].
---
java/spacewalk-java.spec | 8 +++++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 8 insertions(+), 2 deletions(-)
---
11 years, 6 months