Changes to 'refs/tags/spacewalk-java-1.6.18-1'
by Jan Pazdziora
Tag 'spacewalk-java-1.6.18-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2011-08-07 06:02 +0000
Tagging package [spacewalk-java] version [1.6.18-1] in directory [java/].
Changes since spacewalk-java-1.6.17-1:
Jan Pazdziora (2):
Silencing checkstyle.
Automatic commit of package [spacewalk-java] release [1.6.18-1].
---
java/code/src/com/redhat/rhn/manager/channel/ChannelEditor.java | 2 +-
java/spacewalk-java.spec | 5 ++++-
rel-eng/packages/spacewalk-java | 2 +-
3 files changed, 6 insertions(+), 3 deletions(-)
---
12 years, 10 months
2 commits - java/code java/spacewalk-java.spec rel-eng/packages
by Jan Pazdziora
java/code/src/com/redhat/rhn/manager/channel/ChannelEditor.java | 2 +-
java/spacewalk-java.spec | 5 ++++-
rel-eng/packages/spacewalk-java | 2 +-
3 files changed, 6 insertions(+), 3 deletions(-)
New commits:
commit 56fa42240e2afc22c69620d4cc28276b776db0f5
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Sun Aug 7 08:02:50 2011 +0200
Automatic commit of package [spacewalk-java] release [1.6.18-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index d54f200..139f090 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -17,7 +17,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.6.17
+Version: 1.6.18
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -546,6 +546,9 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Sun Aug 07 2011 Jan Pazdziora 1.6.18-1
+- Silencing checkstyle.
+
* Fri Aug 05 2011 Tomas Lestach <tlestach(a)redhat.com> 1.6.17-1
- 728572 - Number is a common interface for both Integer and Long
(tlestach(a)redhat.com)
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index dae3d91..e70fac0 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.6.17-1 java/
+1.6.18-1 java/
commit bafb72770134aa2e7c91b777c839914e802f979c
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Sun Aug 7 08:02:12 2011 +0200
Silencing checkstyle.
Addressing
./code/src/com/redhat/rhn/manager/channel/ChannelEditor.java:100:41: '(' is preceded with whitespace.
diff --git a/java/code/src/com/redhat/rhn/manager/channel/ChannelEditor.java b/java/code/src/com/redhat/rhn/manager/channel/ChannelEditor.java
index 84f378d..ef14bbe 100644
--- a/java/code/src/com/redhat/rhn/manager/channel/ChannelEditor.java
+++ b/java/code/src/com/redhat/rhn/manager/channel/ChannelEditor.java
@@ -97,7 +97,7 @@ public class ChannelEditor {
// make sure we work with long ids
List<Long> longPackageIds = new ArrayList();
for (Iterator it = packageIds.iterator(); it.hasNext();) {
- longPackageIds.add(new Long (((Number)it.next()).longValue()));
+ longPackageIds.add(new Long(((Number)it.next()).longValue()));
}
List<Long> existingPids = ChannelFactory.getPackageIds(channel.getId());
12 years, 10 months
Changes to 'refs/tags/spacewalk-java-1.6.17-1'
by Tomas Lestach
Tag 'spacewalk-java-1.6.17-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2011-08-05 16:09 +0000
Tagging package [spacewalk-java] version [1.6.17-1] in directory [java/].
Changes since spacewalk-java-1.6.16-1:
Tomas Lestach (3):
722454 - removing file attribute from PackageDto and introducing a common method for getting filename from the package path
728572 - Number is a common interface for both Integer and Long
Automatic commit of package [spacewalk-java] release [1.6.17-1].
---
java/code/src/com/redhat/rhn/domain/rhnpackage/Package.java | 9 +-----
java/code/src/com/redhat/rhn/frontend/dto/PackageDto.java | 12 +--------
java/code/src/com/redhat/rhn/frontend/xmlrpc/packages/PackageHelper.java | 13 ++++++++++
java/code/src/com/redhat/rhn/manager/channel/ChannelEditor.java | 2 -
java/spacewalk-java.spec | 8 +++++-
rel-eng/packages/spacewalk-java | 2 -
6 files changed, 26 insertions(+), 20 deletions(-)
---
12 years, 10 months
java/spacewalk-java.spec rel-eng/packages
by Tomas Lestach
java/spacewalk-java.spec | 8 +++++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 8 insertions(+), 2 deletions(-)
New commits:
commit e5465a793913df22ba0ac4f17ba072c9dd6514fb
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Aug 5 18:09:03 2011 +0200
Automatic commit of package [spacewalk-java] release [1.6.17-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 4a453ac..d54f200 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -17,7 +17,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.6.16
+Version: 1.6.17
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -546,6 +546,12 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Fri Aug 05 2011 Tomas Lestach <tlestach(a)redhat.com> 1.6.17-1
+- 728572 - Number is a common interface for both Integer and Long
+ (tlestach(a)redhat.com)
+- 722454 - removing file attribute from PackageDto and introducing a common
+ method for getting filename from the package path (tlestach(a)redhat.com)
+
* Fri Aug 05 2011 Jan Pazdziora 1.6.16-1
- 710169 - correct documentation for api.getApiCallList() API call
(msuchy(a)redhat.com)
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 330b795..dae3d91 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.6.16-1 java/
+1.6.17-1 java/
12 years, 10 months
2 commits - java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/domain/rhnpackage/Package.java | 9 +-----
java/code/src/com/redhat/rhn/frontend/dto/PackageDto.java | 12 +--------
java/code/src/com/redhat/rhn/frontend/xmlrpc/packages/PackageHelper.java | 13 ++++++++++
java/code/src/com/redhat/rhn/manager/channel/ChannelEditor.java | 2 -
4 files changed, 18 insertions(+), 18 deletions(-)
New commits:
commit 224f8d2089c38154207af1e23fddf0a6237a0564
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Aug 5 18:05:45 2011 +0200
728572 - Number is a common interface for both Integer and Long
diff --git a/java/code/src/com/redhat/rhn/manager/channel/ChannelEditor.java b/java/code/src/com/redhat/rhn/manager/channel/ChannelEditor.java
index 891f39f..84f378d 100644
--- a/java/code/src/com/redhat/rhn/manager/channel/ChannelEditor.java
+++ b/java/code/src/com/redhat/rhn/manager/channel/ChannelEditor.java
@@ -97,7 +97,7 @@ public class ChannelEditor {
// make sure we work with long ids
List<Long> longPackageIds = new ArrayList();
for (Iterator it = packageIds.iterator(); it.hasNext();) {
- longPackageIds.add(new Long((Integer) it.next()));
+ longPackageIds.add(new Long (((Number)it.next()).longValue()));
}
List<Long> existingPids = ChannelFactory.getPackageIds(channel.getId());
commit 40ee870ff39ec3557c796491adc8e3d69fc75c13
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Aug 5 17:00:05 2011 +0200
722454 - removing file attribute from PackageDto and introducing a common method for getting filename from the package path
diff --git a/java/code/src/com/redhat/rhn/domain/rhnpackage/Package.java b/java/code/src/com/redhat/rhn/domain/rhnpackage/Package.java
index b27ea65..1bc9a8d 100644
--- a/java/code/src/com/redhat/rhn/domain/rhnpackage/Package.java
+++ b/java/code/src/com/redhat/rhn/domain/rhnpackage/Package.java
@@ -22,8 +22,8 @@ import com.redhat.rhn.domain.errata.impl.PublishedErrata;
import com.redhat.rhn.domain.errata.impl.UnpublishedErrata;
import com.redhat.rhn.domain.org.Org;
import com.redhat.rhn.domain.rpm.SourceRpm;
+import com.redhat.rhn.frontend.xmlrpc.packages.PackageHelper;
-import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.builder.EqualsBuilder;
import org.apache.commons.lang.builder.HashCodeBuilder;
import org.apache.commons.lang.builder.ToStringBuilder;
@@ -97,12 +97,7 @@ public class Package extends BaseDomainHelper {
* @return Returns the file portion of the path.
*/
public String getFile() {
- String[] parts = StringUtils.split(getPath(), '/');
- if (parts != null && parts.length > 0) {
- return parts[parts.length - 1];
- }
-
- return null;
+ return PackageHelper.getPackageFileFromPath(getPath());
}
/**
diff --git a/java/code/src/com/redhat/rhn/frontend/dto/PackageDto.java b/java/code/src/com/redhat/rhn/frontend/dto/PackageDto.java
index fff41a4..d2afa93 100644
--- a/java/code/src/com/redhat/rhn/frontend/dto/PackageDto.java
+++ b/java/code/src/com/redhat/rhn/frontend/dto/PackageDto.java
@@ -16,6 +16,7 @@ package com.redhat.rhn.frontend.dto;
import com.redhat.rhn.common.hibernate.HibernateFactory;
import com.redhat.rhn.common.util.CompressionUtil;
+import com.redhat.rhn.frontend.xmlrpc.packages.PackageHelper;
import java.sql.Blob;
import java.util.Date;
@@ -55,7 +56,6 @@ public class PackageDto extends BaseDto {
private Blob otherXml;
private Blob filelistXml;
private String cookie;
- private String file;
// Pre-existing queries returning this as a string.
@@ -550,14 +550,6 @@ public class PackageDto extends BaseDto {
* @return Returns the file.
*/
public String getFile() {
- return file;
- }
-
-
- /**
- * @param fileIn The file to set.
- */
- public void setFile(String fileIn) {
- file = fileIn;
+ return PackageHelper.getPackageFileFromPath(getPath());
}
}
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/packages/PackageHelper.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/packages/PackageHelper.java
index cd06ce4..923a28e 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/packages/PackageHelper.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/packages/PackageHelper.java
@@ -195,4 +195,17 @@ public class PackageHelper {
private static void addEntry(Map map, String key, Object value) {
map.put(key, value);
}
+
+ /**
+ * Parse filename from package path
+ * @param path package path
+ * @return filename
+ */
+ public static String getPackageFileFromPath(String path) {
+ String[] parts = StringUtils.split(path, '/');
+ if (parts != null && parts.length > 0) {
+ return parts[parts.length - 1];
+ }
+ return null;
+ }
}
12 years, 10 months
Changes to 'refs/tags/spacewalk-java-1.6.16-1'
by Jan Pazdziora
Tag 'spacewalk-java-1.6.16-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2011-08-05 14:59 +0000
Tagging package [spacewalk-java] version [1.6.16-1] in directory [java/].
Changes since spacewalk-config-1.6.1-1:
Jan Pazdziora (1):
Automatic commit of package [spacewalk-java] release [1.6.16-1].
---
java/spacewalk-java.spec | 10 +++++++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 10 insertions(+), 2 deletions(-)
---
12 years, 10 months
java/spacewalk-java.spec rel-eng/packages
by Jan Pazdziora
java/spacewalk-java.spec | 10 +++++++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 10 insertions(+), 2 deletions(-)
New commits:
commit ba07612ecadb3a84ec98becb339b6b2f867f67b2
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Aug 5 16:59:41 2011 +0200
Automatic commit of package [spacewalk-java] release [1.6.16-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index accae31..4a453ac 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -17,7 +17,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.6.15
+Version: 1.6.16
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -546,6 +546,14 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Fri Aug 05 2011 Jan Pazdziora 1.6.16-1
+- 710169 - correct documentation for api.getApiCallList() API call
+ (msuchy(a)redhat.com)
+- 710162 - correct documentation for api.getApiNamespaceCallList() API call
+ (msuchy(a)redhat.com)
+- 710152 - correct documentation for api.getApiNamespaces() API call
+ (msuchy(a)redhat.com)
+
* Fri Aug 05 2011 Miroslav Suchý 1.6.15-1
- checkstyle - Line is longer than 92 characters.
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 6915f8c..330b795 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.6.15-1 java/
+1.6.16-1 java/
12 years, 10 months
Changes to 'refs/tags/spacewalk-config-1.6.1-1'
by Jan Pazdziora
Tag 'spacewalk-config-1.6.1-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2011-08-05 14:02 +0000
Tagging package [spacewalk-config] version [1.6.1-1] in directory [spacewalk/config/].
Changes since rhn-client-tools-1.6.8-1:
Jan Pazdziora (2):
Make monitoring .cgi live again in the /cgi-bin/ namespace, fixing scout config push.
Automatic commit of package [spacewalk-config] release [1.6.1-1].
---
rel-eng/packages/spacewalk-config | 2 +-
spacewalk/config/etc/rhn/satellite-httpd/conf/rhn/rhn_monitoring.conf | 6 ++++++
spacewalk/config/spacewalk-config.spec | 6 +++++-
3 files changed, 12 insertions(+), 2 deletions(-)
---
12 years, 10 months
rel-eng/packages spacewalk/config
by Jan Pazdziora
rel-eng/packages/spacewalk-config | 2 +-
spacewalk/config/spacewalk-config.spec | 6 +++++-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 452c6b5f57db014b32a3f3f08e8c3605e0dd9898
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Aug 5 16:02:01 2011 +0200
Automatic commit of package [spacewalk-config] release [1.6.1-1].
diff --git a/rel-eng/packages/spacewalk-config b/rel-eng/packages/spacewalk-config
index 148cee7..87c78f9 100644
--- a/rel-eng/packages/spacewalk-config
+++ b/rel-eng/packages/spacewalk-config
@@ -1 +1 @@
-1.5.5-1 spacewalk/config/
+1.6.1-1 spacewalk/config/
diff --git a/spacewalk/config/spacewalk-config.spec b/spacewalk/config/spacewalk-config.spec
index 4db95cf..388141b 100644
--- a/spacewalk/config/spacewalk-config.spec
+++ b/spacewalk/config/spacewalk-config.spec
@@ -1,6 +1,6 @@
Name: spacewalk-config
Summary: Spacewalk Configuration
-Version: 1.6.0
+Version: 1.6.1
Release: 1%{?dist}
URL: http://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -105,6 +105,10 @@ chgrp apache /etc/rhn /etc/rhn/rhn.conf /etc/rhn/cluster.ini 2> /dev/null || :
chmod o-rwx /etc/rhn/rhn.conf* /etc/rhn/cluster.ini* /etc/sysconfig/rhn/backup-* /var/lib/rhn/rhn-satellite-prep/* 2> /dev/null || :
%changelog
+* Fri Aug 05 2011 Jan Pazdziora 1.6.1-1
+- Make monitoring .cgi live again in the /cgi-bin/ namespace, fixing scout
+ config push.
+
* Tue Jun 21 2011 Jan Pazdziora 1.5.5-1
- Silence chgrp/chmod, during first installation.
12 years, 10 months
spacewalk/config
by Jan Pazdziora
spacewalk/config/etc/rhn/satellite-httpd/conf/rhn/rhn_monitoring.conf | 6 ++++++
1 file changed, 6 insertions(+)
New commits:
commit 6483c7e7e912df6cf60ad792c3e6de43431ff0d8
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Aug 5 15:49:29 2011 +0200
Make monitoring .cgi live again in the /cgi-bin/ namespace, fixing scout config push.
diff --git a/spacewalk/config/etc/rhn/satellite-httpd/conf/rhn/rhn_monitoring.conf b/spacewalk/config/etc/rhn/satellite-httpd/conf/rhn/rhn_monitoring.conf
index 03b96a8..0eb26ef 100644
--- a/spacewalk/config/etc/rhn/satellite-httpd/conf/rhn/rhn_monitoring.conf
+++ b/spacewalk/config/etc/rhn/satellite-httpd/conf/rhn/rhn_monitoring.conf
@@ -16,6 +16,12 @@ Alias /cgi-mod-perl/ /usr/share/nocpulse/cgi-mod-perl/
Deny from all
Allow from 127.0.0.1
</Location>
+Alias /cgi-bin/create_commands.cgi /usr/share/nocpulse/cgi-bin/create_commands.cgi
+Alias /cgi-bin/fetch_nocpulseini.cgi /usr/share/nocpulse/cgi-bin/fetch_nocpulseini.cgi
+Alias /cgi-bin/fetch_nocpulseini_internal.cgi /usr/share/nocpulse/cgi-bin/fetch_nocpulseini_internal.cgi
+Alias /cgi-bin/redirmgr.cgi /usr/share/nocpulse/cgi-bin/redirmgr.cgi
+Alias /cgi-bin/upload_file.cgi /usr/share/nocpulse/cgi-bin/upload_file.cgi
+Alias /cgi-bin/upload_results.cgi /usr/share/nocpulse/cgi-bin/upload_results.cgi
<Directory "/usr/share/nocpulse/cgi-bin">
AllowOverride None
Options ExecCGI
12 years, 10 months