modules/enterprise/server/container/src/main/scripts/rhq-container.build.xml | 17 +++++----- modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/JPADriftServerBean.java | 11 ++---- 2 files changed, 15 insertions(+), 13 deletions(-)
New commits: commit 1495d03f65e30eef1f533d90ee4c8b434282f790 Author: John Sanda jsanda@redhat.com Date: Mon Nov 28 12:03:06 2011 -0500
[BZ 757758] make property name/values consistent with other server properties
diff --git a/modules/enterprise/server/container/src/main/scripts/rhq-container.build.xml b/modules/enterprise/server/container/src/main/scripts/rhq-container.build.xml index 3a18691..d920ff9 100644 --- a/modules/enterprise/server/container/src/main/scripts/rhq-container.build.xml +++ b/modules/enterprise/server/container/src/main/scripts/rhq-container.build.xml @@ -22,7 +22,7 @@
<property name="rhq.sync.endpoint-address" value="false"/>
- <property name="default.rhq.server.drift.binary.content" value="0"/> + <property name="default.rhq.server.drift.binary.content" value="false"/>
<target name="set-predeploy-prop"> <condition property="predeploy" value="true"> @@ -48,6 +48,7 @@ <property name="rhq.server.quartz.driverDelegateClass" value="${rhq.dev.quartz.driverDelegateClass}" /> <property name="rhq.server.quartz.selectWithLockSQL" value="${rhq.dev.quartz.selectWithLockSQL}" /> <property name="rhq.server.quartz.lockHandlerClass" value="${rhq.dev.quartz.lockHandlerClass}" /> + <property name="rhq.server.drift.store-binary-content" value="${default.rhq.server.drift.binary.content}"/> </target>
<target name="set-default-server-props" unless="predeploy"> @@ -65,6 +66,7 @@ <property name="rhq.server.quartz.driverDelegateClass" value="${default.rhq.server.quartz.driverDelegateClass}" /> <property name="rhq.server.quartz.selectWithLockSQL" value="${default.rhq.server.quartz.selectWithLockSQL}" /> <property name="rhq.server.quartz.lockHandlerClass" value="${default.rhq.server.quartz.lockHandlerClass}" /> + <property name="rhq.server.drift.store-binary-content" value="${default.rhq.server.drift.binary.content}"/> </target>
<target name="initialize" depends="set-predeploy-prop, set-dev-server-props, set-default-server-props"> @@ -610,12 +612,13 @@ rhq.server.plugin-scan-period-ms=${rhq.server.plugin-scan-period-ms} # you have to deal with IP address changes. rhq.sync.endpoint-address=false
-# Enabling this property has two effects. First, it will cause the server to -# request that agents send binary content for files being monitored for drift. -# Secondly, the server will persist that binary content. The property is -# enabled when it is to set a value of 1. Any other value will cause this -# feature to be disabled. -# default.rhq.server.drift.binary.content=0 +# When this is enabled, the server will request that agents send content for +# for binary files that are being monitored for drift. The content for those +# files will then be persisted on the server. By default, the server does not +# persist content for well known binary file types like .ear, .war, .zip, .so, +# etc. The server does however persist content for text files or any other +# files that are not known binary types. +# rhq.server.drift.store-binary-content=${rhq.server.drift.store-binary-content}
# Auto-Install Pre-Configuration Settings # If you wish to circumvent the installer webapp and auto-install the server diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/JPADriftServerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/JPADriftServerBean.java index ddcdace..6633c22 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/JPADriftServerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/JPADriftServerBean.java @@ -306,6 +306,7 @@ public class JPADriftServerBean implements JPADriftServerLocal { throws Exception { final Resource resource = getResource(resourceId); final DriftChangeSetSummary summary = new DriftChangeSetSummary(); + final boolean storeBinaryContent = isBinaryContentStorageEnabled();
try { ZipUtil.walkZipFile(changeSetZip, new ChangeSetFileVisitor() { @@ -346,8 +347,7 @@ public class JPADriftServerBean implements JPADriftServerLocal {
if (version > 0) { for (FileEntry entry : reader) { - boolean addToList = - isBinaryContentStorageEnabled() || !DriftUtil.isBinaryFile(entry.getFile()); + boolean addToList = storeBinaryContent || !DriftUtil.isBinaryFile(entry.getFile()); JPADriftFile oldDriftFile = getDriftFile(entry.getOldSHA(), emptyDriftFiles, addToList); JPADriftFile newDriftFile = getDriftFile(entry.getNewSHA(), emptyDriftFiles, addToList);
@@ -375,8 +375,7 @@ public class JPADriftServerBean implements JPADriftServerLocal { summary.setInitialChangeSet(true); JPADriftSet driftSet = new JPADriftSet(); for (FileEntry entry : reader) { - boolean addToList = - isBinaryContentStorageEnabled() || !DriftUtil.isBinaryFile(entry.getFile()); + boolean addToList = storeBinaryContent || !DriftUtil.isBinaryFile(entry.getFile()); JPADriftFile newDriftFile = getDriftFile(entry.getNewSHA(), emptyDriftFiles, addToList); String path = FileUtil.useForwardSlash(entry.getFile()); // A Drift always has a changeSet. Note that in this code section the changeset is @@ -435,8 +434,8 @@ public class JPADriftServerBean implements JPADriftServerLocal { }
private boolean isBinaryContentStorageEnabled() { - String binaryContent = System.getProperty("default.rhq.server.drift.binary.content", "0"); - return binaryContent.equals("1"); + String binaryContent = System.getProperty("rhq.server.drift.store-binary-content", "false"); + return binaryContent.equals("true"); }
private JPADriftFile getDriftFile(String sha256, List<JPADriftFile> emptyDriftFiles, boolean addToList) {
rhq-commits@lists.fedorahosted.org