Revision

7

Author

dandiep

Date

2008-03-03 14:24:18 -0600 (Mon, 03 Mar 2008)

Log Message

Bring Jersey transport up to Jersey 0.5 and Mule 2.0.0-RC2

Modified Paths

• trunk/pom.xml
• trunk/src/main/resources/META-INF/mule-jersey.xsd
• trunk/src/main/resources/META-INF/services/org/mule/providers/jersey.properties
• trunk/src/main/resources/META-INF/spring.handlers
• trunk/src/test/resources/basic-conf.xml
• trunk/src/test/resources/log4j.properties
• trunk/src/test/resources/servlet-conf.xml

Added Paths

• trunk/assembly.xml
• trunk/src/main/resources/META-INF/services/org/mule/config/
• trunk/src/main/resources/META-INF/services/org/mule/config/registry-bootstrap.properties
• trunk/src/test/java/org/mule/transport/
• trunk/src/test/java/org/mule/transport/jersey/
• trunk/src/test/java/org/mule/transport/jersey/AbderaConnectorFactoryTestCase.class
• trunk/src/test/java/org/mule/transport/jersey/AbderaConnectorTestCase.class
• trunk/src/test/java/org/mule/transport/jersey/AbderaEndpointTestCase.class
• trunk/src/test/java/org/mule/transport/jersey/AbderaMessageAdapterTestCase.class
• trunk/src/test/java/org/mule/transport/jersey/AbderaMessageReceiverTestCase.class
• trunk/src/test/java/org/mule/transport/jersey/BasicJerseyTest.java
• trunk/src/test/java/org/mule/transport/jersey/HelloWorldResource.java
• trunk/src/test/java/org/mule/transport/jersey/ServletJerseyTest.java
• trunk/src/test/resources/mule-test-exclusions.txt

Removed Paths

• trunk/repository/
• trunk/src/main/java/org/mule/providers/
• trunk/src/test/java/org/mule/providers/

Diff

--- trunk/assembly.xml                               (rev 0)
+++ trunk/assembly.xml  2008-03-03 20:24:18 UTC (rev 7)
@@ -0,0 +1,36 @@
+<!--
+Assembly descriptor for the full distribution.
+-->
+<assembly>
+  <id>jersey</id>
+  <formats>
+    <format>dir</format>
+    <format>tar.gz</format>
+    <format>zip</format>
+  </formats>
+  <fileSets>
+    <fileSet>
+      <directory>target</directory>
+      <outputDirectory></outputDirectory>
+      <includes>
+        <include>*.jar</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <directory>examples</directory>
+      <outputDirectory></outputDirectory>
+    </fileSet>
+  </fileSets>
+  <dependencySets>
+    <!-- Mule libraries -->
+    <dependencySet>
+      <outputDirectory>lib</outputDirectory>
+      <useTransitiveFiltering>useTransitiveFiltering</useTransitiveFiltering>
+      <excludes>
+        <exclude>org.mule.transports:mule-transport-jersey</exclude>
+        <exclude>jetty:org.mortbay.jetty</exclude>
+        <exclude>jaxen:jaxen</exclude>
+      </excludes>
+    </dependencySet>
+  </dependencySets>
+</assembly>
Property changes on: trunk/assembly.xml
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:mime-type
   + text/xml
Name: svn:keywords
   + Rev Date
Name: svn:eol-style
   + native

--- trunk/pom.xml    2007-09-13 11:25:41 UTC (rev 6)
+++ trunk/pom.xml       2008-03-03 20:24:18 UTC (rev 7)
@@ -1,86 +1,75 @@
 <project>
- <modelVersion>4.0.0</modelVersion>
-   <groupId>org.mule</groupId>
-   <artifactId>mule-transport-jersey</artifactId>
-   <packaging>jar</packaging>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.mule.transports</groupId>
+    <artifactId>mule-transport-jersey</artifactId>
+    <packaging>jar</packaging>
     <name>Mule Jersey Transport</name>
-   <version>0.1-SNASPHOT</version>
-  <description>Jersey</description>
-
-  <!-- Common Dependencies -->
+    <version>1.0-alpha-1-SNAPSHOT</version>
+    <description>Jersey</description>
+    <properties>
+        <mule.version>2.0.0-RC2</mule.version>
+    </properties>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.5</source>
+                    <target>1.5</target>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <configuration>
+                    <finalName>${artifactId}-${version}</finalName>
+                    <descriptors>
+                        <descriptor>assembly.xml</descriptor>
+                    </descriptors>
+                    <appendAssemblyId>false</appendAssemblyId>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>make-assembly</id><!-- this is used for inheritance merges -->
+                        <phase>package</phase><!-- append to the packaging phase. -->
+                        <goals>
+                            <goal>attached</goal><!-- goals == mojos -->
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+    <!-- Common Dependencies -->
     <dependencies>
         <dependency>
             <groupId>org.mule</groupId>
             <artifactId>mule-core</artifactId>
-            <version>2.0-M2-SNAPSHOT</version>
+            <version>${mule.version}</version>
         </dependency>
         <dependency>
             <groupId>org.mule.transports</groupId>
             <artifactId>mule-transport-http</artifactId>
-            <version>2.0-M2-SNAPSHOT</version>
+            <version>${mule.version}</version>
         </dependency>
         <dependency>
             <groupId>org.mule.modules</groupId>
             <artifactId>mule-module-client</artifactId>
-            <version>2.0-M2-SNAPSHOT</version>
+            <version>${mule.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.mule.tests</groupId>
             <artifactId>mule-tests-functional</artifactId>
-            <version>2.0-M2-SNAPSHOT</version>
+            <version>${mule.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>javax.activation</groupId>
-            <artifactId>activation</artifactId>
-            <version>1.1</version>
+            <groupId>jersey</groupId>
+            <artifactId>jersey</artifactId>
+            <version>0.5-ea</version>
         </dependency>
         <dependency>
-            <groupId>javax.mail</groupId>
-            <artifactId>mail</artifactId>
-            <version>1.4</version>
-        </dependency>
-        <dependency>
-            <groupId>com.sun.xml.bind</groupId>
-            <artifactId>jaxb-impl</artifactId>
-            <version>2.1.4</version>
-        </dependency>
-        <dependency>
-            <groupId>jdom</groupId>
-            <artifactId>jdom</artifactId>
-            <version>1.0</version>
-        </dependency>
-        <dependency>
-            <groupId>rome</groupId>
-            <artifactId>rome</artifactId>
-            <version>0.9</version>
-        </dependency>
-        <dependency>
-            <groupId>org.codehaus.jettison</groupId>
-            <artifactId>jettison</artifactId>
-            <version>1.0-RC2</version>
-        </dependency>
-        <dependency>
-            <groupId>javax.persistence</groupId>
-            <artifactId>persistence-api</artifactId>
-            <version>1.0</version>
-        </dependency>
-        <dependency>
-          <groupId>javax.ws.rs</groupId>
-          <artifactId>jsr311-api</artifactId>
-          <version>2.0</version>
-          <scope>system</scope>
-          <systemPath>${basedir}/repository/jsr311-api.jar</systemPath>
-        </dependency>
-        <dependency>
-          <groupId>com.sun.ws.rs</groupId>
-          <artifactId>jersey</artifactId>
-          <version>0.2-SNAPSHOT</version>
-          <scope>system</scope>
-          <systemPath>${basedir}/repository/jersey-0.2-SNAPSHOT.jar</systemPath>
-        </dependency>
-        <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <version>3.8.1</version>
@@ -88,11 +77,11 @@
         </dependency>
     </dependencies>
     <repositories>
-    <repository>
-      <id>java.net</id>
-      <name>java.net Repository</name>
-      <url>http://download.java.net/maven/1/</url>
-      <layout>legacy</layout>
-    </repository>
-  </repositories>
+        <repository>
+            <id>java.net</id>
+            <name>java.net Repository</name>
+            <url>http://download.java.net/maven/1/</url>
+            <layout>legacy</layout>
+        </repository>
+    </repositories>
 </project>

--- trunk/src/main/resources/META-INF/mule-jersey.xsd        2007-09-13 11:25:41 UTC (rev 6)
+++ trunk/src/main/resources/META-INF/mule-jersey.xsd   2008-03-03 20:24:18 UTC (rev 7)
@@ -12,10 +12,12 @@
     <xsd:import namespace="http://www.mulesource.org/schema/mule/core/2.0" 
                 schemaLocation="http://www.mulesource.org/schema/mule/core/2.0/mule.xsd" />
 
-    <xsd:element name="connector" type="jerseyConnectorType"/>
+    <xsd:element name="connector" type="jerseyConnectorType" substitutionGroup="mule:abstract-connector"/>
     
     <xsd:complexType name="jerseyConnectorType">
-        <xsd:sequence/>
+        <xsd:complexContent>        
+            <xsd:extension base="mule:connectorType"/>
+        </xsd:complexContent>
     </xsd:complexType>
 
 </xsd:schema>

--- trunk/src/main/resources/META-INF/services/org/mule/config/registry-bootstrap.properties                         (rev 0)
+++ trunk/src/main/resources/META-INF/services/org/mule/config/registry-bootstrap.properties    2008-03-03 20:24:18 UTC (rev 7)
@@ -0,0 +1,3 @@
+transformer.1=org.mule.transport.jersey.JerseyResponseToOutputHandler
+transformer.2=org.mule.transport.jersey.JerseyResponseToString
+transformer.2=org.mule.transport.jersey.JerseyResponseToByteArray
\ No newline at end of file
Property changes on: trunk/src/main/resources/META-INF/services/org/mule/config/registry-bootstrap.properties
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:mime-type
   + text/plain
Name: svn:keywords
   + Rev Date
Name: svn:eol-style
   + native

--- trunk/src/main/resources/META-INF/services/org/mule/providers/jersey.properties  2007-09-13 11:25:41 UTC (rev 6)
+++ trunk/src/main/resources/META-INF/services/org/mule/providers/jersey.properties     2008-03-03 20:24:18 UTC (rev 7)
@@ -1,32 +1,3 @@
-#This file is the service descriptor for your transport
-#It ties all the implementation classes together so that Mule can
-#construct endpoints for your transport protocol at runtime
-#For a full list of properties that can be set here see -
-#http://mule.mulesource.org/wiki/x/pwI
-
-#The connector class for your transport. This is alwas required
-connector=org.mule.providers.jersey.JerseyConnector
-
-#Used as the Mule internal representation of a message received or sent by 
-#your transport. This is always required.
-message.adapter=org.mule.providers.jersey.JerseyMessageAdapter
-
-#The message adapter to use if the inbound endpoint is marked for streaming
-#streaming.message.adapter=org.mule.providers.jersey.JerseyStreamingMessageAdapter
-
-#The factory used to create dispatchers responsible for sending events from the underlying technology
-#dispatcher.factory=org.mule.providers.jersey.JerseyMessageDispatcherFactory
-
-#The standard message receiver used to consume events from the underlying technology
-message.receiver=org.mule.providers.jersey.JerseyMessageReceiver
-
-
-#Defines the way in which endpoints for your transport will be constructed
-#Options are (but you can write your own) -
-#org.mule.impl.endpoint.ResourceEndpointBuilder i.e. vm://my.queue
-#org.mule.impl.endpoint.UrlEndpointBuilder i.e. axis:http://localhost:1234/context/Service?params
-#org.mule.impl.endpoint.SocketEndpointBuilder i.e. udp://localhost:2222
-
-endpoint.builder=org.mule.impl.endpoint.UrlEndpointBuilder
-
-#For more information see - http://mule.mulesource.org/wiki/x/DQ
+connector=org.mule.transport.jersey.JerseyConnector
+message.receiver=org.mule.transport.jersey.JerseyMessageReceiver
+endpoint.builder=org.mule.endpoint.UrlEndpointURIBuilder
\ No newline at end of file

--- trunk/src/main/resources/META-INF/spring.handlers        2007-09-13 11:25:41 UTC (rev 6)
+++ trunk/src/main/resources/META-INF/spring.handlers   2008-03-03 20:24:18 UTC (rev 7)
@@ -1 +1 @@
-http\://www.mulesource.org/schema/mule/jersey/2.0=org.mule.providers.jersey.config.JerseyNamespaceHandler
+http\://www.mulesource.org/schema/mule/jersey/2.0=org.mule.transport.jersey.config.JerseyNamespaceHandler

(Binary files differ)

(Binary files differ)

(Binary files differ)

(Binary files differ)

(Binary files differ)

--- trunk/src/test/java/org/mule/transport/jersey/BasicJerseyTest.java                               (rev 0)
+++ trunk/src/test/java/org/mule/transport/jersey/BasicJerseyTest.java  2008-03-03 20:24:18 UTC (rev 7)
@@ -0,0 +1,59 @@
+package org.mule.transport.jersey;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.mule.api.MuleMessage;
+import org.mule.extras.client.MuleClient;
+import org.mule.tck.FunctionalTestCase;
+import org.mule.transport.http.HttpConnector;
+import org.mule.transport.http.HttpConstants;
+import org.mule.transport.jersey.server.MuleRequestAdaptor;
+import org.mule.transport.jersey.server.MuleResponseAdapter;
+
+public class BasicJerseyTest extends FunctionalTestCase {
+
+    public void testBasic() throws Exception
+    {
+        MuleClient client = new MuleClient();
+        
+        MuleMessage result = client.send("http://localhost:63081/helloworld", "", null);
+        assertEquals(200, result.getIntProperty(HttpConnector.HTTP_STATUS_PROPERTY, 0));
+        assertEquals("Hello World", result.getPayloadAsString());
+        
+        // try invalid url
+        result = client.send("http://localhost:63081/hello", "", null);
+        assertEquals(404, result.getIntProperty(HttpConnector.HTTP_STATUS_PROPERTY, 0));
+        
+        Map<String, String> props = new HashMap<String, String>();
+        props.put(HttpConnector.HTTP_METHOD_PROPERTY, HttpConstants.METHOD_GET);
+        result = client.send("http://localhost:63081/helloworld", "", props);
+        assertEquals(405, result.getIntProperty(HttpConnector.HTTP_STATUS_PROPERTY, 0));
+        
+        props.put(HttpConnector.HTTP_METHOD_PROPERTY, HttpConstants.METHOD_DELETE);
+        result = client.send("http://localhost:63081/helloworld", "", props);
+        assertEquals("Hello World Delete", result.getPayloadAsString());
+        assertEquals(200, result.getIntProperty(HttpConnector.HTTP_STATUS_PROPERTY, 0));
+    }
+    
+    public void testParams() throws Exception
+    {
+        MuleClient client = new MuleClient();
+
+        Map<String, String> props = new HashMap<String, String>();
+        props.put(HttpConnector.HTTP_METHOD_PROPERTY, HttpConstants.METHOD_GET);
+        MuleMessage result = client.send("http://localhost:63081/helloworld/sayHelloWithUri/Dan", "", props);
+        assertEquals(200, result.getIntProperty(HttpConnector.HTTP_STATUS_PROPERTY, 0));
+        assertEquals("Hello Dan", result.getPayloadAsString());
+        
+        result = client.send("http://localhost:63081/helloworld/sayHelloWithQuery?name=Dan", "", props);
+        assertEquals(200, result.getIntProperty(HttpConnector.HTTP_STATUS_PROPERTY, 0));
+        assertEquals("Hello Dan", result.getPayloadAsString());
+    }
+    
+    @Override
+    protected String getConfigResources() {
+        return "basic-conf.xml";
+    }
+
+}
Property changes on: trunk/src/test/java/org/mule/transport/jersey/BasicJerseyTest.java
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:keywords
   + Rev Date
Name: svn:eol-style
   + native

--- trunk/src/test/java/org/mule/transport/jersey/HelloWorldResource.java                            (rev 0)
+++ trunk/src/test/java/org/mule/transport/jersey/HelloWorldResource.java       2008-03-03 20:24:18 UTC (rev 7)
@@ -0,0 +1,39 @@
+package org.mule.transport.jersey;
+
+import javax.ws.rs.DELETE;
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.ProduceMime;
+import javax.ws.rs.QueryParam;
+import javax.ws.rs.UriParam;
+
+@Path("/helloworld")
+public class HelloWorldResource {
+
+    @POST
+    @ProduceMime("text/plain")
+    public String sayHelloWorld() {
+        return "Hello World";
+    }
+    
+    @DELETE
+    @ProduceMime("text/plain")
+    public String deleteHelloWorld() {
+        return "Hello World Delete";
+    }
+    
+    @GET
+    @ProduceMime("text/plain")
+    @Path("/sayHelloWithUri/{name}")
+    public String sayHelloWithUri(@UriParam("name") String name) {
+        return "Hello " + name;
+    }
+    
+    @GET
+    @ProduceMime("text/plain")
+    @Path("/sayHelloWithQuery")
+    public String sayHelloWithQuery(@QueryParam("name") String name) {
+        return "Hello " + name;
+    }
+}
\ No newline at end of file
Property changes on: trunk/src/test/java/org/mule/transport/jersey/HelloWorldResource.java
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:keywords
   + Rev Date
Name: svn:eol-style
   + native

--- trunk/src/test/java/org/mule/transport/jersey/ServletJerseyTest.java                             (rev 0)
+++ trunk/src/test/java/org/mule/transport/jersey/ServletJerseyTest.java        2008-03-03 20:24:18 UTC (rev 7)
@@ -0,0 +1,78 @@
+package org.mule.transport.jersey;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.mortbay.http.HttpContext;
+import org.mortbay.http.SocketListener;
+import org.mortbay.jetty.Server;
+import org.mortbay.jetty.servlet.ServletHandler;
+import org.mortbay.util.InetAddrPort;
+import org.mule.api.MuleMessage;
+import org.mule.extras.client.MuleClient;
+import org.mule.tck.FunctionalTestCase;
+import org.mule.transport.http.HttpConnector;
+import org.mule.transport.http.HttpConstants;
+import org.mule.transport.http.servlet.MuleReceiverServlet;
+
+public class ServletJerseyTest extends FunctionalTestCase {
+    public static final int HTTP_PORT = 63088;
+
+    private Server httpServer;
+
+    @Override
+    protected void doSetUp() throws Exception {
+        super.doSetUp();
+        httpServer = new Server();
+        SocketListener socketListener = new SocketListener(new InetAddrPort(HTTP_PORT));
+        httpServer.addListener(socketListener);
+
+        HttpContext context = httpServer.getContext("/");
+        context.setRequestLog(null);
+
+        ServletHandler handler = new ServletHandler();
+        handler.addServlet("MuleReceiverServlet", "/*", MuleReceiverServlet.class
+            .getName());
+
+        context.addHandler(handler);
+        httpServer.start();
+    }
+    
+    @Override
+    protected void doTearDown() throws Exception
+    {
+        super.doTearDown();
+        if (httpServer != null && httpServer.isStarted())
+        {
+            httpServer.stop();
+        }
+    }
+    
+    public void testBasic() throws Exception
+    {
+        MuleClient client = new MuleClient();
+        
+        MuleMessage result = client.send("http://localhost:63088/base/helloworld", "", null);
+        assertEquals(200, result.getIntProperty(HttpConnector.HTTP_STATUS_PROPERTY, 0));
+        assertEquals("Hello World", result.getPayloadAsString());
+        
+        result = client.send("http://localhost:63088/base/hello", "", null);
+        assertEquals(404, result.getIntProperty(HttpConnector.HTTP_STATUS_PROPERTY, 0));
+        
+        Map<String, String> props = new HashMap<String, String>();
+        props.put(HttpConnector.HTTP_METHOD_PROPERTY, HttpConstants.METHOD_GET);
+        result = client.send("http://localhost:63088/base/helloworld", "", props);
+        assertEquals(405, result.getIntProperty(HttpConnector.HTTP_STATUS_PROPERTY, 0));
+        
+        props.put(HttpConnector.HTTP_METHOD_PROPERTY, HttpConstants.METHOD_DELETE);
+        result = client.send("http://localhost:63088/base/helloworld", "", props);
+        assertEquals("Hello World Delete", result.getPayloadAsString());
+        assertEquals(200, result.getIntProperty(HttpConnector.HTTP_STATUS_PROPERTY, 0));
+    }
+    
+    @Override
+    protected String getConfigResources() {
+        return "servlet-conf.xml";
+    }
+
+}
Property changes on: trunk/src/test/java/org/mule/transport/jersey/ServletJerseyTest.java
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:keywords
   + Rev Date
Name: svn:eol-style
   + native

--- trunk/src/test/resources/basic-conf.xml  2007-09-13 11:25:41 UTC (rev 6)
+++ trunk/src/test/resources/basic-conf.xml     2008-03-03 20:24:18 UTC (rev 7)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
+<mule xmlns:spring="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:mule="http://www.mulesource.org/schema/mule/core/2.0"
+       xmlns="http://www.mulesource.org/schema/mule/core/2.0"
        xmlns:jersey="http://www.mulesource.org/schema/mule/jersey/2.0"
        xmlns:vm="http://www.mulesource.org/schema/mule/vm/2.0"
        xsi:schemaLocation="
@@ -10,18 +10,18 @@
                http://www.mulesource.org/schema/mule/jersey/2.0 http://www.mulesource.org/schema/mule/jersey/2.0/mule-jersey.xsd
                http://www.mulesource.org/schema/mule/vm/2.0 http://www.mulesource.org/schema/mule/vm/2.0/mule-vm.xsd">
 
-    <jersey:connector/>
+    <jersey:connector name="jersey"/>
     
-    <mule:model-seda name="BasicJerseyTest">
+    <model name="BasicJerseyTest">
     
-        <mule:service name="helloWorldResource">
-            <mule:component class="org.mule.providers.jersey.HelloWorldResource"/>
-            <mule:inbound-router>
-                <mule:endpoint address="jersey:http://localhost:10081/helloworld"/>
-            </mule:inbound-router>
-        </mule:service>
+        <service name="helloWorldResource">
+            <inbound>
+                <inbound-endpoint address="jersey:http://localhost:63081/"/>
+            </inbound>
+            <component class="org.mule.transport.jersey.HelloWorldResource"/>
+        </service>
         
-    </mule:model-seda>
+    </model>
 
-</beans>
+</mule>
         

--- trunk/src/test/resources/log4j.properties        2007-09-13 11:25:41 UTC (rev 6)
+++ trunk/src/test/resources/log4j.properties   2008-03-03 20:24:18 UTC (rev 7)
@@ -6,4 +6,4 @@
 log4j.appender.A1.layout.ConversionPattern=[%d{MM-dd HH:mm:ss}] %-5p %c{1} [%t]: %m%n
 
 # settings for specific packages
-log4j.logger.org.mule=WARN
+log4j.logger.org.mule=INFO

--- trunk/src/test/resources/mule-test-exclusions.txt                                (rev 0)
+++ trunk/src/test/resources/mule-test-exclusions.txt   2008-03-03 20:24:18 UTC (rev 7)
@@ -0,0 +1,5 @@
+#
+# Test cases listed in this file are not run.
+#
+
+org.mule.transport.jersey.ServletJerseyTest
Property changes on: trunk/src/test/resources/mule-test-exclusions.txt
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:mime-type
   + text/plain
Name: svn:eol-style
   + native

--- trunk/src/test/resources/servlet-conf.xml        2007-09-13 11:25:41 UTC (rev 6)
+++ trunk/src/test/resources/servlet-conf.xml   2008-03-03 20:24:18 UTC (rev 7)
@@ -1,29 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
+<mule xmlns:spring="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:mule="http://www.mulesource.org/schema/mule/core/2.0"
+       xmlns="http://www.mulesource.org/schema/mule/core/2.0"
        xmlns:jersey="http://www.mulesource.org/schema/mule/jersey/2.0"
+       xmlns:vm="http://www.mulesource.org/schema/mule/vm/2.0"
        xmlns:servlet="http://www.mulesource.org/schema/mule/servlet/2.0"
        xsi:schemaLocation="
                http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
                http://www.mulesource.org/schema/mule/core/2.0 http://www.mulesource.org/schema/mule/core/2.0/mule.xsd
                http://www.mulesource.org/schema/mule/jersey/2.0 http://www.mulesource.org/schema/mule/jersey/2.0/mule-jersey.xsd
+               http://www.mulesource.org/schema/mule/vm/2.0 http://www.mulesource.org/schema/mule/vm/2.0/mule-vm.xsd
                http://www.mulesource.org/schema/mule/servlet/2.0 http://www.mulesource.org/schema/mule/servlet/2.0/mule-servlet.xsd">
 
-    <jersey:connector/>
+    <jersey:connector name="jersey"/>
     
-    <servlet:connector name="servlet" servletUrl="http://localhost:18088/"/>
+    <servlet:connector name="servlet" servletUrl="http://localhost:63088/"/>
     
-    <mule:model-seda name="BasicJerseyTest">
+    <model name="BasicJerseyTest">
     
-        <mule:service name="helloWorldResource">
-            <mule:component class="org.mule.providers.jersey.HelloWorldResource"/>
-            <mule:inbound-router>
-                <mule:endpoint address="jersey:servlet://hello"/>
-            </mule:inbound-router>
-        </mule:service>
+        <service name="helloWorldResource">
+            <inbound>
+                <inbound-endpoint address="jersey:servlet://base"/>
+            </inbound>
+            <component class="org.mule.transport.jersey.HelloWorldResource"/>
+        </service>
         
-    </mule:model-seda>
+    </model>
 
-</beans>
+</mule>
         
+
+