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/02/14 22:26:52 UTC
svn commit: r377836 - in /incubator/servicemix/trunk:
servicemix-common/src/main/java/org/apache/servicemix/common/
servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/
servicemix-core/src/main/java/org/apache/servicemix/jbi/management/ s...
Author: gnodet
Date: Tue Feb 14 13:26:49 2006
New Revision: 377836
URL: http://svn.apache.org/viewcvs?rev=377836&view=rev
Log:
SM-305: The running state should be named STARTED in javax.jbi.LifeCycleMBean
Modified:
incubator/servicemix/trunk/servicemix-common/src/main/java/org/apache/servicemix/common/BaseServiceUnitManager.java
incubator/servicemix/trunk/servicemix-common/src/main/java/org/apache/servicemix/common/ServiceUnit.java
incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/ComponentMBeanImpl.java
incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/DeploymentService.java
incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/LocalComponentConnector.java
incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/management/BaseLifeCycle.java
incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/installation/DeploymentTest.java
incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/installation/HotDeployTest.java
incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/installation/InstallationTest.java
incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/management/ManagementContextTest.java
incubator/servicemix/trunk/servicemix-jbi/src/main/java/javax/jbi/management/LifeCycleMBean.java
incubator/servicemix/trunk/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/component/WSNDeployer.java
Modified: incubator/servicemix/trunk/servicemix-common/src/main/java/org/apache/servicemix/common/BaseServiceUnitManager.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-common/src/main/java/org/apache/servicemix/common/BaseServiceUnitManager.java?rev=377836&r1=377835&r2=377836&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-common/src/main/java/org/apache/servicemix/common/BaseServiceUnitManager.java (original)
+++ incubator/servicemix/trunk/servicemix-common/src/main/java/org/apache/servicemix/common/BaseServiceUnitManager.java Tue Feb 14 13:26:49 2006
@@ -171,7 +171,7 @@
if (su == null) {
throw failure("stop", "Service Unit '" + serviceUnitName + "' is not deployed", null);
}
- if (!LifeCycleMBean.RUNNING.equals(su.getCurrentState())) {
+ if (!LifeCycleMBean.STARTED.equals(su.getCurrentState())) {
throw failure("stop", "ServiceUnit should be in a SHUTDOWN state", null);
}
su.stop();
Modified: incubator/servicemix/trunk/servicemix-common/src/main/java/org/apache/servicemix/common/ServiceUnit.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-common/src/main/java/org/apache/servicemix/common/ServiceUnit.java?rev=377836&r1=377835&r2=377836&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-common/src/main/java/org/apache/servicemix/common/ServiceUnit.java (original)
+++ incubator/servicemix/trunk/servicemix-common/src/main/java/org/apache/servicemix/common/ServiceUnit.java Tue Feb 14 13:26:49 2006
@@ -40,7 +40,7 @@
Endpoint endpoint = (Endpoint) iter.next();
endpoint.activate();
}
- this.status = LifeCycleMBean.RUNNING;
+ this.status = LifeCycleMBean.STARTED;
}
public void stop() throws Exception {
Modified: incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/ComponentMBeanImpl.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/ComponentMBeanImpl.java?rev=377836&r1=377835&r2=377836&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/ComponentMBeanImpl.java (original)
+++ incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/ComponentMBeanImpl.java Tue Feb 14 13:26:49 2006
@@ -170,7 +170,7 @@
// need to re-initialze before starting
connector.init();
}
- if (!isRunning()) {
+ if (!isStarted()) {
connector.getLifeCycle().start();
super.start();
}
@@ -183,7 +183,7 @@
* if the item fails to stop.
*/
public void doStop() throws javax.jbi.JBIException {
- if (isUnknown() || isRunning()) {
+ if (isUnknown() || isStarted()) {
connector.getLifeCycle().stop();
super.stop();
}
Modified: incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/DeploymentService.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/DeploymentService.java?rev=377836&r1=377835&r2=377836&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/DeploymentService.java (original)
+++ incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/DeploymentService.java Tue Feb 14 13:26:49 2006
@@ -297,7 +297,7 @@
}
/**
- * Starts the service assembly and puts it in RUNNING state.
+ * Starts the service assembly and puts it in STARTED state.
*
* @param serviceAssemblyName - name of the service assembly.
* @return Result/Status of this operation.
Modified: incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/LocalComponentConnector.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/LocalComponentConnector.java?rev=377836&r1=377835&r2=377836&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/LocalComponentConnector.java (original)
+++ incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/LocalComponentConnector.java Tue Feb 14 13:26:49 2006
@@ -356,7 +356,7 @@
String runningState = getRunningStateFromStore();
log.info("Setting running state for Component: " + componentName + " to " + runningState);
if (runningState != null && componentMBean != null) {
- if (runningState.equals(LifeCycleMBean.RUNNING)) {
+ if (runningState.equals(LifeCycleMBean.STARTED)) {
componentMBean.doStart();
} else if (runningState.equals(LifeCycleMBean.STOPPED)) {
componentMBean.doStart();
Modified: incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/management/BaseLifeCycle.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/management/BaseLifeCycle.java?rev=377836&r1=377835&r2=377836&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/management/BaseLifeCycle.java (original)
+++ incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/management/BaseLifeCycle.java Tue Feb 14 13:26:49 2006
@@ -79,7 +79,7 @@
* @exception javax.jbi.JBIException if the item fails to start.
*/
public void start() throws javax.jbi.JBIException {
- setCurrentState(LifeCycleMBean.RUNNING);
+ setCurrentState(LifeCycleMBean.STARTED);
}
/**
@@ -121,10 +121,10 @@
}
/**
- * @return true if the object is in the runnning state
+ * @return true if the object is in the started state
*/
- public boolean isRunning(){
- return currentState != null && currentState.equals(LifeCycleMBean.RUNNING);
+ public boolean isStarted(){
+ return currentState != null && currentState.equals(LifeCycleMBean.STARTED);
}
/**
Modified: incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/installation/DeploymentTest.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/installation/DeploymentTest.java?rev=377836&r1=377835&r2=377836&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/installation/DeploymentTest.java (original)
+++ incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/installation/DeploymentTest.java Tue Feb 14 13:26:49 2006
@@ -111,7 +111,7 @@
replay();
// test component installation
lifecycleMBean.start();
- assertEquals(LifeCycleMBean.RUNNING, lifecycleMBean.getCurrentState());
+ assertEquals(LifeCycleMBean.STARTED, lifecycleMBean.getCurrentState());
// check mocks
verify();
@@ -201,7 +201,7 @@
replay();
// test component installation
lifecycleMBean.start();
- assertEquals(LifeCycleMBean.RUNNING, lifecycleMBean.getCurrentState());
+ assertEquals(LifeCycleMBean.STARTED, lifecycleMBean.getCurrentState());
// check mocks
verify();
@@ -306,7 +306,7 @@
replay();
// test component installation
lifecycleMBean.start();
- assertEquals(LifeCycleMBean.RUNNING, lifecycleMBean.getCurrentState());
+ assertEquals(LifeCycleMBean.STARTED, lifecycleMBean.getCurrentState());
// check mocks
verify();
Modified: incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/installation/HotDeployTest.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/installation/HotDeployTest.java?rev=377836&r1=377835&r2=377836&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/installation/HotDeployTest.java (original)
+++ incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/installation/HotDeployTest.java Tue Feb 14 13:26:49 2006
@@ -123,7 +123,7 @@
ObjectName lifecycleName = container.getRegistry().getComponentObjectName("component1");
assertNotNull(lifecycleName);
LifeCycleMBean lifecycleMBean = (LifeCycleMBean) MBeanServerInvocationHandler.newProxyInstance(container.getMBeanServer(), lifecycleName, LifeCycleMBean.class, false);
- assertEquals(LifeCycleMBean.RUNNING, lifecycleMBean.getCurrentState());
+ assertEquals(LifeCycleMBean.STARTED, lifecycleMBean.getCurrentState());
// check mocks
verify();
@@ -172,7 +172,7 @@
ObjectName lifecycleName = container.getRegistry().getComponentObjectName("component1");
assertNotNull(lifecycleName);
LifeCycleMBean lifecycleMBean = (LifeCycleMBean) MBeanServerInvocationHandler.newProxyInstance(container.getMBeanServer(), lifecycleName, LifeCycleMBean.class, false);
- assertEquals(LifeCycleMBean.RUNNING, lifecycleMBean.getCurrentState());
+ assertEquals(LifeCycleMBean.STARTED, lifecycleMBean.getCurrentState());
// check mocks
verify();
@@ -250,7 +250,7 @@
ObjectName lifecycleName = container.getRegistry().getComponentObjectName("component1");
assertNotNull(lifecycleName);
LifeCycleMBean lifecycleMBean = (LifeCycleMBean) MBeanServerInvocationHandler.newProxyInstance(container.getMBeanServer(), lifecycleName, LifeCycleMBean.class, false);
- assertEquals(LifeCycleMBean.RUNNING, lifecycleMBean.getCurrentState());
+ assertEquals(LifeCycleMBean.STARTED, lifecycleMBean.getCurrentState());
// check mocks
verify();
Modified: incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/installation/InstallationTest.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/installation/InstallationTest.java?rev=377836&r1=377835&r2=377836&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/installation/InstallationTest.java (original)
+++ incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/installation/InstallationTest.java Tue Feb 14 13:26:49 2006
@@ -238,7 +238,7 @@
lifecycleMock.replay();
// test component installation
lifecycleMBean.start();
- assertEquals(LifeCycleMBean.RUNNING, lifecycleMBean.getCurrentState());
+ assertEquals(LifeCycleMBean.STARTED, lifecycleMBean.getCurrentState());
// check mocks
bootstrapMock.verify();
componentMock.verify();
@@ -279,7 +279,7 @@
// start container
startContainer(false);
lifecycleMBean = (LifeCycleMBean) MBeanServerInvocationHandler.newProxyInstance(container.getMBeanServer(), lifecycleName, LifeCycleMBean.class, false);
- assertEquals(LifeCycleMBean.RUNNING, lifecycleMBean.getCurrentState());
+ assertEquals(LifeCycleMBean.STARTED, lifecycleMBean.getCurrentState());
// check mocks
bootstrapMock.verify();
componentMock.verify();
Modified: incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/management/ManagementContextTest.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/management/ManagementContextTest.java?rev=377836&r1=377835&r2=377836&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/management/ManagementContextTest.java (original)
+++ incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/management/ManagementContextTest.java Tue Feb 14 13:26:49 2006
@@ -107,7 +107,7 @@
names = context.getEngineComponents();
assertNotNull(names);
assertEquals(2, names.length);
- assertEquals(LifeCycleMBean.RUNNING, echo.getCurrentState());
+ assertEquals(LifeCycleMBean.STARTED, echo.getCurrentState());
context.stopComponent("echo");
assertEquals(LifeCycleMBean.STOPPED, echo.getCurrentState());
}
Modified: incubator/servicemix/trunk/servicemix-jbi/src/main/java/javax/jbi/management/LifeCycleMBean.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-jbi/src/main/java/javax/jbi/management/LifeCycleMBean.java?rev=377836&r1=377835&r2=377836&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-jbi/src/main/java/javax/jbi/management/LifeCycleMBean.java (original)
+++ incubator/servicemix/trunk/servicemix-jbi/src/main/java/javax/jbi/management/LifeCycleMBean.java Tue Feb 14 13:26:49 2006
@@ -31,7 +31,7 @@
final static String STOPPED = "Stopped";
- final static String RUNNING = "Running";
+ final static String STARTED = "Started";
final static String UNKNOWN = "Unknown";
}
Modified: incubator/servicemix/trunk/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/component/WSNDeployer.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/component/WSNDeployer.java?rev=377836&r1=377835&r2=377836&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/component/WSNDeployer.java (original)
+++ incubator/servicemix/trunk/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/component/WSNDeployer.java Tue Feb 14 13:26:49 2006
@@ -198,7 +198,7 @@
endpoint.activate();
}
}
- this.status = LifeCycleMBean.RUNNING;
+ this.status = LifeCycleMBean.STARTED;
}
}