Author: mszefler
Date: Fri Sep 1 16:06:37 2006
New Revision: 439502
URL: http://svn.apache.org/viewvc?rev=439502&view=rev
Log:
Moved EPR code into separate module.
Added:
incubator/ode/trunk/bpel-dao/
incubator/ode/trunk/bpel-dao/.classpath (with props)
incubator/ode/trunk/bpel-dao/.project (with props)
incubator/ode/trunk/bpel-dao/pom.xml (with props)
incubator/ode/trunk/bpel-dao/src/
incubator/ode/trunk/bpel-dao/src/main/
incubator/ode/trunk/bpel-dao/src/main/java/
incubator/ode/trunk/bpel-epr/.classpath (with props)
incubator/ode/trunk/bpel-epr/.project (with props)
incubator/ode/trunk/bpel-epr/src/main/java/org/
incubator/ode/trunk/bpel-epr/src/main/java/org/apache/
incubator/ode/trunk/bpel-epr/src/main/java/org/apache/ode/
incubator/ode/trunk/bpel-epr/src/main/java/org/apache/ode/bpel/
incubator/ode/trunk/bpel-epr/src/main/java/org/apache/ode/bpel/epr/
incubator/ode/trunk/bpel-epr/src/main/java/org/apache/ode/bpel/epr/EndpointFactory.java
- copied, changed from r439495,
incubator/ode/trunk/bpel-api/src/main/java/org/apache/ode/bpel/epr/EndpointFactory.java
incubator/ode/trunk/bpel-epr/src/main/java/org/apache/ode/bpel/epr/MutableEndpoint.java
- copied, changed from r439492,
incubator/ode/trunk/bpel-api/src/main/java/org/apache/ode/bpel/epr/MutableEndpoint.java
incubator/ode/trunk/bpel-epr/src/main/java/org/apache/ode/bpel/epr/URLEndpoint.java
- copied, changed from r439492,
incubator/ode/trunk/bpel-api/src/main/java/org/apache/ode/bpel/epr/URLEndpoint.java
incubator/ode/trunk/bpel-epr/src/main/java/org/apache/ode/bpel/epr/WSAEndpoint.java
- copied, changed from r439495,
incubator/ode/trunk/bpel-api/src/main/java/org/apache/ode/bpel/epr/WSAEndpoint.java
incubator/ode/trunk/bpel-epr/src/main/java/org/apache/ode/bpel/epr/WSDL11Endpoint.java
- copied, changed from r439492,
incubator/ode/trunk/bpel-api/src/main/java/org/apache/ode/bpel/epr/WSDL11Endpoint.java
incubator/ode/trunk/bpel-epr/src/main/java/org/apache/ode/bpel/epr/WSDL20Endpoint.java
- copied, changed from r439492,
incubator/ode/trunk/bpel-api/src/main/java/org/apache/ode/bpel/epr/WSDL20Endpoint.java
Removed:
incubator/ode/trunk/bpel-api/src/main/java/org/apache/ode/bpel/epr/EndpointFactory.java
incubator/ode/trunk/bpel-api/src/main/java/org/apache/ode/bpel/epr/MutableEndpoint.java
incubator/ode/trunk/bpel-api/src/main/java/org/apache/ode/bpel/epr/URLEndpoint.java
incubator/ode/trunk/bpel-api/src/main/java/org/apache/ode/bpel/epr/WSAEndpoint.java
incubator/ode/trunk/bpel-api/src/main/java/org/apache/ode/bpel/epr/WSDL11Endpoint.java
incubator/ode/trunk/bpel-api/src/main/java/org/apache/ode/bpel/epr/WSDL20Endpoint.java
Modified:
incubator/ode/trunk/axis2/pom.xml
incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelProcess.java
incubator/ode/trunk/jbi/src/main/java/org/apache/ode/jbi/EndpointReferenceContextImpl.java
incubator/ode/trunk/jbi/src/main/java/org/apache/ode/jbi/JbiEndpointReference.java
incubator/ode/trunk/pom.xml
Modified: incubator/ode/trunk/axis2/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/axis2/pom.xml?rev=439502&r1=439501&r2=439502&view=diff
==============================================================================
--- incubator/ode/trunk/axis2/pom.xml (original)
+++ incubator/ode/trunk/axis2/pom.xml Fri Sep 1 16:06:37 2006
@@ -59,6 +59,10 @@
<groupId>ode</groupId>
<artifactId>ode-bpel-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>ode</groupId>
+ <artifactId>ode-bpel-epr</artifactId>
+ </dependency>
<dependency>
<groupId>ode</groupId>
Added: incubator/ode/trunk/bpel-dao/.classpath
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-dao/.classpath?rev=439502&view=auto
==============================================================================
--- incubator/ode/trunk/bpel-dao/.classpath (added)
+++ incubator/ode/trunk/bpel-dao/.classpath Fri Sep 1 16:06:37 2006
@@ -0,0 +1,6 @@
+<classpath>
+ <classpathentry kind="src" path="src/main/java"/>
+ <classpathentry kind="output" path="target/classes"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
+</classpath>
\ No newline at end of file
Propchange: incubator/ode/trunk/bpel-dao/.classpath
------------------------------------------------------------------------------
svn:eol-style = native
Added: incubator/ode/trunk/bpel-dao/.project
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-dao/.project?rev=439502&view=auto
==============================================================================
--- incubator/ode/trunk/bpel-dao/.project (added)
+++ incubator/ode/trunk/bpel-dao/.project Fri Sep 1 16:06:37 2006
@@ -0,0 +1,14 @@
+<projectDescription>
+ <name>ode-bpel-dao</name>
+ <comment>BPEL Data Access Objects API</comment>
+ <projects/>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments/>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
\ No newline at end of file
Propchange: incubator/ode/trunk/bpel-dao/.project
------------------------------------------------------------------------------
svn:eol-style = native
Added: incubator/ode/trunk/bpel-dao/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-dao/pom.xml?rev=439502&view=auto
==============================================================================
--- incubator/ode/trunk/bpel-dao/pom.xml (added)
+++ incubator/ode/trunk/bpel-dao/pom.xml Fri Sep 1 16:06:37 2006
@@ -0,0 +1,36 @@
+<?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.
+ -->
+
+<project>
+ <artifactId>ode-bpel-dao</artifactId>
+ <name>ODE :: BPEL DAO</name>
+ <description>BPEL Data Access Objects API</description>
+
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>ode</groupId>
+ <artifactId>ode</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ </parent>
+ <groupId>ode</groupId>
+ <version>2.0-SNAPSHOT</version>
+ <dependencies>
+ </dependencies>
+</project>
Propchange: incubator/ode/trunk/bpel-dao/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: incubator/ode/trunk/bpel-epr/.classpath
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-epr/.classpath?rev=439502&view=auto
==============================================================================
--- incubator/ode/trunk/bpel-epr/.classpath (added)
+++ incubator/ode/trunk/bpel-epr/.classpath Fri Sep 1 16:06:37 2006
@@ -0,0 +1,20 @@
+<classpath>
+ <classpathentry kind="src" path="src/main/java"/>
+ <classpathentry kind="output" path="target/classes"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <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/commons-lang/commons-lang/2.1/commons-lang-2.1.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/ode/ode-bpel-bom/2.0-SNAPSHOT/ode-bpel-bom-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/xmlbeans/xbean/2.1.0/xbean-2.1.0.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/log4j/log4j/1.2.12/log4j-1.2.12.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/wsdl4j/wsdl4j/1.5.2/wsdl4j-1.5.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/ode/ode-bpel-dd/2.0-SNAPSHOT/ode-bpel-dd-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/commons-pool/commons-pool/1.2/commons-pool-1.2.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"/>
+</classpath>
\ No newline at end of file
Propchange: incubator/ode/trunk/bpel-epr/.classpath
------------------------------------------------------------------------------
svn:eol-style = native
Added: incubator/ode/trunk/bpel-epr/.project
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-epr/.project?rev=439502&view=auto
==============================================================================
--- incubator/ode/trunk/bpel-epr/.project (added)
+++ incubator/ode/trunk/bpel-epr/.project Fri Sep 1 16:06:37 2006
@@ -0,0 +1,14 @@
+<projectDescription>
+ <name>ode-bpel-epr</name>
+ <comment>Implementations of the EndpointReference interface.</comment>
+ <projects/>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments/>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
\ No newline at end of file
Propchange: incubator/ode/trunk/bpel-epr/.project
------------------------------------------------------------------------------
svn:eol-style = native
Copied:
incubator/ode/trunk/bpel-epr/src/main/java/org/apache/ode/bpel/epr/EndpointFactory.java
(from r439495,
incubator/ode/trunk/bpel-api/src/main/java/org/apache/ode/bpel/epr/EndpointFactory.java)
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-epr/src/main/java/org/apache/ode/bpel/epr/EndpointFactory.java?p2=incubator/ode/trunk/bpel-epr/src/main/java/org/apache/ode/bpel/epr/EndpointFactory.java&p1=incubator/ode/trunk/bpel-api/src/main/java/org/apache/ode/bpel/epr/EndpointFactory.java&r1=439495&r2=439502&rev=439502&view=diff
==============================================================================
(empty)
Copied:
incubator/ode/trunk/bpel-epr/src/main/java/org/apache/ode/bpel/epr/MutableEndpoint.java
(from r439492,
incubator/ode/trunk/bpel-api/src/main/java/org/apache/ode/bpel/epr/MutableEndpoint.java)
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-epr/src/main/java/org/apache/ode/bpel/epr/MutableEndpoint.java?p2=incubator/ode/trunk/bpel-epr/src/main/java/org/apache/ode/bpel/epr/MutableEndpoint.java&p1=incubator/ode/trunk/bpel-api/src/main/java/org/apache/ode/bpel/epr/MutableEndpoint.java&r1=439492&r2=439502&rev=439502&view=diff
==============================================================================
(empty)
Copied:
incubator/ode/trunk/bpel-epr/src/main/java/org/apache/ode/bpel/epr/URLEndpoint.java
(from r439492,
incubator/ode/trunk/bpel-api/src/main/java/org/apache/ode/bpel/epr/URLEndpoint.java)
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-epr/src/main/java/org/apache/ode/bpel/epr/URLEndpoint.java?p2=incubator/ode/trunk/bpel-epr/src/main/java/org/apache/ode/bpel/epr/URLEndpoint.java&p1=incubator/ode/trunk/bpel-api/src/main/java/org/apache/ode/bpel/epr/URLEndpoint.java&r1=439492&r2=439502&rev=439502&view=diff
==============================================================================
(empty)
Copied:
incubator/ode/trunk/bpel-epr/src/main/java/org/apache/ode/bpel/epr/WSAEndpoint.java
(from r439495,
incubator/ode/trunk/bpel-api/src/main/java/org/apache/ode/bpel/epr/WSAEndpoint.java)
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-epr/src/main/java/org/apache/ode/bpel/epr/WSAEndpoint.java?p2=incubator/ode/trunk/bpel-epr/src/main/java/org/apache/ode/bpel/epr/WSAEndpoint.java&p1=incubator/ode/trunk/bpel-api/src/main/java/org/apache/ode/bpel/epr/WSAEndpoint.java&r1=439495&r2=439502&rev=439502&view=diff
==============================================================================
(empty)
Copied:
incubator/ode/trunk/bpel-epr/src/main/java/org/apache/ode/bpel/epr/WSDL11Endpoint.java
(from r439492,
incubator/ode/trunk/bpel-api/src/main/java/org/apache/ode/bpel/epr/WSDL11Endpoint.java)
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-epr/src/main/java/org/apache/ode/bpel/epr/WSDL11Endpoint.java?p2=incubator/ode/trunk/bpel-epr/src/main/java/org/apache/ode/bpel/epr/WSDL11Endpoint.java&p1=incubator/ode/trunk/bpel-api/src/main/java/org/apache/ode/bpel/epr/WSDL11Endpoint.java&r1=439492&r2=439502&rev=439502&view=diff
==============================================================================
(empty)
Copied:
incubator/ode/trunk/bpel-epr/src/main/java/org/apache/ode/bpel/epr/WSDL20Endpoint.java
(from r439492,
incubator/ode/trunk/bpel-api/src/main/java/org/apache/ode/bpel/epr/WSDL20Endpoint.java)
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-epr/src/main/java/org/apache/ode/bpel/epr/WSDL20Endpoint.java?p2=incubator/ode/trunk/bpel-epr/src/main/java/org/apache/ode/bpel/epr/WSDL20Endpoint.java&p1=incubator/ode/trunk/bpel-api/src/main/java/org/apache/ode/bpel/epr/WSDL20Endpoint.java&r1=439492&r2=439502&rev=439502&view=diff
==============================================================================
(empty)
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=439502&r1=439501&r2=439502&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
Fri Sep 1 16:06:37 2006
@@ -43,7 +43,6 @@
import org.apache.ode.bpel.dao.MessageRouteDAO;
import org.apache.ode.bpel.dao.ProcessDAO;
import org.apache.ode.bpel.dao.ProcessInstanceDAO;
-import org.apache.ode.bpel.epr.WSAEndpoint;
import org.apache.ode.bpel.evt.CorrelationMatchEvent;
import org.apache.ode.bpel.evt.CorrelationNoMatchEvent;
import org.apache.ode.bpel.evt.NewProcessInstanceEvent;
@@ -58,11 +57,8 @@
import org.apache.ode.bpel.iapi.MessageExchange.MessageExchangePattern;
import org.apache.ode.bpel.iapi.MessageExchange.Status;
import org.apache.ode.bpel.iapi.MyRoleMessageExchange.CorrelationStatus;
-import org.apache.ode.bpel.intercept.AbortMessageExchangeException;
-import org.apache.ode.bpel.intercept.FaultMessageExchangeException;
import org.apache.ode.bpel.intercept.InterceptorInvoker;
import org.apache.ode.bpel.intercept.MessageExchangeInterceptor;
-import
org.apache.ode.bpel.intercept.MessageExchangeInterceptor.InterceptorContext;
import org.apache.ode.bpel.o.OBase;
import org.apache.ode.bpel.o.OElementVarType;
import org.apache.ode.bpel.o.OMessageVarType;
@@ -75,7 +71,6 @@
import org.apache.ode.bpel.runtime.PropertyAliasEvaluationContext;
import org.apache.ode.jacob.soup.ReplacementMap;
import org.apache.ode.utils.ArrayUtils;
-import org.apache.ode.utils.DOMUtils;
import org.apache.ode.utils.ObjectPrinter;
import org.apache.ode.utils.msg.MessageBundle;
import org.w3c.dom.Element;
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=439502&r1=439501&r2=439502&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
Fri Sep 1 16:06:37 2006
@@ -24,7 +24,6 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.ode.bpel.epr.EndpointFactory;
import org.apache.ode.bpel.iapi.EndpointReference;
import org.apache.ode.bpel.iapi.EndpointReferenceContext;
import org.apache.ode.utils.DOMUtils;
@@ -78,13 +77,18 @@
}
- public EndpointReference convertEndpoint(QName eprType, Element element) {
- EndpointReference endpoint = EndpointFactory.convert(eprType, element);
+ public EndpointReference convertEndpoint(QName eprType, Element epr) {
+ Document doc = DOMUtils.newDocument();
+ DocumentFragment fragment = doc.createDocumentFragment();
+ NodeList children = epr.getChildNodes();
+ for (int i = 0 ; i < children.getLength(); ++i)
+ fragment.appendChild(doc.importNode(children.item(i), true));
+ ServiceEndpoint se =
_ode.getContext().resolveEndpointReference(fragment);
+ if (se == null)
+ return null;
+
+ return new JbiEndpointReference(se, eprType);
- __log.warn( "convertEndpoint: " + eprType + " " + prettyPrint( element ) );
-
- // Forcing JBI lookup
- return resolveEndpointReference(endpoint.toXML().getDocumentElement());
}
public static QName convertClarkQName(String name) {
Modified:
incubator/ode/trunk/jbi/src/main/java/org/apache/ode/jbi/JbiEndpointReference.java
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/jbi/src/main/java/org/apache/ode/jbi/JbiEndpointReference.java?rev=439502&r1=439501&r2=439502&view=diff
==============================================================================
---
incubator/ode/trunk/jbi/src/main/java/org/apache/ode/jbi/JbiEndpointReference.java
(original)
+++
incubator/ode/trunk/jbi/src/main/java/org/apache/ode/jbi/JbiEndpointReference.java
Fri Sep 1 16:06:37 2006
@@ -20,6 +20,7 @@
package org.apache.ode.jbi;
import javax.jbi.servicedesc.ServiceEndpoint;
+import javax.xml.namespace.QName;
import org.w3c.dom.Document;
import org.w3c.dom.DocumentFragment;
@@ -36,15 +37,21 @@
class JbiEndpointReference implements EndpointReference {
private ServiceEndpoint _se;
-
+ private QName _type;
+
JbiEndpointReference(ServiceEndpoint se) {
if (se == null)
throw new NullPointerException("Null ServiceEndpoint");
_se = se;
}
- public Document toXML() {
- DocumentFragment fragment = _se.getAsReference(null);
+ public JbiEndpointReference(ServiceEndpoint se, QName eprType) {
+ this(se);
+ _type = eprType;
+ }
+
+public Document toXML() {
+ DocumentFragment fragment = _se.getAsReference(_type);
if (fragment == null)
return null;
Modified: incubator/ode/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/pom.xml?rev=439502&r1=439501&r2=439502&view=diff
==============================================================================
--- incubator/ode/trunk/pom.xml (original)
+++ incubator/ode/trunk/pom.xml Fri Sep 1 16:06:37 2006
@@ -124,6 +124,7 @@
<module>bpel-runtime</module>
<module>bpel-ql</module>
<module>bpel-connector</module>
+ <module>bpel-epr</module>
<module>dao-hibernate</module>
<module>dao-hibernate-db-derby</module>
@@ -332,6 +333,11 @@
<dependency>
<groupId>ode</groupId>
<artifactId>ode-bpel-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>ode</groupId>
+ <artifactId>ode-bpel-epr</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
