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/10/26 23:42:44 UTC
svn commit: r468148 - in /incubator/ode/trunk: ./ axis2-war/ bpel-api/
bpel-compiler/ bpel-compiler/src/main/java/org/apache/ode/bpel/elang/
bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath10/
bpel-el-xpath10/ bpel-el-xpath20/ bpel-el-xpath2...
Author: mszefler
Date: Thu Oct 26 14:42:43 2006
New Revision: 468148
URL: http://svn.apache.org/viewvc?view=rev&rev=468148
Log:
Removed bpel-el-xpath10 module, moved into bpel-obj,bpel-compiler, and
bpel-runtime the various pieces. This simplifies some dependency issues.
Added:
incubator/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/
incubator/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath10/
incubator/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/elang/
incubator/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/elang/xpath10/
Removed:
incubator/ode/trunk/bpel-el-xpath10/
Modified:
incubator/ode/trunk/axis2-war/pom.xml
incubator/ode/trunk/bpel-api/.classpath
incubator/ode/trunk/bpel-compiler/pom.xml
incubator/ode/trunk/bpel-el-xpath20/pom.xml
incubator/ode/trunk/bpel-el-xpath20/src/main/java/org/apache/ode/bpel/elang/xpath20/compiler/JaxpFunctionResolver.java
incubator/ode/trunk/bpel-el-xpath20/src/main/java/org/apache/ode/bpel/elang/xpath20/compiler/XPath20ExpressionCompilerBPEL20.java
incubator/ode/trunk/bpel-el-xpath20/src/main/java/org/apache/ode/bpel/elang/xpath20/runtime/JaxpFunctionResolver.java
incubator/ode/trunk/bpel-el-xpath20/src/main/java/org/apache/ode/bpel/elang/xpath20/runtime/XPath20ExpressionRuntime.java
incubator/ode/trunk/bpel-runtime/pom.xml
incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelProcess.java
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HCorrelatorSelector.java
incubator/ode/trunk/distro-axis2/pom.xml
incubator/ode/trunk/distro-jbi/pom.xml
incubator/ode/trunk/integration/pom.xml
incubator/ode/trunk/pom.xml
Modified: incubator/ode/trunk/axis2-war/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/axis2-war/pom.xml?view=diff&rev=468148&r1=468147&r2=468148
==============================================================================
--- incubator/ode/trunk/axis2-war/pom.xml (original)
+++ incubator/ode/trunk/axis2-war/pom.xml Thu Oct 26 14:42:43 2006
@@ -218,11 +218,6 @@
</dependency>
<dependency>
<groupId>org.apache.ode</groupId>
- <artifactId>ode-bpel-el-xpath10</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.ode</groupId>
<artifactId>ode-bpel-el-xpath20</artifactId>
<scope>runtime</scope>
</dependency>
Modified: incubator/ode/trunk/bpel-api/.classpath
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-api/.classpath?view=diff&rev=468148&r1=468147&r2=468148
==============================================================================
--- incubator/ode/trunk/bpel-api/.classpath (original)
+++ incubator/ode/trunk/bpel-api/.classpath Thu Oct 26 14:42:43 2006
@@ -18,5 +18,6 @@
<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/log4j/log4j/1.2.12/log4j-1.2.12.jar"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/ode-bpel-compiler"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
Modified: incubator/ode/trunk/bpel-compiler/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-compiler/pom.xml?view=diff&rev=468148&r1=468147&r2=468148
==============================================================================
--- incubator/ode/trunk/bpel-compiler/pom.xml (original)
+++ incubator/ode/trunk/bpel-compiler/pom.xml Thu Oct 26 14:42:43 2006
@@ -49,11 +49,6 @@
<!--
<dependency>
<groupId>org.apache.ode</groupId>
- <artifactId>ode-bpel-el-xpath10</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.ode</groupId>
<artifactId>ode-bpel-el-xpath20</artifactId>
<scope>test</scope>
</dependency>
@@ -71,5 +66,25 @@
<groupId>org.apache.ode</groupId>
<artifactId>ode-bpel-scripts</artifactId>
</dependency>
+ <dependency>
+ <groupId>jaxen</groupId>
+ <artifactId>jaxen</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>net.sf.saxon</groupId>
+ <artifactId>saxon</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>net.sf.saxon</groupId>
+ <artifactId>saxon-xpath</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>net.sf.saxon</groupId>
+ <artifactId>saxon-dom</artifactId>
+ </dependency>
+
</dependencies>
</project>
Modified: incubator/ode/trunk/bpel-el-xpath20/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-el-xpath20/pom.xml?view=diff&rev=468148&r1=468147&r2=468148
==============================================================================
--- incubator/ode/trunk/bpel-el-xpath20/pom.xml (original)
+++ incubator/ode/trunk/bpel-el-xpath20/pom.xml Thu Oct 26 14:42:43 2006
@@ -49,10 +49,6 @@
<groupId>org.apache.ode</groupId>
<artifactId>ode-utils</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.ode</groupId>
- <artifactId>ode-bpel-el-xpath10</artifactId>
- </dependency>
<dependency>
<groupId>net.sf.saxon</groupId>
Modified: incubator/ode/trunk/bpel-el-xpath20/src/main/java/org/apache/ode/bpel/elang/xpath20/compiler/JaxpFunctionResolver.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-el-xpath20/src/main/java/org/apache/ode/bpel/elang/xpath20/compiler/JaxpFunctionResolver.java?view=diff&rev=468148&r1=468147&r2=468148
==============================================================================
--- incubator/ode/trunk/bpel-el-xpath20/src/main/java/org/apache/ode/bpel/elang/xpath20/compiler/JaxpFunctionResolver.java (original)
+++ incubator/ode/trunk/bpel-el-xpath20/src/main/java/org/apache/ode/bpel/elang/xpath20/compiler/JaxpFunctionResolver.java Thu Oct 26 14:42:43 2006
@@ -33,12 +33,12 @@
import org.apache.ode.bpel.elang.xpath20.Constants;
import org.apache.ode.bpel.elang.xpath20.WrappedResolverException;
import org.apache.ode.bpel.elang.xpath20.o.OXPath20ExpressionBPEL20;
-import org.apache.ode.bpel.elang.xsl.XslTransformHandler;
import org.apache.ode.bpel.o.OProcess;
import org.apache.ode.bpel.o.OScope;
import org.apache.ode.bpel.o.OXslSheet;
import org.apache.ode.utils.NSContext;
import org.apache.ode.utils.msg.MessageBundle;
+import org.apache.ode.utils.xsl.XslTransformHandler;
/**
* @author mriou <mriou at apache dot org>
Modified: incubator/ode/trunk/bpel-el-xpath20/src/main/java/org/apache/ode/bpel/elang/xpath20/compiler/XPath20ExpressionCompilerBPEL20.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-el-xpath20/src/main/java/org/apache/ode/bpel/elang/xpath20/compiler/XPath20ExpressionCompilerBPEL20.java?view=diff&rev=468148&r1=468147&r2=468148
==============================================================================
--- incubator/ode/trunk/bpel-el-xpath20/src/main/java/org/apache/ode/bpel/elang/xpath20/compiler/XPath20ExpressionCompilerBPEL20.java (original)
+++ incubator/ode/trunk/bpel-el-xpath20/src/main/java/org/apache/ode/bpel/elang/xpath20/compiler/XPath20ExpressionCompilerBPEL20.java Thu Oct 26 14:42:43 2006
@@ -25,16 +25,16 @@
import org.apache.ode.bpel.compiler.api.ExpressionCompiler;
import org.apache.ode.bpel.compiler.bom.Expression;
import org.apache.ode.bpel.elang.xpath10.compiler.XPathMessages;
+import org.apache.ode.bpel.elang.xpath10.compiler.XslCompilationErrorListener;
import org.apache.ode.bpel.elang.xpath20.Constants;
import org.apache.ode.bpel.elang.xpath20.WrappedResolverException;
import org.apache.ode.bpel.elang.xpath20.o.OXPath20ExpressionBPEL20;
import org.apache.ode.bpel.elang.xpath20.runtime.XPath20ExpressionRuntime;
-import org.apache.ode.bpel.elang.xsl.XslCompilationErrorListener;
-import org.apache.ode.bpel.elang.xsl.XslTransformHandler;
import org.apache.ode.bpel.o.OExpression;
import org.apache.ode.bpel.o.OLValueExpression;
import org.apache.ode.utils.DOMUtils;
import org.apache.ode.utils.msg.MessageBundle;
+import org.apache.ode.utils.xsl.XslTransformHandler;
import org.w3c.dom.Node;
import javax.xml.namespace.QName;
@@ -83,7 +83,7 @@
public void setCompilerContext(CompilerContext compilerContext) {
_compilerContext = compilerContext;
XslCompilationErrorListener xe = new XslCompilationErrorListener(compilerContext);
- XslTransformHandler.getInstance().setXslCompilationErrorListener(xe);
+ XslTransformHandler.getInstance().setErrorListener(xe);
}
Modified: incubator/ode/trunk/bpel-el-xpath20/src/main/java/org/apache/ode/bpel/elang/xpath20/runtime/JaxpFunctionResolver.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-el-xpath20/src/main/java/org/apache/ode/bpel/elang/xpath20/runtime/JaxpFunctionResolver.java?view=diff&rev=468148&r1=468147&r2=468148
==============================================================================
--- incubator/ode/trunk/bpel-el-xpath20/src/main/java/org/apache/ode/bpel/elang/xpath20/runtime/JaxpFunctionResolver.java (original)
+++ incubator/ode/trunk/bpel-el-xpath20/src/main/java/org/apache/ode/bpel/elang/xpath20/runtime/JaxpFunctionResolver.java Thu Oct 26 14:42:43 2006
@@ -19,41 +19,41 @@
package org.apache.ode.bpel.elang.xpath20.runtime;
+import java.io.IOException;
+import java.io.StringWriter;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.HashMap;
+import java.util.List;
+
+import javax.xml.namespace.QName;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
+import javax.xml.xpath.XPathFunction;
+import javax.xml.xpath.XPathFunctionException;
+import javax.xml.xpath.XPathFunctionResolver;
+
+import net.sf.saxon.dom.NodeWrapper;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.ode.bpel.common.FaultException;
import org.apache.ode.bpel.elang.xpath10.o.OXPath10Expression;
import org.apache.ode.bpel.elang.xpath10.o.OXPath10ExpressionBPEL20;
-import org.apache.ode.bpel.elang.xpath10.runtime.XslRuntimeUriResolver;
import org.apache.ode.bpel.elang.xpath20.Constants;
import org.apache.ode.bpel.elang.xpath20.WrappedResolverException;
import org.apache.ode.bpel.elang.xpath20.o.OXPath20ExpressionBPEL20;
-import org.apache.ode.bpel.elang.xsl.XslTransformHandler;
import org.apache.ode.bpel.explang.EvaluationContext;
import org.apache.ode.bpel.o.OLink;
import org.apache.ode.bpel.o.OProcess;
import org.apache.ode.bpel.o.OScope;
import org.apache.ode.bpel.o.OXslSheet;
import org.apache.ode.utils.DOMUtils;
+import org.apache.ode.utils.xsl.XslTransformHandler;
+import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
-import org.w3c.dom.Document;
import org.xml.sax.SAXException;
-
-import javax.xml.namespace.QName;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-import javax.xml.xpath.XPathFunction;
-import javax.xml.xpath.XPathFunctionException;
-import javax.xml.xpath.XPathFunctionResolver;
-import java.io.IOException;
-import java.io.StringWriter;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.HashMap;
-import java.util.List;
-
-import net.sf.saxon.dom.NodeWrapper;
/**
* @author mriou <mriou at apache dot org>
Modified: incubator/ode/trunk/bpel-el-xpath20/src/main/java/org/apache/ode/bpel/elang/xpath20/runtime/XPath20ExpressionRuntime.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-el-xpath20/src/main/java/org/apache/ode/bpel/elang/xpath20/runtime/XPath20ExpressionRuntime.java?view=diff&rev=468148&r1=468147&r2=468148
==============================================================================
--- incubator/ode/trunk/bpel-el-xpath20/src/main/java/org/apache/ode/bpel/elang/xpath20/runtime/XPath20ExpressionRuntime.java (original)
+++ incubator/ode/trunk/bpel-el-xpath20/src/main/java/org/apache/ode/bpel/elang/xpath20/runtime/XPath20ExpressionRuntime.java Thu Oct 26 14:42:43 2006
@@ -40,7 +40,6 @@
import org.apache.ode.bpel.elang.xpath20.Constants;
import org.apache.ode.bpel.elang.xpath20.WrappedResolverException;
import org.apache.ode.bpel.elang.xpath20.o.OXPath20ExpressionBPEL20;
-import org.apache.ode.bpel.elang.xsl.XslTransformHandler;
import org.apache.ode.bpel.explang.ConfigurationException;
import org.apache.ode.bpel.explang.EvaluationContext;
import org.apache.ode.bpel.explang.EvaluationException;
@@ -49,6 +48,7 @@
import org.apache.ode.utils.DOMUtils;
import org.apache.ode.utils.xsd.Duration;
import org.apache.ode.utils.xsd.XMLCalendar;
+import org.apache.ode.utils.xsl.XslTransformHandler;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
Modified: incubator/ode/trunk/bpel-runtime/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-runtime/pom.xml?view=diff&rev=468148&r1=468147&r2=468148
==============================================================================
--- incubator/ode/trunk/bpel-runtime/pom.xml (original)
+++ incubator/ode/trunk/bpel-runtime/pom.xml Thu Oct 26 14:42:43 2006
@@ -72,6 +72,25 @@
<artifactId>commons-collections</artifactId>
<version>${commonsCollectionsVersion}</version>
</dependency>
+ <dependency>
+ <groupId>jaxen</groupId>
+ <artifactId>jaxen</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>net.sf.saxon</groupId>
+ <artifactId>saxon</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>net.sf.saxon</groupId>
+ <artifactId>saxon-xpath</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>net.sf.saxon</groupId>
+ <artifactId>saxon-dom</artifactId>
+ </dependency>
<dependency>
<groupId>jotm</groupId>
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?view=diff&rev=468148&r1=468147&r2=468148
==============================================================================
--- 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 Thu Oct 26 14:42:43 2006
@@ -455,7 +455,7 @@
// instance.
if (messageRoute == null && isCreateInstnace) {
if (__log.isDebugEnabled()) {
- __log.debug("INPUTMSG: " + correlatorId + ": default routing failed, CREATING NEW INSTANCE");
+ __log.debug("INPUTMSG: " + correlatorId + ": routing failed, CREATING NEW INSTANCE");
}
ProcessDAO processDAO = getProcessDAO();
if (processDAO.isRetired()) {
@@ -468,6 +468,7 @@
}
ProcessInstanceDAO newInstance = processDAO.createInstance(correlator);
+
BpelRuntimeContextImpl instance = createRuntimeContext(newInstance, new PROCESS(_oprocess), mex);
// send process instance event
Modified: incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HCorrelatorSelector.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HCorrelatorSelector.java?view=diff&rev=468148&r1=468147&r2=468148
==============================================================================
--- incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HCorrelatorSelector.java (original)
+++ incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HCorrelatorSelector.java Thu Oct 26 14:42:43 2006
@@ -81,6 +81,7 @@
* @hibernate.property column="CORRELATION_KEY" not-null="true"
* @hibernate.column name="CORRELATION_KEY"
* index="IDX_SELECTOR_CKEY"
+ * not-null="true"
* unique-key="UNIQ_SELECTOR"
*
*/
@@ -94,7 +95,8 @@
/**
* @hibernate.many-to-one not-null="true"
- * @hibernate.column name="CORRELATOR" index="IDX_SELECTOR_CORRELATOR" unique-key="UNIQ_SELECTOR"
+ * @hibernate.column name="CORRELATOR" not-null="true"
+ * index="IDX_SELECTOR_CORRELATOR" unique-key="UNIQ_SELECTOR"
*/
public HCorrelator getCorrelator() {
return _correlator;
Modified: incubator/ode/trunk/distro-axis2/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/distro-axis2/pom.xml?view=diff&rev=468148&r1=468147&r2=468148
==============================================================================
--- incubator/ode/trunk/distro-axis2/pom.xml (original)
+++ incubator/ode/trunk/distro-axis2/pom.xml Thu Oct 26 14:42:43 2006
@@ -33,10 +33,6 @@
</dependency>
<dependency>
<groupId>org.apache.ode</groupId>
- <artifactId>ode-bpel-el-xpath10</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.ode</groupId>
<artifactId>ode-bpel-el-xpath20</artifactId>
</dependency>
<dependency>
Modified: incubator/ode/trunk/distro-jbi/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/distro-jbi/pom.xml?view=diff&rev=468148&r1=468147&r2=468148
==============================================================================
--- incubator/ode/trunk/distro-jbi/pom.xml (original)
+++ incubator/ode/trunk/distro-jbi/pom.xml Thu Oct 26 14:42:43 2006
@@ -32,10 +32,6 @@
</dependency>
<dependency>
<groupId>org.apache.ode</groupId>
- <artifactId>ode-bpel-el-xpath10</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.ode</groupId>
<artifactId>ode-bpel-el-xpath20</artifactId>
</dependency>
<dependency>
Modified: incubator/ode/trunk/integration/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/integration/pom.xml?view=diff&rev=468148&r1=468147&r2=468148
==============================================================================
--- incubator/ode/trunk/integration/pom.xml (original)
+++ incubator/ode/trunk/integration/pom.xml Thu Oct 26 14:42:43 2006
@@ -25,10 +25,6 @@
</dependency>
<dependency>
<groupId>org.apache.ode</groupId>
- <artifactId>ode-bpel-el-xpath10</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.ode</groupId>
<artifactId>ode-bpel-el-xpath20</artifactId>
</dependency>
<dependency>
Modified: incubator/ode/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/pom.xml?view=diff&rev=468148&r1=468147&r2=468148
==============================================================================
--- incubator/ode/trunk/pom.xml (original)
+++ incubator/ode/trunk/pom.xml Thu Oct 26 14:42:43 2006
@@ -34,8 +34,8 @@
<properties>
<vendor.name>Apache Software Foundation</vendor.name>
- <maven.test.skip>true</maven.test.skip>
+ <maven.test.skip>true</maven.test.skip>
<!--
Default ODE properties, these properties may be referenced in resources and the
like. -->
@@ -120,7 +120,6 @@
<module>bpel-api</module>
<module>bpel-dao</module>
<module>bpel-api-jca</module>
- <module>bpel-el-xpath10</module>
<module>bpel-el-xpath20</module>
<module>bpel-compiler</module>
<module>bpel-runtime</module>
@@ -369,11 +368,6 @@
<dependency>
<groupId>org.apache.ode</groupId>
<artifactId>ode-bpel-dd</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.ode</groupId>
- <artifactId>ode-bpel-el-xpath10</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>