Attachment 582171 Details for Bug 818952 – patch for edit/load c:group support.

patch for edit/load c:group support.

BZ-818952-commit-b1efec1.txt (text/plain), 8.17 KB, created by Simeon Pinder on 2012-05-04 17:39:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simeon Pinder

Created: 2012-05-04 17:39:55 UTC

Size: 8.17 KB

patch

obsolete

>commit b1efec1b360e6edac3bbd2c2f4041c4d4bf09003
>Author: Simeon Pinder <spinder@redhat.com>
>Date:   Fri May 4 13:42:17 2012 -0400
>
>     [BZ 818952] adding the rest of support for c:group load and edits for BaseComponent for as7.
>
>diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ConfigurationLoadDelegate.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ConfigurationLoadDelegate.java
>index b6dc126..eb64132 100644
>--- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ConfigurationLoadDelegate.java
>+++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ConfigurationLoadDelegate.java
>@@ -107,7 +107,7 @@ public class ConfigurationLoadDelegate implements ConfigurationFacet {
>      * @throws Exception If anything goes wrong
>      */
>     private void loadHandleGroup(Configuration config, PropertyGroupDefinition groupDefinition) throws Exception {
>-        Operation operation;
>+        Operation operation = null;
>         String groupName = groupDefinition.getName();
>         if (groupName.startsWith("attribute:")) {
>             String attr = groupName.substring("attribute:".length());
>@@ -148,7 +148,10 @@ public class ConfigurationLoadDelegate implements ConfigurationFacet {
>             if (includeRuntime)
>                 ((ReadResource)operation).includeRuntime(true);
>         } else {//no special handling of <c:groups> details required.
>-            //Just assume normal group operations aggregation semantics.
>+            //Just assume normal group operations aggregation semantics, so retrieve entries and load.
>+            Operation op = new ReadResource(address);
>+            List<PropertyDefinition> listedDefs = configurationDefinition.getPropertiesInGroup(groupName);
>+            loadHandleProperties(config, listedDefs, op);
>             return;
>         }
>         List<PropertyDefinition> listedDefs = configurationDefinition.getPropertiesInGroup(groupName);
>diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ConfigurationWriteDelegate.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ConfigurationWriteDelegate.java
>index 495b9fe..f9ffd54 100644
>--- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ConfigurationWriteDelegate.java
>+++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ConfigurationWriteDelegate.java
>@@ -151,8 +151,7 @@ public class ConfigurationWriteDelegate implements ConfigurationFacet {
>                 for (PropertyDefinition def : definitions) {
>                     updateProperty(conf,cop,def, address);
>                 }
>-            }
>-            if (groupName.startsWith("child:")) { // one named child resource
>+            } else if (groupName.startsWith("child:")) { // one named child resource
>                 String subPath = groupName.substring("child:".length());
>                 if (!subPath.contains("="))
>                     throw new IllegalArgumentException("subPath of 'child:' expression has no =");
>@@ -227,7 +226,14 @@ public class ConfigurationWriteDelegate implements ConfigurationFacet {
>                         updateProperty(conf, cop, def, address1);
>                     }
>                 }
>-            } // child: case    TODO handle attribute: case
>+
>+            }// child: case    TODO handle attribute: case
>+            else {//handle the base case with no special case handling
>+                  //get the properties from within the group and update as usual.
>+                for (PropertyDefinition propDef : configurationDefinition.getPropertiesInGroup(groupName)) {
>+                    updateProperty(conf, cop, propDef, address);
>+                }
>+            }
>         }
> 
>         return cop;
>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
>index df09e0a..01101cc 100644
>--- 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
>@@ -134,12 +134,12 @@
> 
>         <resource-configuration>
> 
>-
>+          <c:group name="proxy" displayName="Proxy Options">
>             <c:simple-property name="proxy-list" required="false" type="string" readOnly="false" defaultValue="" description="List of proxies, Format (hostname:port) separated with comas."/>
>             <c:simple-property name="proxy-url" required="false" type="string" readOnly="false" defaultValue="/" description="Base URL for MCMP requests."/>
>-
>+          </c:group>
> 
>-
>+          <c:group name="advertise" displayName="Advertise Options">
>             <c:simple-property name="advertise-socket" required="false" type="string" readOnly="false" defaultValue="224.0.1.105:23364"
>                                description="Name of Socket binding to use for the Advertise socket."/>
>             <c:simple-property name="advertise" required="false" type="boolean" readOnly="false" defaultValue="true" description="Use Advertise logic or not."/>
>@@ -149,21 +149,21 @@
>               <c:option-source target="resource" expression="type=Connector plugin=jboss-as-7"/>
>             </c:simple-property>
>             <c:simple-property name="domain" required="false" type="string" readOnly="false" description="loadBalancingGroup name."/>
>-
>+          </c:group>
> 
>-
>+          <c:group name="context" displayName="Web Context Options">
>             <c:simple-property name="excluded-contexts" required="false" type="string" readOnly="false" defaultValue="ROOT,admin-console,invoker,jbossws,jmx-console,juddi,web-console"
>                                description="List of contexts mod_cluster should ignore, Format String separated with comas."/>
>             <c:simple-property name="auto-enable-contexts" required="false" type="boolean" readOnly="false" defaultValue="true" description="Enable contexts even if disabled in mod_cluster_manger (httpd)."/>
>-
>+          </c:group>
> 
>-
>+          <c:group name="session" displayName="Session Options">
>             <c:simple-property name="sticky-session" required="false" type="boolean" readOnly="false" defaultValue="true" description="Use sticky sessions for requests."/>
>             <c:simple-property name="sticky-session-remove" required="false" type="boolean" readOnly="false" defaultValue="false" description="Remove session information on failover."/>
>             <c:simple-property name="sticky-session-force" required="false" type="boolean" readOnly="false" defaultValue="false" description="Don&apos;t failover a request with session information."/>
>-
>+          </c:group>
> 
>-
>+          <c:group name="network" displayName="Network Options">
>             <c:simple-property name="worker-timeout" required="false" type="integer" readOnly="false" defaultValue="-1" description="Timeout to wait in httpd for an available worker to process the requests."/>
>             <c:simple-property name="max-attempts" required="false" type="integer" readOnly="false" defaultValue="1" description="Max attempts to process an idempotent request."/>
>             <c:simple-property name="flush-packets" required="false" type="boolean" readOnly="false" defaultValue="false" description="Enables/disables packet flushing in httpd."/>
>@@ -175,7 +175,7 @@
>             <c:simple-property name="stop-context-timeout" required="false" type="integer" readOnly="false" defaultValue="10" description="Max time to wait for context to process pending requests."/>
>             <c:simple-property name="socket-timeout" required="false" type="integer" readOnly="false" defaultValue="20" description="Timeout to wait for httpd to answer a MCMP message."/>
> 
>-
>+          </c:group>
>         </resource-configuration>
> '>
>

Actions: View

Attachments on bug 818952: 582171 | 583917