svn commit: r464251 - in /incubator/servicemix/trunk/servicemix-eip: ./ src/main/java/org/apache/servicemix/eip/ src/test/java/org/apache/servicemix/eip/

[gn...@apache.org]

Author: gnodet
Date: Sun Oct 15 12:10:26 2006
New Revision: 464251

URL: http://svn.apache.org/viewvc?view=rev&rev=464251
Log:
Convert EIP component to new DefaultComponent

Removed:
    incubator/servicemix/trunk/servicemix-eip/src/main/java/org/apache/servicemix/eip/EIPDeployer.java
    incubator/servicemix/trunk/servicemix-eip/src/main/java/org/apache/servicemix/eip/EIPLifeCycle.java
    incubator/servicemix/trunk/servicemix-eip/src/main/java/org/apache/servicemix/eip/EIPSpringComponent.java
Modified:
    incubator/servicemix/trunk/servicemix-eip/   (props changed)
    incubator/servicemix/trunk/servicemix-eip/src/main/java/org/apache/servicemix/eip/EIPComponent.java
    incubator/servicemix/trunk/servicemix-eip/src/test/java/org/apache/servicemix/eip/AbstractEIPTest.java

Propchange: incubator/servicemix/trunk/servicemix-eip/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sun Oct 15 12:10:26 2006
@@ -2,3 +2,5 @@
 .classpath
 .project
 cobertura.ser
+derby.log
+ServiceMixFlow.dot

Modified: incubator/servicemix/trunk/servicemix-eip/src/main/java/org/apache/servicemix/eip/EIPComponent.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-eip/src/main/java/org/apache/servicemix/eip/EIPComponent.java?view=diff&rev=464251&r1=464250&r2=464251
==============================================================================
--- incubator/servicemix/trunk/servicemix-eip/src/main/java/org/apache/servicemix/eip/EIPComponent.java (original)
+++ incubator/servicemix/trunk/servicemix-eip/src/main/java/org/apache/servicemix/eip/EIPComponent.java Sun Oct 15 12:10:26 2006
@@ -16,30 +16,72 @@
  */
 package org.apache.servicemix.eip;
 
-import org.apache.servicemix.common.BaseComponent;
-import org.apache.servicemix.common.BaseLifeCycle;
-import org.apache.servicemix.common.BaseServiceUnitManager;
-import org.apache.servicemix.common.Deployer;
+import java.util.List;
+
+import org.apache.servicemix.common.DefaultComponent;
 
 /**
  * @author gnodet
  * @version $Revision: 376451 $
+ * @org.apache.xbean.XBean element="component"
+ *                  description="An EIP component"
  */
-public class EIPComponent extends BaseComponent {
+public class EIPComponent extends DefaultComponent {
 
-    /* (non-Javadoc)
-     * @see org.servicemix.common.BaseComponent#createLifeCycle()
+    private EIPEndpoint[] endpoints;
+    private EIPConfiguration configuration;
+
+    public EIPComponent() {
+        configuration = new EIPConfiguration();
+    }
+    
+    /**
+     * @return the configuration
+     */
+    protected EIPConfiguration getConfiguration() {
+        return configuration;
+    }
+
+    /**
+     * @param configuration the configuration to set
+     */
+    protected void setConfiguration(EIPConfiguration configuration) {
+        this.configuration = configuration;
+    }
+
+    /**
+     * @return Returns the endpoints.
      */
-    protected BaseLifeCycle createLifeCycle() {
-        return new EIPLifeCycle(this);
+    public EIPEndpoint[] getEndpoints() {
+        return endpoints;
     }
 
+    /**
+     * @param endpoints The endpoints to set.
+     */
+    public void setEndpoints(EIPEndpoint[] endpoints) {
+        this.endpoints = endpoints;
+    }
+    
     /* (non-Javadoc)
-     * @see org.servicemix.common.BaseComponent#createServiceUnitManager()
+     * @see org.servicemix.common.BaseComponentLifeCycle#getExtensionMBean()
      */
-    public BaseServiceUnitManager createServiceUnitManager() {
-        Deployer[] deployers = new Deployer[] { new EIPDeployer(this) };
-        return new BaseServiceUnitManager(this, deployers);
+    protected Object getExtensionMBean() throws Exception {
+        return configuration;
+    }
+
+    protected void doInit() throws Exception {
+        super.doInit();
+        configuration.setRootDir(context.getWorkspaceRoot());
+        configuration.load();
+    }
+
+    protected List getConfiguredEndpoints() {
+        return asList(endpoints);
+    }
+
+    protected Class[] getEndpointClasses() {
+        return new Class[] { EIPEndpoint.class };
     }
 
 }

Modified: incubator/servicemix/trunk/servicemix-eip/src/test/java/org/apache/servicemix/eip/AbstractEIPTest.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-eip/src/test/java/org/apache/servicemix/eip/AbstractEIPTest.java?view=diff&rev=464251&r1=464250&r2=464251
==============================================================================
--- incubator/servicemix/trunk/servicemix-eip/src/test/java/org/apache/servicemix/eip/AbstractEIPTest.java (original)
+++ incubator/servicemix/trunk/servicemix-eip/src/test/java/org/apache/servicemix/eip/AbstractEIPTest.java Sun Oct 15 12:10:26 2006
@@ -98,7 +98,7 @@
     }
     
     protected void activateComponent(EIPEndpoint endpoint, String name) throws Exception {
-        EIPSpringComponent eip = new EIPSpringComponent();
+        EIPComponent eip = new EIPComponent();
         endpoint.setService(new QName(name));
         endpoint.setEndpoint("ep");
         eip.setEndpoints(new EIPEndpoint[] { endpoint });