java/code/src/com/redhat/rhn/domain/config/ConfigChannel.java | 3 -
java/code/src/com/redhat/rhn/domain/config/ConfigurationFactory.java | 17
++++++----
java/code/src/com/redhat/rhn/manager/configuration/file/ConfigFileData.java | 2 -
java/code/src/com/redhat/rhn/testing/ConfigTestUtils.java | 3 -
java/spacewalk-java.spec | 6 ++-
rel-eng/packages/spacewalk-java | 2 -
6 files changed, 20 insertions(+), 13 deletions(-)
New commits:
commit 27736228af802102aebafc3aa2d39752ac03680d
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu May 24 12:12:28 2012 +0200
Automatic commit of package [spacewalk-java] release [1.8.72-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index c5b872d..67a99e8 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -22,7 +22,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.8.71
+Version: 1.8.72
Release: 1%{?dist}
URL:
https://fedorahosted.org/spacewalk
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -605,6 +605,10 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Thu May 24 2012 Tomas Lestach <tlestach(a)redhat.com> 1.8.72-1
+- fix ConfigurationManagerTest.testCopyFile
+- fix ConfigTestUtils.createConfigRevision
+
* Mon May 21 2012 Jan Pazdziora 1.8.71-1
- %%defattr is not needed since rpm 4.4
- Fix incorrect text fields.
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index e953573..b7ace5c 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.8.71-1 java/
+1.8.72-1 java/
commit 38295d46216af56a6ff517de30c4a169c874aeb4
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu May 24 11:11:19 2012 +0200
fix ConfigurationManagerTest.testCopyFile
and some config stuff
diff --git a/java/code/src/com/redhat/rhn/domain/config/ConfigChannel.java
b/java/code/src/com/redhat/rhn/domain/config/ConfigChannel.java
index c1f7021..b08f9c4 100644
--- a/java/code/src/com/redhat/rhn/domain/config/ConfigChannel.java
+++ b/java/code/src/com/redhat/rhn/domain/config/ConfigChannel.java
@@ -224,8 +224,7 @@ public class ConfigChannel extends BaseDomainHelper implements
Identifiable {
file.setConfigFileName(cfn);
file.setCreated(new Date());
file.setModified(new Date());
- ConfigurationFactory.commit(file);
- return file;
+ return ConfigurationFactory.commit(file);
}
/**
diff --git a/java/code/src/com/redhat/rhn/domain/config/ConfigurationFactory.java
b/java/code/src/com/redhat/rhn/domain/config/ConfigurationFactory.java
index 7121e5d..b14ec06 100644
--- a/java/code/src/com/redhat/rhn/domain/config/ConfigurationFactory.java
+++ b/java/code/src/com/redhat/rhn/domain/config/ConfigurationFactory.java
@@ -157,8 +157,9 @@ public class ConfigurationFactory extends HibernateFactory {
* attached to it. config channels also used stored procedures for
* insertions, so we can't simply ask hibernate to save it for us.
* @param file The configuration file to persist
+ * @return config file id
*/
- public static void saveNewConfigFile(ConfigFile file) {
+ public static Long saveNewConfigFile(ConfigFile file) {
//This is designed to catch some of the cases in which the config channel
//was not saved before the config file.
//There is still the possibility that the config channel hasn't been
committed to
@@ -186,7 +187,7 @@ public class ConfigurationFactory extends HibernateFactory {
outParams.put("configFileId", new Integer(Types.NUMERIC));
Map result = m.execute(inParams, outParams);
- file.setId((Long)result.get("configFileId"));
+ return (Long)result.get("configFileId");
}
/**
@@ -278,15 +279,18 @@ public class ConfigurationFactory extends HibernateFactory {
* use a stored procedure for inserting, we have to decide whether to
* insert or update here. If the file's id is null, we insert.
* @param file The file to save or update
+ * @return config file
*/
- public static void commit(ConfigFile file) {
+ public static ConfigFile commit(ConfigFile file) {
commit(file.getConfigChannel());
if (file.getId() == null) {
- saveNewConfigFile(file);
+ Long fileId = saveNewConfigFile(file);
+ file = (ConfigFile) getSession().get(ConfigFile.class, fileId);
}
else {
save(file);
}
+ return file;
}
/**
@@ -786,7 +790,7 @@ public class ConfigurationFactory extends HibernateFactory {
//Step 5
revision.setId(null);
- commit(revision);
+ revision = commit(revision);
file.setLatestConfigRevision(revision);
commit(file);
@@ -903,6 +907,7 @@ public class ConfigurationFactory extends HibernateFactory {
file.setConfigFileState(ConfigFileState.normal());
file.setCreated(new Date());
file.setModified(new Date());
+ file = commit(file);
}
else {
rev = getNextRevisionForFile(file);
@@ -918,7 +923,7 @@ public class ConfigurationFactory extends HibernateFactory {
newRevision.setConfigFile(file);
//Step 4
- commit(newRevision);
+ newRevision = commit(newRevision);
file.setLatestConfigRevision(newRevision);
commit(file);
}
diff --git a/java/code/src/com/redhat/rhn/manager/configuration/file/ConfigFileData.java
b/java/code/src/com/redhat/rhn/manager/configuration/file/ConfigFileData.java
index 0ce68cb..0260128 100644
--- a/java/code/src/com/redhat/rhn/manager/configuration/file/ConfigFileData.java
+++ b/java/code/src/com/redhat/rhn/manager/configuration/file/ConfigFileData.java
@@ -440,7 +440,7 @@ public abstract class ConfigFileData {
cRevision.getConfigFile().getConfigFileName().getPath())
&&
getOwner().equals(cInfo.getUsername()) &&
getGroup().equals(cInfo.getGroupname()) &&
- getPermissions().equals(cInfo.getFilemode().toString()) &&
+ Long.valueOf(getPermissions()).equals(cInfo.getFilemode()) &&
((StringUtils.isEmpty(cfdSelinuxCtx) &&
StringUtils.isEmpty(crSelinuxCtx)) ||
cfdSelinuxCtx.equals(crSelinuxCtx));
}
commit 87f03bc923e346eeec20a39785598b3945ae874e
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed May 23 11:33:30 2012 +0200
fix ConfigTestUtils.createConfigRevision
ome commit to fix them all:
TEST com.redhat.rhn.domain.action.config.test.ConfigActionTest
TEST com.redhat.rhn.domain.action.config.test.ConfigRevisionActionTest
TEST com.redhat.rhn.domain.action.test.ActionFactoryTest
TEST com.redhat.rhn.domain.config.test.ConfigRevisionTest
TEST com.redhat.rhn.domain.config.test.ConfigurationFactoryTest
TEST com.redhat.rhn.frontend.action.configuration.ssm.test.ConfigListActionTest
TEST com.redhat.rhn.frontend.action.configuration.test.CompareChannelActionTest
TEST com.redhat.rhn.frontend.action.configuration.test.CompareCopyActionTest
TEST com.redhat.rhn.frontend.action.configuration.test.CompareDeployedActionTest
TEST com.redhat.rhn.frontend.action.configuration.test.CompareRevisionActionTest
TEST com.redhat.rhn.frontend.action.configuration.test.CopyFileLocalActionTest
TEST com.redhat.rhn.frontend.action.configuration.test.CopyFileSandboxActionTest
TEST com.redhat.rhn.frontend.action.configuration.test.CopyFilesCentralActionTest
TEST com.redhat.rhn.frontend.action.configuration.test.DeleteRevisionActionTest
TEST com.redhat.rhn.frontend.action.configuration.test.FileDetailsActionTest
TEST com.redhat.rhn.frontend.action.configuration.test.FileDownloadActionTest
TEST com.redhat.rhn.frontend.action.configuration.test.LocalRevisionDeployActionTest
TEST com.redhat.rhn.frontend.action.schedule.test.ActionSystemsSetupActionTest
TEST com.redhat.rhn.frontend.xmlrpc.configchannel.test.ConfigChannelHandlerTest
TEST com.redhat.rhn.frontend.xmlrpc.system.config.test.ServerConfigHandlerTest
diff --git a/java/code/src/com/redhat/rhn/testing/ConfigTestUtils.java
b/java/code/src/com/redhat/rhn/testing/ConfigTestUtils.java
index 264e4ae..b81cd30 100644
--- a/java/code/src/com/redhat/rhn/testing/ConfigTestUtils.java
+++ b/java/code/src/com/redhat/rhn/testing/ConfigTestUtils.java
@@ -208,8 +208,7 @@ public class ConfigTestUtils extends Assert {
cr.setConfigFile(file);
cr.setConfigInfo(info);
cr.setConfigFileType(type);
- ConfigurationFactory.commit(cr);
- return cr;
+ return ConfigurationFactory.commit(cr);
}
/**