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 2009/03/02 14:39:27 UTC
svn commit: r749304 - in /servicemix/smx4/nmr/trunk/jbi:
deployer/src/main/java/org/apache/servicemix/jbi/deployer/
deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/
deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/ deployer...
Author: gnodet
Date: Mon Mar 2 13:39:25 2009
New Revision: 749304
URL: http://svn.apache.org/viewvc?rev=749304&view=rev
Log:
SMX4NMR-111: Make sure the JBI plugin can be used to deploy jbi artifacts onto the NMR
Added:
servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/AdminCommandsService.java (contents, props changed)
- copied, changed from r749252, servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/AdminCommands.java
Removed:
servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/AdminCommands.java
Modified:
servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/NamingStrategy.java
servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/AdminCommandsImpl.java
servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/AdminService.java
servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/DefaultNamingStrategy.java
servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/DeploymentService.java
servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/DeployServiceAssemblyTask.java
servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/InstallComponentTask.java
servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/InstallSharedLibraryTask.java
servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/JbiTask.java
servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/ListBindingComponentsTask.java
servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/ListServiceAssembliesTask.java
servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/ListServiceEnginesTask.java
servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/ListSharedLibrariesTask.java
servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/ShutDownComponentTask.java
servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/ShutDownServiceAssemblyTask.java
servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/StartComponentTask.java
servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/StartServiceAssemblyTask.java
servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/StopComponentTask.java
servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/StopServiceAssemblyTask.java
servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/UndeployServiceAssemblyTask.java
servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/UninstallComponentTask.java
servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/UninstallSharedLibraryTask.java
servicemix/smx4/nmr/trunk/jbi/deployer/src/main/resources/META-INF/spring/servicemix-jbi-deployer.xml
servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/itests/ManagementTest.java
Copied: servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/AdminCommandsService.java (from r749252, servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/AdminCommands.java)
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/AdminCommandsService.java?p2=servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/AdminCommandsService.java&p1=servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/AdminCommands.java&r1=749252&r2=749304&rev=749304&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/AdminCommands.java (original)
+++ servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/AdminCommandsService.java Mon Mar 2 13:39:25 2009
@@ -21,7 +21,7 @@
/**
* Provides a simple interface to access ServiceMix administration commands.
*/
-public interface AdminCommands {
+public interface AdminCommandsService {
String installComponent(String file, Properties properties, boolean deferException) throws Exception;
@@ -49,6 +49,7 @@
String listComponents(boolean excludeSEs,
boolean excludeBCs,
+ boolean excludePojos,
String requiredState,
String sharedLibraryName,
String serviceAssemblyName) throws Exception;
Propchange: servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/AdminCommandsService.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/AdminCommandsService.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/NamingStrategy.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/NamingStrategy.java?rev=749304&r1=749303&r2=749304&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/NamingStrategy.java (original)
+++ servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/NamingStrategy.java Mon Mar 2 13:39:25 2009
@@ -29,7 +29,7 @@
ObjectName getObjectName(ServiceAssembly serviceAssembly) throws MalformedObjectNameException;
- ObjectName getObjectName(AdminCommands adminCommandsService) throws MalformedObjectNameException;
+ ObjectName getObjectName(AdminCommandsService adminCommandsService) throws MalformedObjectNameException;
ObjectName createCustomComponentMBeanName(String type, String name);
Modified: servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/AdminCommandsImpl.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/AdminCommandsImpl.java?rev=749304&r1=749303&r2=749304&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/AdminCommandsImpl.java (original)
+++ servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/AdminCommandsImpl.java Mon Mar 2 13:39:25 2009
@@ -26,7 +26,7 @@
import javax.jbi.management.LifeCycleMBean;
import javax.management.StandardMBean;
-import org.apache.servicemix.jbi.deployer.AdminCommands;
+import org.apache.servicemix.jbi.deployer.AdminCommandsService;
import org.apache.servicemix.jbi.deployer.Component;
import org.apache.servicemix.jbi.deployer.ServiceAssembly;
import org.apache.servicemix.jbi.deployer.ServiceUnit;
@@ -36,7 +36,7 @@
import org.springframework.beans.factory.InitializingBean;
import org.springframework.util.StringUtils;
-public class AdminCommandsImpl implements AdminCommands, InitializingBean, DisposableBean {
+public class AdminCommandsImpl implements AdminCommandsService, InitializingBean, DisposableBean {
private Deployer deployer;
private InstallationService installationService;
@@ -53,7 +53,7 @@
public String installComponent(String file, Properties props, boolean deferException) throws Exception {
// TODO: handle deferException
try {
- getInstallationService().install(file, props, false);
+ getInstallationService().install(file, props, true);
return ManagementSupport.createSuccessMessage("installComponent", file);
} catch (Exception e) {
throw ManagementSupport.failure("installComponent", file, e);
@@ -176,7 +176,7 @@
public String deployServiceAssembly(String file, boolean deferException) throws Exception {
// TODO: handle deferException
try {
- return deploymentService.deploy(file);
+ return deploymentService.deploy(file, true);
} catch (Throwable e) {
throw ManagementSupport.failure("deployServiceAssembly", file, e);
}
@@ -274,7 +274,7 @@
* @param serviceAssemblyName
* @return list of components in an XML blob
*/
- public String listComponents(boolean excludeSEs, boolean excludeBCs, String requiredState,
+ public String listComponents(boolean excludeSEs, boolean excludeBCs, boolean excludePojos, String requiredState,
String sharedLibraryName, String serviceAssemblyName) throws Exception {
//validate requiredState
if (requiredState != null && requiredState.length() > 0
@@ -445,7 +445,7 @@
}
public void afterPropertiesSet() throws Exception {
- deployer.getManagementAgent().register(new StandardMBean(this, AdminCommands.class),
+ deployer.getManagementAgent().register(new StandardMBean(this, AdminCommandsService.class),
deployer.getNamingStrategy().getObjectName(this));
}
Modified: servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/AdminService.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/AdminService.java?rev=749304&r1=749303&r2=749304&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/AdminService.java (original)
+++ servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/AdminService.java Mon Mar 2 13:39:25 2009
@@ -29,7 +29,7 @@
*/
public class AdminService implements AdminServiceMBean {
- public static final String DEFAULT_NAME = "ServiceMix4";
+ public static final String DEFAULT_NAME = "ServiceMix";
public static final String DEFAULT_DOMAIN = "org.apache.servicemix";
Modified: servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/DefaultNamingStrategy.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/DefaultNamingStrategy.java?rev=749304&r1=749303&r2=749304&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/DefaultNamingStrategy.java (original)
+++ servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/DefaultNamingStrategy.java Mon Mar 2 13:39:25 2009
@@ -24,7 +24,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.servicemix.jbi.deployer.AdminCommands;
+import org.apache.servicemix.jbi.deployer.AdminCommandsService;
import org.apache.servicemix.jbi.deployer.Component;
import org.apache.servicemix.jbi.deployer.NamingStrategy;
import org.apache.servicemix.jbi.deployer.ServiceAssembly;
@@ -67,8 +67,8 @@
"Name=" + sanitize(serviceAssembly.getName()));
}
- public ObjectName getObjectName(AdminCommands adminCommandsService) throws MalformedObjectNameException {
- return getSystemObjectName(jmxDomainName, AdminService.DEFAULT_NAME, AdminCommands.class);
+ public ObjectName getObjectName(AdminCommandsService adminCommandsService) throws MalformedObjectNameException {
+ return getSystemObjectName(jmxDomainName, AdminService.DEFAULT_NAME, AdminCommandsService.class);
}
Modified: servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/DeploymentService.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/DeploymentService.java?rev=749304&r1=749303&r2=749304&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/DeploymentService.java (original)
+++ servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/DeploymentService.java Mon Mar 2 13:39:25 2009
@@ -61,6 +61,10 @@
}
public String deploy(String saZipURL) throws Exception {
+ return deploy(saZipURL, false);
+ }
+
+ public String deploy(String saZipURL, boolean autoStart) throws Exception {
try {
if (saZipURL == null) {
throw ManagementSupport.failure("deploy", "saZipURL must not be null");
@@ -85,7 +89,7 @@
checkSus(sa.getServiceUnits());
String name = sa.getIdentification().getName();
LOG.info("Deploy ServiceAssembly " + name);
- ServiceAssemblyInstaller installer = new ServiceAssemblyInstaller(deployer, root, jarfile, false);
+ ServiceAssemblyInstaller installer = new ServiceAssemblyInstaller(deployer, root, jarfile, autoStart);
installer.installBundle();
installer.init();
installer.install();
Modified: servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/DeployServiceAssemblyTask.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/DeployServiceAssemblyTask.java?rev=749304&r1=749303&r2=749304&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/DeployServiceAssemblyTask.java (original)
+++ servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/DeployServiceAssemblyTask.java Mon Mar 2 13:39:25 2009
@@ -18,7 +18,7 @@
import java.io.File;
-import org.apache.servicemix.jbi.deployer.AdminCommands;
+import org.apache.servicemix.jbi.deployer.AdminCommandsService;
import org.apache.tools.ant.BuildException;
/**
@@ -59,7 +59,7 @@
*
* @throws BuildException
*/
- public void doExecute(AdminCommands acs) throws Exception {
+ public void doExecute(AdminCommandsService acs) throws Exception {
if (file == null) {
throw new BuildException("null file - file should be an archive");
}
Modified: servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/InstallComponentTask.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/InstallComponentTask.java?rev=749304&r1=749303&r2=749304&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/InstallComponentTask.java (original)
+++ servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/InstallComponentTask.java Mon Mar 2 13:39:25 2009
@@ -24,7 +24,7 @@
import java.util.List;
import java.util.Properties;
-import org.apache.servicemix.jbi.deployer.AdminCommands;
+import org.apache.servicemix.jbi.deployer.AdminCommandsService;
import org.apache.tools.ant.BuildException;
/**
@@ -86,7 +86,7 @@
*
* @throws BuildException
*/
- public void doExecute(AdminCommands acs) throws Exception {
+ public void doExecute(AdminCommandsService acs) throws Exception {
if (file == null) {
throw new BuildException("null file - file should be an archive");
}
Modified: servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/InstallSharedLibraryTask.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/InstallSharedLibraryTask.java?rev=749304&r1=749303&r2=749304&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/InstallSharedLibraryTask.java (original)
+++ servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/InstallSharedLibraryTask.java Mon Mar 2 13:39:25 2009
@@ -18,7 +18,7 @@
import java.io.File;
-import org.apache.servicemix.jbi.deployer.AdminCommands;
+import org.apache.servicemix.jbi.deployer.AdminCommandsService;
import org.apache.tools.ant.BuildException;
/**
@@ -59,7 +59,7 @@
*
* @throws BuildException
*/
- public void doExecute(AdminCommands acs) throws Exception {
+ public void doExecute(AdminCommandsService acs) throws Exception {
if (file == null) {
throw new BuildException("null file - file should be an archive");
}
Modified: servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/JbiTask.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/JbiTask.java?rev=749304&r1=749303&r2=749304&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/JbiTask.java (original)
+++ servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/JbiTask.java Mon Mar 2 13:39:25 2009
@@ -27,7 +27,7 @@
import javax.management.remote.JMXConnectorFactory;
import javax.management.remote.JMXServiceURL;
-import org.apache.servicemix.jbi.deployer.AdminCommands;
+import org.apache.servicemix.jbi.deployer.AdminCommandsService;
import org.apache.servicemix.jbi.deployer.impl.AdminService;
import org.apache.servicemix.jbi.deployer.impl.DefaultNamingStrategy;
import org.apache.tools.ant.BuildException;
@@ -115,12 +115,12 @@
* @return the main administration service MBean
* @throws IOException
*/
- public AdminCommands getAdminCommandsService() throws IOException {
+ public AdminCommandsService getAdminCommandsService() throws IOException {
ObjectName objectName = DefaultNamingStrategy.getSystemObjectName(jmxDomainName, containerName,
- AdminCommands.class);
- return (AdminCommands) MBeanServerInvocationHandler.newProxyInstance(
+ AdminCommandsService.class);
+ return (AdminCommandsService) MBeanServerInvocationHandler.newProxyInstance(
jmxConnector.getMBeanServerConnection(), objectName,
- AdminCommands.class, true);
+ AdminCommandsService.class, true);
}
/**
@@ -255,7 +255,7 @@
* @throws BuildException
*/
public void execute() throws BuildException {
- AdminCommands acs;
+ AdminCommandsService acs;
try {
log("Retrieving remote admin interface", Project.MSG_DEBUG);
connect();
@@ -281,6 +281,6 @@
}
}
- protected abstract void doExecute(AdminCommands acs) throws Exception;
+ protected abstract void doExecute(AdminCommandsService acs) throws Exception;
}
\ No newline at end of file
Modified: servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/ListBindingComponentsTask.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/ListBindingComponentsTask.java?rev=749304&r1=749303&r2=749304&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/ListBindingComponentsTask.java (original)
+++ servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/ListBindingComponentsTask.java Mon Mar 2 13:39:25 2009
@@ -16,7 +16,7 @@
*/
package org.apache.servicemix.jbi.deployer.task;
-import org.apache.servicemix.jbi.deployer.AdminCommands;
+import org.apache.servicemix.jbi.deployer.AdminCommandsService;
import org.apache.tools.ant.Project;
/**
@@ -111,8 +111,8 @@
*
* @throws BuildException
*/
- public void doExecute(AdminCommands acs) throws Exception {
- String result = acs.listComponents(true, false, getState(), getSharedLibraryName(), getServiceAssemblyName());
+ public void doExecute(AdminCommandsService acs) throws Exception {
+ String result = acs.listComponents(true, false, false, getState(), getSharedLibraryName(), getServiceAssemblyName());
if (xmlOutput != null) {
getProject().setProperty(xmlOutput, result);
}
Modified: servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/ListServiceAssembliesTask.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/ListServiceAssembliesTask.java?rev=749304&r1=749303&r2=749304&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/ListServiceAssembliesTask.java (original)
+++ servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/ListServiceAssembliesTask.java Mon Mar 2 13:39:25 2009
@@ -16,7 +16,7 @@
*/
package org.apache.servicemix.jbi.deployer.task;
-import org.apache.servicemix.jbi.deployer.AdminCommands;
+import org.apache.servicemix.jbi.deployer.AdminCommandsService;
import org.apache.tools.ant.Project;
/**
@@ -95,7 +95,7 @@
*
* @throws BuildException
*/
- public void doExecute(AdminCommands acs) throws Exception {
+ public void doExecute(AdminCommandsService acs) throws Exception {
String result = acs.listServiceAssemblies(getState(), getComponentName(), getServiceAssemblyName());
if (xmlOutput != null) {
getProject().setProperty(xmlOutput, result);
Modified: servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/ListServiceEnginesTask.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/ListServiceEnginesTask.java?rev=749304&r1=749303&r2=749304&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/ListServiceEnginesTask.java (original)
+++ servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/ListServiceEnginesTask.java Mon Mar 2 13:39:25 2009
@@ -16,7 +16,7 @@
*/
package org.apache.servicemix.jbi.deployer.task;
-import org.apache.servicemix.jbi.deployer.AdminCommands;
+import org.apache.servicemix.jbi.deployer.AdminCommandsService;
import org.apache.tools.ant.Project;
/**
@@ -95,8 +95,8 @@
*
* @throws BuildException
*/
- public void doExecute(AdminCommands acs) throws Exception {
- String result = acs.listComponents(false, true, getState(), getSharedLibraryName(), getServiceAssemblyName());
+ public void doExecute(AdminCommandsService acs) throws Exception {
+ String result = acs.listComponents(false, true, false, getState(), getSharedLibraryName(), getServiceAssemblyName());
if (xmlOutput != null) {
getProject().setProperty(xmlOutput, result);
}
Modified: servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/ListSharedLibrariesTask.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/ListSharedLibrariesTask.java?rev=749304&r1=749303&r2=749304&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/ListSharedLibrariesTask.java (original)
+++ servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/ListSharedLibrariesTask.java Mon Mar 2 13:39:25 2009
@@ -16,7 +16,7 @@
*/
package org.apache.servicemix.jbi.deployer.task;
-import org.apache.servicemix.jbi.deployer.AdminCommands;
+import org.apache.servicemix.jbi.deployer.AdminCommandsService;
import org.apache.tools.ant.Project;
/**
@@ -79,7 +79,7 @@
*
* @throws BuildException
*/
- public void doExecute(AdminCommands acs) throws Exception {
+ public void doExecute(AdminCommandsService acs) throws Exception {
String result = acs.listSharedLibraries(getComponentName(), getSharedLibraryName());
if (xmlOutput != null) {
getProject().setProperty(xmlOutput, result);
Modified: servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/ShutDownComponentTask.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/ShutDownComponentTask.java?rev=749304&r1=749303&r2=749304&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/ShutDownComponentTask.java (original)
+++ servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/ShutDownComponentTask.java Mon Mar 2 13:39:25 2009
@@ -16,7 +16,7 @@
*/
package org.apache.servicemix.jbi.deployer.task;
-import org.apache.servicemix.jbi.deployer.AdminCommands;
+import org.apache.servicemix.jbi.deployer.AdminCommandsService;
import org.apache.tools.ant.BuildException;
/**
@@ -47,7 +47,7 @@
*
* @throws BuildException
*/
- public void doExecute(AdminCommands acs) throws Exception {
+ public void doExecute(AdminCommandsService acs) throws Exception {
if (name == null) {
throw new BuildException("null componentName");
}
Modified: servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/ShutDownServiceAssemblyTask.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/ShutDownServiceAssemblyTask.java?rev=749304&r1=749303&r2=749304&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/ShutDownServiceAssemblyTask.java (original)
+++ servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/ShutDownServiceAssemblyTask.java Mon Mar 2 13:39:25 2009
@@ -16,7 +16,7 @@
*/
package org.apache.servicemix.jbi.deployer.task;
-import org.apache.servicemix.jbi.deployer.AdminCommands;
+import org.apache.servicemix.jbi.deployer.AdminCommandsService;
import org.apache.tools.ant.BuildException;
/**
@@ -47,7 +47,7 @@
*
* @throws BuildException
*/
- public void doExecute(AdminCommands acs) throws Exception {
+ public void doExecute(AdminCommandsService acs) throws Exception {
if (name == null) {
throw new BuildException("null service assembly name");
}
Modified: servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/StartComponentTask.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/StartComponentTask.java?rev=749304&r1=749303&r2=749304&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/StartComponentTask.java (original)
+++ servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/StartComponentTask.java Mon Mar 2 13:39:25 2009
@@ -16,7 +16,7 @@
*/
package org.apache.servicemix.jbi.deployer.task;
-import org.apache.servicemix.jbi.deployer.AdminCommands;
+import org.apache.servicemix.jbi.deployer.AdminCommandsService;
import org.apache.tools.ant.BuildException;
/**
@@ -47,7 +47,7 @@
*
* @throws BuildException
*/
- public void doExecute(AdminCommands acs) throws Exception {
+ public void doExecute(AdminCommandsService acs) throws Exception {
if (name == null) {
throw new BuildException("null componentName");
}
Modified: servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/StartServiceAssemblyTask.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/StartServiceAssemblyTask.java?rev=749304&r1=749303&r2=749304&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/StartServiceAssemblyTask.java (original)
+++ servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/StartServiceAssemblyTask.java Mon Mar 2 13:39:25 2009
@@ -16,7 +16,7 @@
*/
package org.apache.servicemix.jbi.deployer.task;
-import org.apache.servicemix.jbi.deployer.AdminCommands;
+import org.apache.servicemix.jbi.deployer.AdminCommandsService;
import org.apache.tools.ant.BuildException;
/**
@@ -47,7 +47,7 @@
*
* @throws BuildException
*/
- public void doExecute(AdminCommands acs) throws Exception {
+ public void doExecute(AdminCommandsService acs) throws Exception {
if (name == null) {
throw new BuildException("null service assembly name");
}
Modified: servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/StopComponentTask.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/StopComponentTask.java?rev=749304&r1=749303&r2=749304&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/StopComponentTask.java (original)
+++ servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/StopComponentTask.java Mon Mar 2 13:39:25 2009
@@ -16,7 +16,7 @@
*/
package org.apache.servicemix.jbi.deployer.task;
-import org.apache.servicemix.jbi.deployer.AdminCommands;
+import org.apache.servicemix.jbi.deployer.AdminCommandsService;
import org.apache.tools.ant.BuildException;
/**
@@ -47,7 +47,7 @@
*
* @throws BuildException
*/
- public void doExecute(AdminCommands acs) throws Exception {
+ public void doExecute(AdminCommandsService acs) throws Exception {
if (name == null) {
throw new BuildException("null componentName");
}
Modified: servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/StopServiceAssemblyTask.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/StopServiceAssemblyTask.java?rev=749304&r1=749303&r2=749304&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/StopServiceAssemblyTask.java (original)
+++ servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/StopServiceAssemblyTask.java Mon Mar 2 13:39:25 2009
@@ -16,7 +16,7 @@
*/
package org.apache.servicemix.jbi.deployer.task;
-import org.apache.servicemix.jbi.deployer.AdminCommands;
+import org.apache.servicemix.jbi.deployer.AdminCommandsService;
import org.apache.tools.ant.BuildException;
/**
@@ -47,7 +47,7 @@
*
* @throws BuildException
*/
- public void doExecute(AdminCommands acs) throws Exception {
+ public void doExecute(AdminCommandsService acs) throws Exception {
if (name == null) {
throw new BuildException("null componentName");
}
Modified: servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/UndeployServiceAssemblyTask.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/UndeployServiceAssemblyTask.java?rev=749304&r1=749303&r2=749304&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/UndeployServiceAssemblyTask.java (original)
+++ servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/UndeployServiceAssemblyTask.java Mon Mar 2 13:39:25 2009
@@ -16,7 +16,7 @@
*/
package org.apache.servicemix.jbi.deployer.task;
-import org.apache.servicemix.jbi.deployer.AdminCommands;
+import org.apache.servicemix.jbi.deployer.AdminCommandsService;
import org.apache.tools.ant.BuildException;
/**
@@ -47,7 +47,7 @@
*
* @throws BuildException
*/
- public void doExecute(AdminCommands acs) throws Exception {
+ public void doExecute(AdminCommandsService acs) throws Exception {
if (name == null) {
throw new BuildException("null componentName");
}
Modified: servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/UninstallComponentTask.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/UninstallComponentTask.java?rev=749304&r1=749303&r2=749304&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/UninstallComponentTask.java (original)
+++ servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/UninstallComponentTask.java Mon Mar 2 13:39:25 2009
@@ -16,7 +16,7 @@
*/
package org.apache.servicemix.jbi.deployer.task;
-import org.apache.servicemix.jbi.deployer.AdminCommands;
+import org.apache.servicemix.jbi.deployer.AdminCommandsService;
import org.apache.tools.ant.BuildException;
/**
@@ -47,7 +47,7 @@
*
* @throws BuildException
*/
- public void doExecute(AdminCommands acs) throws Exception {
+ public void doExecute(AdminCommandsService acs) throws Exception {
if (name == null) {
throw new BuildException("null componentName");
}
Modified: servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/UninstallSharedLibraryTask.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/UninstallSharedLibraryTask.java?rev=749304&r1=749303&r2=749304&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/UninstallSharedLibraryTask.java (original)
+++ servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/UninstallSharedLibraryTask.java Mon Mar 2 13:39:25 2009
@@ -16,7 +16,7 @@
*/
package org.apache.servicemix.jbi.deployer.task;
-import org.apache.servicemix.jbi.deployer.AdminCommands;
+import org.apache.servicemix.jbi.deployer.AdminCommandsService;
import org.apache.tools.ant.BuildException;
/**
@@ -47,7 +47,7 @@
*
* @throws BuildException
*/
- public void doExecute(AdminCommands acs) throws Exception {
+ public void doExecute(AdminCommandsService acs) throws Exception {
if (name == null) {
throw new BuildException("null componentName");
}
Modified: servicemix/smx4/nmr/trunk/jbi/deployer/src/main/resources/META-INF/spring/servicemix-jbi-deployer.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/deployer/src/main/resources/META-INF/spring/servicemix-jbi-deployer.xml?rev=749304&r1=749303&r2=749304&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/deployer/src/main/resources/META-INF/spring/servicemix-jbi-deployer.xml (original)
+++ servicemix/smx4/nmr/trunk/jbi/deployer/src/main/resources/META-INF/spring/servicemix-jbi-deployer.xml Mon Mar 2 13:39:25 2009
@@ -90,7 +90,7 @@
<!-- Expose management service in OSGi -->
- <osgi:service ref="adminCommandsService" interface="org.apache.servicemix.jbi.deployer.AdminCommands" />
+ <osgi:service ref="adminCommandsService" interface="org.apache.servicemix.jbi.deployer.AdminCommandsService" />
<!-- Environment -->
<bean id="environment" class="org.apache.servicemix.jbi.runtime.impl.EnvironmentImpl">
Modified: servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/itests/ManagementTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/itests/ManagementTest.java?rev=749304&r1=749303&r2=749304&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/itests/ManagementTest.java (original)
+++ servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/itests/ManagementTest.java Mon Mar 2 13:39:25 2009
@@ -16,10 +16,8 @@
*/
package org.apache.servicemix.jbi.itests;
-import javax.jbi.management.DeploymentException;
-
import org.apache.servicemix.kernel.testing.support.AbstractIntegrationTest;
-import org.apache.servicemix.jbi.deployer.AdminCommands;
+import org.apache.servicemix.jbi.deployer.AdminCommandsService;
public class ManagementTest extends AbstractIntegrationTest {
@@ -85,7 +83,7 @@
getBundleVersion("org.apache.servicemix.samples.wsdl-first", "wsdl-first-sa"),
null, "zip").getPath();
- AdminCommands admin = getAdminCommands();
+ AdminCommandsService admin = getAdminCommands();
try {
String res = admin.installComponent(smxJsr181, null, false);
@@ -135,8 +133,8 @@
System.err.println(admin.uninstallSharedLibrary("servicemix-shared"));
}
- protected AdminCommands getAdminCommands() {
- return getOsgiService(AdminCommands.class);
+ protected AdminCommandsService getAdminCommands() {
+ return getOsgiService(AdminCommandsService.class);
}
}