modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseComponent.java | 39 +- modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DatasourceComponent.java | 66 +++ modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml | 51 ++ modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/DatasourceDeployTest.java | 180 ++++++---- 4 files changed, 238 insertions(+), 98 deletions(-)
New commits: commit 2e4e8dadb30d546fa2b57c61e77a1923721af084 Author: Heiko W. Rupp hwr@redhat.com Date: Wed Jul 6 18:08:22 2011 +0200
Allow to deploy xa-data-sources.
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DatasourceComponent.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DatasourceComponent.java index ad6914f..e969644 100644 --- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DatasourceComponent.java +++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DatasourceComponent.java @@ -1,11 +1,14 @@ package org.rhq.modules.plugins.jbossas7;
+import java.util.HashMap; import java.util.List; +import java.util.Map;
import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory;
import org.rhq.core.domain.configuration.Configuration; +import org.rhq.core.domain.configuration.PropertySimple; import org.rhq.core.pluginapi.operation.OperationFacet; import org.rhq.core.pluginapi.operation.OperationResult; import org.rhq.modules.plugins.jbossas7.json.Operation; @@ -47,25 +50,44 @@ public class DatasourceComponent extends BaseComponent implements OperationFacet } } else if (operationName.equals("addDatasource")) { - String driver = parameters.getSimpleValue("driver", NOTSET); - String jndiName = parameters.getSimpleValue("jndi-name", NOTSET); - String poolName = parameters.getSimpleValue("pool-name", NOTSET); - String connectionUrl = parameters.getSimpleValue("connection-url",NOTSET); - String userName = parameters.getSimpleValue("user-name",""); - String password = parameters.getSimpleValue("password",""); String name = parameters.getSimpleValue("name",NOTSET);
List<PROPERTY_VALUE> address = pathToAddress(getPath()); address.add(new PROPERTY_VALUE("data-source",name)); Operation op = new Operation("add",address); - op.addAdditionalProperty("driver-name",driver); - op.addAdditionalProperty("jndi-name",jndiName); - op.addAdditionalProperty("pool-name",poolName); - op.addAdditionalProperty("connection-url",connectionUrl); - if (userName!=null && !userName.isEmpty()) - op.addAdditionalProperty("user-name",userName); - if (password!=null && !password.isEmpty()) - op.addAdditionalProperty("password",password); + addRequiredToOp(op,parameters,"driver-name"); + addRequiredToOp(op,parameters,"jndi-name"); + addRequiredToOp(op, parameters, "pool-name"); + addRequiredToOp(op, parameters, "connection-url"); + addOptionalToOp(op, parameters, "user-name"); + addOptionalToOp(op,parameters,"password"); + + Result res = connection.execute(op); + if (res.isSuccess()) { + result.setSimpleResult("Success"); + } + else { + result.setErrorMessage(res.getFailureDescription().toString()); + } + + } + else if (operationName.equals("addXADatasource")) { + String name = parameters.getSimpleValue("name",NOTSET); + + List<PROPERTY_VALUE> address = pathToAddress(getPath()); + address.add(new PROPERTY_VALUE("xa-data-source",name)); + Operation op = new Operation("add",address); + addRequiredToOp(op,parameters,"driver-name"); + addRequiredToOp(op,parameters,"jndi-name"); + addRequiredToOp(op,parameters,"pool-name"); + addRequiredToOp(op,parameters,"connection-url"); + addOptionalToOp(op,parameters,"user-name"); + addOptionalToOp(op,parameters,"password"); + addRequiredToOp(op,parameters,"xa-data-source-class"); + + Map<String,Object> props = new HashMap<String, Object>(); // TODO + props.put("_foo","_bar"); // TODO AS7-1209 + op.addAdditionalProperty("xa-data-source-properties",props);
Result res = connection.execute(op); if (res.isSuccess()) { @@ -83,7 +105,25 @@ public class DatasourceComponent extends BaseComponent implements OperationFacet return result; }
- void addAdditionalToOp(Operation op, Configuration parameters, String property, boolean optional) { + void addAdditionalToOp(Operation op, Configuration parameters, String property, boolean optional) { + + PropertySimple ps = parameters.getSimple(property); + if (ps==null) { + if (!optional) + throw new IllegalArgumentException("Property " + property + " not found for required parameter"); + } + else { + String tmp = ps.getStringValue(); + op.addAdditionalProperty(property,tmp); + } + } + + + void addRequiredToOp(Operation op, Configuration parameters, String property) { + addAdditionalToOp(op,parameters,property,false); + }
+ void addOptionalToOp(Operation op, Configuration parameters, String property) { + addAdditionalToOp(op,parameters,property,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 index 248367a..9aac735 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 @@ -738,22 +738,38 @@ <operation name="addDatasource" description="Add a datasource to the system. Needs a jdbc-driver that was already added to the domain and promoted to the respective server-group(s) (if in domain mode)."> <parameters> <c:simple-property name="name" required="true" description="Name of the datasource"/> - <c:simple-property name="driver" required="true"> + <c:simple-property name="driver-name" required="true"> <c:option-source target="resource" expression="type=DomainDeployment"/> </c:simple-property> -<!-- - <c:simple-property name="server-group" required="true" > - <c:property-options> - <c:option value="_all" name="All"/> - </c:property-options> - <c:option-source target="resource" expression="type=ServerGroup"/> - </c:simple-property> ---> <c:simple-property name="jndi-name" description="JNDI-Name of the Datasource" required="true"/> + <c:simple-property name="connection-url" description="URL for the connection to the database" required="true"/> <c:simple-property name="pool-name" description="Name of the pool" required="true"/> + <c:simple-property name="user-name" description="User name for DB-connections" required="false" /> + <c:simple-property name="password" description="Password" type="password" required="false"/> + </parameters> + <results> + <c:simple-property name="operationResult"/> + </results> + </operation> + + <operation name="addXADatasource" description="Add a XA datasource to the system. Needs a jdbc-driver that was already added to the domain and promoted to the respective server-group(s) (if in domain mode)."> + <parameters> + <c:simple-property name="name" required="true" description="Name of the datasource"/> + <c:simple-property name="driver-name" required="true"> + <c:option-source target="resource" expression="type=DomainDeployment"/> + </c:simple-property> + <c:simple-property name="xa-data-source-class" required="true" description="xa-data-source-class"/> + <c:simple-property name="jndi-name" description="JNDI-Name of the Datasource" required="true"/> <c:simple-property name="connection-url" description="URL for the connection to the database" required="true"/> + <c:simple-property name="pool-name" description="Name of the pool" required="true"/> <c:simple-property name="user-name" description="User name for DB-connections" required="false" /> <c:simple-property name="password" description="Password" type="password" required="false"/> + <c:list-property name="xa-properties" displayName="XA Properties" description="Additional XA Properties" required="false"> + <c:map-property name="xa-properties"> + <c:simple-property name="key" displayName="Key" description="Key of the property"/> + <c:simple-property name="value" displayName="Value" description="Value of the property"/> + </c:map-property> + </c:list-property> </parameters> <results> <c:simple-property name="operationResult"/> diff --git a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/DatasourceDeployTest.java b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/DatasourceDeployTest.java index 8930fe9..6ce5619 100644 --- a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/DatasourceDeployTest.java +++ b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/DatasourceDeployTest.java @@ -19,6 +19,7 @@ package org.rhq.modules.plugins.jbossas7;
import java.io.IOException; +import java.util.HashMap; import java.util.List; import java.util.Map;
@@ -73,10 +74,7 @@ public class DatasourceDeployTest extends AbstractIntegrationTest { List<String> result = (List<String>) res.getResult(); assert result.contains(DRIVER): "Driver not found in deployments";
- op = new Operation("remove","deployment",DRIVER); - res = conn.execute(op); - assert res != null; - assert res.isSuccess() : "Removal of driver from /deployment failed"; + cleanupDomainDeployment(conn); }
/* @@ -121,7 +119,7 @@ public class DatasourceDeployTest extends AbstractIntegrationTest { uploadDriverToDomain(conn); Result res;
- Address sgAddress = addDriverToServerGroup(conn); + Address sgAddress = addDriverToMainServerGroup(conn);
Operation op; // Now try to see if this ended up in server-one @@ -149,18 +147,8 @@ public class DatasourceDeployTest extends AbstractIntegrationTest {
// Now clean up - op = new Remove(sgAddress); - res = conn.execute(op); - assert res != null; - assert res.isSuccess() : "Could not remove driver from server group"; - - - Address deployment = new Address("deployment",DRIVER); - op = new Remove(deployment); - res = conn.execute(op); - assert res != null; - assert res.isSuccess() : "Could not remove driver from /deployment"; - + cleanupSGDeployment(conn,sgAddress); + cleanupDomainDeployment(conn); }
public void createDatasource() throws Exception { @@ -168,12 +156,12 @@ public class DatasourceDeployTest extends AbstractIntegrationTest { ASConnection conn = getASConnection(); uploadDriverToDomain(conn); Result res; - Address sgAddress = addDriverToServerGroup(conn); + Address sgAddress = addDriverToMainServerGroup(conn); Operation op;
// Now create the data source in the profile, that main-server-group is using.
- Address dsAddress = createDatasource(conn); + Address dsAddress = createDatasource(conn, false);
System.out.println("Deployed new datasource at " + dsAddress.toString());
@@ -181,24 +169,33 @@ public class DatasourceDeployTest extends AbstractIntegrationTest {
// clean up
- op = new Remove(dsAddress); - res = conn.execute(op); - assert res != null; - assert res.isSuccess() : "Could not remove datasource from profile"; + cleanupDatasource(conn,dsAddress); + cleanupSGDeployment(conn,sgAddress); + cleanupDomainDeployment(conn);
+ }
- op = new Remove(sgAddress); - res = conn.execute(op); - assert res != null; - assert res.isSuccess() : "Could not remove driver from server group"; + public void createXADatasource() throws Exception {
+ ASConnection conn = getASConnection(); + uploadDriverToDomain(conn); + Result res; + Address sgAddress = addDriverToMainServerGroup(conn); + Operation op;
- Address deployment = new Address("deployment",DRIVER); - op = new Remove(deployment); - res = conn.execute(op); - assert res != null; - assert res.isSuccess() : "Could not remove driver from /deployment"; + // Now create the data source in the profile, that main-server-group is using. + + Address dsAddress = createDatasource(conn, true); + + System.out.println("Deployed new xa-datasource at " + dsAddress.toString());
+ Thread.sleep(1000L); // give some time to settle + + // clean up + + cleanupDatasource(conn,dsAddress); + cleanupSGDeployment(conn,sgAddress); + cleanupDomainDeployment(conn); }
@@ -206,12 +203,12 @@ public class DatasourceDeployTest extends AbstractIntegrationTest { ASConnection conn = getASConnection(); uploadDriverToDomain(conn); Result res; - Address sgAddress = addDriverToServerGroup(conn); + Address sgAddress = addDriverToMainServerGroup(conn); Operation op;
// Now create the data source in the profile, that main-server-group is using.
- Address dsAddress = createDatasource(conn); + Address dsAddress = createDatasource(conn, false);
System.out.println("Deployed new datasource at " + dsAddress.toString());
@@ -222,25 +219,9 @@ public class DatasourceDeployTest extends AbstractIntegrationTest { assert res != null; assert res.isSuccess(): "Updating the max-pool-size did not work: " + res.getFailureDescription();
- - op = new Remove(dsAddress); - res = conn.execute(op); - assert res != null; - assert res.isSuccess() : "Could not remove datasource from profile"; - - - op = new Remove(sgAddress); - res = conn.execute(op); - assert res != null; - assert res.isSuccess() : "Could not remove driver from server group"; - - - Address deployment = new Address("deployment",DRIVER); - op = new Remove(deployment); - res = conn.execute(op); - assert res != null; - assert res.isSuccess() : "Could not remove driver from /deployment"; - + cleanupDatasource(conn,dsAddress); + cleanupSGDeployment(conn,sgAddress); + cleanupDomainDeployment(conn);
}
@@ -248,7 +229,7 @@ public class DatasourceDeployTest extends AbstractIntegrationTest { ASConnection conn = getASConnection(); uploadDriverToDomain(conn); Result res; - Address sgAddress = addDriverToServerGroup(conn); + Address sgAddress = addDriverToMainServerGroup(conn); Operation op;
// Now create the data source in the profile, that main-server-group is using. @@ -261,7 +242,7 @@ public class DatasourceDeployTest extends AbstractIntegrationTest {
Configuration parameters = new Configuration(); parameters.put(new PropertySimple("name",name)); - parameters.put(new PropertySimple("driver",DRIVER)); + parameters.put(new PropertySimple("driver-name",DRIVER)); parameters.put(new PropertySimple("pool-name","pgPool")); parameters.put(new PropertySimple("connection-url","jdbc:postgresql:foo@localhost:5432")); parameters.put(new PropertySimple("jndi-name","postgresDS")); @@ -280,41 +261,102 @@ public class DatasourceDeployTest extends AbstractIntegrationTest {
Thread.sleep(1000L); // give some time to settle
+ cleanupDatasource(conn, dsAddress); + cleanupSGDeployment(conn, sgAddress); + cleanupDomainDeployment(conn);
- op = new Remove(dsAddress); - res = conn.execute(op); - assert res != null; - assert res.isSuccess() : "Could not remove datasource from profile"; + }
+ public void deployXADatasourceViaOperation() throws Exception { + ASConnection conn = getASConnection(); + uploadDriverToDomain(conn); + Result res; + Address sgAddress = addDriverToMainServerGroup(conn); + Operation op;
- op = new Remove(sgAddress); - res = conn.execute(op); - assert res != null; - assert res.isSuccess() : "Could not remove driver from server group"; + // Now create the data source in the profile, that main-server-group is using. + + String name = "myTestDS";
+ DatasourceComponent dc = new DatasourceComponent(); + dc.path="profile=default,subsystem=datasources"; + dc.connection = conn;
- Address deployment = new Address("deployment",DRIVER); + Configuration parameters = new Configuration(); + parameters.put(new PropertySimple("name",name)); + parameters.put(new PropertySimple("driver-name",DRIVER)); + parameters.put(new PropertySimple("pool-name","pgPool")); + parameters.put(new PropertySimple("connection-url","jdbc:postgresql:foo@localhost:5432")); + parameters.put(new PropertySimple("jndi-name","postgresDS")); + parameters.put(new PropertySimple("xa-data-source-class","org.postgres.XA.driver")); + OperationResult operationResult = dc.invokeOperation("addXADatasource",parameters); + assert operationResult != null; + assert operationResult.getSimpleResult()!=null ; + assert operationResult.getErrorMessage()==null; + + Address dsAddress = new Address(); + dsAddress.add("profile","default"); + dsAddress.add("subsystem","datasources"); + dsAddress.add("xa-data-source",name); + + + System.out.println("Deployed new xa-datasource at " + dsAddress.toString()); + + Thread.sleep(1000L); // give some time to settle + + cleanupDatasource(conn, dsAddress); + cleanupSGDeployment(conn, sgAddress); + cleanupDomainDeployment(conn); + + + } + + private void cleanupDomainDeployment(ASConnection conn) { + Operation op;Result res;Address deployment = new Address("deployment",DRIVER); op = new Remove(deployment); res = conn.execute(op); assert res != null; assert res.isSuccess() : "Could not remove driver from /deployment"; - - }
+ private void cleanupSGDeployment(ASConnection conn, Address sgAddress) { + Operation op;Result res; + op = new Remove(sgAddress); + res = conn.execute(op); + assert res != null; + assert res.isSuccess() : "Could not remove driver from server group @ " + sgAddress; + }
- private Address createDatasource(ASConnection conn) { + private void cleanupDatasource(ASConnection conn, Address dsAddress) { Operation op;Result res; + op = new Remove(dsAddress); + res = conn.execute(op); + assert res != null; + assert res.isSuccess() : "Could not remove datasource from profile @ " + dsAddress; + } + + private Address createDatasource(ASConnection conn, boolean isXa) { + Operation op; + Result res; Address dsAddress = new Address("profile","default"); dsAddress.add("subsystem","datasources"); - dsAddress.add("data-source", POSTGRES); + if (isXa) + dsAddress.add("xa-data-source", POSTGRES); + else + dsAddress.add("data-source", POSTGRES);
op = new Operation("add",dsAddress); op.addAdditionalProperty("driver-name",DRIVER); op.addAdditionalProperty("jndi-name","postgresDS"); op.addAdditionalProperty("pool-name","pgPool"); op.addAdditionalProperty("connection-url","jdbc:postgresql://127.0.0.1:5432/rhqdev"); + if (isXa) { + op.addAdditionalProperty("xa-data-source-class","org.postgresql.xa.PGXADataSource"); + Map<String,String> map = new HashMap<String, String>(1); // TODO AS7-1209 + map.put("key","value"); + op.addAdditionalProperty("xa-data-source-properties",map); + }
res = conn.execute(op); assert res != null; @@ -322,7 +364,7 @@ public class DatasourceDeployTest extends AbstractIntegrationTest { return dsAddress; }
- private Address addDriverToServerGroup(ASConnection conn) { + private Address addDriverToMainServerGroup(ASConnection conn) { Result res;// then add the driver to the server-group we want to have the DS on Address sgAddress = new Address(); sgAddress.add("server-group", "main-server-group");
commit 37f2759320d13dfd2e68e93563ffcc4098f58059 Author: Heiko W. Rupp hwr@redhat.com Date: Wed Jul 6 13:28:14 2011 +0200
Allow to add username/password when creating the DS. Allow to promote a deployment to all server groups.
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseComponent.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseComponent.java index 401bfb6..5feaf3a 100644 --- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseComponent.java +++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseComponent.java @@ -21,6 +21,7 @@ package org.rhq.modules.plugins.jbossas7; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.codehaus.jackson.JsonNode; +import org.hibernate.cfg.CollectionSecondPass;
import org.rhq.core.domain.configuration.Configuration; import org.rhq.core.domain.configuration.PropertySimple; @@ -53,11 +54,14 @@ import org.rhq.modules.plugins.jbossas7.json.CompositeOperation; import org.rhq.modules.plugins.jbossas7.json.Operation; import org.rhq.modules.plugins.jbossas7.json.PROPERTY_VALUE; import org.rhq.modules.plugins.jbossas7.json.ReadAttribute; +import org.rhq.modules.plugins.jbossas7.json.ReadChildrenNames; import org.rhq.modules.plugins.jbossas7.json.ReadResource; import org.rhq.modules.plugins.jbossas7.json.Result;
import java.io.OutputStream; import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; import java.util.Collections; import java.util.HashMap; import java.util.Iterator; @@ -478,16 +482,32 @@ public class BaseComponent implements ResourceComponent, MeasurementFacet, Confi } else if (what.equals("domain-deployment")) { if (op.equals("promote")) { String serverGroup = parameters.getSimpleValue("server-group","-not set-"); + List<String> serverGroups = new ArrayList<String>(); + if (serverGroup.equals("__all")) { + serverGroups.addAll(getServerGroups()); + } + else { + serverGroups.add(serverGroup); + } + String resourceKey = context.getResourceKey(); + resourceKey = resourceKey.substring(resourceKey.indexOf("=")+1); + + log.info("Promoting [" + resourceKey + "] to server group(s) [" + Arrays.asList(serverGroups) + "]"); + PropertySimple simple = parameters.getSimple("enabled"); Boolean enabled = false; if (simple!=null && simple.getBooleanValue()!=null) enabled= simple.getBooleanValue(); - address.add(new PROPERTY_VALUE("server-group",serverGroup)); - String resourceKey = context.getResourceKey(); - resourceKey = resourceKey.substring(resourceKey.indexOf("=")+1); - address.add(new PROPERTY_VALUE("deployment", resourceKey)); - operation = new Operation("add",address,"enabled",enabled);
+ operation = new CompositeOperation(); + for (String theGroup : serverGroups) { + address = new ArrayList<PROPERTY_VALUE>(); + address.add(new PROPERTY_VALUE("server-group",theGroup)); + + address.add(new PROPERTY_VALUE("deployment", resourceKey)); + Operation step = new Operation("add",address,"enabled",enabled); + ((CompositeOperation)operation).addStep(step); + } } }
@@ -505,10 +525,17 @@ public class BaseComponent implements ResourceComponent, MeasurementFacet, Confi else { operationResult.setErrorMessage("No valid operation was given for input [" + name + "]"); } - // TODO throw an exception if the operation failed? return operationResult; }
+ @SuppressWarnings("unchecked") + private Collection<String> getServerGroups() { + Operation op = new ReadChildrenNames(Collections.<PROPERTY_VALUE>emptyList(),"server-group"); + Result res = connection.execute(op); + + return (Collection<String>) res.getResult(); + } + Object getObjectForProperty(PropertySimple prop, PropertyDefinitionSimple propDef) {
PropertySimpleType type = propDef.getType(); diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DatasourceComponent.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DatasourceComponent.java index 4be263f..ad6914f 100644 --- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DatasourceComponent.java +++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DatasourceComponent.java @@ -51,6 +51,8 @@ public class DatasourceComponent extends BaseComponent implements OperationFacet String jndiName = parameters.getSimpleValue("jndi-name", NOTSET); String poolName = parameters.getSimpleValue("pool-name", NOTSET); String connectionUrl = parameters.getSimpleValue("connection-url",NOTSET); + String userName = parameters.getSimpleValue("user-name",""); + String password = parameters.getSimpleValue("password",""); String name = parameters.getSimpleValue("name",NOTSET);
List<PROPERTY_VALUE> address = pathToAddress(getPath()); @@ -60,6 +62,10 @@ public class DatasourceComponent extends BaseComponent implements OperationFacet op.addAdditionalProperty("jndi-name",jndiName); op.addAdditionalProperty("pool-name",poolName); op.addAdditionalProperty("connection-url",connectionUrl); + if (userName!=null && !userName.isEmpty()) + op.addAdditionalProperty("user-name",userName); + if (password!=null && !password.isEmpty()) + op.addAdditionalProperty("password",password);
Result res = connection.execute(op); if (res.isSuccess()) { @@ -76,4 +82,8 @@ public class DatasourceComponent extends BaseComponent implements OperationFacet
return result; } + + void addAdditionalToOp(Operation op, Configuration parameters, String property, boolean optional) { + + } } 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 0cb4eef..248367a 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 @@ -126,7 +126,7 @@ <c:simple-property name="auto-start" displayName="Autostart" default="false" type="boolean" /> </parameters> <results> - <c:simple-property name="result" description="Outcome of the create server operation"/> + <c:simple-property name="operationResult" description="Outcome of the create server operation"/> </results> </operation> <operation name="managed-server:remove" displayName="Remove managed server" description="Remove a managed server"> @@ -137,7 +137,7 @@ </c:simple-property> </parameters> <results> - <c:simple-property name="result" description="Outcome of the remove server operation"/> + <c:simple-property name="operationResult" description="Outcome of the remove server operation"/> </results>
</operation> @@ -218,7 +218,7 @@ <c:simple-property name="auto-start" displayName="Autostart" description="Should this server start at boot?" type="boolean" default="false" required="true"/> </parameters> <results> - <c:simple-property name="result" description="Outcome of the create server operation"/> + <c:simple-property name="operationResult" description="Outcome of the create server operation"/> </results> </operation> <operation name="server:remove" displayName="Delete server" description="Deletes a server on this host."> @@ -226,7 +226,7 @@ <c:simple-property name="name" description="Name of this new server" required="true"/> </parameters> <results> - <c:simple-property name="result" description="Outcome of the delete server operation"/> + <c:simple-property name="operationResult" description="Outcome of the delete server operation"/> </results> </operation> </server> @@ -243,12 +243,15 @@ <operation name="domain-deployment:promote" displayName="Deploy to Server-Group" description="Deploy this deployment to a server group"> <parameters> <c:simple-property name="server-group" required="true" description="Server group to deploy to" type="string"> + <c:property-options> + <c:option value="__all" name="All"/> + </c:property-options> <c:option-source target="resource" expression="type=ServerGroup" /> </c:simple-property> <c:simple-property name="enabled" required="true" default="true" description="Should the deployment be enabled on the server group?" type="boolean"/> </parameters> <results> - <c:simple-property name="result" description="Outcome of the deploy to server group operation"/> + <c:simple-property name="operationResult" description="Outcome of the deploy to server group operation"/> </results> </operation>
@@ -749,6 +752,8 @@ <c:simple-property name="jndi-name" description="JNDI-Name of the Datasource" required="true"/> <c:simple-property name="pool-name" description="Name of the pool" required="true"/> <c:simple-property name="connection-url" description="URL for the connection to the database" required="true"/> + <c:simple-property name="user-name" description="User name for DB-connections" required="false" /> + <c:simple-property name="password" description="Password" type="password" required="false"/> </parameters> <results> <c:simple-property name="operationResult"/> @@ -806,7 +811,7 @@ description="A class that implements org.jboss.jca.adapters.jdbc.URLSelectorStrategy" required="false"/> <c:simple-property name="use-java-context" type="boolean" readOnly="true" description="Setting this to false will bind the DataSource into global JNDI;"/> - <c:simple-property name="enabled" type="string" readOnly="true" description="Specifies if the datasource should be enabled"/> + <c:simple-property name="enabled" type="boolean" readOnly="true" required="false" description="Specifies if the datasource should be enabled"/> <c:simple-property name="max-pool-size" type="integer" readOnly="false" required="false" description="The max-pool-size element indicates the maximum number of connections for a pool. No more connections will be created in each sub-pool."/> <c:simple-property name="min-pool-size" type="integer" readOnly="false" required="false"
rhq-commits@lists.fedorahosted.org