[jboss-svn-commits] JBL Code SVN: r38087 - in labs/jbossesb/branches/JBESB_4_11_CP/product/tools/jonplugin/as5/src/main: resources/META-INF and 1 other directory.

[jboss-svn-commits at lists.jboss.org]

Author: tcunning
Date: 2012-05-14 11:47:22 -0400 (Mon, 14 May 2012)
New Revision: 38087

Modified:
   labs/jbossesb/branches/JBESB_4_11_CP/product/tools/jonplugin/as5/src/main/java/org/jbosson/plugins/jbossesb/ESB5Component.java
   labs/jbossesb/branches/JBESB_4_11_CP/product/tools/jonplugin/as5/src/main/resources/META-INF/rhq-plugin.xml
Log:
JBESB-3734
Add options for farm/exploded to match JON 3 options for WAR deployment.


Modified: labs/jbossesb/branches/JBESB_4_11_CP/product/tools/jonplugin/as5/src/main/java/org/jbosson/plugins/jbossesb/ESB5Component.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_11_CP/product/tools/jonplugin/as5/src/main/java/org/jbosson/plugins/jbossesb/ESB5Component.java	2012-05-11 20:12:36 UTC (rev 38086)
+++ labs/jbossesb/branches/JBESB_4_11_CP/product/tools/jonplugin/as5/src/main/java/org/jbosson/plugins/jbossesb/ESB5Component.java	2012-05-14 15:47:22 UTC (rev 38087)
@@ -220,7 +220,7 @@
       if (deployTimeConfig.get("deployFarmed") == null) {
 		  PropertySimple df = new PropertySimple();
 		  df.setName("deployFarmed");
-		  df.setBooleanValue(false);
+		  df.setBooleanValue(deployTimeConfig.getSimple("deployFarmed").getBooleanValue());
 		  deployTimeConfig.put(df);
       }
 		  

Modified: labs/jbossesb/branches/JBESB_4_11_CP/product/tools/jonplugin/as5/src/main/resources/META-INF/rhq-plugin.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_11_CP/product/tools/jonplugin/as5/src/main/resources/META-INF/rhq-plugin.xml	2012-05-11 20:12:36 UTC (rev 38086)
+++ labs/jbossesb/branches/JBESB_4_11_CP/product/tools/jonplugin/as5/src/main/resources/META-INF/rhq-plugin.xml	2012-05-14 15:47:22 UTC (rev 38087)
@@ -96,10 +96,24 @@
          <content name="file" displayName="ESB Package" category="deployable" isCreationType="true">
             <configuration>
                <c:group name="deployment" displayName="Deployment Options">
-                  <c:simple-property name="deployZipped" displayName="Deploy Zipped" type="boolean" default="false" required="true"
-                                     description="Indicates if the ESB is deployed either zipped or exploded."/>
-                  <c:simple-property name="deployDirectory" displayName="Deploy Directory" type="string" default="deploy" required="true"
-                                     description="Path to deploy the file. This must be a path relative to the AS configuration set in use."/>
+
+           <c:simple-property name="deployExploded" displayName="Deploy Exploded?" type="boolean" required="true"
+                              default="false">
+                <c:description>
+                    Should the archive be deployed in exploded form (i.e. as a directory)?
+                </c:description>
+           </c:simple-property>
+           <c:simple-property name="deployFarmed" type="boolean" required="true" default="false">
+                <c:description>
+                    Should the application be deployed as a farmed deployment (i.e. to the farm directory, rather than
+                    the deploy directory)? This option should only be set to Yes if this application server instance is
+                    a node in a cluster, otherwise the application creation will fail. If set to Yes, the Deploy
+                    Exploded property must be set to No, since exploded deployments to farm via the Profile Service are
+                    currently not supported.
+                </c:description>
+           </c:simple-property>
+
+
                </c:group>
             </configuration>
          </content>