Title: [1012] trunk/servicemix-http: Add XBean deployment to the Http component
Revision
1012
Author
gnt
Date
2005-12-05 15:36:28 -0500 (Mon, 05 Dec 2005)

Log Message

Add XBean deployment to the Http component

Modified Paths


Added Paths

Diff

Modified: trunk/servicemix-http/maven.xml (1011 => 1012)

--- trunk/servicemix-http/maven.xml	2005-12-05 16:11:03 UTC (rev 1011)
+++ trunk/servicemix-http/maven.xml	2005-12-05 20:36:28 UTC (rev 1012)
@@ -7,4 +7,25 @@
 
   <goal name="nightly" prereqs="clean, jbi:install, jbi:deploy"/>
 
+  <postGoal name="java:compile">
+    <attainGoal name="xbean:generate" />
+  </postGoal>
+
+  <goal name="xbean:generate" description="Generates the XBean XSD, documentation and META-INF/services files.">
+    <path id="test.classpath">
+      <pathelement path="${maven.build.dest}" />
+      <pathelement path="${basedir}/target/classes" />
+      <pathelement path="${basedir}/target/test-classes" />
+      <path refid="maven.dependency.classpath" />
+    </path>
+
+    <taskdef name="xsdGenerate" classname="org.xbean.spring.generator.MappingGeneratorTask">
+      <classpath refid="test.classpath" />
+    </taskdef>
+    <xsdGenerate destFile="${basedir}/target/servicemix-http-${pom.currentVersion}.xsd" namespace="http://servicemix.org/http/1.0"
+    		classpathref="test.classpath" srcdir="${basedir}/src/main/java"  metaInfDir="${basedir}/target/generated/"/>
+  	<copy file="${basedir}/target/servicemix-http-${pom.currentVersion}.xsd" todir="${basedir}/target/generated/"/>
+  	<copy file="${basedir}/target/servicemix-http-${pom.currentVersion}.xsd" todir="${basedir}/../xdocs"/>    
+    <copy file="${basedir}/target/servicemix-http-${pom.currentVersion}.xsd.html" todir="${basedir}/../xdocs"/>
+  </goal>
 </project>

Modified: trunk/servicemix-http/project.xml (1011 => 1012)

--- trunk/servicemix-http/project.xml	2005-12-05 16:11:03 UTC (rev 1011)
+++ trunk/servicemix-http/project.xml	2005-12-05 20:36:28 UTC (rev 1012)
@@ -95,6 +95,30 @@
           <jbi.bundle>true</jbi.bundle>
         </properties>
       </dependency>
+      <dependency>
+        <groupId>org.xbean</groupId>
+        <artifactId>xbean-spring</artifactId>
+        <version>${xbean_version}</version>
+        <properties>
+          <jbi.bundle>true</jbi.bundle>
+        </properties>
+      </dependency>
+      <dependency>
+        <groupId>org.xbean</groupId>
+        <artifactId>xbean-server</artifactId>
+        <version>${xbean_version}</version>
+        <properties>
+          <jbi.bundle>true</jbi.bundle>
+        </properties>
+      </dependency>
+      <dependency>
+        <groupId>org.xbean</groupId>
+        <artifactId>xbean-kernel</artifactId>
+        <version>${xbean_version}</version>
+        <properties>
+          <jbi.bundle>true</jbi.bundle>
+        </properties>
+      </dependency>
       
       <!-- Provided dependencies -->
       <dependency>
@@ -173,6 +197,22 @@
       <version>1.0</version>
     </dependency>
 
+      <dependency>
+        <groupId>annogen</groupId>
+        <artifactId>annogen</artifactId>
+        <version>${annogen_version}</version>
+        <properties>
+          <scope>compile</scope>
+        </properties>
+      </dependency>
+      <dependency>
+        <groupId>qdox</groupId>
+        <artifactId>qdox</artifactId>
+        <version>${qdox_version}</version>
+        <properties>
+          <scope>compile</scope>
+        </properties>
+      </dependency>
     </dependencies>  
 
 </project>

Modified: trunk/servicemix-http/src/main/java/org/servicemix/http/ConsumerProcessor.java (1011 => 1012)

--- trunk/servicemix-http/src/main/java/org/servicemix/http/ConsumerProcessor.java	2005-12-05 16:11:03 UTC (rev 1011)
+++ trunk/servicemix-http/src/main/java/org/servicemix/http/ConsumerProcessor.java	2005-12-05 20:36:28 UTC (rev 1012)
@@ -45,7 +45,7 @@
     }
 
     public void start() throws Exception {
-        String url = ""
+        String url = ""
         context = getServerManager().createContext(url, this);
         context.start();
         channel = endpoint.getServiceUnit().getComponent().getComponentContext().getDeliveryChannel();

Modified: trunk/servicemix-http/src/main/java/org/servicemix/http/HttpComponent.java (1011 => 1012)

--- trunk/servicemix-http/src/main/java/org/servicemix/http/HttpComponent.java	2005-12-05 16:11:03 UTC (rev 1011)
+++ trunk/servicemix-http/src/main/java/org/servicemix/http/HttpComponent.java	2005-12-05 20:36:28 UTC (rev 1012)
@@ -35,7 +35,7 @@
      * @see org.servicemix.common.BaseComponent#createServiceUnitManager()
      */
     public BaseServiceUnitManager createServiceUnitManager() {
-        Deployer[] deployers = new Deployer[] { new HttpWsdl1Deployer(this) };
+        Deployer[] deployers = new Deployer[] { new HttpWsdl1Deployer(this), new HttpXBeanDeployer(this) };
         return new BaseServiceUnitManager(this, deployers);
     }
 

Modified: trunk/servicemix-http/src/main/java/org/servicemix/http/HttpEndpoint.java (1011 => 1012)

--- trunk/servicemix-http/src/main/java/org/servicemix/http/HttpEndpoint.java	2005-12-05 16:11:03 UTC (rev 1011)
+++ trunk/servicemix-http/src/main/java/org/servicemix/http/HttpEndpoint.java	2005-12-05 20:36:28 UTC (rev 1012)
@@ -22,20 +22,28 @@
 import javax.jbi.component.ComponentContext;
 import javax.jbi.messaging.MessageExchange.Role;
 import javax.jbi.servicedesc.ServiceEndpoint;
-import javax.wsdl.extensions.http.HTTPAddress;
 import javax.wsdl.extensions.http.HTTPBinding;
 
 import org.servicemix.common.Endpoint;
 import org.servicemix.common.ExchangeProcessor;
+import org.servicemix.common.wsdl1.JbiExtension;
 
+/**
+ * 
+ * @author gnodet
+ * @version $Revision: 908 $
+ * @org.xbean.XBean element="endpoint"
+ *                  description="An http endpoint"
+ * 
+ */
 public class HttpEndpoint extends Endpoint {
 
-    protected HTTPAddress address;
     protected HTTPBinding binding;
     protected ExchangeProcessor processor;
     protected ServiceEndpoint activated;
     protected Role role;
     protected URI defaultMep;
+    protected String locationURI;
     
     public ExchangeProcessor getProcessor() {
         return this.processor;
@@ -68,14 +76,6 @@
         processor.stop();
     }
 
-    public HTTPAddress getAddress() {
-        return address;
-    }
-
-    public void setAddress(HTTPAddress address) {
-        this.address = address;
-    }
-
     public HTTPBinding getBinding() {
         return binding;
     }
@@ -91,6 +91,22 @@
     public void setRole(Role role) {
         this.role = role;
     }
+    
+    /**
+     * @org.xbean.Property alias="role"
+     * @param role
+     */
+    public void setRoleAsString(String role) {
+        if (role == null) {
+            throw new IllegalArgumentException("Role must be specified");
+        } else if (JbiExtension.ROLE_CONSUMER.equals(role)) {
+            setRole(Role.CONSUMER);
+        } else if (JbiExtension.ROLE_PROVIDER.equals(role)) {
+            setRole(Role.PROVIDER);
+        } else {
+            throw new IllegalArgumentException("Unrecognized role: " + role);
+        }
+    }
 
     public void setDefaultMep(URI defaultMep) {
         this.defaultMep = defaultMep;
@@ -100,4 +116,12 @@
         return defaultMep;
     }
 
+    public String getLocationURI() {
+        return locationURI;
+    }
+
+    public void setLocationURI(String locationUri) {
+        this.locationURI = locationUri;
+    }
+
 }

Modified: trunk/servicemix-http/src/main/java/org/servicemix/http/HttpLifeCycle.java (1011 => 1012)

--- trunk/servicemix-http/src/main/java/org/servicemix/http/HttpLifeCycle.java	2005-12-05 16:11:03 UTC (rev 1011)
+++ trunk/servicemix-http/src/main/java/org/servicemix/http/HttpLifeCycle.java	2005-12-05 20:36:28 UTC (rev 1012)
@@ -21,6 +21,7 @@
 import org.apache.commons.httpclient.MultiThreadedHttpConnectionManager;
 import org.codehaus.xfire.XFire;
 import org.codehaus.xfire.XFireFactory;
+import org.servicemix.common.BaseComponent;
 import org.servicemix.common.BaseLifeCycle;
 
 public class HttpLifeCycle extends BaseLifeCycle {
@@ -31,7 +32,7 @@
     protected MultiThreadedHttpConnectionManager connectionManager;
     protected HttpConfiguration configuration;
     
-    public HttpLifeCycle(HttpComponent component) {
+    public HttpLifeCycle(BaseComponent component) {
         super(component);
         configuration = new HttpConfiguration();
     }

Added: trunk/servicemix-http/src/main/java/org/servicemix/http/HttpSpringComponent.java (1011 => 1012)

--- trunk/servicemix-http/src/main/java/org/servicemix/http/HttpSpringComponent.java	2005-12-05 16:11:03 UTC (rev 1011)
+++ trunk/servicemix-http/src/main/java/org/servicemix/http/HttpSpringComponent.java	2005-12-05 20:36:28 UTC (rev 1012)
@@ -0,0 +1,97 @@
+/** 
+ * 
+ * Copyright 2005 LogicBlaze, Inc. http://www.logicblaze.com
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License"); 
+ * you may not use this file except in compliance with the License. 
+ * You may obtain a copy of the License at 
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, 
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+ * See the License for the specific language governing permissions and 
+ * limitations under the License. 
+ * 
+ **/
+package org.servicemix.http;
+
+import org.servicemix.common.BaseComponent;
+import org.servicemix.common.BaseLifeCycle;
+import org.servicemix.common.ServiceUnit;
+
+/**
+ * 
+ * @author gnodet
+ * @version $Revision: 908 $
+ * @org.xbean.XBean element="component"
+ *                  description="An http component"
+ */
+public class HttpSpringComponent extends BaseComponent {
+
+    private HttpEndpoint[] endpoints;
+    
+    /* (non-Javadoc)
+     * @see org.servicemix.common.BaseComponent#createLifeCycle()
+     */
+    protected BaseLifeCycle createLifeCycle() {
+        return new LifeCycle();
+    }
+
+    public HttpEndpoint[] getEndpoints() {
+        return endpoints;
+    }
+
+    public void setEndpoints(HttpEndpoint[] endpoints) {
+        this.endpoints = endpoints;
+    }
+    
+    public class LifeCycle extends HttpLifeCycle {
+
+        protected ServiceUnit su;
+        
+        public LifeCycle() {
+            super(HttpSpringComponent.this);
+        }
+        
+        /* (non-Javadoc)
+         * @see org.servicemix.common.BaseLifeCycle#doInit()
+         */
+        protected void doInit() throws Exception {
+            super.doInit();
+            su = new ServiceUnit();
+            su.setComponent(HttpSpringComponent.this);
+            for (int i = 0; i < endpoints.length; i++) {
+                endpoints[i].setServiceUnit(su);
+                su.addEndpoint(endpoints[i]);
+            }
+            getRegistry().registerServiceUnit(su);
+        }
+
+        /* (non-Javadoc)
+         * @see org.servicemix.common.BaseLifeCycle#doStart()
+         */
+        protected void doStart() throws Exception {
+            super.doStart();
+            su.start();
+        }
+        
+        /* (non-Javadoc)
+         * @see org.servicemix.common.BaseLifeCycle#doStop()
+         */
+        protected void doStop() throws Exception {
+            su.stop();
+            super.doStop();
+        }
+        
+        /* (non-Javadoc)
+         * @see org.servicemix.common.BaseLifeCycle#doShutDown()
+         */
+        protected void doShutDown() throws Exception {
+            su.shutDown();
+            super.doShutDown();
+        }
+    }
+
+}

Modified: trunk/servicemix-http/src/main/java/org/servicemix/http/HttpWsdl1Deployer.java (1011 => 1012)

--- trunk/servicemix-http/src/main/java/org/servicemix/http/HttpWsdl1Deployer.java	2005-12-05 16:11:03 UTC (rev 1011)
+++ trunk/servicemix-http/src/main/java/org/servicemix/http/HttpWsdl1Deployer.java	2005-12-05 20:36:28 UTC (rev 1012)
@@ -48,7 +48,7 @@
         HttpEndpoint endpoint = new HttpEndpoint();
         endpoint.setRole(jbiEndpoint.getRole());
         endpoint.setDefaultMep(jbiEndpoint.getDefaultMep());
-        endpoint.setAddress((HTTPAddress) portElement);
+        endpoint.setLocationURI(((HTTPAddress) portElement).getLocationURI());
         endpoint.setBinding((HTTPBinding) bindingElement);
         return endpoint;
     }

Added: trunk/servicemix-http/src/main/java/org/servicemix/http/HttpXBeanDeployer.java (1011 => 1012)

--- trunk/servicemix-http/src/main/java/org/servicemix/http/HttpXBeanDeployer.java	2005-12-05 16:11:03 UTC (rev 1011)
+++ trunk/servicemix-http/src/main/java/org/servicemix/http/HttpXBeanDeployer.java	2005-12-05 20:36:28 UTC (rev 1012)
@@ -0,0 +1,47 @@
+/** 
+ * 
+ * Copyright 2005 LogicBlaze, Inc. http://www.logicblaze.com
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License"); 
+ * you may not use this file except in compliance with the License. 
+ * You may obtain a copy of the License at 
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, 
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+ * See the License for the specific language governing permissions and 
+ * limitations under the License. 
+ * 
+ **/
+package org.servicemix.http;
+
+import org.servicemix.common.BaseComponent;
+import org.servicemix.common.Endpoint;
+import org.servicemix.common.xbean.AbstractXBeanDeployer;
+
+import javax.jbi.management.DeploymentException;
+
+public class HttpXBeanDeployer extends AbstractXBeanDeployer {
+
+    public HttpXBeanDeployer(BaseComponent component) {
+        super(component);
+    }
+
+    protected boolean validate(Endpoint endpoint) throws DeploymentException {
+        if (endpoint instanceof HttpEndpoint == false) {
+            throw failure("deploy", "Endpoint should be a Http endpoint", null);
+        }
+        HttpEndpoint ep = (HttpEndpoint) endpoint;
+        if (ep.getRole() == null) {
+            throw failure("deploy", "Endpoint must have a defined role", null);
+        }
+        if (ep.getLocationURI() == null) {
+            throw failure("deploy", "Endpoint must have a defined locationURI", null);
+        }
+        return true;
+    }
+
+
+}

Modified: trunk/servicemix-http/src/main/java/org/servicemix/http/ProviderProcessor.java (1011 => 1012)

--- trunk/servicemix-http/src/main/java/org/servicemix/http/ProviderProcessor.java	2005-12-05 16:11:03 UTC (rev 1011)
+++ trunk/servicemix-http/src/main/java/org/servicemix/http/ProviderProcessor.java	2005-12-05 20:36:28 UTC (rev 1012)
@@ -42,7 +42,7 @@
     public ProviderProcessor(HttpEndpoint endpoint) throws Exception {
         this.endpoint = endpoint;
         this.host = new HostConfiguration();
-        this.host.setHost(new URI(endpoint.getAddress().getLocationURI(), false));
+        this.host.setHost(new URI(endpoint.getLocationURI(), false));
     }
 
     public void process(MessageExchange exchange) throws Exception {
@@ -53,7 +53,7 @@
             channel.send(exchange);
             return;
         }
-        PostMethod method = new PostMethod(endpoint.getAddress().getLocationURI());
+        PostMethod method = new PostMethod(endpoint.getLocationURI());
         marshaler.fromNMS(method, exchange, exchange.getMessage("in"));
         int response = getClient().executeMethod(host, method);
         if (response != HttpStatus.SC_OK) {

Modified: trunk/servicemix-http/src/test/java/org/servicemix/http/HttpComponentConsumerTest.java (1011 => 1012)

--- trunk/servicemix-http/src/test/java/org/servicemix/http/HttpComponentConsumerTest.java	2005-12-05 16:11:03 UTC (rev 1011)
+++ trunk/servicemix-http/src/test/java/org/servicemix/http/HttpComponentConsumerTest.java	2005-12-05 20:36:28 UTC (rev 1012)
@@ -163,8 +163,8 @@
     }
     
     public void testPerfInOnlyWithBigMessage() throws Exception {
-        int nbRuns = 4;
-        int sizeInKb =1024;
+        int nbRuns = 2;
+        int sizeInKb = 64;
         
         StringBuffer sb = new StringBuffer();
         sb.append("<hello>");

Modified: trunk/servicemix-http/src/test/java/org/servicemix/http/HttpComponentProviderTest.java (1011 => 1012)

--- trunk/servicemix-http/src/test/java/org/servicemix/http/HttpComponentProviderTest.java	2005-12-05 16:11:03 UTC (rev 1011)
+++ trunk/servicemix-http/src/test/java/org/servicemix/http/HttpComponentProviderTest.java	2005-12-05 20:36:28 UTC (rev 1012)
@@ -160,8 +160,8 @@
     }
     
     public void testPerfInOnlyWithBigMessage() throws Exception {
-        int nbRuns = 4;
-        int sizeInKb =1024;
+        int nbRuns = 2;
+        int sizeInKb = 64;
         
         StringBuffer sb = new StringBuffer();
         sb.append("<hello>");

Added: trunk/servicemix-http/src/test/java/org/servicemix/http/HttpSpringTest.java (1011 => 1012)

--- trunk/servicemix-http/src/test/java/org/servicemix/http/HttpSpringTest.java	2005-12-05 16:11:03 UTC (rev 1011)
+++ trunk/servicemix-http/src/test/java/org/servicemix/http/HttpSpringTest.java	2005-12-05 20:36:28 UTC (rev 1012)
@@ -0,0 +1,60 @@
+/** 
+ * 
+ * Copyright 2005 LogicBlaze, Inc. http://www.logicblaze.com
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License"); 
+ * you may not use this file except in compliance with the License. 
+ * You may obtain a copy of the License at 
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, 
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+ * See the License for the specific language governing permissions and 
+ * limitations under the License. 
+ * 
+ **/
+package org.servicemix.http;
+
+import javax.jbi.messaging.ExchangeStatus;
+import javax.jbi.messaging.InOut;
+import javax.xml.namespace.QName;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.servicemix.client.DefaultServiceMixClient;
+import org.servicemix.jbi.jaxp.SourceTransformer;
+import org.servicemix.jbi.jaxp.StringSource;
+import org.servicemix.tck.SpringTestSupport;
+import org.springframework.context.support.AbstractXmlApplicationContext;
+import org.xbean.spring.context.ClassPathXmlApplicationContext;
+
+public class HttpSpringTest extends SpringTestSupport {
+
+    private static Log logger =  LogFactory.getLog(HttpSpringTest.class);
+
+    public void test() throws Exception {
+        DefaultServiceMixClient client = new DefaultServiceMixClient(jbi);
+        InOut me = client.createInOutExchange();
+        me.setService(new QName("http://test", "MyProviderService"));
+        me.getInMessage().setContent(new StringSource("<echo xmlns='http://test'><echoin0>world</echoin0></echo>"));
+        client.sendSync(me);
+        if (me.getStatus() == ExchangeStatus.ERROR) {
+            if (me.getFault() != null) {
+                fail("Received fault: " + new SourceTransformer().toString(me.getFault().getContent()));
+            } else if (me.getError() != null) {
+                throw me.getError();
+            } else {
+                fail("Received ERROR status");
+            }
+        } else {
+            logger.info(new SourceTransformer().toString(me.getOutMessage().getContent()));
+        }
+    }
+    
+    protected AbstractXmlApplicationContext createBeanFactory() {
+        return new ClassPathXmlApplicationContext("org/servicemix/http/spring.xml");
+    }
+    
+}

Added: trunk/servicemix-http/src/test/java/org/servicemix/http/HttpXBeanDeployerTest.java (1011 => 1012)

--- trunk/servicemix-http/src/test/java/org/servicemix/http/HttpXBeanDeployerTest.java	2005-12-05 16:11:03 UTC (rev 1011)
+++ trunk/servicemix-http/src/test/java/org/servicemix/http/HttpXBeanDeployerTest.java	2005-12-05 20:36:28 UTC (rev 1012)
@@ -0,0 +1,84 @@
+package org.servicemix.http;
+
+import java.io.File;
+import java.net.URI;
+import java.net.URL;
+
+import javax.jbi.messaging.ExchangeStatus;
+import javax.jbi.messaging.InOut;
+import javax.xml.namespace.QName;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.servicemix.client.DefaultServiceMixClient;
+import org.servicemix.components.util.EchoComponent;
+import org.servicemix.jbi.container.ActivationSpec;
+import org.servicemix.jbi.container.JBIContainer;
+import org.servicemix.jbi.jaxp.SourceTransformer;
+import org.servicemix.jbi.jaxp.StringSource;
+import org.servicemix.tck.Receiver;
+import org.servicemix.tck.ReceiverComponent;
+
+import junit.framework.TestCase;
+
+public class HttpXBeanDeployerTest extends TestCase {
+
+    private static Log logger =  LogFactory.getLog(HttpSpringTest.class);
+
+    protected JBIContainer container;
+    
+    protected void setUp() throws Exception {
+        container = new JBIContainer();
+        container.setUseMBeanServer(false);
+        container.setCreateMBeanServer(false);
+        container.setEmbedded(true);
+        container.init();
+    }
+    
+    protected void tearDown() throws Exception {
+        if (container != null) {
+            container.shutDown();
+        }
+    }
+
+    public void test() throws Exception {
+        // HTTP Component
+        HttpComponent component = new HttpComponent();
+        container.activateComponent(component, "HTTPComponent");
+        
+        // Add a receiver component
+        ActivationSpec asEcho = new ActivationSpec("echo", new EchoComponent());
+        asEcho.setEndpoint("myConsumer");
+        asEcho.setService(new QName("http://test", "MyConsumerService"));
+        container.activateComponent(asEcho);
+        
+        // Start container
+        container.start();
+
+        // Deploy SU
+        URL url = ""
+        File path = new File(new URI(url.toString()));
+        path = path.getParentFile();
+        component.getServiceUnitManager().deploy("xbean", path.getAbsolutePath());
+        component.getServiceUnitManager().start("xbean");
+        
+        // Test
+        DefaultServiceMixClient client = new DefaultServiceMixClient(container);
+        InOut me = client.createInOutExchange();
+        me.setService(new QName("http://test", "MyProviderService"));
+        me.getInMessage().setContent(new StringSource("<echo xmlns='http://test'><echoin0>world</echoin0></echo>"));
+        client.sendSync(me);
+        if (me.getStatus() == ExchangeStatus.ERROR) {
+            if (me.getFault() != null) {
+                fail("Received fault: " + new SourceTransformer().toString(me.getFault().getContent()));
+            } else if (me.getError() != null) {
+                throw me.getError();
+            } else {
+                fail("Received ERROR status");
+            }
+        } else {
+            logger.info(new SourceTransformer().toString(me.getOutMessage().getContent()));
+        }
+    }
+    
+}

Modified: trunk/servicemix-http/src/test/resources/log4j.properties (1011 => 1012)

--- trunk/servicemix-http/src/test/resources/log4j.properties	2005-12-05 16:11:03 UTC (rev 1011)
+++ trunk/servicemix-http/src/test/resources/log4j.properties	2005-12-05 20:36:28 UTC (rev 1012)
@@ -1,7 +1,7 @@
 #
 # The logging properties used during tests..
 #
-log4j.rootLogger=INFO, stdout
+log4j.rootLogger=DEBUG, stdout
 
 log4j.logger.org.activemq=WARN
 log4j.logger.org.activeio=INFO

Added: trunk/servicemix-http/src/test/resources/org/servicemix/http/spring.xml (1011 => 1012)

--- trunk/servicemix-http/src/test/resources/org/servicemix/http/spring.xml	2005-12-05 16:11:03 UTC (rev 1011)
+++ trunk/servicemix-http/src/test/resources/org/servicemix/http/spring.xml	2005-12-05 20:36:28 UTC (rev 1012)
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns:sm="http://servicemix.org/config/1.0" 
+	   xmlns:http="http://servicemix.org/http/1.0"
+	   xmlns:test="http://test">
+
+  <!-- the JBI container -->
+  <sm:container id="jbi" embedded="true">
+    <sm:activationSpecs>
+
+      <!-- output using a POJO -->
+      <sm:activationSpec>
+      	<sm:component>
+            <http:component>
+            	<http:endpoints>
+            		<http:endpoint service="test:MyConsumerService"
+            					   endpoint="myConsumer"
+            		               role="consumer" 
+            		               locationURI="http://localhost:8192/Service/"
+            		               defaultMep="http://www.w3.org/2004/08/wsdl/in-out" />
+            		<http:endpoint service="test:MyProviderService"
+            					   endpoint="myProvider"
+            		               role="provider" 
+            		               locationURI="http://localhost:8192/Service/" />
+            	</http:endpoints>
+            </http:component>
+        </sm:component>
+      </sm:activationSpec>
+      
+      <sm:activationSpec service="test:MyConsumerService" endpoint="myConsumer">
+        <sm:component>
+          <bean class="org.servicemix.components.util.EchoComponent" />
+        </sm:component>
+      </sm:activationSpec>
+
+    </sm:activationSpecs>
+  </sm:container>
+
+</beans>

Added: trunk/servicemix-http/src/test/resources/xbean/xbean.xml (1011 => 1012)

--- trunk/servicemix-http/src/test/resources/xbean/xbean.xml	2005-12-05 16:11:03 UTC (rev 1011)
+++ trunk/servicemix-http/src/test/resources/xbean/xbean.xml	2005-12-05 20:36:28 UTC (rev 1012)
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<beans xmlns:http="http://servicemix.org/http/1.0"
+       xmlns:test="http://test">
+
+	<http:endpoint service="test:MyConsumerService"
+				   endpoint="myConsumer"
+	               role="consumer" 
+	               locationURI="http://localhost:8192/Service/"
+	               defaultMep="http://www.w3.org/2004/08/wsdl/in-out" />
+	               
+	<http:endpoint service="test:MyProviderService"
+				   endpoint="myProvider"
+	               role="provider" 
+	               locationURI="http://localhost:8192/Service/" />
+  				   
+</beans>

Reply via email to