2 files changed, 19 insertions, 18 deletions
diff --git a/java/sca/modules/implementation-bpel-runtime/META-INF/MANIFEST.MF b/java/sca/modules/implementation-bpel-runtime/META-INF/MANIFEST.MF
index ead15fc122..b90a5bd039 100644
--- a/java/sca/modules/implementation-bpel-runtime/META-INF/MANIFEST.MF
+++ b/java/sca/modules/implementation-bpel-runtime/META-INF/MANIFEST.MF
@@ -22,22 +22,10 @@ Bundle-ClassPath: .,ode-bpel-epr-1.3.2.jar,ode-bpel-store-1.3.2.jar,
  geronimo-connector-2.0.1.jar,openjpa-1.3.0-SNAPSHOT.jar
 Bundle-Description: Apache Tuscany SCA BPEL ODE Implementation Extensi
  on
-Import-Package: org.apache.tuscany.sca.assembly;version="2.0",
- org.apache.tuscany.sca.core;version="2.0",
- org.apache.tuscany.sca.databinding.xml;version="2.0",
- org.apache.tuscany.sca.implementation.bpel;version="2.0",
- org.apache.tuscany.sca.interfacedef;version="2.0",
- org.apache.tuscany.sca.interfacedef.wsdl;version="2.0",
- org.apache.tuscany.sca.invocation;version="2.0",
- org.apache.tuscany.sca.policy;version="2.0.0",
- org.apache.tuscany.sca.provider;version="2.0",
- org.apache.tuscany.sca.runtime;version="2.0",
- org.eclipse.core.runtime;common=split,
- org.oasisopen.sca.annotation;version="2.0",
- com.ibm.websphere.jtaextensions;resolution:=optional,
+Import-Package: com.ibm.websphere.jtaextensions;resolution:=optional,
+ com.ibm.wsdl,
  com.ibm.wsdl.util.xml;resolution:=optional,
  com.ibm.wsdl.xml;resolution:=optional,
- com.ibm.wsdl,
  com.ibm.wsspi.uow;resolution:=optional,
  com.sun.mirror.apt;resolution:=optional,
  com.sun.mirror.declaration;resolution:=optional,
@@ -52,6 +40,7 @@ Import-Package: org.apache.tuscany.sca.assembly;version="2.0",
  javax.rmi;resolution:=optional,
  javax.security.auth;resolution:=optional,
  javax.sql;resolution:=optional,
+ javax.transaction,
  javax.wsdl;resolution:=optional,
  javax.wsdl.extensions;resolution:=optional,
  javax.wsdl.extensions.http;resolution:=optional,
@@ -104,6 +93,16 @@ Import-Package: org.apache.tuscany.sca.assembly;version="2.0",
  org.apache.tools.ant;resolution:=optional,
  org.apache.tools.ant.taskdefs;resolution:=optional,
  org.apache.tools.ant.types;resolution:=optional,
+ org.apache.tuscany.sca.assembly;version="2.0",
+ org.apache.tuscany.sca.core;version="2.0",
+ org.apache.tuscany.sca.databinding.xml;version="2.0",
+ org.apache.tuscany.sca.implementation.bpel;version="2.0",
+ org.apache.tuscany.sca.interfacedef;version="2.0",
+ org.apache.tuscany.sca.interfacedef.wsdl;version="2.0",
+ org.apache.tuscany.sca.invocation;version="2.0",
+ org.apache.tuscany.sca.policy;version="2.0.0",
+ org.apache.tuscany.sca.provider;version="2.0",
+ org.apache.tuscany.sca.runtime;version="2.0",
  org.apache.xerces.dom;resolution:=optional,
  org.apache.xerces.impl.xs;resolution:=optional,
  org.apache.xerces.jaxp;resolution:=optional,
@@ -116,6 +115,7 @@ Import-Package: org.apache.tuscany.sca.assembly;version="2.0",
  org.apache.xmlbeans;resolution:=optional,
  org.apache.xmlbeans.impl.values;resolution:=optional,
  org.apache.xmlbeans.xml.stream;resolution:=optional,
+ org.eclipse.core.runtime;common=split,
  org.hibernate;resolution:=optional,
  org.hibernate.cfg;resolution:=optional,
  org.hibernate.classic;resolution:=optional,
@@ -127,6 +127,7 @@ Import-Package: org.apache.tuscany.sca.assembly;version="2.0",
  org.jaxen.expr;resolution:=optional,
  org.jaxen.saxpath;resolution:=optional,
  org.jaxen.saxpath.helpers;resolution:=optional,
+ org.oasisopen.sca.annotation;version="2.0",
  org.objectweb.howl.log;resolution:=optional,
  org.objectweb.howl.log.xa;resolution:=optional,
  org.postgresql;resolution:=optional,
diff --git a/java/sca/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELImplementationProvider.java b/java/sca/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELImplementationProvider.java
index 2a3f75a575..7ac2ee9a03 100644
--- a/java/sca/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELImplementationProvider.java
+++ b/java/sca/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELImplementationProvider.java
@@ -25,8 +25,8 @@ import javax.transaction.TransactionManager;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.tuscany.sca.assembly.Endpoint2;
-import org.apache.tuscany.sca.assembly.EndpointReference2;
+import org.apache.tuscany.sca.assembly.Endpoint;
+import org.apache.tuscany.sca.assembly.EndpointReference;
 import org.apache.tuscany.sca.assembly.Reference;
 import org.apache.tuscany.sca.assembly.Service;
 import org.apache.tuscany.sca.databinding.xml.DOMDataBinding;
@@ -72,14 +72,14 @@ public class BPELImplementationProvider implements ImplementationProvider {
         	//TODO - MJE, 06/06/2009 - we can eventually remove the reset of the service interface
         	// contract and leave it to the Endpoints only
             service.getInterfaceContract().getInterface().resetDataBinding(DOMDataBinding.NAME);
-            for( Endpoint2 endpoint : service.getEndpoints() ) {
+            for( Endpoint endpoint : service.getEndpoints() ) {
             	endpoint.getInterfaceContract().getInterface().resetDataBinding(DOMDataBinding.NAME);
             } // end for
         } // end for
        
         for (Reference reference: component.getReferences()) {
             reference.getInterfaceContract().getInterface().resetDataBinding(DOMDataBinding.NAME);
-            /* for( EndpointReference2 epr : reference.getEndpointReferences() ) {
+            /* for( EndpointReference epr : reference.getEndpointReferences() ) {
             	epr.getInterfaceContract().getInterface().resetDataBinding(DOMDataBinding.NAME);
             } // end for */
         } // end for