svn commit: r666086 - in /servicemix/smx3/trunk/common/servicemix-common/src/main/java/org/apache/servicemix/common: BaseComponent.java DefaultComponent.java xbean/AbstractXBeanDeployer.java

[gn...@apache.org]

Author: gnodet
Date: Tue Jun 10 05:28:51 2008
New Revision: 666086

URL: http://svn.apache.org/viewvc?rev=666086&view=rev
Log:
Avoid reference to BaseLifeCycle

Modified:
    servicemix/smx3/trunk/common/servicemix-common/src/main/java/org/apache/servicemix/common/BaseComponent.java
    servicemix/smx3/trunk/common/servicemix-common/src/main/java/org/apache/servicemix/common/DefaultComponent.java
    servicemix/smx3/trunk/common/servicemix-common/src/main/java/org/apache/servicemix/common/xbean/AbstractXBeanDeployer.java

Modified: servicemix/smx3/trunk/common/servicemix-common/src/main/java/org/apache/servicemix/common/BaseComponent.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/common/servicemix-common/src/main/java/org/apache/servicemix/common/BaseComponent.java?rev=666086&r1=666085&r2=666086&view=diff
==============================================================================
--- servicemix/smx3/trunk/common/servicemix-common/src/main/java/org/apache/servicemix/common/BaseComponent.java (original)
+++ servicemix/smx3/trunk/common/servicemix-common/src/main/java/org/apache/servicemix/common/BaseComponent.java Tue Jun 10 05:28:51 2008
@@ -38,6 +38,7 @@
  * @version $Revision$
  * @since 3.0
  */
+@Deprecated
 public abstract class BaseComponent implements ServiceMixComponent {
 
     protected final transient Log logger = LogFactory.getLog(getClass());

Modified: servicemix/smx3/trunk/common/servicemix-common/src/main/java/org/apache/servicemix/common/DefaultComponent.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/common/servicemix-common/src/main/java/org/apache/servicemix/common/DefaultComponent.java?rev=666086&r1=666085&r2=666086&view=diff
==============================================================================
--- servicemix/smx3/trunk/common/servicemix-common/src/main/java/org/apache/servicemix/common/DefaultComponent.java (original)
+++ servicemix/smx3/trunk/common/servicemix-common/src/main/java/org/apache/servicemix/common/DefaultComponent.java Tue Jun 10 05:28:51 2008
@@ -282,8 +282,9 @@
     }
 
     /* (non-Javadoc)
-    * @see org.servicemix.common.BaseLifeCycle#doInit()
+    * @see org.apache.servicemix.common.AsyncBaseLifeCycle#doInit()
     */
+    @Override
     protected void doInit() throws Exception {
         super.doInit();
         List endpoints = getConfiguredEndpoints();
@@ -351,8 +352,9 @@
 
 
     /* (non-Javadoc)
-    * @see org.servicemix.common.BaseLifeCycle#doStart()
+    * @see org.apache.servicemix.common.AsyncBaseLifeCycle#doStart()
     */
+    @Override
     protected void doStart() throws Exception {
         super.doStart();
         if (serviceUnit != null) {
@@ -364,8 +366,9 @@
     }
 
     /* (non-Javadoc)
-    * @see org.servicemix.common.BaseLifeCycle#doStop()
+    * @see org.apache.servicemix.common.AsyncBaseLifeCycle#doStop()
     */
+    @Override
     protected void doStop() throws Exception {
         if (serviceUnit != null) {
             serviceUnit.stop();
@@ -374,8 +377,9 @@
     }
 
     /* (non-Javadoc)
-    * @see org.servicemix.common.BaseLifeCycle#doShutDown()
+    * @see org.apache.servicemix.common.AsyncBaseLifeCycle#doShutDown()
     */
+    @Override
     protected void doShutDown() throws Exception {
         if (serviceUnit != null) {
             serviceUnit.shutDown();

Modified: servicemix/smx3/trunk/common/servicemix-common/src/main/java/org/apache/servicemix/common/xbean/AbstractXBeanDeployer.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/common/servicemix-common/src/main/java/org/apache/servicemix/common/xbean/AbstractXBeanDeployer.java?rev=666086&r1=666085&r2=666086&view=diff
==============================================================================
--- servicemix/smx3/trunk/common/servicemix-common/src/main/java/org/apache/servicemix/common/xbean/AbstractXBeanDeployer.java (original)
+++ servicemix/smx3/trunk/common/servicemix-common/src/main/java/org/apache/servicemix/common/xbean/AbstractXBeanDeployer.java Tue Jun 10 05:28:51 2008
@@ -28,7 +28,6 @@
 import javax.jbi.management.DeploymentException;
 
 import org.apache.servicemix.common.AbstractDeployer;
-import org.apache.servicemix.common.BaseLifeCycle;
 import org.apache.servicemix.common.Endpoint;
 import org.apache.servicemix.common.EndpointComponentContext;
 import org.apache.servicemix.common.ServiceMixComponent;
@@ -167,7 +166,7 @@
 
     protected Map getParentBeansMap() {
         Map beans = new HashMap();
-        beans.put("context", new EndpointComponentContext(((BaseLifeCycle) component.getLifeCycle()).getContext()));
+        beans.put("context", new EndpointComponentContext(component.getComponentContext()));
         beans.put("component", component);
         Object smx3 = component.getSmx3Container();
         if (smx3 != null) {