Attachment 581992 Details for Bug 818673 – a patch that implements this

[patch] a patch that implements this

BZ-818673.patch (text/plain), 39.79 KB, created by Ian Springer on 2012-05-04 00:45:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ian Springer

Created: 2012-05-04 00:45:17 UTC

Size: 39.79 KB

patch

obsolete

>diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/Domain2Descriptor.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/Domain2Descriptor.java
>index 4a64d1f..f852ba8 100644
>--- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/Domain2Descriptor.java
>+++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/Domain2Descriptor.java
>@@ -38,6 +38,8 @@ import org.rhq.modules.plugins.jbossas7.json.Operation;
> @SuppressWarnings("unchecked")
> public class Domain2Descriptor {
> 
>+    private static final String PLUGIN_NAME = "JBossAS7";
>+
>     //Need to hard code until JIRA addressed: https://issues.jboss.org/browse/AS7-4384 
>     private String[] properties = { "cpu", "mem", "heap", "sessions", "requests", "send-traffic", "receive-traffic",
>         "busyness", "connection-pool" };
>@@ -270,9 +272,9 @@ public class Domain2Descriptor {
>             doIndent(childIndent, element);
>             element.append("<runs-inside>\n");
>             doIndent(childIndent + 2, element);
>-            element.append("<parent-resource-type name=\"Profile\" plugin=\"jboss-as-7\"/>\n");
>+            element.append("<parent-resource-type name=\"Profile\" plugin=\"" + PLUGIN_NAME + "\"/>\n");
>             doIndent(childIndent + 2, element);
>-            element.append("<parent-resource-type name=\"JBossAS7 Standalone Server\" plugin=\"jboss-as-7\"/>\n");
>+            element.append("<parent-resource-type name=\"JBossAS7 Standalone Server\" plugin=\"" + PLUGIN_NAME + "\"/>\n");
>             doIndent(childIndent, element);
>             element.append("</runs-inside>\n");
>         }
>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..74814e8 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
>@@ -2,6 +2,8 @@
> 
> <!DOCTYPE plugin [
> 
>+    <!ENTITY pluginName 'JBossAS7'>
>+
>     <!ENTITY startScriptPluginConfigGroup '
>     <c:group name="operations">
>         <c:simple-property name="startScript" type="file"
>@@ -146,7 +148,7 @@
>             <c:simple-property name="advertise-security-key" required="false" type="string" readOnly="false" description="String containing the security key for the Advertise logic."/>
>             <c:simple-property name="balancer" required="false" type="string" readOnly="false" defaultValue="mycluster" description="The balancer name."/>
>             <c:simple-property name="connector" required="true" type="string" readOnly="false" defaultValue="ajp" description="Name of the web connector used to communicate with the load balancer.">
>-              <c:option-source target="resource" expression="type=Connector plugin=jboss-as-7"/>
>+              <c:option-source target="resource" expression="type=Connector plugin=&pluginName;"/>
>             </c:simple-property>
>             <c:simple-property name="domain" required="false" type="string" readOnly="false" description="loadBalancingGroup name."/>
> 
>@@ -692,9 +694,9 @@
> '>
> 
> ]>
>-<plugin name="jboss-as-7"
>+<plugin name="&pluginName;"
>         displayName="JBoss Application Server 7.x"
>-        description="Management of JBossAS 7"
>+        description="provides monitoring and management of JBossAS 7.x"
>         package="org.rhq.modules.plugins.jbossas7"
>         xmlns="urn:xmlns:rhq-plugin"
>         xmlns:c="urn:xmlns:rhq-configuration"
>@@ -887,7 +889,7 @@
>       <resource-configuration>
>         
>         <c:simple-property name="hostname" displayName="Name of the host to put the server on" required="true" readOnly="true">
>-          <c:option-source target="resource" expression="type=^Host$ plugin=jboss-as-7"/>
>+          <c:option-source target="resource" expression="type=^Host$ plugin=&pluginName;"/>
>         </c:simple-property>
>         <c:simple-property name="group" readOnly="true" displayName="Server Group" description="Server Group this instance belongs to.">
>           <c:option-source target="resource" expression="type=ServerGroup"/>
>@@ -901,7 +903,7 @@
> 
> 
> 
>@@ -965,7 +967,7 @@
>           >
> 
>         <runs-inside>
>-          <parent-resource-type name="Profile" plugin="jboss-as-7"/>
>+          <parent-resource-type name="Profile" plugin="&pluginName;"/>
>         </runs-inside>
> 
>         <plugin-configuration>
>@@ -1006,7 +1008,7 @@
> 
>       <resource-configuration>
>         <c:simple-property name="profile" description="The profile name" required="true">
>-          <c:option-source target="resource" expression="type=^Profile$ plugin=jboss-as-7"/>
>+          <c:option-source target="resource" expression="type=^Profile$ plugin=&pluginName;"/>
>         </c:simple-property>
>         <c:simple-property name="socket-binding-group" readOnly="false" required="true">
>           <c:option-source target="resource" expression="type=SocketBindingGroup"/>
>@@ -1318,7 +1320,7 @@
>         >
> 
>       <runs-inside>
>-        <parent-resource-type name="JBossAS7 Standalone Server" plugin="jboss-as-7"/>
>+        <parent-resource-type name="JBossAS7 Standalone Server" plugin="&pluginName;"/>
>         
>       </runs-inside>
> 
>@@ -1442,9 +1444,9 @@
>            description="Information about the underlying JVM"
>            singleton="true">
>     <runs-inside>
>-      <parent-resource-type name="Managed Server" plugin="jboss-as-7"/>
>-      <parent-resource-type name="Host" plugin="jboss-as-7"/>
>-      <parent-resource-type name="JBossAS7 Standalone Server" plugin="jboss-as-7"/>
>+      <parent-resource-type name="Managed Server" plugin="&pluginName;"/>
>+      <parent-resource-type name="Host" plugin="&pluginName;"/>
>+      <parent-resource-type name="JBossAS7 Standalone Server" plugin="&pluginName;"/>
>     </runs-inside>
> 
>     <plugin-configuration>
>@@ -1637,8 +1639,8 @@
>           singleton="true">
> 
>     <runs-inside>
>-      <parent-resource-type name="Profile" plugin="jboss-as-7"/>
>-      <parent-resource-type name="JBossAS7 Standalone Server" plugin="jboss-as-7"/>
>+      <parent-resource-type name="Profile" plugin="&pluginName;"/>
>+      <parent-resource-type name="JBossAS7 Standalone Server" plugin="&pluginName;"/>
>     </runs-inside>
> 
>     <plugin-configuration>
>@@ -1647,7 +1649,7 @@
> 
>     <resource-configuration>
>       <c:simple-property name="default-virtual-server" required="true" type="string" readOnly="false" defaultValue="default-host" description="The web container's default virtual server. The default value is default-host.">
>-        <c:option-source target="resource" expression="type=VHost plugin=jboss-as-7"/>
>+        <c:option-source target="resource" expression="type=VHost plugin=&pluginName;"/>
>       </c:simple-property>
>       <c:simple-property name="instance-id" readOnly="true" required="false" type="string" description="The identifier for this server instance."/>
>       <c:simple-property name="native" required="false" type="boolean" readOnly="true" defaultValue="true" description="Add the native initialization listener to the web container. The default value is true."/>
>@@ -1803,7 +1805,7 @@
>           <c:map-property name="*Configuration+" displayName="Configuration" readOnly="false" required="false">
>             <c:simple-property name="cache-container" required="false" type="string" readOnly="false"
>                                description="Enables clustered SSO using the specified clustered cache container.">
>-              <c:option-source target="resource" expression="type='Cache Container' plugin=jboss-as-7"/>
>+              <c:option-source target="resource" expression="type='Cache Container' plugin=&pluginName;"/>
>             </c:simple-property>
>             <c:simple-property name="cache-name" required="false" type="string" readOnly="false" description="Name of the cache to use in the cache container."/>
>             <c:simple-property name="domain" required="false" type="string" readOnly="false" description="The cookie domain that will be used."/>
>@@ -1876,7 +1878,7 @@
>           description="General settings of the JCA engine. Not necessarily for end-users">
> 
>     <runs-inside>
>-      <parent-resource-type name="JBossAS7 Standalone Server" plugin="jboss-as-7"/>
>+      <parent-resource-type name="JBossAS7 Standalone Server" plugin="&pluginName;"/>
>     </runs-inside>
> 
>     <plugin-configuration>
>@@ -1904,7 +1906,7 @@
>           description="Datasources subsystem for Standalone servers.">
> 
>     <runs-inside>
>-      <parent-resource-type name="JBossAS7 Standalone Server" plugin="jboss-as-7"/>
>+      <parent-resource-type name="JBossAS7 Standalone Server" plugin="&pluginName;"/>
>     </runs-inside>
> 
>     <plugin-configuration>
>@@ -1972,7 +1974,7 @@
>           description="Datasources subsystem for profile.">
> 
>     <runs-inside>
>-      <parent-resource-type name="Profile" plugin="jboss-as-7"/>
>+      <parent-resource-type name="Profile" plugin="&pluginName;"/>
>     </runs-inside>
> 
>     <plugin-configuration>
>@@ -2019,7 +2021,7 @@
>           description="Datasources subsystem for Managed servers.">
> 
>     <runs-inside>
>-      <parent-resource-type name="Managed Server" plugin="jboss-as-7"/>
>+      <parent-resource-type name="Managed Server" plugin="&pluginName;"/>
>     </runs-inside>
> 
>     <plugin-configuration>
>@@ -2104,7 +2106,7 @@
>            class="BaseComponent"
>            createDeletePolicy="both">
>     <runs-inside>
>-      <parent-resource-type name="Host" plugin="jboss-as-7"/>
>+      <parent-resource-type name="Host" plugin="&pluginName;"/>
>     </runs-inside>
> 
>     <plugin-configuration>
>@@ -2123,8 +2125,8 @@
>            singleton="true"
>            createDeletePolicy="both">
>     <runs-inside>
>-      <parent-resource-type name="Managed Server" plugin="jboss-as-7"/>
>-      <parent-resource-type name="ServerGroup" plugin="jboss-as-7"/>
>+      <parent-resource-type name="Managed Server" plugin="&pluginName;"/>
>+      <parent-resource-type name="ServerGroup" plugin="&pluginName;"/>
>     </runs-inside>
> 
>     <plugin-configuration>
>@@ -2133,7 +2135,7 @@
> 
>     <resource-configuration>
>       <c:simple-property name="baseDefinition" required="true" readOnly="true" description="The definition from host level to use/override">
>-        <c:option-source target="resource" expression="type='JVM Definition (Host)' plugin=jboss-as-7"/>
>+        <c:option-source target="resource" expression="type='JVM Definition (Host)' plugin=&pluginName;"/>
>       </c:simple-property>
>       &jvmDefinitionResourceConfigProperties;
>     </resource-configuration>
>@@ -2147,8 +2149,8 @@
>       >
> 
>     <runs-inside>
>-      <parent-resource-type name="Profile" plugin="jboss-as-7"/>
>-      <parent-resource-type name="JBossAS7 Standalone Server" plugin="jboss-as-7"/>
>+      <parent-resource-type name="Profile" plugin="&pluginName;"/>
>+      <parent-resource-type name="JBossAS7 Standalone Server" plugin="&pluginName;"/>
>     </runs-inside>
> 
>     <plugin-configuration>
>@@ -2536,8 +2538,8 @@
>       >
> 
>     <runs-inside>
>-      <parent-resource-type name="Profile" plugin="jboss-as-7"/>
>-      <parent-resource-type name="JBossAS7 Standalone Server" plugin="jboss-as-7"/>
>+      <parent-resource-type name="Profile" plugin="&pluginName;"/>
>+      <parent-resource-type name="JBossAS7 Standalone Server" plugin="&pluginName;"/>
>     </runs-inside>
> 
>     <plugin-configuration>
>@@ -2635,9 +2637,9 @@
>           singleton="true">
> 
>     <runs-inside>
>-      <parent-resource-type name="Profile" plugin="jboss-as-7"/>
>-      <parent-resource-type name="JBossAS7 Standalone Server" plugin="jboss-as-7"/>
>-      <parent-resource-type name="Managed Server" plugin="jboss-as-7"/>
>+      <parent-resource-type name="Profile" plugin="&pluginName;"/>
>+      <parent-resource-type name="JBossAS7 Standalone Server" plugin="&pluginName;"/>
>+      <parent-resource-type name="Managed Server" plugin="&pluginName;"/>
>     </runs-inside>
> 
>     <plugin-configuration>
>@@ -2704,8 +2706,8 @@
> 		    >
> 
> 			<runs-inside>
>-			    <parent-resource-type name="Pre Handler Chain"  plugin="jboss-as-7"/>
>-			    <parent-resource-type name="Post Handler Chain"  plugin="jboss-as-7"/>
>+			    <parent-resource-type name="Pre Handler Chain"  plugin="&pluginName;"/>
>+			    <parent-resource-type name="Post Handler Chain"  plugin="&pluginName;"/>
> 			</runs-inside>
> 
> 		     <plugin-configuration>
>@@ -2734,8 +2736,8 @@
> 		    >
> 
> 			<runs-inside>
>-			    <parent-resource-type name="Pre Handler Chain"  plugin="jboss-as-7"/>
>-			    <parent-resource-type name="Post Handler Chain"  plugin="jboss-as-7"/>
>+			    <parent-resource-type name="Pre Handler Chain"  plugin="&pluginName;"/>
>+			    <parent-resource-type name="Post Handler Chain"  plugin="&pluginName;"/>
> 			</runs-inside>
> 
> 		     <plugin-configuration>
>@@ -2756,9 +2758,9 @@
>            singleton="true">
> 
>     <runs-inside>
>-      <parent-resource-type name="Host" plugin="jboss-as-7"/>
>-      <parent-resource-type name="JBossAS7 Standalone Server" plugin="jboss-as-7"/>
>-      <parent-resource-type name="Managed Server" plugin="jboss-as-7"/>
>+      <parent-resource-type name="Host" plugin="&pluginName;"/>
>+      <parent-resource-type name="JBossAS7 Standalone Server" plugin="&pluginName;"/>
>+      <parent-resource-type name="Managed Server" plugin="&pluginName;"/>
>     </runs-inside>
> 
>     <plugin-configuration>
>@@ -2820,7 +2822,7 @@
>            description="The transactions subsystem.">
> 
>     <runs-inside>
>-      <parent-resource-type name="JBossAS7 Standalone Server" plugin="jboss-as-7"/>
>+      <parent-resource-type name="JBossAS7 Standalone Server" plugin="&pluginName;"/>
>     </runs-inside>
> 
>     <plugin-configuration>
>@@ -2865,7 +2867,7 @@
>            description="The transactions subsystem.">
> 
>     <runs-inside>
>-      <parent-resource-type name="Profile" plugin="jboss-as-7"/>
>+      <parent-resource-type name="Profile" plugin="&pluginName;"/>
>     </runs-inside>
> 
>     <plugin-configuration>
>@@ -2900,7 +2902,7 @@
>            description="The transactions subsystem.">
> 
>     <runs-inside>
>-      <parent-resource-type name="Managed Server" plugin="jboss-as-7"/>
>+      <parent-resource-type name="Managed Server" plugin="&pluginName;"/>
>     </runs-inside>
> 
>     <plugin-configuration>
>@@ -2927,9 +2929,9 @@
>            description="A named network interface, along with required criteria for determining the IP address to associate with that interface">
> 
>     <runs-inside>
>-      <parent-resource-type name="JBossAS7 Host Controller" plugin="jboss-as-7"/>
>-      <parent-resource-type name="Host" plugin="jboss-as-7"/>
>-      <parent-resource-type name="JBossAS7 Standalone Server" plugin="jboss-as-7"/>
>+      <parent-resource-type name="JBossAS7 Host Controller" plugin="&pluginName;"/>
>+      <parent-resource-type name="Host" plugin="&pluginName;"/>
>+      <parent-resource-type name="JBossAS7 Standalone Server" plugin="&pluginName;"/>
>     </runs-inside>
> 
>     <plugin-configuration>
>@@ -2943,8 +2945,8 @@
>            class="SocketBindingGroupComponent">
> 
>     <runs-inside>
>-      <parent-resource-type name="JBossAS7 Standalone Server" plugin="jboss-as-7"/>
>-      <parent-resource-type name="JBossAS7 Host Controller" plugin="jboss-as-7"/>
>+      <parent-resource-type name="JBossAS7 Standalone Server" plugin="&pluginName;"/>
>+      <parent-resource-type name="JBossAS7 Host Controller" plugin="&pluginName;"/>
>     </runs-inside>
> 
>     <plugin-configuration>
>@@ -2955,7 +2957,7 @@
>       <c:simple-property name="default-interface" readOnly="true" displayName="Default Interface"
>                          description="Default Interface for these bindings. See Network Interfaces for its definition"
>                          required="true">
>-        <c:option-source target="resource" expression="type='Network Interface' plugin=jboss-as-7"/>
>+        <c:option-source target="resource" expression="type='Network Interface' plugin=&pluginName;"/>
>       </c:simple-property>
>       
>       <c:simple-property name="port-offset" readOnly="false" displayName="Port Offset"
>@@ -2967,7 +2969,7 @@
>             <c:simple-property name="name" description="The name of the socket. Services which need to access the socket configuration information will find it using this name." readOnly="true"/>
>             <c:simple-property name="interface" description="Name of the interface to which the socket should be bound, or, for multicast sockets, the interface on which it should listen. This should be one of the declared interfaces."
>                                required="false">
>-              <c:option-source target="resource" expression="type='Network Interface' plugin=jboss-as-7"/>
>+              <c:option-source target="resource" expression="type='Network Interface' plugin=&pluginName;"/>
>             </c:simple-property>
>             <c:simple-property name="port:expr" displayName="Port" required="false" description="Number of the port to which the socket should be bound. ${} Expresions are allowed. Can be omitted if multicast-port is set."/>
>             <c:simple-property name="fixed-port" description="Whether the port value should remain fixed even if numeric offsets are applied to the other sockets in the socket group."
>@@ -2989,9 +2991,9 @@
>            creationDataType="content">
> 
>     <runs-inside>
>-      <parent-resource-type name="ServerGroup" plugin="jboss-as-7"/>
>+      <parent-resource-type name="ServerGroup" plugin="&pluginName;"/>
>       
>-      <parent-resource-type name="JBossAS7 Standalone Server" plugin="jboss-as-7"/>
>+      <parent-resource-type name="JBossAS7 Standalone Server" plugin="&pluginName;"/>
>     </runs-inside>
> 
>     <plugin-configuration>
>@@ -3051,7 +3053,7 @@
>            description="Runtime resources associated with a child deployment packaged inside another deployment; for example a war packaged inside an ear.">
> 
>     <runs-inside>
>-      <parent-resource-type name="Deployment" plugin="jboss-as-7"/>
>+      <parent-resource-type name="Deployment" plugin="&pluginName;"/>
>     </runs-inside>
>     <plugin-configuration>
>       <c:simple-property name="path" default="subdeployment" readOnly="true"/>
>@@ -3067,8 +3069,8 @@
>            singleton="true">
> 
>     <runs-inside>
>-      <parent-resource-type name="Deployment" plugin="jboss-as-7"/>
>-      <parent-resource-type name="Subdeployment" plugin="jboss-as-7"/>
>+      <parent-resource-type name="Deployment" plugin="&pluginName;"/>
>+      <parent-resource-type name="Subdeployment" plugin="&pluginName;"/>
>     </runs-inside>
> 
>     <plugin-configuration>
>@@ -3100,8 +3102,8 @@
>            singleton="true">
> 
>     <runs-inside>
>-      <parent-resource-type name="Deployment" plugin="jboss-as-7"/>
>-      <parent-resource-type name="Subdeployment" plugin="jboss-as-7"/>
>+      <parent-resource-type name="Deployment" plugin="&pluginName;"/>
>+      <parent-resource-type name="Subdeployment" plugin="&pluginName;"/>
>     </runs-inside>
> 
>     <plugin-configuration>
>@@ -3233,7 +3235,7 @@
>              description="A JDBC data-source configuration">
> 
>       <runs-inside>
>-        <parent-resource-type name="Deployment" plugin="jboss-as-7"/>
>+        <parent-resource-type name="Deployment" plugin="&pluginName;"/>
>       </runs-inside>
> 
>       <plugin-configuration>
>@@ -3346,8 +3348,8 @@
>            singleton="true">
> 
>     <runs-inside>
>-      <parent-resource-type name="Deployment" plugin="jboss-as-7"/>
>-      <parent-resource-type name="Subdeployment" plugin="jboss-as-7"/>
>+      <parent-resource-type name="Deployment" plugin="&pluginName;"/>
>+      <parent-resource-type name="Subdeployment" plugin="&pluginName;"/>
>     </runs-inside>
> 
>     <plugin-configuration>
>@@ -3441,8 +3443,8 @@
>            singleton="true">
> 
>     <runs-inside>
>-      <parent-resource-type name="Deployment" plugin="jboss-as-7"/>
>-      <parent-resource-type name="Subdeployment" plugin="jboss-as-7"/>
>+      <parent-resource-type name="Deployment" plugin="&pluginName;"/>
>+      <parent-resource-type name="Subdeployment" plugin="&pluginName;"/>
>     </runs-inside>
> 
>     <plugin-configuration>
>@@ -3632,8 +3634,8 @@
>            singleton="true">
> 
>     <runs-inside>
>-      <parent-resource-type name="Deployment" plugin="jboss-as-7"/>
>-      <parent-resource-type name="Subdeployment" plugin="jboss-as-7"/>
>+      <parent-resource-type name="Deployment" plugin="&pluginName;"/>
>+      <parent-resource-type name="Subdeployment" plugin="&pluginName;"/>
>     </runs-inside>
> 
>     <plugin-configuration>
>@@ -3675,8 +3677,8 @@
>            singleton="true">
> 
>     <runs-inside>
>-      <parent-resource-type name="Deployment" plugin="jboss-as-7"/>
>-      <parent-resource-type name="Subdeployment" plugin="jboss-as-7"/>
>+      <parent-resource-type name="Deployment" plugin="&pluginName;"/>
>+      <parent-resource-type name="Subdeployment" plugin="&pluginName;"/>
>     </runs-inside>
> 
>     <plugin-configuration>
>@@ -3825,7 +3827,7 @@
>            singleton="true"
>       >
>     <runs-inside>
>-      <parent-resource-type name="JBossAS7 Standalone Server" plugin="jboss-as-7"/>
>+      <parent-resource-type name="JBossAS7 Standalone Server" plugin="&pluginName;"/>
>     </runs-inside>
> 
>     <plugin-configuration>
>@@ -3867,9 +3869,9 @@
>            singleton="true">
> 
>     <runs-inside>
>-      <parent-resource-type name="Profile" plugin="jboss-as-7"/>
>-      <parent-resource-type name="JBossAS7 Standalone Server" plugin="jboss-as-7"/>
>-      <parent-resource-type name="Managed Server" plugin="jboss-as-7"/>
>+      <parent-resource-type name="Profile" plugin="&pluginName;"/>
>+      <parent-resource-type name="JBossAS7 Standalone Server" plugin="&pluginName;"/>
>+      <parent-resource-type name="Managed Server" plugin="&pluginName;"/>
>     </runs-inside>
> 
>     <plugin-configuration>
>@@ -3934,9 +3936,9 @@
>            singleton="true">
> 
>     <runs-inside>
>-      <parent-resource-type name="Profile" plugin="jboss-as-7"/>
>-      <parent-resource-type name="JBossAS7 Standalone Server" plugin="jboss-as-7"/>
>-      <parent-resource-type name="Managed Server" plugin="jboss-as-7"/>
>+      <parent-resource-type name="Profile" plugin="&pluginName;"/>
>+      <parent-resource-type name="JBossAS7 Standalone Server" plugin="&pluginName;"/>
>+      <parent-resource-type name="Managed Server" plugin="&pluginName;"/>
>     </runs-inside>
> 
>     <plugin-configuration>
>@@ -3961,9 +3963,9 @@
>            singleton="true">
> 
>     <runs-inside>
>-      <parent-resource-type name="Profile" plugin="jboss-as-7"/>
>-      <parent-resource-type name="JBossAS7 Standalone Server" plugin="jboss-as-7"/>
>-      <parent-resource-type name="Managed Server" plugin="jboss-as-7"/>
>+      <parent-resource-type name="Profile" plugin="&pluginName;"/>
>+      <parent-resource-type name="JBossAS7 Standalone Server" plugin="&pluginName;"/>
>+      <parent-resource-type name="Managed Server" plugin="&pluginName;"/>
>     </runs-inside>
> 
>     <plugin-configuration>
>@@ -4000,7 +4002,7 @@
>       <resource-configuration>
>         <c:simple-property name="name" required="false" type="string" readOnly="false" description="The name of the BootstrapContext"/>
>         <c:simple-property name="workmanager" required="false" type="string" readOnly="false" description="The WorkManager instance for the BootstrapContext">
>-          <c:option-source target="resource" expression="type=Workmanager plugin=jboss-as-7"/>
>+          <c:option-source target="resource" expression="type=Workmanager plugin=&pluginName;"/>
>         </c:simple-property>
>       </resource-configuration>
>     </service>
>@@ -4087,9 +4089,9 @@
>            singleton="true">
> 
>     <runs-inside>
>-      <parent-resource-type name="Profile" plugin="jboss-as-7"/>
>-      <parent-resource-type name="JBossAS7 Standalone Server" plugin="jboss-as-7"/>
>-      <parent-resource-type name="Managed Server" plugin="jboss-as-7"/>
>+      <parent-resource-type name="Profile" plugin="&pluginName;"/>
>+      <parent-resource-type name="JBossAS7 Standalone Server" plugin="&pluginName;"/>
>+      <parent-resource-type name="Managed Server" plugin="&pluginName;"/>
>     </runs-inside>
> 
>     <plugin-configuration>
>@@ -4112,9 +4114,9 @@
>            singleton="true">
> 
>     <runs-inside>
>-      <parent-resource-type name="Profile" plugin="jboss-as-7"/>
>-      <parent-resource-type name="JBossAS7 Standalone Server" plugin="jboss-as-7"/>
>-      <parent-resource-type name="Managed Server" plugin="jboss-as-7"/>
>+      <parent-resource-type name="Profile" plugin="&pluginName;"/>
>+      <parent-resource-type name="JBossAS7 Standalone Server" plugin="&pluginName;"/>
>+      <parent-resource-type name="Managed Server" plugin="&pluginName;"/>
>     </runs-inside>
> 
>     <plugin-configuration>
>@@ -4135,9 +4137,9 @@
>            singleton="true">
> 
>     <runs-inside>
>-      <parent-resource-type name="Profile" plugin="jboss-as-7"/>
>-      <parent-resource-type name="JBossAS7 Standalone Server" plugin="jboss-as-7"/>
>-      <parent-resource-type name="Managed Server" plugin="jboss-as-7"/>
>+      <parent-resource-type name="Profile" plugin="&pluginName;"/>
>+      <parent-resource-type name="JBossAS7 Standalone Server" plugin="&pluginName;"/>
>+      <parent-resource-type name="Managed Server" plugin="&pluginName;"/>
>     </runs-inside>
> 
>     <plugin-configuration>
>@@ -4160,7 +4162,7 @@
>         <c:simple-property name="create-table" required="false" type="boolean" readOnly="true" description="Boolean to determine whether to create create the tables"/>
>         <c:simple-property name="create-table-ddl" required="false" type="string" readOnly="true" description="The DDL used to create the table"/>
>         <c:simple-property name="data-source" required="true" type="string" readOnly="true" description="The datasource used for sequence generation">
>-          <c:option-source target="resource" expression="type=DataSource plugin=jboss-as-7"/>
>+          <c:option-source target="resource" expression="type=DataSource plugin=&pluginName;"/>
>         </c:simple-property>
>         <c:simple-property name="drop-table" required="false" type="boolean" readOnly="true" description="Boolean to determine whether to create drop the tables"/>
>         <c:simple-property name="id-column" required="false" type="string" readOnly="true" description="The ID column name"/>
>@@ -4180,9 +4182,9 @@
>            singleton="true">
> 
>     <runs-inside>
>-      <parent-resource-type name="Profile" plugin="jboss-as-7"/>
>-      <parent-resource-type name="JBossAS7 Standalone Server" plugin="jboss-as-7"/>
>-      <parent-resource-type name="Managed Server" plugin="jboss-as-7"/>
>+      <parent-resource-type name="Profile" plugin="&pluginName;"/>
>+      <parent-resource-type name="JBossAS7 Standalone Server" plugin="&pluginName;"/>
>+      <parent-resource-type name="Managed Server" plugin="&pluginName;"/>
>     </runs-inside>
> 
>     <plugin-configuration>
>@@ -4206,9 +4208,9 @@
>          class="BaseComponent">
> 
>     <runs-inside>
>-      <parent-resource-type name="Profile" plugin="jboss-as-7"/>
>-      <parent-resource-type name="JBossAS7 Standalone Server" plugin="jboss-as-7"/>
>-      <parent-resource-type name="Managed Server" plugin="jboss-as-7"/>
>+      <parent-resource-type name="Profile" plugin="&pluginName;"/>
>+      <parent-resource-type name="JBossAS7 Standalone Server" plugin="&pluginName;"/>
>+      <parent-resource-type name="Managed Server" plugin="&pluginName;"/>
>     </runs-inside>
> 
>     <plugin-configuration>
>@@ -4559,9 +4561,9 @@
>            singleton="true">
> 
>     <runs-inside>
>-      <parent-resource-type name="Profile" plugin="jboss-as-7"/>
>-      <parent-resource-type name="JBossAS7 Standalone Server" plugin="jboss-as-7"/>
>-      <parent-resource-type name="Managed Server" plugin="jboss-as-7"/>
>+      <parent-resource-type name="Profile" plugin="&pluginName;"/>
>+      <parent-resource-type name="JBossAS7 Standalone Server" plugin="&pluginName;"/>
>+      <parent-resource-type name="Managed Server" plugin="&pluginName;"/>
>     </runs-inside>
> 
>     <plugin-configuration>
>@@ -4651,9 +4653,9 @@
>            singleton="true">
> 
>     <runs-inside>
>-      <parent-resource-type name="Profile" plugin="jboss-as-7"/>
>-      <parent-resource-type name="JBossAS7 Standalone Server" plugin="jboss-as-7"/>
>-      <parent-resource-type name="Managed Server" plugin="jboss-as-7"/>
>+      <parent-resource-type name="Profile" plugin="&pluginName;"/>
>+      <parent-resource-type name="JBossAS7 Standalone Server" plugin="&pluginName;"/>
>+      <parent-resource-type name="Managed Server" plugin="&pluginName;"/>
>     </runs-inside>
> 
>     <plugin-configuration>
>@@ -4849,9 +4851,9 @@
>            singleton="true">
> 
>     <runs-inside>
>-      <parent-resource-type name="Profile" plugin="jboss-as-7"/>
>-      <parent-resource-type name="JBossAS7 Standalone Server" plugin="jboss-as-7"/>
>-      <parent-resource-type name="Managed Server" plugin="jboss-as-7"/>
>+      <parent-resource-type name="Profile" plugin="&pluginName;"/>
>+      <parent-resource-type name="JBossAS7 Standalone Server" plugin="&pluginName;"/>
>+      <parent-resource-type name="Managed Server" plugin="&pluginName;"/>
>     </runs-inside>
> 
>     <plugin-configuration>
>@@ -4876,9 +4878,9 @@
>            singleton="true">
> 
>     <runs-inside>
>-      <parent-resource-type name="Profile" plugin="jboss-as-7"/>
>-      <parent-resource-type name="JBossAS7 Standalone Server" plugin="jboss-as-7"/>
>-      <parent-resource-type name="Managed Server" plugin="jboss-as-7"/>
>+      <parent-resource-type name="Profile" plugin="&pluginName;"/>
>+      <parent-resource-type name="JBossAS7 Standalone Server" plugin="&pluginName;"/>
>+      <parent-resource-type name="Managed Server" plugin="&pluginName;"/>
>     </runs-inside>
> 
>     <plugin-configuration>
>@@ -5043,9 +5045,9 @@
>           singleton="true">
> 
>     <runs-inside>
>-      <parent-resource-type name="Profile" plugin="jboss-as-7"/>
>-      <parent-resource-type name="JBossAS7 Standalone Server" plugin="jboss-as-7"/>
>-      <parent-resource-type name="Managed Server" plugin="jboss-as-7"/>
>+      <parent-resource-type name="Profile" plugin="&pluginName;"/>
>+      <parent-resource-type name="JBossAS7 Standalone Server" plugin="&pluginName;"/>
>+      <parent-resource-type name="Managed Server" plugin="&pluginName;"/>
>     </runs-inside>
> 
>     <plugin-configuration>
>@@ -5137,8 +5139,8 @@
>           singleton="true">
> 
>     <runs-inside>
>-      <parent-resource-type name="Profile" plugin="jboss-as-7"/>
>-      <parent-resource-type name="JBossAS7 Standalone Server" plugin="jboss-as-7"/>
>+      <parent-resource-type name="Profile" plugin="&pluginName;"/>
>+      <parent-resource-type name="JBossAS7 Standalone Server" plugin="&pluginName;"/>
>     </runs-inside>
> 
>     <plugin-configuration>
>@@ -5157,9 +5159,9 @@
>           singleton="true">
> 
>     <runs-inside>
>-      <parent-resource-type name="Profile" plugin="jboss-as-7"/>
>-      <parent-resource-type name="JBossAS7 Standalone Server" plugin="jboss-as-7"/>
>-      <parent-resource-type name="Managed Server" plugin="jboss-as-7"/>
>+      <parent-resource-type name="Profile" plugin="&pluginName;"/>
>+      <parent-resource-type name="JBossAS7 Standalone Server" plugin="&pluginName;"/>
>+      <parent-resource-type name="Managed Server" plugin="&pluginName;"/>
>     </runs-inside>
> 
>     <plugin-configuration>
>@@ -5186,9 +5188,9 @@
>            singleton="true">
> 
>     <runs-inside>
>-        <parent-resource-type name="Profile"  plugin="jboss-as-7"/>
>-        <parent-resource-type name="JBossAS7 Standalone Server"  plugin="jboss-as-7"/>
>-        <parent-resource-type name="Managed Server" plugin="jboss-as-7"/>
>+        <parent-resource-type name="Profile"  plugin="&pluginName;"/>
>+        <parent-resource-type name="JBossAS7 Standalone Server"  plugin="&pluginName;"/>
>+        <parent-resource-type name="Managed Server" plugin="&pluginName;"/>
>     </runs-inside>
> 
>     <plugin-configuration>
>@@ -5279,9 +5281,9 @@
>            singleton="true">
> 
>     <runs-inside>
>-      <parent-resource-type name="Profile"  plugin="jboss-as-7"/>
>-      <parent-resource-type name="JBossAS7 Standalone Server"  plugin="jboss-as-7"/>
>-      <parent-resource-type name="Managed Server" plugin="jboss-as-7"/>
>+      <parent-resource-type name="Profile"  plugin="&pluginName;"/>
>+      <parent-resource-type name="JBossAS7 Standalone Server"  plugin="&pluginName;"/>
>+      <parent-resource-type name="Managed Server" plugin="&pluginName;"/>
>     </runs-inside>
> 
>     <plugin-configuration>
>@@ -5295,7 +5297,7 @@
>              createDeletePolicy="both">
> 
>       <runs-inside>
>-        <parent-resource-type name="Mail"  plugin="jboss-as-7"/>
>+        <parent-resource-type name="Mail"  plugin="&pluginName;"/>
>       </runs-inside>
> 
>       <plugin-configuration>
>@@ -5315,7 +5317,7 @@
>                createDeletePolicy="both">
> 
>           <runs-inside>
>-              <parent-resource-type name="Mail Session"  plugin="jboss-as-7"/>
>+              <parent-resource-type name="Mail Session"  plugin="&pluginName;"/>
>           </runs-inside>
> 
>           <plugin-configuration>
>@@ -5337,7 +5339,7 @@
>                createDeletePolicy="both">
> 
>           <runs-inside>
>-              <parent-resource-type name="Mail Session"  plugin="jboss-as-7"/>
>+              <parent-resource-type name="Mail Session"  plugin="&pluginName;"/>
>           </runs-inside>
> 
>           <plugin-configuration>
>@@ -5359,7 +5361,7 @@
>                createDeletePolicy="both">
> 
>           <runs-inside>
>-              <parent-resource-type name="Mail Session"  plugin="jboss-as-7"/>
>+              <parent-resource-type name="Mail Session"  plugin="&pluginName;"/>
>           </runs-inside>
> 
>           <plugin-configuration>
>@@ -5385,9 +5387,9 @@
>              singleton="true">
> 
>     <runs-inside>
>-      <parent-resource-type name="Profile" plugin="jboss-as-7"/>
>-      <parent-resource-type name="JBossAS7 Standalone Server" plugin="jboss-as-7"/>
>-      <parent-resource-type name="Managed Server" plugin="jboss-as-7"/>
>+      <parent-resource-type name="Profile" plugin="&pluginName;"/>
>+      <parent-resource-type name="JBossAS7 Standalone Server" plugin="&pluginName;"/>
>+      <parent-resource-type name="Managed Server" plugin="&pluginName;"/>
>     </runs-inside>
> 
>     <plugin-configuration>
>diff --git a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/AbstractJBossAS7PluginTest.java b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/AbstractJBossAS7PluginTest.java
>index 58b0c91..d9542c0 100644
>--- a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/AbstractJBossAS7PluginTest.java
>+++ b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/AbstractJBossAS7PluginTest.java
>@@ -39,13 +39,13 @@ import org.rhq.test.arquillian.AfterDiscovery;
> import static org.testng.Assert.assertNotNull;
> 
> /**
>- * The base class for all jboss-as-7 plugin integration tests.
>+ * The base class for all as7 plugin integration tests.
>  *
>  * @author Ian Springer
>  */
> public abstract class AbstractJBossAS7PluginTest extends AbstractAgentPluginTest {
> 
>-    protected static final String PLUGIN_NAME = "jboss-as-7";
>+    protected static final String PLUGIN_NAME = "JBossAS7";
> 
>     public static final String MANAGEMENT_USERNAME = "test";
>     public static final String MANAGEMENT_PASSWORD = "test";
>diff --git a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/nonpc/AbstractIntegrationTest.java b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/nonpc/AbstractIntegrationTest.java
>index 9cba788..bb1eca2 100644
>--- a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/nonpc/AbstractIntegrationTest.java
>+++ b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/nonpc/AbstractIntegrationTest.java
>@@ -61,7 +61,9 @@ import org.rhq.modules.plugins.jbossas7.json.PROPERTY_VALUE;
>  */
> @Test(groups = {"integration", "nonpc"}, dependsOnGroups = "discovery")
> public abstract class AbstractIntegrationTest {
>-    
>+
>+    protected static final String PLUGIN_NAME = "JBossAS7";
>+
>     protected static final String DC_HOST = System.getProperty("jboss.domain.bindAddress");
>     protected static final int DC_HTTP_PORT = Integer.valueOf(System.getProperty("jboss.domain.httpManagementPort"));
>     protected static final String DC_USER = AbstractJBossAS7PluginTest.MANAGEMENT_USERNAME;
>diff --git a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/nonpc/ServerGroupTest.java b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/nonpc/ServerGroupTest.java
>index 99bf8f6..a64c9cb 100644
>--- a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/nonpc/ServerGroupTest.java
>+++ b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/nonpc/ServerGroupTest.java
>@@ -43,8 +43,7 @@ public class ServerGroupTest extends AbstractIntegrationTest {
>         Configuration rc = new Configuration();
>         rc.put(new PropertySimple("profile","default"));
>         rc.put(new PropertySimple("socket-binding-group","standard-sockets"));
>-        ResourceType rt = new ResourceType("ServerGroup", "jboss-as-7",
>-                ResourceCategory.SERVICE, null);
>+        ResourceType rt = new ResourceType("ServerGroup", PLUGIN_NAME, ResourceCategory.SERVICE, null);
> 
>         String serverGroupName = "_test-sg";
>         try {
>@@ -67,7 +66,7 @@ public class ServerGroupTest extends AbstractIntegrationTest {
>         Configuration rc = new Configuration();
>         rc.put(new PropertySimple("profile","luzibumpf")); // Does not exist op should fail
>         rc.put(new PropertySimple("socket-binding-group","standard-sockets"));
>-        ResourceType rt = new ResourceType("ServerGroup", "jboss-as-7",
>+        ResourceType rt = new ResourceType("ServerGroup", PLUGIN_NAME,
>                 ResourceCategory.SERVICE, null);
> 
>         String serverGroupName = "_test-sg";
>diff --git a/modules/plugins/jboss-as-7/src/test/resources/test-plugin.xml b/modules/plugins/jboss-as-7/src/test/resources/test-plugin.xml
>index 16247c6..e96e6a8 100644
>--- a/modules/plugins/jboss-as-7/src/test/resources/test-plugin.xml
>+++ b/modules/plugins/jboss-as-7/src/test/resources/test-plugin.xml
>@@ -1,4 +1,4 @@
>-<plugin name="jboss-as-7"
>+<plugin name="JBossAS7"
>         displayName="JBoss Application Server 7.x"
>         description="Management of JBossAS 7"
>         package="org.rhq.modules.plugins.jbossas7"
>@@ -205,7 +205,7 @@
>             <c:simple-property name="default-interface" readOnly="true" displayName="Default Interface"
>                                description="Default Interface for these bindings. See Network Interfaces for its definition"
>                                required="true">
>-                <c:option-source target="resource" expression="type=Network Interface plugin=jboss-as-7"/>
>+                <c:option-source target="resource" expression="type=Network Interface plugin=JBossAS7"/>
>             </c:simple-property>
>             
>             <c:simple-property name="port-offset" readOnly="false" displayName="Port Offset"
>@@ -217,7 +217,7 @@
>                     <c:simple-property name="name"  readOnly="true"/>
>                     <c:simple-property name="interface"
>                                        required="false">
>-                        <c:option-source target="resource" expression="type=Network Interface plugin=jboss-as-7"/>
>+                        <c:option-source target="resource" expression="type=Network Interface plugin=JBossAS7"/>
>                     </c:simple-property>
>                     <c:simple-property name="port"  type="integer"/>
>                     <c:simple-property name="fixed-port"

Actions: View | Diff

Attachments on bug 818673: 581992 | 588422