java/code/src/com/redhat/rhn/domain/channel/NewChannelHelper.java
| 9 +++++++++
java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java
| 1 +
java/spacewalk-java.spec
| 8 +++++++-
rel-eng/packages/spacewalk-java
| 2 +-
4 files changed, 18 insertions(+), 2 deletions(-)
New commits:
commit e400e8108499f5e295a0f5df05620096e26a2997
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Nov 23 17:26:45 2012 +0100
Automatic commit of package [spacewalk-java] release [1.9.17-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 295b7f4..0b1b141 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.9.16
+Version: 1.9.17
Release: 1%{?dist}
URL:
https://fedorahosted.org/spacewalk
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -617,6 +617,12 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Fri Nov 23 2012 Tomas Lestach <tlestach(a)redhat.com> 1.9.17-1
+- 879443 - preserve product name when cloning channels using API
+- Implement new API call system.listAllInstallablePackages
+- Fix query for API call system.listLatestInstallablePackages
+- 798571 - Moscow time is GMT+4.
+
* Thu Nov 22 2012 Jan Pazdziora 1.9.16-1
- Fixing checkstyle.
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index e7a5837..ff26caa 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.9.16-1 java/
+1.9.17-1 java/
commit 75c9bec2e4cf450338ba018961eb9f780d9f693b
Author: Nigel Jones <nigjones(a)redhat.com>
Date: Fri Nov 23 16:49:49 2012 +0100
879443 - preserve product name when cloning channels using API
similar to the perl channel clone code
diff --git a/java/code/src/com/redhat/rhn/domain/channel/NewChannelHelper.java
b/java/code/src/com/redhat/rhn/domain/channel/NewChannelHelper.java
index 5640cd6..9b02294 100644
--- a/java/code/src/com/redhat/rhn/domain/channel/NewChannelHelper.java
+++ b/java/code/src/com/redhat/rhn/domain/channel/NewChannelHelper.java
@@ -48,6 +48,7 @@ public class NewChannelHelper {
private String gpgUrl;
private String gpgFingerprint;
private String description;
+ private ProductName productName;
/**
* Creates a cloned channel based off the info contained within this object
@@ -101,6 +102,7 @@ public class NewChannelHelper {
cloned.setOrg(user.getOrg());
cloned.setBaseDir("/dev/null"); //this is how the perl code did it
cloned.setOriginal(toClone);
+ cloned.setProductName(productName);
if (parent != null) {
cloned.setParentChannel(parent);
@@ -289,6 +291,13 @@ public class NewChannelHelper {
}
/**
+ * @param productNameIn Product name to set.
+ */
+ public void setProductName(ProductName productNameIn) {
+ this.productName = productNameIn;
+ }
+
+ /**
* @param summaryIn The summary to set.
*/
public void setSummary(String summaryIn) {
diff --git
a/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java
b/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java
index f31e854..1c4995f 100644
---
a/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java
+++
b/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java
@@ -1994,6 +1994,7 @@ public class ChannelSoftwareHandler extends BaseHandler {
helper.setParent(parent);
helper.setUser(loggedInUser);
helper.setSummary(summary);
+ helper.setProductName(originalChan.getProductName());
Channel clone = helper.clone(originalState.booleanValue(), originalChan);
ChannelManager.cloneNewestPackages(originalChan.getId(), clone,
"api");