You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by gn...@apache.org on 2006/06/20 23:11:43 UTC
svn commit: r415807 - in /incubator/servicemix/trunk:
apache-servicemix/src/main/release/ant/
servicemix-core/src/main/java/org/apache/servicemix/jbi/management/task/
Author: gnodet
Date: Tue Jun 20 14:11:42 2006
New Revision: 415807
URL: http://svn.apache.org/viewvc?rev=415807&view=rev
Log:
SM-464: Fix ant tasks to be fully jbi compliant
Modified:
incubator/servicemix/trunk/apache-servicemix/src/main/release/ant/servicemix-ant-task.xml
incubator/servicemix/trunk/apache-servicemix/src/main/release/ant/servicemix_ant_taskdef.properties
incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/management/task/InstallComponentTask.java
incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/management/task/JbiTask.java
incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/management/task/ListBindingComponentsTask.java
incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/management/task/ListServiceAssembliesTask.java
incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/management/task/ListServiceEnginesTask.java
incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/management/task/ListSharedLibrariesTask.java
Modified: incubator/servicemix/trunk/apache-servicemix/src/main/release/ant/servicemix-ant-task.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/apache-servicemix/src/main/release/ant/servicemix-ant-task.xml?rev=415807&r1=415806&r2=415807&view=diff
==============================================================================
--- incubator/servicemix/trunk/apache-servicemix/src/main/release/ant/servicemix-ant-task.xml (original)
+++ incubator/servicemix/trunk/apache-servicemix/src/main/release/ant/servicemix-ant-task.xml Tue Jun 20 14:11:42 2006
@@ -149,15 +149,15 @@
</target>
- <!-- shutdown-component -->
- <target name="shutdown-component" description="shut downs a particular Servicemix component.">
- <echo message=" shutdown-component" />
+ <!-- shut-down-component -->
+ <target name="shut-down-component" description="shut downs a particular Servicemix component.">
+ <echo message=" shut-down-component" />
<echo message=" shuts down a particular component (service engine or binding component) in Servicemix" />
<echo message=" host=${sm.host}" />
<echo message=" port=${sm.port}" />
<echo message=" name=${sm.component.name}" />
- <jbi-shutdown-component
+ <jbi-shut-down-component
username="${sm.username}"
password="${sm.password}"
host="${sm.host}"
@@ -231,15 +231,15 @@
/>
</target>
- <!-- shutdown-service-assembly -->
- <target name="shutdown-service-assembly" description="shuts down a particular service assembly in Servicemix.">
- <echo message=" shutdown-service-assembly" />
+ <!-- shut-down-service-assembly -->
+ <target name="shut-down-service-assembly" description="shuts down a particular service assembly in Servicemix.">
+ <echo message=" shut-down-service-assembly" />
<echo message=" shuts down a particular service assembly in Servicemix." />
<echo message=" host=${sm.host}" />
<echo message=" port=${sm.port}" />
<echo message=" name=${sm.service.assembly.name}" />
- <jbi-shutdown-service-assembly
+ <jbi-shut-down-service-assembly
username="${sm.username}"
password="${sm.password}"
host="${sm.host}"
@@ -423,18 +423,18 @@
ant -f servicemix-ant-task.xml -Dsm.component.name=componentname stop-component
----------------------------------------------------------
- target : shutdown-component
- - shutdown service engine or binding component in Servicemix.
+ target : shut-down-component
+ - shut down service engine or binding component in Servicemix.
options :
sm.username : Servicemix user name.
sm.password : Servicemix password.
sm.host : host name where Servicemix is running.
sm.port : port where Servicemix is listening.
- sm.component.name : component name, service engine or binding component to shutdown.
+ sm.component.name : component name, service engine or binding component to shut down.
Example :
- ant -f servicemix-ant-task.xml -Dsm.component.name=componentname shutdown-component
+ ant -f servicemix-ant-task.xml -Dsm.component.name=componentname shut-down-component
----------------------------------------------------------
target : deploy-service-assembly
@@ -493,18 +493,18 @@
ant -f servicemix-ant-task.xml -Dsm.service.assembly.name stop-service-assembly
----------------------------------------------------------
- target : shutdown-service-assembly
- - shutdowns service assembly in Servicemix.
+ target : shut-down-service-assembly
+ - shuts down service assembly in Servicemix.
options :
sm.username : Servicemix user name.
sm.password : Servicemix password.
sm.host : host name where Servicemix is running.
sm.port : port where Servicemix is listening.
- sm.service.assembly.name : service assembly name to shutdown.
+ sm.service.assembly.name : service assembly name to shut down.
Example :
- ant -f servicemix-ant-task.xml -Dsm.service.assembly.name shutdown-service-assembly
+ ant -f servicemix-ant-task.xml -Dsm.service.assembly.name shut-down-service-assembly
----------------------------------------------------------
target : list-service-engines
Modified: incubator/servicemix/trunk/apache-servicemix/src/main/release/ant/servicemix_ant_taskdef.properties
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/apache-servicemix/src/main/release/ant/servicemix_ant_taskdef.properties?rev=415807&r1=415806&r2=415807&view=diff
==============================================================================
--- incubator/servicemix/trunk/apache-servicemix/src/main/release/ant/servicemix_ant_taskdef.properties (original)
+++ incubator/servicemix/trunk/apache-servicemix/src/main/release/ant/servicemix_ant_taskdef.properties Tue Jun 20 14:11:42 2006
@@ -5,12 +5,12 @@
jbi-uninstall-shared-library=org.apache.servicemix.jbi.management.task.UninstallSharedLibraryTask
jbi-start-component=org.apache.servicemix.jbi.management.task.StartComponentTask
jbi-stop-component=org.apache.servicemix.jbi.management.task.StopComponentTask
-jbi-shutdown-component=org.apache.servicemix.jbi.management.task.ShutDownComponentTask
+jbi-shut-down-component=org.apache.servicemix.jbi.management.task.ShutDownComponentTask
jbi-deploy-service-assembly=org.apache.servicemix.jbi.management.task.DeployServiceAssemblyTask
jbi-undeploy-service-assembly=org.apache.servicemix.jbi.management.task.UndeployServiceAssemblyTask
jbi-start-service-assembly=org.apache.servicemix.jbi.management.task.StartServiceAssemblyTask
jbi-stop-service-assembly=org.apache.servicemix.jbi.management.task.StopServiceAssemblyTask
-jbi-shutdown-service-assembly=org.apache.servicemix.jbi.management.task.ShutDownServiceAssemblyTask
+jbi-shut-down-service-assembly=org.apache.servicemix.jbi.management.task.ShutDownServiceAssemblyTask
jbi-list-service-engines=org.apache.servicemix.jbi.management.task.ListServiceEnginesTask
jbi-list-binding-components=org.apache.servicemix.jbi.management.task.ListBindingComponentsTask
jbi-list-shared-libraries=org.apache.servicemix.jbi.management.task.ListSharedLibrariesTask
Modified: incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/management/task/InstallComponentTask.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/management/task/InstallComponentTask.java?rev=415807&r1=415806&r2=415807&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/management/task/InstallComponentTask.java (original)
+++ incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/management/task/InstallComponentTask.java Tue Jun 20 14:11:42 2006
@@ -57,7 +57,7 @@
this.paramsFile = paramsFile;
}
- public Param addParam() {
+ public Param createParam() {
Param p = new Param();
if (nestedParams == null) {
nestedParams = new ArrayList();
@@ -93,13 +93,13 @@
if (nestedParams != null) {
for (Iterator iter = nestedParams.iterator(); iter.hasNext();) {
Param p = (Param) iter.next();
- props.setProperty(p.getValue(), p.getName());
+ props.setProperty(p.getName(), p.getValue());
}
}
return props;
}
- private static class Param {
+ public static class Param {
private String name;
private String value;
public String getName() {
Modified: incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/management/task/JbiTask.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/management/task/JbiTask.java?rev=415807&r1=415806&r2=415807&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/management/task/JbiTask.java (original)
+++ incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/management/task/JbiTask.java Tue Jun 20 14:11:42 2006
@@ -82,14 +82,8 @@
* initialize the connection
* @throws BuildException
*/
- public void connect() throws BuildException {
- try {
- this.jmxConnector = getJMXConnector(getServiceURL());
- }
- catch (Throwable e) {
- log("Failed to initialize the JbiTask: " + e.getMessage(), Project.MSG_ERR);
- throw new BuildException(e);
- }
+ public void connect() throws IOException {
+ this.jmxConnector = getJMXConnector(getServiceURL());
}
@@ -267,9 +261,9 @@
*/
public void execute() throws BuildException {
AdminCommandsServiceMBean acs;
- connect();
try {
log("Retrieving remote admin interface", Project.MSG_DEBUG);
+ connect();
acs = getAdminCommandsService();
} catch (Throwable e) {
log("Error accessing ServiceMix administration: " + e.getMessage(), Project.MSG_WARN);
Modified: incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/management/task/ListBindingComponentsTask.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/management/task/ListBindingComponentsTask.java?rev=415807&r1=415806&r2=415807&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/management/task/ListBindingComponentsTask.java (original)
+++ incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/management/task/ListBindingComponentsTask.java Tue Jun 20 14:11:42 2006
@@ -30,6 +30,21 @@
private String serviceAssemblyName;
private String bindingComponentName;
private String state;
+ private String xmlOutput;
+
+ /**
+ * @return the xmlOutput
+ */
+ public String isXmlOutput() {
+ return xmlOutput;
+ }
+
+ /**
+ * @param xmlOutput the xmlOutput to set
+ */
+ public void setXmlOutput(String xmlOutput) {
+ this.xmlOutput = xmlOutput;
+ }
/**
*
@@ -102,6 +117,9 @@
*/
public void doExecute(AdminCommandsServiceMBean acs) throws Exception {
String result = acs.listComponents(true, false, true, getState(), getSharedLibraryName(), getServiceAssemblyName());
+ if (xmlOutput != null) {
+ getProject().setProperty(xmlOutput, result);
+ }
log(result, Project.MSG_WARN);
}
Modified: incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/management/task/ListServiceAssembliesTask.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/management/task/ListServiceAssembliesTask.java?rev=415807&r1=415806&r2=415807&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/management/task/ListServiceAssembliesTask.java (original)
+++ incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/management/task/ListServiceAssembliesTask.java Tue Jun 20 14:11:42 2006
@@ -29,6 +29,22 @@
private String state;
private String componentName;
private String serviceAssemblyName;
+ private String xmlOutput;
+
+ /**
+ * @return the xmlOutput
+ */
+ public String isXmlOutput() {
+ return xmlOutput;
+ }
+
+ /**
+ * @param xmlOutput the xmlOutput to set
+ */
+ public void setXmlOutput(String xmlOutput) {
+ this.xmlOutput = xmlOutput;
+ }
+
/**
*
@@ -85,6 +101,9 @@
*/
public void doExecute(AdminCommandsServiceMBean acs) throws Exception {
String result = acs.listServiceAssemblies(getState(), getComponentName(), getServiceAssemblyName());
+ if (xmlOutput != null) {
+ getProject().setProperty(xmlOutput, result);
+ }
log(result, Project.MSG_WARN);
}
Modified: incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/management/task/ListServiceEnginesTask.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/management/task/ListServiceEnginesTask.java?rev=415807&r1=415806&r2=415807&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/management/task/ListServiceEnginesTask.java (original)
+++ incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/management/task/ListServiceEnginesTask.java Tue Jun 20 14:11:42 2006
@@ -29,6 +29,22 @@
private String state;
private String serviceAssemblyName;
private String sharedLibraryName;
+ private String xmlOutput;
+
+ /**
+ * @return the xmlOutput
+ */
+ public String isXmlOutput() {
+ return xmlOutput;
+ }
+
+ /**
+ * @param xmlOutput the xmlOutput to set
+ */
+ public void setXmlOutput(String xmlOutput) {
+ this.xmlOutput = xmlOutput;
+ }
+
/**
*
@@ -86,6 +102,9 @@
*/
public void doExecute(AdminCommandsServiceMBean acs) throws Exception {
String result = acs.listComponents(false, true, true, getState(), getSharedLibraryName(), getServiceAssemblyName());
+ if (xmlOutput != null) {
+ getProject().setProperty(xmlOutput, result);
+ }
log(result, Project.MSG_WARN);
}
Modified: incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/management/task/ListSharedLibrariesTask.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/management/task/ListSharedLibrariesTask.java?rev=415807&r1=415806&r2=415807&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/management/task/ListSharedLibrariesTask.java (original)
+++ incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/management/task/ListSharedLibrariesTask.java Tue Jun 20 14:11:42 2006
@@ -28,6 +28,22 @@
private String componentName;
private String sharedLibraryName;
+ private String xmlOutput;
+
+ /**
+ * @return the xmlOutput
+ */
+ public String isXmlOutput() {
+ return xmlOutput;
+ }
+
+ /**
+ * @param xmlOutput the xmlOutput to set
+ */
+ public void setXmlOutput(String xmlOutput) {
+ this.xmlOutput = xmlOutput;
+ }
+
/**
*
@@ -68,6 +84,9 @@
*/
public void doExecute(AdminCommandsServiceMBean acs) throws Exception {
String result = acs.listSharedLibraries(getComponentName(), getSharedLibraryName());
+ if (xmlOutput != null) {
+ getProject().setProperty(xmlOutput, result);
+ }
log(result, Project.MSG_WARN);
}