Bug 1231904 - Error in server log on rhq-jboss-as-7-plugin update

Make nativeLocalAuth property optional and fix resource upgrade code, to actually do upgrade.
rhq-project · Jun 16, 2015 · 9bf0db1 · 9bf0db1
1 parent 1ce9c99
commit 9bf0db1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/...ugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java b/...ugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java
@@ -625,6 +625,7 @@ public ResourceUpgradeReport upgrade(ResourceUpgradeContext inventoriedResource)
 
         if (pluginConfiguration.getSimpleValue(Property.NATIVE_LOCAL_AUTH) == null) {
             serverPluginConfiguration.setNativeLocalAuth(hostConfig.isNativeLocalOnly());
+            report.setNewPluginConfiguration(serverPluginConfiguration.getPluginConfig());
             upgraded = true;
         }
 

diff --git a/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml
@@ -1526,7 +1526,7 @@
         </c:simple-property>
         <c:simple-property name="nativeHost" default="127.0.0.1" required="true" description="Native management API host"/>
         <c:simple-property name="nativePort" type="integer" required="true" default="9999" description="Native management API port" />
-        <c:simple-property name="nativeLocalAuth" displayName="Native Local Authentication" type="boolean">
+        <c:simple-property name="nativeLocalAuth" required="false" displayName="Native Local Authentication" type="boolean">
             <c:description>
             Specifies if the local authentication should be used to interact with the EAP CLI 
             (this includes bundle:handover feature, EAP patching and CLI operations).