You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ode.apache.org by ms...@apache.org on 2006/08/17 03:14:20 UTC

svn commit: r432094 - in /incubator/ode/trunk: ./ axis2/ bpel-api/src/main/java/org/apache/ode/bpel/iapi/ bpel-bom/ bpel-bom/src/main/java/org/apache/ode/bom/wsdl/ bpel-compiler/ bpel-parser/ bpel-runtime/src/main/java/org/apache/ode/bpel/deploy/ bpel-...

Author: mszefler
Date: Wed Aug 16 18:14:18 2006
New Revision: 432094

URL: http://svn.apache.org/viewvc?rev=432094&view=rev
Log:
Upgraded JBI to use new deployment descriptors.

Added:
    incubator/ode/trunk/bpel-bom/src/main/java/org/apache/ode/bom/wsdl/WSDLReaderImpl.java   (with props)
    incubator/ode/trunk/jbi/src/main/java/org/apache/ode/jbi/BindingContextImpl.java
Removed:
    incubator/ode/trunk/jbi-examples/src/examples/HelloWorld2/HelloWorld2-process/HelloWorld2.dd
Modified:
    incubator/ode/trunk/axis2/.classpath
    incubator/ode/trunk/axis2/.project
    incubator/ode/trunk/bpel-api/src/main/java/org/apache/ode/bpel/iapi/DeploymentUnit.java
    incubator/ode/trunk/bpel-api/src/main/java/org/apache/ode/bpel/iapi/MyRoleMessageExchange.java
    incubator/ode/trunk/bpel-bom/.classpath
    incubator/ode/trunk/bpel-bom/.project
    incubator/ode/trunk/bpel-bom/src/main/java/org/apache/ode/bom/wsdl/WSDLFactoryImpl.java
    incubator/ode/trunk/bpel-compiler/.classpath
    incubator/ode/trunk/bpel-compiler/.project
    incubator/ode/trunk/bpel-parser/.classpath
    incubator/ode/trunk/bpel-parser/.project
    incubator/ode/trunk/bpel-parser/pom.xml
    incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/deploy/DeploymentUnitImpl.java
    incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelProcess.java
    incubator/ode/trunk/jbi-examples/src/examples/HelloWorld2/HelloWorld2-process/deploy.xml
    incubator/ode/trunk/jbi-install/src/etc/META-INF/jbi.xml
    incubator/ode/trunk/jbi/src/main/java/org/apache/ode/jbi/EndpointReferenceContextImpl.java
    incubator/ode/trunk/jbi/src/main/java/org/apache/ode/jbi/JbiMessageExchangeEventRouter.java
    incubator/ode/trunk/jbi/src/main/java/org/apache/ode/jbi/MyEndpointReference.java
    incubator/ode/trunk/jbi/src/main/java/org/apache/ode/jbi/OdeContext.java
    incubator/ode/trunk/jbi/src/main/java/org/apache/ode/jbi/OdeLifeCycle.java
    incubator/ode/trunk/jbi/src/main/java/org/apache/ode/jbi/OdeService.java
    incubator/ode/trunk/jbi/src/main/java/org/apache/ode/jbi/OdeServiceUnit.java
    incubator/ode/trunk/pom.xml

Modified: incubator/ode/trunk/axis2/.classpath
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/axis2/.classpath?rev=432094&r1=432093&r2=432094&view=diff
==============================================================================
--- incubator/ode/trunk/axis2/.classpath (original)
+++ incubator/ode/trunk/axis2/.classpath Wed Aug 16 18:14:18 2006
@@ -1,62 +1,73 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src/main/java"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="var" path="M2_REPO/ws-commons/axiom-api/1.0/axiom-api-1.0.jar"/>
-	<classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.6.2/xercesImpl-2.6.2.jar"/>
-	<classpathentry kind="var" path="M2_REPO/antlr/antlr/2.7.6rc1/antlr-2.7.6rc1.jar"/>
-	<classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.1/commons-collections-3.1.jar"/>
-	<classpathentry kind="var" path="M2_REPO/jdom/jdom/1.0/jdom-1.0.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate/3.1.2/hibernate-3.1.2.jar"/>
-	<classpathentry kind="var" path="M2_REPO/axis2/axis2/1.0/axis2-1.0.jar"/>
-	<classpathentry kind="var" path="M2_REPO/com/ibm/icu/icu4j/2.6.1/icu4j-2.6.1.jar"/>
-	<classpathentry kind="var" path="M2_REPO/quartz/quartz/1.5.1/quartz-1.5.1.jar"/>
-	<classpathentry kind="var" path="M2_REPO/commons-lang/commons-lang/2.1/commons-lang-2.1.jar"/>
-	<classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
-	<classpathentry kind="var" path="M2_REPO/ehcache/ehcache/1.1/ehcache-1.1.jar"/>
-	<classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar"/>
-	<classpathentry kind="var" path="M2_REPO/jotm/jotm/2.0.10/jotm-2.0.10.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/apache/geronimo/specs/geronimo-j2ee-connector_1.5_spec/1.0/geronimo-j2ee-connector_1.5_spec-1.0.jar"/>
-	<classpathentry kind="src" path="/ode-bpel-scheduler-quartz"/>
-	<classpathentry kind="var" path="M2_REPO/xom/xom/1.0b3/xom-1.0b3.jar"/>
-	<classpathentry kind="var" path="M2_REPO/commons-pool/commons-pool/1.2/commons-pool-1.2.jar"/>
-	<classpathentry kind="var" path="M2_REPO/jotm/jotm_jrmp_stubs/2.0.10/jotm_jrmp_stubs-2.0.10.jar"/>
-	<classpathentry kind="src" path="/ode-bpel-api"/>
-	<classpathentry kind="var" path="M2_REPO/xmlbeans/xbean/2.1.0/xbean-2.1.0.jar"/>
-	<classpathentry kind="src" path="/ode-utils"/>
-	<classpathentry kind="src" path="/ode-bpel-compiler"/>
-	<classpathentry kind="src" path="/ode-bpel-runtime"/>
-	<classpathentry kind="src" path="/ode-bpel-el-xpath20"/>
-	<classpathentry kind="var" path="M2_REPO/org/apache/geronimo/specs/geronimo-jta_1.0.1B_spec/1.0/geronimo-jta_1.0.1B_spec-1.0.jar"/>
-	<classpathentry kind="var" path="M2_REPO/stax/stax-api/1.0/stax-api-1.0.jar"/>
-	<classpathentry kind="src" path="/ode-minerva"/>
-	<classpathentry kind="var" path="M2_REPO/saxon/saxon-dom/8.4/saxon-dom-8.4.jar"/>
-	<classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.0.3/commons-logging-1.0.3.jar"/>
-	<classpathentry kind="var" path="M2_REPO/wsdl4j/wsdl4j/1.5.1/wsdl4j-1.5.1.jar"/>
-	<classpathentry kind="var" path="M2_REPO/asm/asm/1.5.3/asm-1.5.3.jar"/>
-	<classpathentry kind="src" path="/ode-bpel-bom"/>
-	<classpathentry kind="var" path="M2_REPO/org/objectweb/carol/carol/2.0.5/carol-2.0.5.jar"/>
-	<classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.12/log4j-1.2.12.jar"/>
-	<classpathentry kind="var" path="M2_REPO/xmlbeans/xmlpublic/2.1.0/xmlpublic-2.1.0.jar"/>
-	<classpathentry kind="src" path="/ode-dao-hibernate"/>
-	<classpathentry kind="src" path="/ode-bpel-obj"/>
-	<classpathentry kind="src" path="/ode-jacob"/>
-	<classpathentry kind="var" path="M2_REPO/saxon/saxon/8.4/saxon-8.4.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/apache/derby/derby/10.1.2.1/derby-10.1.2.1.jar"/>
-	<classpathentry kind="var" path="M2_REPO/cglib/cglib/2.1_3/cglib-2.1_3.jar"/>
-	<classpathentry kind="var" path="M2_REPO/jaxen/jaxen/1.1-beta-8/jaxen-1.1-beta-8.jar"/>
-	<classpathentry kind="src" path="/ode-bpel-ql"/>
-	<classpathentry kind="var" path="M2_REPO/xerces/xmlParserAPIs/2.6.2/xmlParserAPIs-2.6.2.jar"/>
-	<classpathentry kind="var" path="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar"/>
-	<classpathentry kind="var" path="M2_REPO/howl/howl-logger/0.1.11/howl-logger-0.1.11.jar"/>
-	<classpathentry kind="src" path="/ode-naming"/>
-	<classpathentry kind="var" path="M2_REPO/org/ccil/cowan/tagsoup/tagsoup/0.9.7/tagsoup-0.9.7.jar"/>
-	<classpathentry kind="src" path="/ode-bpel-el-xpath10"/>
-	<classpathentry kind="var" path="M2_REPO/ws-commons/axiom-impl/1.0/axiom-impl-1.0.jar"/>
-	<classpathentry kind="var" path="M2_REPO/xalan/xalan/2.6.0/xalan-2.6.0.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/apache/geronimo/specs/geronimo-servlet_2.4_spec/1.0/geronimo-servlet_2.4_spec-1.0.jar"/>
-	<classpathentry kind="src" path="/ode-bpel-parser"/>
-	<classpathentry kind="src" path="/ode-bpel-dd"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/ode-bpel-connector"/>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>
+  <classpathentry kind="src" path="src/main/java"/>
+  <classpathentry kind="src" path="src/test/java" output="target/test-classes"/>
+  <classpathentry kind="src" path="src/test/resources" output="target/test-classes"/>
+  <classpathentry kind="output" path="target/classes"/>
+  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+  <classpathentry kind="var" path="M2_REPO/org/objectweb/carol/carol/2.0.5/carol-2.0.5.jar"/>
+  <classpathentry kind="var" path="M2_REPO/commons-codec/commons-codec/1.3/commons-codec-1.3.jar"/>
+  <classpathentry kind="var" path="M2_REPO/ws-commons/axiom-impl/1.0/axiom-impl-1.0.jar"/>
+  <classpathentry kind="var" path="M2_REPO/ws-commons/axiom-dom/1.0/axiom-dom-1.0.jar"/>
+  <classpathentry kind="var" path="M2_REPO/javax/activation/activation/1.1/activation-1.1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/com/ibm/icu/icu4j/2.6.1/icu4j-2.6.1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/xerces/xmlParserAPIs/2.6.2/xmlParserAPIs-2.6.2.jar"/>
+  <classpathentry kind="var" path="M2_REPO/woodstox/wstx/1.0.7/wstx-1.0.7.jar"/>
+  <classpathentry kind="var" path="M2_REPO/ode/ode-bpel-ql/2.0-SNAPSHOT/ode-bpel-ql-2.0-SNAPSHOT.jar"/>
+  <classpathentry kind="var" path="M2_REPO/saxon/saxon-dom/8.4/saxon-dom-8.4.jar"/>
+  <classpathentry kind="var" path="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/xom/xom/1.0b3/xom-1.0b3.jar"/>
+  <classpathentry kind="var" path="M2_REPO/ode/ode-utils/2.0-SNAPSHOT/ode-utils-2.0-SNAPSHOT.jar"/>
+  <classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar"/>
+  <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.1/commons-collections-3.1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/xalan/xalan/2.6.0/xalan-2.6.0.jar"/>
+  <classpathentry kind="var" path="M2_REPO/commons-lang/commons-lang/2.1/commons-lang-2.1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/ehcache/ehcache/1.1/ehcache-1.1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/ode/ode-bpel-connector/2.0-SNAPSHOT/ode-bpel-connector-2.0-SNAPSHOT.jar"/>
+  <classpathentry kind="var" path="M2_REPO/ode/ode-bpel-bom/2.0-SNAPSHOT/ode-bpel-bom-2.0-SNAPSHOT.jar"/>
+  <classpathentry kind="var" path="M2_REPO/xmlbeans/xmlpublic/2.1.0/xmlpublic-2.1.0.jar"/>
+  <classpathentry kind="var" path="M2_REPO/ode/ode-bpel-api/2.0-SNAPSHOT/ode-bpel-api-2.0-SNAPSHOT.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate/3.1.2/hibernate-3.1.2.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/apache/ws/commons/XmlSchema/1.0.2/XmlSchema-1.0.2.jar"/>
+  <classpathentry kind="var" path="M2_REPO/ode/ode-bpel-parser/2.0-SNAPSHOT/ode-bpel-parser-2.0-SNAPSHOT.jar"/>
+  <classpathentry kind="var" path="M2_REPO/ode/ode-naming/2.0-SNAPSHOT/ode-naming-2.0-SNAPSHOT.jar"/>
+  <classpathentry kind="var" path="M2_REPO/ode/ode-bpel-runtime/2.0-SNAPSHOT/ode-bpel-runtime-2.0-SNAPSHOT.jar"/>
+  <classpathentry kind="var" path="M2_REPO/jaxen/jaxen/1.1-beta-8/jaxen-1.1-beta-8.jar"/>
+  <classpathentry kind="var" path="M2_REPO/xmlbeans/xbean/2.1.0/xbean-2.1.0.jar"/>
+  <classpathentry kind="var" path="M2_REPO/wsdl4j/wsdl4j/1.5.1/wsdl4j-1.5.1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/stax/stax-api/1.0/stax-api-1.0.jar"/>
+  <classpathentry kind="var" path="M2_REPO/ode/ode-bpel-scheduler-quartz/2.0-SNAPSHOT/ode-bpel-scheduler-quartz-2.0-SNAPSHOT.jar"/>
+  <classpathentry kind="var" path="M2_REPO/howl/howl-logger/0.1.11/howl-logger-0.1.11.jar"/>
+  <classpathentry kind="var" path="M2_REPO/axis2/axis2/1.0/axis2-1.0.jar"/>
+  <classpathentry kind="var" path="M2_REPO/ode/ode-bpel-compiler/2.0-SNAPSHOT/ode-bpel-compiler-2.0-SNAPSHOT.jar"/>
+  <classpathentry kind="var" path="M2_REPO/commons-pool/commons-pool/1.2/commons-pool-1.2.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/apache/geronimo/specs/geronimo-jta_1.0.1B_spec/1.0/geronimo-jta_1.0.1B_spec-1.0.jar"/>
+  <classpathentry kind="var" path="M2_REPO/ode/ode-dao-hibernate/2.0-SNAPSHOT/ode-dao-hibernate-2.0-SNAPSHOT.jar"/>
+  <classpathentry kind="var" path="M2_REPO/commons-httpclient/commons-httpclient/3.0/commons-httpclient-3.0.jar"/>
+  <classpathentry kind="var" path="M2_REPO/ode/ode-bpel-obj/2.0-SNAPSHOT/ode-bpel-obj-2.0-SNAPSHOT.jar"/>
+  <classpathentry kind="var" path="M2_REPO/ode/ode-bpel-el-xpath20/2.0-SNAPSHOT/ode-bpel-el-xpath20-2.0-SNAPSHOT.jar"/>
+  <classpathentry kind="var" path="M2_REPO/ode/ode-bpel-api-jca/2.0-SNAPSHOT/ode-bpel-api-jca-2.0-SNAPSHOT.jar"/>
+  <classpathentry kind="var" path="M2_REPO/ode/ode-jca-ra/2.0-SNAPSHOT/ode-jca-ra-2.0-SNAPSHOT.jar"/>
+  <classpathentry kind="var" path="M2_REPO/ode/ode-minerva/2.0-SNAPSHOT/ode-minerva-2.0-SNAPSHOT.jar"/>
+  <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/apache/geronimo/specs/geronimo-servlet_2.4_spec/1.0/geronimo-servlet_2.4_spec-1.0.jar"/>
+  <classpathentry kind="var" path="M2_REPO/ode/ode-bpel-dd/2.0-SNAPSHOT/ode-bpel-dd-2.0-SNAPSHOT.jar"/>
+  <classpathentry kind="var" path="M2_REPO/saxon/saxon/8.4/saxon-8.4.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/apache/derby/derby/10.1.2.1/derby-10.1.2.1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.0.3/commons-logging-1.0.3.jar"/>
+  <classpathentry kind="var" path="M2_REPO/jotm/jotm/2.0.10/jotm-2.0.10.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/ccil/cowan/tagsoup/tagsoup/0.9.7/tagsoup-0.9.7.jar"/>
+  <classpathentry kind="var" path="M2_REPO/quartz/quartz/1.5.1/quartz-1.5.1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/asm/asm/1.5.3/asm-1.5.3.jar"/>
+  <classpathentry kind="var" path="M2_REPO/ode/ode-jca-server/2.0-SNAPSHOT/ode-jca-server-2.0-SNAPSHOT.jar"/>
+  <classpathentry kind="var" path="M2_REPO/cglib/cglib/2.1_3/cglib-2.1_3.jar"/>
+  <classpathentry kind="var" path="M2_REPO/ws-commons/axiom-api/1.0/axiom-api-1.0.jar"/>
+  <classpathentry kind="var" path="M2_REPO/ode/ode-jacob/2.0-SNAPSHOT/ode-jacob-2.0-SNAPSHOT.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/apache/geronimo/specs/geronimo-j2ee-connector_1.5_spec/1.0/geronimo-j2ee-connector_1.5_spec-1.0.jar"/>
+  <classpathentry kind="var" path="M2_REPO/jdom/jdom/1.0/jdom-1.0.jar"/>
+  <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.6.2/xercesImpl-2.6.2.jar"/>
+  <classpathentry kind="var" path="M2_REPO/jotm/jotm_jrmp_stubs/2.0.10/jotm_jrmp_stubs-2.0.10.jar"/>
+  <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.12/log4j-1.2.12.jar"/>
+  <classpathentry kind="var" path="M2_REPO/antlr/antlr/2.7.6rc1/antlr-2.7.6rc1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/ws-commons/neethi/1.0.1/neethi-1.0.1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/ode/ode-bpel-el-xpath10/2.0-SNAPSHOT/ode-bpel-el-xpath10-2.0-SNAPSHOT.jar"/>
+</classpath>
\ No newline at end of file

Modified: incubator/ode/trunk/axis2/.project
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/axis2/.project?rev=432094&r1=432093&r2=432094&view=diff
==============================================================================
--- incubator/ode/trunk/axis2/.project (original)
+++ incubator/ode/trunk/axis2/.project Wed Aug 16 18:14:18 2006
@@ -1,24 +1,7 @@
 <projectDescription>
   <name>ode-axis2</name>
   <comment/>
-  <projects>
-    <project>ode-bpel-scheduler-quartz</project>
-    <project>ode-bpel-api</project>
-    <project>ode-utils</project>
-    <project>ode-bpel-compiler</project>
-    <project>ode-bpel-runtime</project>
-    <project>ode-bpel-el-xpath20</project>
-    <project>ode-minerva</project>
-    <project>ode-bpel-bom</project>
-    <project>ode-dao-hibernate</project>
-    <project>ode-bpel-obj</project>
-    <project>ode-jacob</project>
-    <project>ode-bpel-ql</project>
-    <project>ode-naming</project>
-    <project>ode-bpel-el-xpath10</project>
-    <project>ode-bpel-parser</project>
-    <project>ode-bpel-dd</project>
-  </projects>
+  <projects/>
   <buildSpec>
     <buildCommand>
       <name>org.eclipse.jdt.core.javabuilder</name>

Modified: incubator/ode/trunk/bpel-api/src/main/java/org/apache/ode/bpel/iapi/DeploymentUnit.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-api/src/main/java/org/apache/ode/bpel/iapi/DeploymentUnit.java?rev=432094&r1=432093&r2=432094&view=diff
==============================================================================
--- incubator/ode/trunk/bpel-api/src/main/java/org/apache/ode/bpel/iapi/DeploymentUnit.java (original)
+++ incubator/ode/trunk/bpel-api/src/main/java/org/apache/ode/bpel/iapi/DeploymentUnit.java Wed Aug 16 18:14:18 2006
@@ -19,12 +19,13 @@
 
 package org.apache.ode.bpel.iapi;
 
-import javax.xml.namespace.QName;
 import java.io.File;
-import java.util.Set;
 import java.util.Collection;
+import java.util.Set;
+
+import javax.wsdl.Definition;
+import javax.xml.namespace.QName;
 
-import org.apache.ode.bom.wsdl.Definition4BPEL;
 import org.apache.ode.bpel.dd.DeployDocument;
 
 
@@ -51,14 +52,14 @@
      * @param namespaceURI WSDL targetNamespace
      * @return corresponding WSDL document
      */
-    Definition4BPEL getDefinitionForNamespace(String namespaceURI);
+    Definition getDefinitionForNamespace(String namespaceURI);
 
     
     /**
      * Get a collection of all the WSDL definitions in the deployment directory.
      * @return collection of WSDL documents
      */
-    Collection<Definition4BPEL> getDefinitions();
+    Collection<Definition> getDefinitions();
 
 
   /**

Modified: incubator/ode/trunk/bpel-api/src/main/java/org/apache/ode/bpel/iapi/MyRoleMessageExchange.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-api/src/main/java/org/apache/ode/bpel/iapi/MyRoleMessageExchange.java?rev=432094&r1=432093&r2=432094&view=diff
==============================================================================
--- incubator/ode/trunk/bpel-api/src/main/java/org/apache/ode/bpel/iapi/MyRoleMessageExchange.java (original)
+++ incubator/ode/trunk/bpel-api/src/main/java/org/apache/ode/bpel/iapi/MyRoleMessageExchange.java Wed Aug 16 18:14:18 2006
@@ -93,6 +93,6 @@
    * @return service name
    */
   public QName getServiceName();
-
+  
   public void setEndpointReference(EndpointReference ref);
 }

Modified: incubator/ode/trunk/bpel-bom/.classpath
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-bom/.classpath?rev=432094&r1=432093&r2=432094&view=diff
==============================================================================
--- incubator/ode/trunk/bpel-bom/.classpath (original)
+++ incubator/ode/trunk/bpel-bom/.classpath Wed Aug 16 18:14:18 2006
@@ -1,16 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src/main/java"/>
-	<classpathentry output="target/test-classes" kind="src" path="src/test/java"/>
-	<classpathentry output="target/test-classes" kind="src" path="src/test/resources"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="src" path="/ode-utils"/>
-	<classpathentry kind="var" path="M2_REPO/commons-lang/commons-lang/2.1/commons-lang-2.1.jar"/>
-	<classpathentry kind="var" path="M2_REPO/wsdl4j/wsdl4j/1.5.1/wsdl4j-1.5.1.jar"/>
-	<classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.0.3/commons-logging-1.0.3.jar"/>
-	<classpathentry kind="var" path="M2_REPO/commons-pool/commons-pool/1.2/commons-pool-1.2.jar"/>
-	<classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.1/commons-collections-3.1.jar"/>
-	<classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.12/log4j-1.2.12.jar"/>
-	<classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>
+  <classpathentry kind="src" path="src/main/java"/>
+  <classpathentry kind="src" path="src/test/java" output="target/test-classes"/>
+  <classpathentry kind="src" path="src/test/resources" output="target/test-classes"/>
+  <classpathentry kind="output" path="target/classes"/>
+  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+  <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.0.3/commons-logging-1.0.3.jar"/>
+  <classpathentry kind="var" path="M2_REPO/ode/ode-utils/2.0-SNAPSHOT/ode-utils-2.0-SNAPSHOT.jar"/>
+  <classpathentry kind="var" path="M2_REPO/commons-lang/commons-lang/2.1/commons-lang-2.1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/commons-pool/commons-pool/1.2/commons-pool-1.2.jar"/>
+  <classpathentry kind="var" path="M2_REPO/wsdl4j/wsdl4j/1.5.2/wsdl4j-1.5.2.jar"/>
+  <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.12/log4j-1.2.12.jar"/>
+  <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.1/commons-collections-3.1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
+</classpath>
\ No newline at end of file

Modified: incubator/ode/trunk/bpel-bom/.project
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-bom/.project?rev=432094&r1=432093&r2=432094&view=diff
==============================================================================
--- incubator/ode/trunk/bpel-bom/.project (original)
+++ incubator/ode/trunk/bpel-bom/.project Wed Aug 16 18:14:18 2006
@@ -1,9 +1,7 @@
 <projectDescription>
   <name>ode-bpel-bom</name>
   <comment>A DOM-like structure to represent BPEL documents (API).</comment>
-  <projects>
-    <project>ode-utils</project>
-  </projects>
+  <projects/>
   <buildSpec>
     <buildCommand>
       <name>org.eclipse.jdt.core.javabuilder</name>

Modified: incubator/ode/trunk/bpel-bom/src/main/java/org/apache/ode/bom/wsdl/WSDLFactoryImpl.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-bom/src/main/java/org/apache/ode/bom/wsdl/WSDLFactoryImpl.java?rev=432094&r1=432093&r2=432094&view=diff
==============================================================================
--- incubator/ode/trunk/bpel-bom/src/main/java/org/apache/ode/bom/wsdl/WSDLFactoryImpl.java (original)
+++ incubator/ode/trunk/bpel-bom/src/main/java/org/apache/ode/bom/wsdl/WSDLFactoryImpl.java Wed Aug 16 18:14:18 2006
@@ -69,7 +69,7 @@
 
 
   public WSDLReader newWSDLReader() {
-    WSDLReader reader = _wsdlFactory.newWSDLReader();
+    WSDLReader reader = new WSDLReaderImpl(this);
     reader.setFactoryImplName(getClass().getName());
     reader.setFeature("javax.wsdl.verbose", false);
     reader.setExtensionRegistry(newPopulatedExtensionRegistry());

Added: incubator/ode/trunk/bpel-bom/src/main/java/org/apache/ode/bom/wsdl/WSDLReaderImpl.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-bom/src/main/java/org/apache/ode/bom/wsdl/WSDLReaderImpl.java?rev=432094&view=auto
==============================================================================
--- incubator/ode/trunk/bpel-bom/src/main/java/org/apache/ode/bom/wsdl/WSDLReaderImpl.java (added)
+++ incubator/ode/trunk/bpel-bom/src/main/java/org/apache/ode/bom/wsdl/WSDLReaderImpl.java Wed Aug 16 18:14:18 2006
@@ -0,0 +1,28 @@
+package org.apache.ode.bom.wsdl;
+
+import javax.wsdl.WSDLException;
+import javax.wsdl.factory.WSDLFactory;
+
+/**
+ * Little hack to solve the disfunctional WSDL4J extension mechanism. Without this,
+ * WSDL4J will attempt to do Class.forName to get the WSDLFactory, which will break
+ * if WSDL4J is loaded from a parent class-loader (as it often is, e.g. in ServiceMix).
+ * 
+ * @author Maciej Szefler - m s z e f l e r @ g m a i l . c o m
+ *
+ */
+class WSDLReaderImpl extends com.ibm.wsdl.xml.WSDLReaderImpl {
+
+    private WSDLFactory _localFactory;
+    
+    WSDLReaderImpl(WSDLFactory factory) {
+        _localFactory = factory;
+    }
+    
+    @Override
+    protected WSDLFactory getWSDLFactory() throws WSDLException {
+        return _localFactory;
+    }
+
+    
+}

Propchange: incubator/ode/trunk/bpel-bom/src/main/java/org/apache/ode/bom/wsdl/WSDLReaderImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/ode/trunk/bpel-compiler/.classpath
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-compiler/.classpath?rev=432094&r1=432093&r2=432094&view=diff
==============================================================================
--- incubator/ode/trunk/bpel-compiler/.classpath (original)
+++ incubator/ode/trunk/bpel-compiler/.classpath Wed Aug 16 18:14:18 2006
@@ -1,38 +1,37 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src/main/java"/>
-	<classpathentry output="target/test-classes" kind="src" path="src/test/java"/>
-	<classpathentry output="target/test-classes" kind="src" path="src/test/resources"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="src" path="/ode-bpel-el-xpath20"/>
-	<classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.0.3/commons-logging-1.0.3.jar"/>
-	<classpathentry kind="var" path="M2_REPO/xerces/xmlParserAPIs/2.6.2/xmlParserAPIs-2.6.2.jar"/>
-	<classpathentry kind="src" path="/ode-bpel-api"/>
-	<classpathentry kind="src" path="/ode-utils"/>
-	<classpathentry kind="var" path="M2_REPO/xmlbeans/xbean/2.1.0/xbean-2.1.0.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/ccil/cowan/tagsoup/tagsoup/0.9.7/tagsoup-0.9.7.jar"/>
-	<classpathentry kind="var" path="M2_REPO/xalan/xalan/2.6.0/xalan-2.6.0.jar"/>
-	<classpathentry kind="var" path="M2_REPO/saxon/saxon/8.4/saxon-8.4.jar"/>
-	<classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
-	<classpathentry kind="src" path="/ode-bpel-obj"/>
-	<classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.6.2/xercesImpl-2.6.2.jar"/>
-	<classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.1/commons-collections-3.1.jar"/>
-	<classpathentry kind="var" path="M2_REPO/commons-lang/commons-lang/2.1/commons-lang-2.1.jar"/>
-	<classpathentry kind="var" path="M2_REPO/jdom/jdom/1.0/jdom-1.0.jar"/>
-	<classpathentry kind="var" path="M2_REPO/com/ibm/icu/icu4j/2.6.1/icu4j-2.6.1.jar"/>
-	<classpathentry kind="src" path="/ode-bpel-bom"/>
-	<classpathentry kind="src" path="/ode-bpel-el-xpath10"/>
-	<classpathentry kind="var" path="M2_REPO/xmlbeans/xmlpublic/2.1.0/xmlpublic-2.1.0.jar"/>
-	<classpathentry kind="var" path="M2_REPO/xom/xom/1.0b3/xom-1.0b3.jar"/>
-	<classpathentry kind="var" path="M2_REPO/stax/stax-api/1.0/stax-api-1.0.jar"/>
-	<classpathentry kind="src" path="/ode-bpel-dd"/>
-	<classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.12/log4j-1.2.12.jar"/>
-	<classpathentry kind="src" path="/ode-bpel-parser"/>
-	<classpathentry kind="var" path="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar"/>
-	<classpathentry kind="var" path="M2_REPO/commons-pool/commons-pool/1.2/commons-pool-1.2.jar"/>
-	<classpathentry kind="var" path="M2_REPO/saxon/saxon-dom/8.4/saxon-dom-8.4.jar"/>
-	<classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar"/>
-	<classpathentry kind="var" path="M2_REPO/jaxen/jaxen/1.1-beta-8/jaxen-1.1-beta-8.jar"/>
-	<classpathentry kind="var" path="M2_REPO/wsdl4j/wsdl4j/1.5.1/wsdl4j-1.5.1.jar"/>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>
+  <classpathentry kind="src" path="src/main/java"/>
+  <classpathentry kind="src" path="src/test/java" output="target/test-classes"/>
+  <classpathentry kind="src" path="src/test/resources" output="target/test-classes"/>
+  <classpathentry kind="output" path="target/classes"/>
+  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+  <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.12/log4j-1.2.12.jar"/>
+  <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.6.2/xercesImpl-2.6.2.jar"/>
+  <classpathentry kind="var" path="M2_REPO/xmlbeans/xbean/2.1.0/xbean-2.1.0.jar"/>
+  <classpathentry kind="var" path="M2_REPO/jaxen/jaxen/1.1-beta-8/jaxen-1.1-beta-8.jar"/>
+  <classpathentry kind="var" path="M2_REPO/wsdl4j/wsdl4j/1.5.1/wsdl4j-1.5.1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.0.3/commons-logging-1.0.3.jar"/>
+  <classpathentry kind="var" path="M2_REPO/jdom/jdom/1.0/jdom-1.0.jar"/>
+  <classpathentry kind="var" path="M2_REPO/xmlbeans/xmlpublic/2.1.0/xmlpublic-2.1.0.jar"/>
+  <classpathentry kind="var" path="M2_REPO/ode/ode-bpel-obj/2.0-SNAPSHOT/ode-bpel-obj-2.0-SNAPSHOT.jar"/>
+  <classpathentry kind="var" path="M2_REPO/ode/ode-bpel-parser/2.0-SNAPSHOT/ode-bpel-parser-2.0-SNAPSHOT.jar"/>
+  <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.1/commons-collections-3.1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/ode/ode-bpel-el-xpath20/2.0-SNAPSHOT/ode-bpel-el-xpath20-2.0-SNAPSHOT.jar"/>
+  <classpathentry kind="var" path="M2_REPO/xom/xom/1.0b3/xom-1.0b3.jar"/>
+  <classpathentry kind="var" path="M2_REPO/ode/ode-bpel-dd/2.0-SNAPSHOT/ode-bpel-dd-2.0-SNAPSHOT.jar"/>
+  <classpathentry kind="var" path="M2_REPO/saxon/saxon/8.4/saxon-8.4.jar"/>
+  <classpathentry kind="var" path="M2_REPO/com/ibm/icu/icu4j/2.6.1/icu4j-2.6.1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/ode/ode-bpel-api/2.0-SNAPSHOT/ode-bpel-api-2.0-SNAPSHOT.jar"/>
+  <classpathentry kind="var" path="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/ccil/cowan/tagsoup/tagsoup/0.9.7/tagsoup-0.9.7.jar"/>
+  <classpathentry kind="var" path="M2_REPO/xalan/xalan/2.6.0/xalan-2.6.0.jar"/>
+  <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/saxon/saxon-dom/8.4/saxon-dom-8.4.jar"/>
+  <classpathentry kind="var" path="M2_REPO/ode/ode-bpel-bom/2.0-SNAPSHOT/ode-bpel-bom-2.0-SNAPSHOT.jar"/>
+  <classpathentry kind="var" path="M2_REPO/commons-lang/commons-lang/2.1/commons-lang-2.1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/ode/ode-bpel-el-xpath10/2.0-SNAPSHOT/ode-bpel-el-xpath10-2.0-SNAPSHOT.jar"/>
+  <classpathentry kind="var" path="M2_REPO/stax/stax-api/1.0/stax-api-1.0.jar"/>
+  <classpathentry kind="var" path="M2_REPO/xerces/xmlParserAPIs/2.6.2/xmlParserAPIs-2.6.2.jar"/>
+  <classpathentry kind="var" path="M2_REPO/ode/ode-utils/2.0-SNAPSHOT/ode-utils-2.0-SNAPSHOT.jar"/>
+  <classpathentry kind="var" path="M2_REPO/commons-pool/commons-pool/1.2/commons-pool-1.2.jar"/>
+</classpath>
\ No newline at end of file

Modified: incubator/ode/trunk/bpel-compiler/.project
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-compiler/.project?rev=432094&r1=432093&r2=432094&view=diff
==============================================================================
--- incubator/ode/trunk/bpel-compiler/.project (original)
+++ incubator/ode/trunk/bpel-compiler/.project Wed Aug 16 18:14:18 2006
@@ -1,16 +1,7 @@
 <projectDescription>
   <name>ode-bpel-compiler</name>
   <comment>Converts BPEL object model into compiled BPEL representation.</comment>
-  <projects>
-    <project>ode-bpel-el-xpath20</project>
-    <project>ode-bpel-api</project>
-    <project>ode-utils</project>
-    <project>ode-bpel-obj</project>
-    <project>ode-bpel-bom</project>
-    <project>ode-bpel-el-xpath10</project>
-    <project>ode-bpel-dd</project>
-    <project>ode-bpel-parser</project>
-  </projects>
+  <projects/>
   <buildSpec>
     <buildCommand>
       <name>org.eclipse.jdt.core.javabuilder</name>

Modified: incubator/ode/trunk/bpel-parser/.classpath
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-parser/.classpath?rev=432094&r1=432093&r2=432094&view=diff
==============================================================================
--- incubator/ode/trunk/bpel-parser/.classpath (original)
+++ incubator/ode/trunk/bpel-parser/.classpath Wed Aug 16 18:14:18 2006
@@ -1,19 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src/main/java"/>
-	<classpathentry output="target/test-classes" kind="src" path="src/test/java"/>
-	<classpathentry output="target/test-classes" kind="src" path="src/test/resources"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="src" path="/ode-bpel-bom"/>
-	<classpathentry kind="src" path="/ode-bpel-scripts"/>
-	<classpathentry kind="src" path="/ode-utils"/>
-	<classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
-	<classpathentry kind="src" path="/ode-bpel-schemas"/>
-	<classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.12/log4j-1.2.12.jar"/>
-	<classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.1/commons-collections-3.1.jar"/>
-	<classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.0.3/commons-logging-1.0.3.jar"/>
-	<classpathentry kind="var" path="M2_REPO/commons-pool/commons-pool/1.2/commons-pool-1.2.jar"/>
-	<classpathentry kind="var" path="M2_REPO/wsdl4j/wsdl4j/1.5.1/wsdl4j-1.5.1.jar"/>
-	<classpathentry kind="var" path="M2_REPO/commons-lang/commons-lang/2.1/commons-lang-2.1.jar"/>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>
+  <classpathentry kind="src" path="src/main/java"/>
+  <classpathentry kind="src" path="src/test/java" output="target/test-classes"/>
+  <classpathentry kind="src" path="src/test/resources" output="target/test-classes"/>
+  <classpathentry kind="output" path="target/classes"/>
+  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+  <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.1/commons-collections-3.1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/ode/ode-utils/2.0-SNAPSHOT/ode-utils-2.0-SNAPSHOT.jar"/>
+  <classpathentry kind="var" path="M2_REPO/ode/ode-bpel-scripts/2.0-SNAPSHOT/ode-bpel-scripts-2.0-SNAPSHOT.jar"/>
+  <classpathentry kind="var" path="M2_REPO/wsdl4j/wsdl4j/1.5.1/wsdl4j-1.5.1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.12/log4j-1.2.12.jar"/>
+  <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/commons-pool/commons-pool/1.2/commons-pool-1.2.jar"/>
+  <classpathentry kind="var" path="M2_REPO/ode/ode-bpel-schemas/2.0-SNAPSHOT/ode-bpel-schemas-2.0-SNAPSHOT.jar"/>
+  <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.0.3/commons-logging-1.0.3.jar"/>
+  <classpathentry kind="var" path="M2_REPO/commons-lang/commons-lang/2.1/commons-lang-2.1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/ode/ode-bpel-bom/2.0-SNAPSHOT/ode-bpel-bom-2.0-SNAPSHOT.jar"/>
+</classpath>
\ No newline at end of file

Modified: incubator/ode/trunk/bpel-parser/.project
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-parser/.project?rev=432094&r1=432093&r2=432094&view=diff
==============================================================================
--- incubator/ode/trunk/bpel-parser/.project (original)
+++ incubator/ode/trunk/bpel-parser/.project Wed Aug 16 18:14:18 2006
@@ -1,12 +1,7 @@
 <projectDescription>
   <name>ode-bpel-parser</name>
   <comment/>
-  <projects>
-    <project>ode-bpel-bom</project>
-    <project>ode-bpel-scripts</project>
-    <project>ode-utils</project>
-    <project>ode-bpel-schemas</project>
-  </projects>
+  <projects/>
   <buildSpec>
     <buildCommand>
       <name>org.eclipse.jdt.core.javabuilder</name>

Modified: incubator/ode/trunk/bpel-parser/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-parser/pom.xml?rev=432094&r1=432093&r2=432094&view=diff
==============================================================================
--- incubator/ode/trunk/bpel-parser/pom.xml (original)
+++ incubator/ode/trunk/bpel-parser/pom.xml Wed Aug 16 18:14:18 2006
@@ -45,7 +45,6 @@
     <dependency>
       <groupId>ode</groupId>
       <artifactId>ode-bpel-schemas</artifactId>
-      <scope>test</scope>
     </dependency>
 
     <dependency>

Modified: incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/deploy/DeploymentUnitImpl.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/deploy/DeploymentUnitImpl.java?rev=432094&r1=432093&r2=432094&view=diff
==============================================================================
--- incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/deploy/DeploymentUnitImpl.java (original)
+++ incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/deploy/DeploymentUnitImpl.java Wed Aug 16 18:14:18 2006
@@ -19,6 +19,21 @@
 
 package org.apache.ode.bpel.deploy;
 
+import java.io.File;
+import java.io.FileFilter;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Set;
+
+import javax.wsdl.Definition;
+import javax.wsdl.WSDLException;
+import javax.wsdl.xml.WSDLReader;
+import javax.xml.namespace.QName;
+
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.ode.bom.wsdl.Definition4BPEL;
@@ -33,19 +48,6 @@
 import org.apache.ode.bpel.o.OProcess;
 import org.apache.ode.bpel.o.Serializer;
 
-import javax.wsdl.WSDLException;
-import javax.wsdl.xml.WSDLReader;
-import javax.xml.namespace.QName;
-import java.io.File;
-import java.io.FileFilter;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Set;
-
 /**
  * Container providing various functions on the deployment directory.
  * 
@@ -93,7 +95,7 @@
 
     public DeploymentUnitImpl(File dir) {
         if (!dir.exists())
-            throw new IllegalArgumentException("Directory "  + dir + " does not exist!");
+            throw new IllegalArgumentException("Directory " + dir + " does not exist!");
 
         _duDirectory = dir;
         _name = dir.getName();
@@ -113,6 +115,9 @@
     private void compileProcesses() {
         File[] bpels = _duDirectory.listFiles(_bpelFilter);
         for (File bpel : bpels) {
+            File compiled = new File(bpel.getParentFile(), bpel.getName().substring(0,bpel.getName().length()-".bpel".length()) + ".cbp");
+            if (compiled.exists())
+                continue;
             compile(bpel);
         }
     }
@@ -236,14 +241,14 @@
         return _docRegistry;
     }
 
-    public Definition4BPEL getDefinitionForNamespace(String namespaceURI) {
+    public Definition getDefinitionForNamespace(String namespaceURI) {
         return getDocRegistry().getDefinition(namespaceURI);
     }
 
-    public Collection<Definition4BPEL> getDefinitions() {
+    public Collection<Definition> getDefinitions() {
         Definition4BPEL defs[] = getDocRegistry().getDefinitions();
-        ArrayList<Definition4BPEL> ret = new ArrayList<Definition4BPEL>(defs.length);
-        for (Definition4BPEL def: defs)
+        ArrayList<Definition> ret = new ArrayList<Definition>(defs.length);
+        for (Definition4BPEL def : defs)
             ret.add(def);
         return ret;
     }

Modified: incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelProcess.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelProcess.java?rev=432094&r1=432093&r2=432094&view=diff
==============================================================================
--- incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelProcess.java (original)
+++ incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelProcess.java Wed Aug 16 18:14:18 2006
@@ -92,7 +92,7 @@
     private Map<OPartnerLink, PartnerLinkMyRoleImpl> _myRoles = new HashMap<OPartnerLink, PartnerLinkMyRoleImpl>();
 
     BpelEngineImpl _engine;
-    
+
     DebuggerSupport _debugger;
 
     final OProcess _oprocess;
@@ -111,14 +111,9 @@
 
     private DeploymentUnit _du;
 
-    public BpelProcess(
-            QName pid, 
-            DeploymentUnit du,
-            OProcess oprocess, 
-            Map<OPartnerLink, Endpoint> myRoleEndpointNames,
-            Map<OPartnerLink, Endpoint> initialPartners,
-            BpelEventListener debugger, 
-            ExpressionLanguageRuntimeRegistry expLangRuntimeRegistry,
+    public BpelProcess(QName pid, DeploymentUnit du, OProcess oprocess,
+            Map<OPartnerLink, Endpoint> myRoleEndpointNames, Map<OPartnerLink, Endpoint> initialPartners,
+            BpelEventListener debugger, ExpressionLanguageRuntimeRegistry expLangRuntimeRegistry,
             List<MessageExchangeInterceptor> localMexInterceptors) {
         _pid = pid;
         _du = du;
@@ -132,7 +127,7 @@
                 Endpoint endpoint = myRoleEndpointNames.get(pl);
                 if (endpoint == null)
                     throw new NullPointerException("No service name for plink " + pl);
-                PartnerLinkMyRoleImpl myRole = new PartnerLinkMyRoleImpl(pl,endpoint);
+                PartnerLinkMyRoleImpl myRole = new PartnerLinkMyRoleImpl(pl, endpoint);
                 _myRoles.put(pl, myRole);
                 _endpointToMyRoleMap.put(endpoint, myRole);
             }
@@ -144,7 +139,6 @@
         }
     }
 
-
     static String generateMessageExchangeIdentifier(String partnerlinkName, String operationName) {
         StringBuffer sb = new StringBuffer(partnerlinkName);
         sb.append('.');
@@ -158,11 +152,8 @@
      * @param mex
      */
     void invokeProcess(MyRoleMessageExchangeImpl mex) {
-        PartnerLinkMyRoleImpl target = null;
-        for (Endpoint endpoint : _endpointToMyRoleMap.keySet()) {
-            if (endpoint.serviceName.equals(mex.getServiceName()))
-                target = _endpointToMyRoleMap.get(endpoint);
-        }
+        PartnerLinkMyRoleImpl target = getMyRoleForService(mex.getServiceName());
+
         if (target == null) {
             String errmsg = __msgs.msgMyRoleRoutingFailure(mex.getMessageExchangeId());
             __log.error(errmsg);
@@ -181,6 +172,14 @@
         target.invokeMyRole(mex);
     }
 
+    private PartnerLinkMyRoleImpl getMyRoleForService(QName serviceName) {
+        for (Map.Entry<Endpoint,PartnerLinkMyRoleImpl> e : _endpointToMyRoleMap.entrySet()) {
+            if (e.getKey().serviceName.equals(serviceName))
+                return e.getValue();
+        }
+        return null;
+    }
+
     void initMyRoleMex(MyRoleMessageExchangeImpl mex) {
         PartnerLinkMyRoleImpl target = null;
         for (Endpoint endpoint : _endpointToMyRoleMap.keySet()) {
@@ -325,20 +324,21 @@
 
     private abstract class PartnerLinkRoleImpl {
         protected OPartnerLink _plinkDef;
+
         protected Element _initialEPR;
-        
+
         PartnerLinkRoleImpl(OPartnerLink plink) {
             _plinkDef = plink;
         }
 
-
         String getPartnerLinkName() {
             return _plinkDef.name;
         }
 
         /**
-         * Get the initial value of this role's EPR. This value is obtained from 
-         * the integration layer when the process is enabled on the server. 
+         * Get the initial value of this role's EPR. This value is obtained from
+         * the integration layer when the process is enabled on the server.
+         * 
          * @return
          */
         Element getInitialEPR() {
@@ -357,7 +357,6 @@
             _endpoint = endpoint;
         }
 
-        
         public String toString() {
             StringBuffer buf = new StringBuffer("{PartnerLinkRole-");
             buf.append(_plinkDef.name);
@@ -366,7 +365,7 @@
             buf.append(" on ");
             buf.append(_endpoint);
             buf.append('}');
-            
+
             return buf.toString();
         }
 
@@ -629,8 +628,9 @@
 
     private class PartnerLinkPartnerRoleImpl extends PartnerLinkRoleImpl {
         Endpoint _initialPartner;
+
         public PartnerRoleChannel _channel;
-        
+
         private PartnerLinkPartnerRoleImpl(OPartnerLink plink, Endpoint initialPartner) {
             super(plink);
             _initialPartner = initialPartner;
@@ -646,7 +646,7 @@
             processInstance.invocationResponse(messageExchange);
             processInstance.execute();
         }
-        
+
     }
 
     /**
@@ -718,11 +718,13 @@
         _debugger = new DebuggerSupport(this);
         // Activate all the my-role endpoints.
         for (PartnerLinkMyRoleImpl myrole : _myRoles.values()) {
-            myrole._initialEPR = _engine._contexts.bindingContext.activateMyRoleEndpoint(_pid, _du, myrole._endpoint, myrole._plinkDef.myRolePortType);
+            myrole._initialEPR = _engine._contexts.bindingContext.activateMyRoleEndpoint(_pid, _du, myrole._endpoint,
+                    myrole._plinkDef.myRolePortType);
         }
-        
+
         for (PartnerLinkPartnerRoleImpl prole : _partnerRoles.values()) {
-            PartnerRoleChannel channel = _engine._contexts.bindingContext.createPartnerRoleChannel(_pid, _du, prole._plinkDef.partnerRolePortType,prole._initialPartner);
+            PartnerRoleChannel channel = _engine._contexts.bindingContext.createPartnerRoleChannel(_pid, _du,
+                    prole._plinkDef.partnerRolePortType, prole._initialPartner);
             prole._channel = channel;
             prole._initialEPR = channel.getInitialEndpointReference().toXML().getDocumentElement();
         }

Modified: incubator/ode/trunk/jbi-examples/src/examples/HelloWorld2/HelloWorld2-process/deploy.xml
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/jbi-examples/src/examples/HelloWorld2/HelloWorld2-process/deploy.xml?rev=432094&r1=432093&r2=432094&view=diff
==============================================================================
--- incubator/ode/trunk/jbi-examples/src/examples/HelloWorld2/HelloWorld2-process/deploy.xml (original)
+++ incubator/ode/trunk/jbi-examples/src/examples/HelloWorld2/HelloWorld2-process/deploy.xml Wed Aug 16 18:14:18 2006
@@ -1,5 +1,5 @@
 <deploy xmlns="http://ode.fivesight.com/schemas/2006/06/27/dd" 
-	xmlns:pns="urn:org.apache.ode/examples/jbi/HelloWorld2"
+	xmlns:pns="urn:/HelloWorld2.bpel"
         xmlns:sns="urn:/HelloWorld2.wsdl" >
 
 

Modified: incubator/ode/trunk/jbi-install/src/etc/META-INF/jbi.xml
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/jbi-install/src/etc/META-INF/jbi.xml?rev=432094&r1=432093&r2=432094&view=diff
==============================================================================
--- incubator/ode/trunk/jbi-install/src/etc/META-INF/jbi.xml (original)
+++ incubator/ode/trunk/jbi-install/src/etc/META-INF/jbi.xml Wed Aug 16 18:14:18 2006
@@ -52,6 +52,7 @@
         <path-element>lib/ode-bpel-runtime.jar</path-element>
         <path-element>lib/ode-bpel-scheduler-quartz.jar</path-element>
         <path-element>lib/ode-bpel-connector.jar</path-element>
+        <path-element>lib/ode-bpel-schemas.jar</path-element>
         <path-element>lib/ode-jca-server.jar</path-element>
         <path-element>lib/ode-jca-ra.jar</path-element>
         <path-element>lib/ode-dao-hibernate.jar</path-element>

Added: incubator/ode/trunk/jbi/src/main/java/org/apache/ode/jbi/BindingContextImpl.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/jbi/src/main/java/org/apache/ode/jbi/BindingContextImpl.java?rev=432094&view=auto
==============================================================================
--- incubator/ode/trunk/jbi/src/main/java/org/apache/ode/jbi/BindingContextImpl.java (added)
+++ incubator/ode/trunk/jbi/src/main/java/org/apache/ode/jbi/BindingContextImpl.java Wed Aug 16 18:14:18 2006
@@ -0,0 +1,108 @@
+/*
+ * 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 javax.jbi.servicedesc.ServiceEndpoint;
+import javax.wsdl.PortType;
+import javax.xml.namespace.QName;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.ode.bpel.iapi.BindingContext;
+import org.apache.ode.bpel.iapi.ContextException;
+import org.apache.ode.bpel.iapi.DeploymentUnit;
+import org.apache.ode.bpel.iapi.Endpoint;
+import org.apache.ode.bpel.iapi.EndpointReference;
+import org.apache.ode.bpel.iapi.PartnerRoleChannel;
+import org.w3c.dom.Element;
+
+/**
+ * JBI Implementation of ODE's {@link org.apache.ode.bpel.iapi.BindingContext}
+ * interface.
+ * 
+ * @author Maciej Szefler - m s z e f l e r @ g m a i l . c o m
+ * 
+ */
+class BindingContextImpl implements BindingContext {
+    private static final Log __log = LogFactory.getLog(BindingContextImpl.class);
+
+    private final OdeContext _ode;
+
+    BindingContextImpl(OdeContext ode) {
+        _ode = ode;
+    }
+
+    public Element activateMyRoleEndpoint(QName processId, DeploymentUnit deploymentUnit, Endpoint myRoleEndpoint,
+            PortType portType) {
+        try {
+            return _ode.activateEndpoint(processId, myRoleEndpoint).toXML().getDocumentElement();
+        } catch (Exception ex) {
+            throw new ContextException("Could not activate endpoint " + myRoleEndpoint + " for process " + processId,
+                    ex);
+        }
+    }
+
+    public void deactivateMyRoleEndpoint(Endpoint myRoleEndpoint) {
+        try {
+            _ode.deactivateEndpoint(myRoleEndpoint);
+        } catch (Exception ex) {
+            String errmsg = "Could not deactivate endpoint: " + myRoleEndpoint;
+            __log.error(errmsg, ex);
+            throw new ContextException(errmsg, ex);
+        }
+    }
+
+    public PartnerRoleChannel createPartnerRoleChannel(QName processId, DeploymentUnit deploymentUnit,
+            PortType portType, Endpoint initialPartnerEndpoint) {
+        
+        if (initialPartnerEndpoint != null) {
+            ServiceEndpoint se = _ode.getContext().getEndpoint(initialPartnerEndpoint.serviceName,initialPartnerEndpoint.portName);
+            if (se == null)
+                throw new ContextException("Unkown endpoint: "  + initialPartnerEndpoint, null);
+            JbiEndpointReference jbiEpr = new JbiEndpointReference(se);
+            return new PartnerRoleChannelImpl(jbiEpr);
+        } else {
+            return new PartnerRoleChannelImpl();
+        }
+        
+    }
+
+    
+    private class PartnerRoleChannelImpl implements PartnerRoleChannel {
+        
+        private final JbiEndpointReference _initialEPR;
+
+        PartnerRoleChannelImpl(JbiEndpointReference epr) {
+            _initialEPR = epr;
+        }
+        
+        PartnerRoleChannelImpl() {
+            _initialEPR = null;
+        }
+
+        public EndpointReference getInitialEndpointReference() {
+            return _initialEPR;
+        }
+
+        public void close() {
+            ; // noop
+        }
+        
+    }
+}

Modified: incubator/ode/trunk/jbi/src/main/java/org/apache/ode/jbi/EndpointReferenceContextImpl.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/jbi/src/main/java/org/apache/ode/jbi/EndpointReferenceContextImpl.java?rev=432094&r1=432093&r2=432094&view=diff
==============================================================================
--- incubator/ode/trunk/jbi/src/main/java/org/apache/ode/jbi/EndpointReferenceContextImpl.java (original)
+++ incubator/ode/trunk/jbi/src/main/java/org/apache/ode/jbi/EndpointReferenceContextImpl.java Wed Aug 16 18:14:18 2006
@@ -101,39 +101,6 @@
     return null;
   }
   
-  public EndpointReference activateEndpoint(QName pid, QName serviceId, Element externalEpr) {
-    try {
-      return _ode.activateEndpoint(pid,serviceId,externalEpr);
-    } catch (Exception ex) {
-      throw new ContextException("Could not activate endpoint for " + serviceId, ex);
-    }
-  }
-
-  public void activateMyRoleEndpoint(QName serviceName, String portName, Definition wsdl) {
-    // TODO Implement me
-    throw new UnsupportedOperationException("To implement.");
-  }
-
-  public void activateExternalEndpoint(QName serviceName, String portName, Definition wsdl) {
-    // TODO Implement me
-    throw new UnsupportedOperationException("To implement.");
-  }
-
-  public void deactivateEndpoint(EndpointReference epr) {
-    if (!(epr instanceof MyEndpointReference)) {
-      String errmsg = "deactivateEndpoint misused.";
-      __log.fatal(errmsg);
-      throw new IllegalArgumentException(errmsg);
-    }
-
-    try {
-      _ode.deactivateEndpoint((MyEndpointReference)epr);
-    } catch (Exception ex) {
-      String errmsg = "Could not deactivate endpoint: " + epr;
-      __log.error(errmsg, ex);
-      throw new ContextException(errmsg,ex);
-    }
-  }
 
   public EndpointReference convertEndpoint(QName eprType, Element element) {
     EndpointReference endpoint = EndpointFactory.convert(eprType, element);

Modified: incubator/ode/trunk/jbi/src/main/java/org/apache/ode/jbi/JbiMessageExchangeEventRouter.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/jbi/src/main/java/org/apache/ode/jbi/JbiMessageExchangeEventRouter.java?rev=432094&r1=432093&r2=432094&view=diff
==============================================================================
--- incubator/ode/trunk/jbi/src/main/java/org/apache/ode/jbi/JbiMessageExchangeEventRouter.java (original)
+++ incubator/ode/trunk/jbi/src/main/java/org/apache/ode/jbi/JbiMessageExchangeEventRouter.java Wed Aug 16 18:14:18 2006
@@ -24,6 +24,7 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.ode.bpel.iapi.Endpoint;
 
 class JbiMessageExchangeEventRouter implements JbiMessageExchangeProcessor {
   private static final Log __log = LogFactory.getLog(JbiMessageExchangeEventRouter.class);
@@ -38,7 +39,7 @@
     if (mex.getRole().equals(javax.jbi.messaging.MessageExchange.Role.CONSUMER)) {
       _ode._consumer.onJbiMessageExchange(mex);
     } else if (mex.getRole().equals(javax.jbi.messaging.MessageExchange.Role.PROVIDER)) {
-      OdeService svc = _ode.getServiceByServiceName(mex.getEndpoint().getServiceName());
+      OdeService svc = _ode.getService(new Endpoint(mex.getEndpoint().getServiceName(), mex.getEndpoint().getEndpointName()));
       if (svc == null)  {
         __log.error("Received message exchange for unknown service: " + mex.getEndpoint().getServiceName());
         return;

Modified: incubator/ode/trunk/jbi/src/main/java/org/apache/ode/jbi/MyEndpointReference.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/jbi/src/main/java/org/apache/ode/jbi/MyEndpointReference.java?rev=432094&r1=432093&r2=432094&view=diff
==============================================================================
--- incubator/ode/trunk/jbi/src/main/java/org/apache/ode/jbi/MyEndpointReference.java (original)
+++ incubator/ode/trunk/jbi/src/main/java/org/apache/ode/jbi/MyEndpointReference.java Wed Aug 16 18:14:18 2006
@@ -67,7 +67,7 @@
     
     // TODO: handle the operation name problem.
     DocumentFragment fragment = se.getAsReference(null);
-    root.appendChild(fragment);
+    root.appendChild(xml.importNode(fragment,true));
     return xml;
   }
 

Modified: incubator/ode/trunk/jbi/src/main/java/org/apache/ode/jbi/OdeContext.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/jbi/src/main/java/org/apache/ode/jbi/OdeContext.java?rev=432094&r1=432093&r2=432094&view=diff
==============================================================================
--- incubator/ode/trunk/jbi/src/main/java/org/apache/ode/jbi/OdeContext.java (original)
+++ incubator/ode/trunk/jbi/src/main/java/org/apache/ode/jbi/OdeContext.java Wed Aug 16 18:14:18 2006
@@ -19,6 +19,7 @@
 package org.apache.ode.jbi;
 
 import java.util.ArrayList;
+
 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
@@ -34,15 +35,12 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
 import org.apache.ode.bpel.dao.BpelDAOConnectionFactory;
 import org.apache.ode.bpel.engine.BpelServerImpl;
-import org.apache.ode.bpel.iapi.EndpointReference;
+import org.apache.ode.bpel.iapi.Endpoint;
 import org.apache.ode.bpel.scheduler.quartz.QuartzSchedulerImpl;
 import org.apache.ode.jbi.msgmap.Mapper;
-import org.apache.ode.utils.DOMUtils;
+import org.w3c.dom.Document;
 
 /**
  * Encapsulation of all the junk needed to get the BPEL engine running.
@@ -51,214 +49,181 @@
  */
 final class OdeContext {
 
-  private static final Log __log = LogFactory.getLog(OdeContext.class);
-  
-  /** static singleton */
-  private static OdeContext __self;
+    private static final Log __log = LogFactory.getLog(OdeContext.class);
 
-  private ComponentContext _context;
+    /** static singleton */
+    private static OdeContext __self;
 
-  private Map<QName, Document> _descriptorCache = new ConcurrentHashMap<QName, Document>();
+    private ComponentContext _context;
 
-  /** Ordered list of messsage mappers. */
-  private ArrayList<Mapper> _mappers = new ArrayList<Mapper>();
+    private Map<QName, Document> _descriptorCache = new ConcurrentHashMap<QName, Document>();
 
-  /** Mapper by class name. */
-  private Map<String,Mapper> _mappersByClassName = new HashMap<String,Mapper>();
+    /** Ordered list of messsage mappers. */
+    private ArrayList<Mapper> _mappers = new ArrayList<Mapper>();
 
-  OdeConsumer _consumer = new OdeConsumer(this);
+    /** Mapper by class name. */
+    private Map<String, Mapper> _mappersByClassName = new HashMap<String, Mapper>();
 
-  JbiMessageExchangeProcessor _jbiMessageExchangeProcessor = new JbiMessageExchangeEventRouter(
-      this);
+    OdeConsumer _consumer = new OdeConsumer(this);
 
-  BpelServerImpl _server;
+    JbiMessageExchangeProcessor _jbiMessageExchangeProcessor = new JbiMessageExchangeEventRouter(this);
 
-  EndpointReferenceContextImpl _eprContext;
+    BpelServerImpl _server;
 
-  MessageExchangeContextImpl _mexContext;
+    EndpointReferenceContextImpl _eprContext;
 
-  QuartzSchedulerImpl _scheduler;
+    MessageExchangeContextImpl _mexContext;
 
-  ExecutorService _executorService;
+    QuartzSchedulerImpl _scheduler;
 
-  BpelDAOConnectionFactory _daocf;
+    ExecutorService _executorService;
 
-  OdeConfigProperties _config;
+    BpelDAOConnectionFactory _daocf;
 
-  DataSource _dataSource;
+    OdeConfigProperties _config;
 
-  /** Mapping of OdeServiceId to OdeService */
-  private Map<QName, OdeService> _activeOdeServices = new ConcurrentHashMap<QName, OdeService>();
+    DataSource _dataSource;
 
-  /** Mapping of JbiServiceName to OdeService */
-  private Map<QName, OdeService> _activeJbiServices = new ConcurrentHashMap<QName, OdeService>();
+    /** Mapping of Endpoint to OdeService */
+    private Map<Endpoint, OdeService> _activeOdeServices = new ConcurrentHashMap<Endpoint, OdeService>();
 
+    /**
+     * Gets the delivery channel.
+     * 
+     * @return delivery channel
+     */
+    public DeliveryChannel getChannel() {
+        DeliveryChannel chnl = null;
 
-  /**
-   * Gets the delivery channel.
-   * 
-   * @return delivery channel
-   */
-  public DeliveryChannel getChannel() {
-    DeliveryChannel chnl = null;
+        if (_context != null) {
+            try {
+                chnl = _context.getDeliveryChannel();
+            } catch (Exception e) {
+                // TODO better error logging
+                e.printStackTrace();
+            }
+        }
 
-    if (_context != null) {
-      try {
-        chnl = _context.getDeliveryChannel();
-      } catch (Exception e) {
-        // TODO better error logging
-        e.printStackTrace();
-      }
+        return chnl;
     }
 
-    return chnl;
-  }
+    /**
+     * Sets the Component context.
+     * 
+     * @param ctx
+     *            component context.
+     */
+    public void setContext(ComponentContext ctx) {
+        _context = ctx;
+    }
+
+    /**
+     * DOCUMENT ME!
+     * 
+     * @return Transformation engine context
+     */
+    public ComponentContext getContext() {
+        return _context;
+    }
+
+    /**
+     * Used to grab a reference of this object.
+     * 
+     * @return an initialized TransformationEngineContext reference
+     */
+    public static synchronized OdeContext getInstance() {
+        if (__self == null) {
+            synchronized (OdeContext.class) {
+                if (__self == null) {
+                    __self = new OdeContext();
+                }
+            }
+        }
 
-  /**
-   * Sets the Component context.
-   * 
-   * @param ctx
-   *          component context.
-   */
-  public void setContext(ComponentContext ctx) {
-    _context = ctx;
-  }
+        return __self;
+    }
 
-  /**
-   * DOCUMENT ME!
-   * 
-   * @return Transformation engine context
-   */
-  public ComponentContext getContext() {
-    return _context;
-  }
+    public void addEndpointDoc(QName svcname, Document df) {
+        _descriptorCache.put(svcname, df);
+    }
 
-  /**
-   * Used to grab a reference of this object.
-   * 
-   * @return an initialized TransformationEngineContext reference
-   */
-  public static synchronized OdeContext getInstance() {
-    if (__self == null) {
-      synchronized (OdeContext.class) {
-        if (__self == null) {
-          __self = new OdeContext();
-        }
-      }
+    public Document getServiceDescription(QName svcName) {
+        return _descriptorCache.get(svcName);
     }
 
-    return __self;
-  }
+    public TransactionManager getTransactionManager() {
+        return (TransactionManager) getContext().getTransactionManager();
+    }
 
-  public void addEndpointDoc(QName svcname, Document df) {
-    _descriptorCache.put(svcname, df);
-  }
+    public MyEndpointReference activateEndpoint(QName pid, Endpoint endpoint) throws Exception {
+        if (__log.isDebugEnabled()) {
+            __log.debug("Activate endpoint: " + endpoint);
+        }
 
-  public Document getServiceDescription(QName svcName) {
-    return _descriptorCache.get(svcName);
-  }
+        OdeService service = new OdeService(this, endpoint);
+        MyEndpointReference myepr = new MyEndpointReference(service);
+        service.activate();
+        _activeOdeServices.put(endpoint, service);
+        return myepr;
 
-  public TransactionManager getTransactionManager() {
-    return (TransactionManager) getContext().getTransactionManager();
-  }
+    }
 
-  public MyEndpointReference activateEndpoint(QName pid, QName odeServiceId,
-      Element externalEpr) throws Exception {
-    QName jbiServiceName;
-    String jbiEndpointName;
+    public void deactivateEndpoint(Endpoint endpoint) throws Exception {
+        OdeService svc = _activeOdeServices.remove(endpoint);
 
-    if ( __log.isDebugEnabled() ) {
-      __log.debug( "Activate endpoint: " + prettyPrint( externalEpr ) );
+        if (svc != null) {
+            svc.deactivate();
+        }
     }
 
-    QName elname = new QName(externalEpr.getNamespaceURI(),externalEpr.getLocalName());
-    if (elname.equals(EndpointReference.SERVICE_REF_QNAME)) {
-        externalEpr = DOMUtils.getFirstChildElement(externalEpr);
-        if ( externalEpr == null ) {
-            throw new IllegalArgumentException( "Unsupported EPR: " + prettyPrint(externalEpr) );
+    public OdeService getService(Endpoint endpoint) {
+        return _activeOdeServices.get(endpoint);
+    }
+
+    public OdeService getService(QName serviceName) {
+        for (Map.Entry<Endpoint,OdeService> e : _activeOdeServices.entrySet()){
+            if (e.getKey().serviceName.equals(serviceName))
+                return e.getValue();
         }
-        elname = new QName(externalEpr.getNamespaceURI(),externalEpr.getLocalName());
+        return null;
     }
     
-    // extract serviceName and endpointName from JBI EPR 
-    if (elname.equals(EndpointReferenceContextImpl.JBI_EPR)) {
-      String serviceName = externalEpr.getAttribute("service-name");
-      jbiServiceName = EndpointReferenceContextImpl.convertClarkQName( serviceName );
-      jbiEndpointName = externalEpr.getAttribute("end-point-name");
-    } else {
-      throw new IllegalArgumentException( "Unsupported EPR: " + prettyPrint(externalEpr) );
+    public Mapper findMapper(NormalizedMessage nmsMsg, Operation op) {
+        ArrayList<Mapper> maybe = new ArrayList<Mapper>();
+
+        for (Mapper m : _mappers) {
+            Mapper.Recognized result = m.isRecognized(nmsMsg, op);
+            switch (result) {
+            case TRUE:
+                return m;
+            case FALSE:
+                continue;
+            case UNSURE:
+                maybe.add(m);
+                break;
+            }
+        }
+
+        if (maybe.size() == 0)
+            return null;
+        if (maybe.size() == 1)
+            return maybe.get(0);
+
+        __log.warn("Multiple mappers may match input message for operation " + op.getName());
+        // Get the first match.
+        return maybe.get(0);
     }
-    
-    OdeService service = new OdeService(this, odeServiceId, jbiServiceName, jbiEndpointName);
-    MyEndpointReference myepr = new MyEndpointReference(service);
-    service.activate();
-    _activeOdeServices.put(odeServiceId, service);
-    _activeJbiServices.put(jbiServiceName, service);
-    return myepr;
-
-  }
-
-  public void deactivateEndpoint(MyEndpointReference epr) throws Exception {
-    OdeService svc = _activeOdeServices.remove(epr.getService().getOdeServiceId());
-    _activeJbiServices.remove(epr.getService().getJbiServiceName());
-    if (svc != null) {
-      svc.deactivate();
-    }
-  }
-
-  public OdeService getService(QName odeServiceId) {
-	    return _activeOdeServices.get(odeServiceId);
-	  }
-
-  public OdeService getServiceByServiceName(QName jbiServiceName) {
-	    return _activeJbiServices.get(jbiServiceName);
-	  }
-
-  public Mapper findMapper(NormalizedMessage nmsMsg, Operation op) {
-    ArrayList<Mapper> maybe = new ArrayList<Mapper>();
-
-    for (Mapper m : _mappers) {
-      Mapper.Recognized result = m.isRecognized(nmsMsg, op);
-      switch (result) {
-      case TRUE:
-        return m;
-      case FALSE:
-        continue;
-      case UNSURE:
-        maybe.add(m);
-        break;
-      }
+
+    public Mapper getMapper(String name) {
+        return _mappersByClassName.get(name);
+    }
+
+    public void registerMapper(Mapper mapper) {
+        _mappers.add(mapper);
+        _mappersByClassName.put(mapper.getClass().getName(), mapper);
+    }
+
+    public Mapper getDefaultMapper() {
+        return _mappers.get(0);
     }
-    
-    if (maybe.size() == 0)
-      return null;
-    if (maybe.size() == 1)
-      return maybe.get(0);
-    
-    __log.warn("Multiple mappers may match input message for operation " + op.getName());
-    // Get the first match.
-    return maybe.get(0);
-  }
-  
-  public Mapper getMapper(String name) {
-    return _mappersByClassName.get(name);
-  }
-  
-  public void registerMapper(Mapper mapper) {
-    _mappers.add(mapper);
-    _mappersByClassName.put(mapper.getClass().getName(), mapper);
-  }
-  
-  public Mapper getDefaultMapper() {
-    return _mappers.get(0);
-  }
-
-  private String prettyPrint( Element el ) {
-      try {
-          return DOMUtils.prettyPrint( el );
-      } catch ( java.io.IOException ioe ) {
-          return ioe.getMessage();
-      }
-  }
-  
 }

Modified: incubator/ode/trunk/jbi/src/main/java/org/apache/ode/jbi/OdeLifeCycle.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/jbi/src/main/java/org/apache/ode/jbi/OdeLifeCycle.java?rev=432094&r1=432093&r2=432094&view=diff
==============================================================================
--- incubator/ode/trunk/jbi/src/main/java/org/apache/ode/jbi/OdeLifeCycle.java (original)
+++ incubator/ode/trunk/jbi/src/main/java/org/apache/ode/jbi/OdeLifeCycle.java Wed Aug 16 18:14:18 2006
@@ -249,7 +249,7 @@
     _ode._server = new BpelServerImpl();
     // We don't want the server to automatically activate deployed processes,
     // we'll do that explcitly
-    _ode._server.setAutoActivate(false);
+    _ode._server.setAutoActivate(true);
     _ode._eprContext = new EndpointReferenceContextImpl(_ode);
     _ode._mexContext = new MessageExchangeContextImpl(_ode);
     _ode._executorService = Executors.newCachedThreadPool();
@@ -264,6 +264,7 @@
     _ode._server.setDaoConnectionFactory(_ode._daocf);
     _ode._server.setEndpointReferenceContext(_ode._eprContext);
     _ode._server.setMessageExchangeContext(_ode._mexContext);
+    _ode._server.setBindingContext(new BindingContextImpl(_ode));
     _ode._server.setScheduler(_ode._scheduler);
     _ode._server.init();
 

Modified: incubator/ode/trunk/jbi/src/main/java/org/apache/ode/jbi/OdeService.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/jbi/src/main/java/org/apache/ode/jbi/OdeService.java?rev=432094&r1=432093&r2=432094&view=diff
==============================================================================
--- incubator/ode/trunk/jbi/src/main/java/org/apache/ode/jbi/OdeService.java (original)
+++ incubator/ode/trunk/jbi/src/main/java/org/apache/ode/jbi/OdeService.java Wed Aug 16 18:14:18 2006
@@ -18,6 +18,7 @@
  */
 package org.apache.ode.jbi;
 
+import org.apache.ode.bpel.iapi.Endpoint;
 import org.apache.ode.bpel.iapi.Message;
 import org.apache.ode.bpel.iapi.MyRoleMessageExchange;
 import org.apache.ode.bpel.iapi.MessageExchange.MessageExchangePattern;
@@ -54,21 +55,15 @@
 
   private OdeContext  _ode;
 
-  private QName _odeServiceId;
-
-  private QName _jbiServiceName;
-
-  private String _jbiPortName;
-
   private Element _serviceref;
+
+  private Endpoint _endpoint;
   
   
-  public OdeService(OdeContext odeContext, QName odeServiceId, QName jbiServiceName, String jbiPortName)
+  public OdeService(OdeContext odeContext, Endpoint endpoint)
       throws Exception {
     _ode = odeContext;
-    _odeServiceId = odeServiceId;
-    _jbiServiceName = jbiServiceName;
-    _jbiPortName = jbiPortName;
+    _endpoint = endpoint;
   }
 
   /**
@@ -78,14 +73,14 @@
    */
   public void activate() throws JBIException {
     if (_serviceref ==  null) {
-      ServiceEndpoint[] candidates = _ode.getContext().getExternalEndpointsForService(_jbiServiceName);
+      ServiceEndpoint[] candidates = _ode.getContext().getExternalEndpointsForService(_endpoint.serviceName);
       if (candidates.length != 0) {
         _external = candidates[0];
       }
     }
-    _internal = _ode.getContext().activateEndpoint(_jbiServiceName, _jbiPortName);
+    _internal = _ode.getContext().activateEndpoint(_endpoint.serviceName, _endpoint.portName);
     if (__log.isDebugEnabled()) {
-      __log.debug("Activated service " + _jbiServiceName + " on port " +  _jbiPortName);
+      __log.debug("Activated endpoint " + _endpoint);
     }
     // TODO: Is there a race situation here?
   }
@@ -95,7 +90,7 @@
    */
   public void deactivate() throws JBIException {
     _ode.getContext().deactivateEndpoint(_internal);
-    __log.debug("Dectivated service " + _jbiServiceName + " with port " +  _jbiPortName);
+    __log.debug("Dectivated endpoint " +  _endpoint);
   }
 
   public ServiceEndpoint getInternalServiceEndpoint() {
@@ -209,12 +204,11 @@
     MyRoleMessageExchange odeMex = null;
     try {
       if (__log.isDebugEnabled()) {
-      __log.debug("invokeOde() JBI exchangeId=" + jbiMex.getExchangeId() + " serviceName=" + serviceName + " operation=" + jbiMex.getOperation() );
-      __log.debug("invokeOde() ODE servideId=" + _odeServiceId + " serviceName=" + _jbiServiceName + " port=" + _jbiPortName + " internal=" + _internal );
+          __log.debug("invokeOde() JBI exchangeId=" + jbiMex.getExchangeId() + " endpoint=" + _endpoint + " operation=" + jbiMex.getOperation() );
       }
       odeMex = _ode._server.getEngine().createMessageExchange(
         jbiMex.getExchangeId(),
-        _odeServiceId,
+        _endpoint.serviceName,
         jbiMex.getOperation().getLocalPart());
 
       if (odeMex.getOperation() != null) {
@@ -333,13 +327,8 @@
     }
   }
 
-  public QName getJbiServiceName() {
-    return _jbiServiceName;
-  }
-
-  
-  public QName getOdeServiceId() {
-    return _jbiServiceName;
+  public Endpoint getEndpoint() {
+    return _endpoint;
   }
 
   

Modified: incubator/ode/trunk/jbi/src/main/java/org/apache/ode/jbi/OdeServiceUnit.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/jbi/src/main/java/org/apache/ode/jbi/OdeServiceUnit.java?rev=432094&r1=432093&r2=432094&view=diff
==============================================================================
--- incubator/ode/trunk/jbi/src/main/java/org/apache/ode/jbi/OdeServiceUnit.java (original)
+++ incubator/ode/trunk/jbi/src/main/java/org/apache/ode/jbi/OdeServiceUnit.java Wed Aug 16 18:14:18 2006
@@ -48,10 +48,6 @@
     /** Our JBI indentifier. */
     private String _serviceUnitID;
 
-    /** List of process IDs for each of the above files. */
-
-    private List<QName> _pids;
-
     /** Ctor. */
     OdeServiceUnit(OdeContext ode, String serviceUnitID, String serviceUnitRootPath) {
         _ode = ode;
@@ -91,39 +87,39 @@
     }
 
     public void start() throws Exception {
-        List<QName> activated = new ArrayList<QName>(_pids.size());
-        Exception e = null;
-        for (QName pid : _pids) {
-            try {
-                _ode._server.activate(pid, false);
-                activated.add(pid);
-            } catch (Exception ex) {
-                e = ex;
-                __log.error("Unable to activate " + pid, ex);
-                break;
-            }
-        }
-        if (activated.size() != _pids.size()) {
-            for (QName pid : activated)
-                try {
-                    _ode._server.deactivate(pid, true);
-                } catch (Exception ex) {
-                    __log.error("Unable to deactivate " + pid, ex);
-                }
-        }
-
-        if (e != null)
-            throw e;
+//        List<QName> activated = new ArrayList<QName>(_pids.size());
+//        Exception e = null;
+//        for (QName pid : _pids) {
+//            try {
+//                _ode._server.activate(pid, false);
+//                activated.add(pid);
+//            } catch (Exception ex) {
+//                e = ex;
+//                __log.error("Unable to activate " + pid, ex);
+//                break;
+//            }
+//        }
+//        if (activated.size() != _pids.size()) {
+//            for (QName pid : activated)
+//                try {
+//                    _ode._server.deactivate(pid, true);
+//                } catch (Exception ex) {
+//                    __log.error("Unable to deactivate " + pid, ex);
+//                }
+//        }
+//
+//        if (e != null)
+//            throw e;
     }
 
     public void stop() throws Exception {
-        for (QName pid : _pids) {
-            try {
-                _ode._server.deactivate(pid, true);
-            } catch (Exception ex) {
-                __log.error("Unable to deactivate " + pid, ex);
-            }
-        }
+//        for (QName pid : _pids) {
+//            try {
+//                _ode._server.deactivate(pid, true);
+//            } catch (Exception ex) {
+//                __log.error("Unable to deactivate " + pid, ex);
+//            }
+//        }
     }
 
 }

Modified: incubator/ode/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/pom.xml?rev=432094&r1=432093&r2=432094&view=diff
==============================================================================
--- incubator/ode/trunk/pom.xml (original)
+++ incubator/ode/trunk/pom.xml Wed Aug 16 18:14:18 2006
@@ -75,7 +75,7 @@
         <servicemixVersion>3.0-incubating-SNAPSHOT</servicemixVersion>
         <staxApiVersion>1.0</staxApiVersion>
         <staxVersion>1.1.2-dev</staxVersion>
-        <wsdl4jVersion>1.5.1</wsdl4jVersion>
+        <wsdl4jVersion>1.5.2</wsdl4jVersion>
         <xapoolVersion>1.4</xapoolVersion>
         <xercesVersion>2.6.2</xercesVersion>
         <xmlResolverVersion>1.1</xmlResolverVersion>