upgrade transport to mule2.0.RC3

JumpMind · Mar 20, 2008 · 4c9e69f · 4c9e69f
1 parent 8d2b5fd
commit 4c9e69f
Show file tree

Hide file tree

Showing 8 changed files with 41 additions and 22 deletions.
diff --git a/mule-transport-symmetric/pom.xml b/mule-transport-symmetric/pom.xml
@@ -41,6 +41,14 @@
 					<optimize>true</optimize>
 				</configuration>
 			</plugin>
+            <plugin>
+                <artifactId>maven-eclipse-plugin</artifactId>
+                <configuration>
+                    <downloadSources>true</downloadSources>
+                    <downloadJavadocs>true</downloadJavadocs>
+                    <useProjectReferences>false</useProjectReferences>
+                </configuration>
+            </plugin>
 		</plugins>
 	</build>
 

diff --git a/...etric/src/main/java/org/jumpmind/mule/transport/symmetric/SymmetricMessageDispatcher.java b/...etric/src/main/java/org/jumpmind/mule/transport/symmetric/SymmetricMessageDispatcher.java
@@ -12,7 +12,7 @@
 
 import org.mule.api.MuleEvent;
 import org.mule.api.MuleMessage;
-import org.mule.api.endpoint.ImmutableEndpoint;
+import org.mule.api.endpoint.OutboundEndpoint;
 import org.mule.transport.AbstractMessageDispatcher;
 
 
@@ -22,7 +22,7 @@
 public class SymmetricMessageDispatcher extends AbstractMessageDispatcher
 {
 
-    public SymmetricMessageDispatcher(ImmutableEndpoint endpoint)
+    public SymmetricMessageDispatcher(OutboundEndpoint endpoint)
     {
         super(endpoint);
 

diff --git a/...rc/main/java/org/jumpmind/mule/transport/symmetric/SymmetricMessageDispatcherFactory.java b/...rc/main/java/org/jumpmind/mule/transport/symmetric/SymmetricMessageDispatcherFactory.java
@@ -11,7 +11,7 @@
 package org.jumpmind.mule.transport.symmetric;
 
 import org.mule.api.MuleException;
-import org.mule.api.endpoint.ImmutableEndpoint;
+import org.mule.api.endpoint.OutboundEndpoint;
 import org.mule.api.transport.MessageDispatcher;
 import org.mule.transport.AbstractMessageDispatcherFactory;
 
@@ -25,7 +25,7 @@ public class SymmetricMessageDispatcherFactory extends AbstractMessageDispatcher
     /* For general guidelines on writing transports see
        http://mule.mulesource.org/display/MULE/Writing+Transports */
 
-    public MessageDispatcher create(ImmutableEndpoint endpoint) throws MuleException
+    public MessageDispatcher create(OutboundEndpoint endpoint) throws MuleException
     {
         return new SymmetricMessageDispatcher(endpoint);
     }

diff --git a/...mmetric/src/main/java/org/jumpmind/mule/transport/symmetric/SymmetricMessageReceiver.java b/...mmetric/src/main/java/org/jumpmind/mule/transport/symmetric/SymmetricMessageReceiver.java
@@ -11,7 +11,7 @@
 package org.jumpmind.mule.transport.symmetric;
 
 import org.jumpmind.symmetric.SymmetricEngine;
-import org.mule.api.endpoint.ImmutableEndpoint;
+import org.mule.api.endpoint.InboundEndpoint;
 import org.mule.api.lifecycle.CreateException;
 import org.mule.api.lifecycle.LifecycleException;
 import org.mule.api.service.Service;
@@ -33,7 +33,7 @@ public class SymmetricMessageReceiver extends AbstractMessageReceiver {
      */
 
     public SymmetricMessageReceiver(Connector connector, Service service,
-            ImmutableEndpoint endpoint) throws CreateException {
+            InboundEndpoint endpoint) throws CreateException {
         super(connector, service, endpoint);
     }
 

diff --git a/...d.mule/i18n/symmetric-messages.properties → ...g/mule/i18n/symmetric-messages.properties b/...d.mule/i18n/symmetric-messages.properties → ...g/mule/i18n/symmetric-messages.properties
diff --git a/...pmind.mule/transport/symmetric.properties → ...s/org/mule/transport/symmetric.properties b/...pmind.mule/transport/symmetric.properties → ...s/org/mule/transport/symmetric.properties
diff --git a/...etric/src/test/java/org/jumpmind/mule/transport/symmetric/SymmetricConnectorTestCase.java b/...etric/src/test/java/org/jumpmind/mule/transport/symmetric/SymmetricConnectorTestCase.java
@@ -10,12 +10,11 @@
 
 package org.jumpmind.mule.transport.symmetric;
 
-import org.jumpmind.mule.transport.symmetric.SymmetricConnector;
 import org.jumpmind.symmetric.model.Data;
 import org.jumpmind.symmetric.model.DataEventType;
 import org.jumpmind.symmetric.model.TriggerHistory;
 import org.mule.api.transport.Connector;
-import org.mule.tck.providers.AbstractConnectorTestCase;
+import org.mule.transport.AbstractConnectorTestCase;
 
 public class SymmetricConnectorTestCase extends AbstractConnectorTestCase {
 

diff --git a/...src/test/java/org/jumpmind/mule/transport/symmetric/SymmetricMessageReceiverTestCase.java b/...src/test/java/org/jumpmind/mule/transport/symmetric/SymmetricMessageReceiverTestCase.java
@@ -10,24 +10,32 @@
 
 package org.jumpmind.mule.transport.symmetric;
 
-import org.jumpmind.mule.transport.symmetric.SymmetricConnector;
-import org.jumpmind.mule.transport.symmetric.SymmetricMessageReceiver;
-import org.mule.api.endpoint.EndpointURI;
+import org.mule.api.endpoint.EndpointBuilder;
+import org.mule.api.endpoint.InboundEndpoint;
+import org.mule.api.lifecycle.InitialisationException;
 import org.mule.api.service.Service;
 import org.mule.api.transport.MessageReceiver;
-import org.mule.endpoint.InboundEndpoint;
-import org.mule.endpoint.MuleEndpointURI;
-import org.mule.tck.providers.AbstractMessageReceiverTestCase;
+import org.mule.config.i18n.MessageFactory;
+import org.mule.endpoint.EndpointURIEndpointBuilder;
+import org.mule.transport.AbstractMessageReceiverTestCase;
 
 import com.mockobjects.dynamic.Mock;
 
 public class SymmetricMessageReceiverTestCase extends
 		AbstractMessageReceiverTestCase {
 
-	/*
-	 * For general guidelines on writing transports see
-	 * http://mule.mulesource.org/display/MULE/Writing+Transports
-	 */
+    private SymmetricConnector connector;
+
+    protected void doSetUp() throws Exception
+    {
+        connector = new SymmetricConnector();
+        connector.setName("TestConnector");
+
+        connector.setMuleContext(muleContext);
+        muleContext.getRegistry().registerConnector(connector);
+
+        super.doSetUp();
+    }
 
 	public MessageReceiver getMessageReceiver() throws Exception {
 		Mock mockService = new Mock(Service.class);
@@ -37,10 +45,14 @@ public MessageReceiver getMessageReceiver() throws Exception {
 	}
 
 	public InboundEndpoint getEndpoint() throws Exception {
-		InboundEndpoint endpoint = new InboundEndpoint();
-		endpoint.setEndpointURI(new MuleEndpointURI("symmetric:http://localhost:1234"));
-		endpoint.setConnector(new SymmetricConnector());
-		return endpoint;
+	    EndpointBuilder builder = new EndpointURIEndpointBuilder("symmetric:http://localhost:1234", muleContext);
+        if (connector == null)
+        {
+            throw new InitialisationException(MessageFactory.createStaticMessage("Connector has not been initialized."), null);
+        }
+        builder.setConnector(connector);
+        endpoint = muleContext.getRegistry().lookupEndpointFactory().getInboundEndpoint(builder);
+        return endpoint;
 	}
 
 }