You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ode.apache.org by rr...@apache.org on 2009/07/24 16:21:11 UTC

svn commit: r797474 - in /ode/branches/APACHE_ODE_1.X: ./ jbi/src/test/java/org/apache/ode/jbi/ jbi/src/test/resources/ jbi/src/test/resources/HelloWorldJbiTest/

Author: rr
Date: Fri Jul 24 14:21:11 2009
New Revision: 797474

URL: http://svn.apache.org/viewvc?rev=797474&view=rev
Log:
ODE-499: Extended JBI tests

Added:
    ode/branches/APACHE_ODE_1.X/jbi/src/test/java/org/apache/ode/jbi/HelloWorldJbiTest.java   (with props)
    ode/branches/APACHE_ODE_1.X/jbi/src/test/java/org/apache/ode/jbi/JbiTestBase.java   (with props)
    ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/HelloWorldJbiTest/
    ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/HelloWorldJbiTest/HelloWorld2.bpel
    ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/HelloWorldJbiTest/HelloWorld2.wsdl   (with props)
    ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/HelloWorldJbiTest/deploy.xml   (with props)
    ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/HelloWorldJbiTest/smx.xml   (with props)
    ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/HelloWorldJbiTest/test.properties   (with props)
Modified:
    ode/branches/APACHE_ODE_1.X/Rakefile
    ode/branches/APACHE_ODE_1.X/jbi/src/test/java/org/apache/ode/jbi/OdeJbiComponentLifeCycleTest.java
    ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/HelloWorldRequest.xml
    ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/log4j.properties

Modified: ode/branches/APACHE_ODE_1.X/Rakefile
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/Rakefile?rev=797474&r1=797473&r2=797474&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/Rakefile (original)
+++ ode/branches/APACHE_ODE_1.X/Rakefile Fri Jul 24 14:21:11 2009
@@ -86,7 +86,7 @@
   :resource         =>"org.apache.geronimo.specs:geronimo-j2ee-connector_1.5_spec:jar:1.0"
 )
 JAXEN               = "jaxen:jaxen:jar:1.1.1"
-JBI                 = "org.apache.servicemix:servicemix-jbi:jar:3.1.1-incubating"
+JBI                 = group("org.apache.servicemix.specs.jbi-api-1.0", :under=>"org.apache.servicemix.specs", :version=>"1.1.0")
 JENCKS              = "org.jencks:jencks:jar:all:1.3"
 JIBX                = "jibx:jibx-run:jar:1.1-beta3"
 LOG4J               = "log4j:log4j:jar:1.2.13"
@@ -94,10 +94,32 @@
                        "net.sourceforge.serp:serp:jar:1.13.1"]
 
 SAXON               = group("saxon", "saxon-xpath", "saxon-dom", "saxon-xqj", :under=>"net.sf.saxon", :version=>"9.x")
-SERVICEMIX          = group("servicemix-core", "servicemix-shared", "servicemix-services",
-                        :under=>"org.apache.servicemix", :version=>"3.1-incubating")
-SPRING              = group("spring-beans", "spring-context", "spring-core", "spring-jmx",
-                        :under=>"org.springframework", :version=>"2.0.1")
+SERVICEMIX          = [
+                        group("servicemix-core", 
+                            :under=>"org.apache.servicemix", :version=>"3.3"), 
+                        group("servicemix-soap", "servicemix-common", "servicemix-shared", "servicemix-http", "servicemix-eip",
+                            :under=>"org.apache.servicemix", :version=>"2008.01"), 
+                        group("servicemix-utils", 
+                            :under=>"org.apache.servicemix", :version=>"1.0.0"),
+                        "commons-httpclient:commons-httpclient:jar:3.0", 
+                        "org.mortbay.jetty:jetty:jar:6.1.12rc1",
+                        "org.mortbay.jetty:jetty-client:jar:6.1.12rc1",
+                        "org.mortbay.jetty:jetty-sslengine:jar:6.1.12rc1",
+                        "org.mortbay.jetty:servlet-api-2.5:jar:6.1.12rc1",
+                        "org.mortbay.jetty:jetty-util:jar:6.1.12rc1",
+                        "org.codehaus.woodstox:wstx-asl:jar:3.2.2",
+                        "org.apache.geronimo.specs:geronimo-activation_1.1_spec:jar:1.0.1",
+                        "org.apache.geronimo.specs:geronimo-annotation_1.0_spec:jar:1.1",
+                        "org.apache.geronimo.specs:geronimo-javamail_1.4_spec:jar:1.2",
+                        "org.apache.geronimo.specs:geronimo-stax-api_1.0_spec:jar:1.0.1",
+                        "org.apache.geronimo.specs:geronimo-jms_1.1_spec:jar:1.1",
+                        "org.jencks:jencks:jar:2.1",
+                        "org.objectweb.howl:howl:jar:1.0.1-1",
+                        "org.apache.activemq:activemq-core:jar:4.1.1",
+                        "org.apache.activemq:activemq-ra:jar:4.1.1",
+                        "commons-beanutils:commons-beanutils:jar:1.7.0"
+                        ]
+SPRING              = ["org.springframework:spring:jar:2.5.6"]
 TRANQL              = [ "tranql:tranql-connector:jar:1.1", "axion:axion:jar:1.0-M3-dev", COMMONS.primitives ]
 WOODSTOX            = "woodstox:wstx-asl:jar:3.2.1"
 WSDL4J              = "wsdl4j:wsdl4j:jar:1.6.1"
@@ -109,8 +131,12 @@
   :neethi           =>"org.apache.neethi:neethi:jar:2.0.2",
   :xml_schema       =>"org.apache.ws.commons.schema:XmlSchema:jar:1.3.2"
 )
-XBEAN               = group("xbean-classloader", "xbean-kernel", "xbean-server", "xbean-spring",
-                        :under=>"org.apache.xbean", :version=>"2.8")
+XBEAN               = [
+  "org.apache.xbean:xbean-kernel:jar:3.3",
+  "org.apache.xbean:xbean-server:jar:3.3",
+  "org.apache.xbean:xbean-spring:jar:3.4.3",
+  "org.apache.xbean:xbean-classloader:jar:3.4.3"
+]
 XMLBEANS            = "org.apache.xmlbeans:xmlbeans:jar:2.3.0"
 
 repositories.remote << "http://www.intalio.org/public/maven2"
@@ -490,14 +516,21 @@
       jbi.include path_to("src/main/jbi/ode-jbi.properties")
     end
 
-    test.with projects("dao-jpa", "bpel-compiler", "bpel-api-jca", "jca-ra",
+    test.with projects("dao-jpa", "dao-hibernate", "bpel-compiler", "bpel-api-jca", "jca-ra",
       "jca-server", "jacob"),
       BACKPORT, COMMONS.lang, COMMONS.collections, DERBY, GERONIMO.connector, GERONIMO.kernel,
       GERONIMO.transaction, JAVAX.connector, JAVAX.ejb, JAVAX.persistence, JAVAX.stream,
       JAVAX.transaction, JAXEN, JBI, OPENJPA, SAXON, SERVICEMIX, SPRING, TRANQL,
-      XALAN, XBEAN, XMLBEANS, XSTREAM
-    test.using :properties=>{ "jbi.install"=>_("target/smixInstallDir"),  "jbi.examples"=>_("../distro/src/examples-jbi/") }
-    test.setup unzip(_("target/smixInstallDir/install/ODE")=>project("dao-jpa-ojpa-derby").package(:zip))
+      XALAN, XBEAN, XMLBEANS, XSTREAM,
+      LOG4J
+
+      test.setup unzip(_("target/test/smx/ode")=>project("dao-jpa-ojpa-derby").package(:zip))
+      test.setup unzip(_("target/test/smx/ode")=>project("dao-hibernate-db").package(:zip))
+      test.setup task(:prepare_jbi_tests) do |task|
+      cp _("src/main/jbi/ode-jbi.properties"), _("target/test/smx/ode")
+      cp _("src/main/jbi/hibernate.properties"), _("target/test/smx/ode")
+      cp_r _("src/test/resources"), _("target/test/resources")
+    end
   end
 
   desc "ODE JCA Resource Archive"

Added: ode/branches/APACHE_ODE_1.X/jbi/src/test/java/org/apache/ode/jbi/HelloWorldJbiTest.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/jbi/src/test/java/org/apache/ode/jbi/HelloWorldJbiTest.java?rev=797474&view=auto
==============================================================================
--- ode/branches/APACHE_ODE_1.X/jbi/src/test/java/org/apache/ode/jbi/HelloWorldJbiTest.java (added)
+++ ode/branches/APACHE_ODE_1.X/jbi/src/test/java/org/apache/ode/jbi/HelloWorldJbiTest.java Fri Jul 24 14:21:11 2009
@@ -0,0 +1,7 @@
+package org.apache.ode.jbi;
+
+public class HelloWorldJbiTest extends JbiTestBase {
+    public void testHelloWold() throws Exception {
+        go();
+    }
+}

Propchange: ode/branches/APACHE_ODE_1.X/jbi/src/test/java/org/apache/ode/jbi/HelloWorldJbiTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: ode/branches/APACHE_ODE_1.X/jbi/src/test/java/org/apache/ode/jbi/JbiTestBase.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/jbi/src/test/java/org/apache/ode/jbi/JbiTestBase.java?rev=797474&view=auto
==============================================================================
--- ode/branches/APACHE_ODE_1.X/jbi/src/test/java/org/apache/ode/jbi/JbiTestBase.java (added)
+++ ode/branches/APACHE_ODE_1.X/jbi/src/test/java/org/apache/ode/jbi/JbiTestBase.java Fri Jul 24 14:21:11 2009
@@ -0,0 +1,127 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.apache.ode.jbi;
+
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.PrintWriter;
+import java.net.URL;
+import java.net.URLConnection;
+import java.util.Properties;
+import java.util.regex.Pattern;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.servicemix.components.util.EchoComponent;
+import org.apache.servicemix.http.HttpComponent;
+import org.apache.servicemix.jbi.container.ActivationSpec;
+import org.apache.servicemix.jbi.container.JBIContainer;
+import org.apache.servicemix.jbi.framework.ComponentContextImpl;
+import org.apache.servicemix.jbi.framework.ComponentNameSpace;
+import org.apache.servicemix.jbi.util.FileUtil;
+import org.apache.servicemix.tck.SpringTestSupport;
+import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
+import org.springframework.context.support.AbstractXmlApplicationContext;
+
+public class JbiTestBase extends SpringTestSupport {
+    private static Log log = LogFactory.getLog(JbiTestBase.class);
+
+    private OdeComponent odeComponent;
+    
+    protected Properties testProperties;
+    
+    @Override
+    protected AbstractXmlApplicationContext createBeanFactory() {
+        return new ClassPathXmlApplicationContext("/" + getTestName() + "/smx.xml");
+    }
+    
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+
+        JBIContainer jbiContainer = ((JBIContainer) getBean("jbi"));
+        odeComponent = new OdeComponent();
+        
+        ComponentContextImpl cc = new ComponentContextImpl(jbiContainer, new ComponentNameSpace(jbiContainer.getName(), "ODE"));
+        ActivationSpec activationSpec = new ActivationSpec();
+        activationSpec.setComponent(odeComponent);
+        activationSpec.setComponentName("ODE");
+        jbiContainer.activateComponent(new File("target/test/smx/ode").getAbsoluteFile(), odeComponent, "", cc, activationSpec,  true, false, false, null);
+        
+        testProperties = new Properties();
+        testProperties.load(getClass().getResourceAsStream("/" + getTestName() + "/test.properties"));
+    }
+    
+    protected String getTestName() {
+        return getClass().getSimpleName();
+    }
+    
+    protected void enableProcess(String resource, boolean enable) throws Exception {
+        resource = "target/test/resources/" + resource;
+        String process = resource.substring(resource.lastIndexOf('/') + 1);
+        if (enable) {
+            odeComponent.getServiceUnitManager().deploy(process, resource);
+            odeComponent.getServiceUnitManager().init(process, resource);
+            odeComponent.getServiceUnitManager().start(process);
+        } else {
+            odeComponent.getServiceUnitManager().stop(process);
+            odeComponent.getServiceUnitManager().undeploy(process, resource);
+        }
+    }
+
+    @Override
+    protected void tearDown() throws Exception {
+        super.tearDown();
+    }
+
+
+    protected void go() throws Exception {
+        enableProcess(getTestName(), true);
+
+        String request = testProperties.getProperty("request");
+        String expectedResponse = testProperties.getProperty("response");
+        String httpUrl = testProperties.getProperty("http.url", "");
+        if (!httpUrl.equals("")) {
+            log.debug(getTestName() + " sending http request to " + httpUrl + " request: " + request);
+            URLConnection connection = new URL(httpUrl).openConnection();
+            connection.setDoOutput(true);
+            connection.setDoInput(true);
+            //Send request
+            OutputStream os = connection.getOutputStream();
+            PrintWriter wt = new PrintWriter(os);
+            wt.print(request);
+            wt.flush();
+            wt.close();
+            // Read the response.
+            InputStream is = connection.getInputStream();
+            ByteArrayOutputStream baos = new ByteArrayOutputStream();
+            FileUtil.copyInputStream(is, baos);
+            String result = baos.toString();
+            log.debug(getTestName() + " have result: " + result);
+            matchResponse(expectedResponse, result);
+        }
+        
+        
+        enableProcess(getTestName(), false);
+    }
+    
+    protected void matchResponse(String expectedResponse, String result) {
+        assertTrue("Response doesn't match expected regex.\nExpected: " + expectedResponse + "\nReceived: " + result, Pattern.compile(expectedResponse, Pattern.DOTALL).matcher(result).matches());
+    }
+}

Propchange: ode/branches/APACHE_ODE_1.X/jbi/src/test/java/org/apache/ode/jbi/JbiTestBase.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: ode/branches/APACHE_ODE_1.X/jbi/src/test/java/org/apache/ode/jbi/OdeJbiComponentLifeCycleTest.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/jbi/src/test/java/org/apache/ode/jbi/OdeJbiComponentLifeCycleTest.java?rev=797474&r1=797473&r2=797474&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/jbi/src/test/java/org/apache/ode/jbi/OdeJbiComponentLifeCycleTest.java (original)
+++ ode/branches/APACHE_ODE_1.X/jbi/src/test/java/org/apache/ode/jbi/OdeJbiComponentLifeCycleTest.java Fri Jul 24 14:21:11 2009
@@ -36,23 +36,18 @@
 public class OdeJbiComponentLifeCycleTest extends TestCase {
 
     JBIContainer container;
-    File rootDir, installDir, odeDir;
+    File rootDir, odeDir;
     TransactionManager txm;
     private OdeComponent component;
+    private static String helloWorldDir = "target/test/resources/HelloWorldJbiTest";
 
     protected void setUp() throws Exception {
-        rootDir = new File(System.getProperty("jbi.install"));
-        rootDir.mkdir();
-        installDir = new File(rootDir, "install");
-        installDir.mkdir();
+        rootDir = new File("target/test/smx");
+        odeDir = new File(rootDir, "ode");
         txm = new EmbeddedGeronimoFactory().getTransactionManager();
-        odeDir = new File(installDir, "ODE");
-        odeDir.mkdir();
 
         container = new JBIContainer();
         container.setUseMBeanServer(false);
-        container.setInstallationDirPath(installDir.getAbsolutePath());
-        container.setDeploymentDirPath(odeDir.getAbsolutePath());
         container.setRootDir(rootDir.getAbsolutePath());
         container.setCreateMBeanServer(false);
         container.setEmbedded(true);
@@ -62,6 +57,7 @@
         container.start();
 
         component = new OdeComponent();
+        
     }
 
     protected void tearDown() throws Exception {
@@ -89,13 +85,11 @@
         activateComponent();
         container.start();
 
-        String examples = System.getProperty("jbi.examples");
-        // For lack of a better way of doing this:
-        component.getServiceUnitManager().deploy("HelloWorld", examples + "/HelloWorld2/HelloWorld2-process");
-        component.getServiceUnitManager().init("HelloWorld", examples + "/HelloWorld2/HelloWorld2-process");
+        component.getServiceUnitManager().deploy("HelloWorld", helloWorldDir);
+        component.getServiceUnitManager().init("HelloWorld", helloWorldDir);
         component.getServiceUnitManager().start("HelloWorld");
         component.getServiceUnitManager().stop("HelloWorld");
-        component.getServiceUnitManager().undeploy("HelloWorld", examples + "/HelloWorld2/HelloWorld2-process");
+        component.getServiceUnitManager().undeploy("HelloWorld", helloWorldDir);
 
         container.deactivateComponent("ODE");
 
@@ -107,10 +101,8 @@
         activateComponent();
         container.start();
 
-        String examples = System.getProperty("jbi.examples");
-        // For lack of a better way of doing this:
-        component.getServiceUnitManager().deploy("HelloWorld", examples + "/HelloWorld2/HelloWorld2-process/");
-        component.getServiceUnitManager().init("HelloWorld", examples + "/HelloWorld2/HelloWorld2-process/");
+        component.getServiceUnitManager().deploy("HelloWorld", helloWorldDir);
+        component.getServiceUnitManager().init("HelloWorld", helloWorldDir);
         component.getServiceUnitManager().start("HelloWorld");
         DefaultServiceMixClient client = new DefaultServiceMixClient(container);
         InOut io = client.createInOutExchange();

Added: ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/HelloWorldJbiTest/HelloWorld2.bpel
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/HelloWorldJbiTest/HelloWorld2.bpel?rev=797474&view=auto
==============================================================================
--- ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/HelloWorldJbiTest/HelloWorld2.bpel (added)
+++ ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/HelloWorldJbiTest/HelloWorld2.bpel Fri Jul 24 14:21:11 2009
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<bpws:process exitOnStandardFault="yes" name="HelloWorld2"
+    targetNamespace="urn:/HeaderTest.bpel"
+    xmlns:bpws="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
+    xmlns:hello="urn:/HelloWorld2.wsdl" xmlns:tns="urn:/HeaderTest.bpel" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+    <bpws:import importType="http://schemas.xmlsoap.org/wsdl/"
+        location="HelloWorld2.wsdl" namespace="urn:/HelloWorld2.wsdl"/>
+    <bpws:partnerLinks>
+        <bpws:partnerLink myRole="Provider" name="helloPartnerLink" partnerLinkType="hello:HelloPartnerLinkType"/>
+    </bpws:partnerLinks>
+    <bpws:variables>
+        <bpws:variable messageType="hello:HelloRequest" name="request"/>
+        <bpws:variable messageType="hello:HelloResponse" name="response"/>
+        <bpws:variable name="text" type="xsd:string"/>
+    </bpws:variables>
+    <bpws:sequence>
+        <bpws:receive createInstance="yes" name="start"
+            operation="Hello" partnerLink="helloPartnerLink"
+            portType="hello:HelloPortType" variable="request"/>
+        <bpws:assign name="assign1" validate="no">
+            <bpws:copy>
+                <bpws:from><![CDATA[$request.body/hello:text]]></bpws:from>
+                <bpws:to variable="text"/>
+            </bpws:copy>
+            <bpws:copy>
+                <bpws:from>
+                    <bpws:literal>
+                        <hello:HelloResponse xmlns:hello="urn:/HelloWorld2.wsdl">
+                            <hello:text/>
+                        </hello:HelloResponse>
+                    </bpws:literal>
+                </bpws:from>
+                <bpws:to><![CDATA[$response.body]]></bpws:to>
+            </bpws:copy>
+            <bpws:copy>
+                <bpws:from><![CDATA[concat($text,' World')]]></bpws:from>
+                <bpws:to><![CDATA[$response.body/hello:text]]></bpws:to>
+            </bpws:copy>
+        </bpws:assign>
+        <bpws:reply name="end" operation="Hello"
+            partnerLink="helloPartnerLink"
+            portType="hello:HelloPortType" variable="response"/>
+    </bpws:sequence>
+</bpws:process>

Added: ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/HelloWorldJbiTest/HelloWorld2.wsdl
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/HelloWorldJbiTest/HelloWorld2.wsdl?rev=797474&view=auto
==============================================================================
--- ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/HelloWorldJbiTest/HelloWorld2.wsdl (added)
+++ ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/HelloWorldJbiTest/HelloWorld2.wsdl Fri Jul 24 14:21:11 2009
@@ -0,0 +1,74 @@
+<?xml version="1.0"?>
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one
+  ~ or more contributor license agreements.  See the NOTICE file
+  ~ distributed with this work for additional information
+  ~ regarding copyright ownership.  The ASF licenses this file
+  ~ to you 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.
+  -->
+<definitions name="Hello"
+        targetNamespace="urn:/HelloWorld2.wsdl"
+        xmlns:tns="urn:/HelloWorld2.wsdl"
+        xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+        xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype"
+        xmlns="http://schemas.xmlsoap.org/wsdl/">
+
+    <types>
+        <schema targetNamespace="urn:/HelloWorld2.wsdl"
+                xmlns="http://www.w3.org/2000/10/XMLSchema">
+            <element name="HelloRequest">
+                <complexType>
+                    <all>
+                        <element name="text" type="string"/>
+                    </all>
+                </complexType>
+            </element>
+            <element name="HelloResponse">
+                <complexType>
+                    <all>
+                        <element name="text" type="string"/>
+                    </all>
+                </complexType>
+            </element>
+        </schema>
+    </types>
+
+    <message name="HelloRequest">
+        <part name="body" element="tns:HelloRequest"/>
+    </message>
+
+    <message name="HelloResponse">
+        <part name="body" element="tns:HelloResponse"/>
+    </message>
+
+    <portType name="HelloPortType">
+        <operation name="Hello">
+            <input message="tns:HelloRequest"/>
+            <output message="tns:HelloResponse"/>
+        </operation>
+    </portType>
+
+    <plnk:partnerLinkType name="HelloPartnerLinkType">
+        <plnk:role name="Provider" portType="tns:HelloPortType"/>
+    </plnk:partnerLinkType>
+    
+    <!--
+    
+    This is an abstract interface/portType definition.  Note the lack of 
+    binding and service: these are defined by the HTTP binding component.
+    See HelloWorld2-http/HelloWorld2.wsdl for details.
+    
+    -->
+
+</definitions>

Propchange: ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/HelloWorldJbiTest/HelloWorld2.wsdl
------------------------------------------------------------------------------
    svn:eol-style = native

Added: ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/HelloWorldJbiTest/deploy.xml
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/HelloWorldJbiTest/deploy.xml?rev=797474&view=auto
==============================================================================
--- ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/HelloWorldJbiTest/deploy.xml (added)
+++ ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/HelloWorldJbiTest/deploy.xml Fri Jul 24 14:21:11 2009
@@ -0,0 +1,30 @@
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one
+  ~ or more contributor license agreements.  See the NOTICE file
+  ~ distributed with this work for additional information
+  ~ regarding copyright ownership.  The ASF licenses this file
+  ~ to you 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.
+  -->
+<deploy xmlns="http://www.apache.org/ode/schemas/dd/2007/03"
+        xmlns:pns="urn:/HeaderTest.bpel"
+        xmlns:sns="urn:/HelloWorld2.wsdl" >
+
+
+	<process name="pns:HelloWorld2">
+		<active>true</active>
+		<provide partnerLink="helloPartnerLink">
+			<service name="sns:HelloService" port="HelloPort"/>
+		</provide>
+	</process>
+</deploy>

Propchange: ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/HelloWorldJbiTest/deploy.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/HelloWorldJbiTest/smx.xml
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/HelloWorldJbiTest/smx.xml?rev=797474&view=auto
==============================================================================
--- ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/HelloWorldJbiTest/smx.xml (added)
+++ ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/HelloWorldJbiTest/smx.xml Fri Jul 24 14:21:11 2009
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You 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.
+
+-->
+<beans xmlns:sm="http://servicemix.apache.org/config/1.0"
+	   xmlns:http="http://servicemix.apache.org/http/1.0"
+	   xmlns:eip="http://servicemix.apache.org/eip/1.0"
+	   xmlns:hello="urn:/HelloWorld2.wsdl"
+	   >
+
+	<bean id="transactionManager" class="org.apache.geronimo.transaction.manager.GeronimoTransactionManager"/>
+	
+	<sm:container 
+		id="jbi" 
+		embedded="false" 
+		rootDir="target/test/smx"
+		transactionManager="#transactionManager"
+		>
+		<sm:activationSpecs>
+			<sm:activationSpec id="hello-http">
+				<sm:component>
+					<http:component>
+						<http:endpoints>
+							<http:endpoint 
+								service="hello:HelloService"
+								endpoint="http" 
+								defaultOperation="Hello"
+								role="consumer" 
+								locationURI="http://localhost:8192/HelloHttp/"
+								defaultMep="http://www.w3.org/2004/08/wsdl/in-out" 
+								soap="true" />
+						</http:endpoints>
+					</http:component>
+				</sm:component>
+			</sm:activationSpec>
+		</sm:activationSpecs>
+	</sm:container>
+</beans>

Propchange: ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/HelloWorldJbiTest/smx.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/HelloWorldJbiTest/test.properties
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/HelloWorldJbiTest/test.properties?rev=797474&view=auto
==============================================================================
--- ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/HelloWorldJbiTest/test.properties (added)
+++ ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/HelloWorldJbiTest/test.properties Fri Jul 24 14:21:11 2009
@@ -0,0 +1,20 @@
+#
+#    Licensed to the Apache Software Foundation (ASF) under one or more
+#    contributor license agreements.  See the NOTICE file distributed with
+#    this work for additional information regarding copyright ownership.
+#    The ASF licenses this file to You 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.
+#
+http.url=http://localhost:8192/HelloHttp/
+request=<SOAP-ENV:Envelope xmlns:SOAP-ENV='http://schemas.xmlsoap.org/soap/envelope/'><SOAP-ENV:Body><HelloRequest xmlns="urn:/HelloWorld2.wsdl"><text>hello</text></HelloRequest></SOAP-ENV:Body></SOAP-ENV:Envelope>
+response=.*hello World.*
+

Propchange: ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/HelloWorldJbiTest/test.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/HelloWorldRequest.xml
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/HelloWorldRequest.xml?rev=797474&r1=797473&r2=797474&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/HelloWorldRequest.xml (original)
+++ ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/HelloWorldRequest.xml Fri Jul 24 14:21:11 2009
@@ -16,10 +16,6 @@
   ~ specific language governing permissions and limitations
   ~ under the License.
   -->
-  <message xmlns="http://java.sun.com/xml/ns/jbi/wsdl-11-wrapper"> 
-      <part> 
-  <HelloRequest xmlns="urn:/HelloWorld2.wsdl">
+<HelloRequest xmlns="urn:/HelloWorld2.wsdl">
     <text>hello</text>
-  </HelloRequest>
-  </part>
-</message>
+</HelloRequest>

Modified: ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/log4j.properties
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/log4j.properties?rev=797474&r1=797473&r2=797474&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/log4j.properties (original)
+++ ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/log4j.properties Fri Jul 24 14:21:11 2009
@@ -1,37 +1,35 @@
-#
-#    Licensed to the Apache Software Foundation (ASF) under one or more
-#    contributor license agreements.  See the NOTICE file distributed with
-#    this work for additional information regarding copyright ownership.
-#    The ASF licenses this file to You 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.
-#
-
-# Set root logger level to WARN and its only appender to CONSOLE
-log4j.rootLogger=WARN, CONSOLE
-
-# log4j properties to work with commandline tools.
-log4j.category.org.mortbay=ERROR
-log4j.category.org.hibernate.type=WARN
-log4j.category.org.objectweb=ERROR
-#log4j.category.org.apache.ode.axis2=DEBUG
-log4j.category.org.apache.ode.bpel.engine=DEBUG
-log4j.category.org.apache.ode.jbi=DEBUG
-log4j.category.org.apache.ode.bpel.engine.DebuggerSupport=WARN
-log4j.category.org.apache.ode.bpel.runtime.DebuggerSupport=WARN
-log4j.category.org.apache.ode.daohib.bpel.CorrelatorDaoImpl=TRACE
-
-#log4j.category.org.apache.ode.bpel.epr=INFO
-
-# Console appender
-log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
-log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
-log4j.appender.CONSOLE.layout.ConversionPattern=%p - %C{1}.%M(%L) | %m%n
+# 
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You 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.
+#
+#
+
+#
+# The logging properties used during tests..
+#
+log4j.rootLogger=DEBUG, file
+#log4j.rootLogger=INFO, file
+
+log4j.appender.file=org.apache.log4j.FileAppender
+log4j.appender.file.File=target/test/test.log
+log4j.appender.file.layout=org.apache.log4j.PatternLayout
+log4j.appender.file.layout.ConversionPattern=%d{MM-dd@HH:mm:ss} %-5p (%13F:%L) %3x - %m%n 
+
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=%d{MM-dd@HH:mm:ss} %-5p (%13F:%L) %3x - %m%n 
+