You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ode.apache.org by rr...@apache.org on 2009/12/01 15:18:16 UTC
svn commit: r885764 - in /ode/branches/APACHE_ODE_1.X:
bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/
bpel-compiler/src/test/java/org/apache/ode/bpel/compiler/
bpel-compiler/src/test/java/org/apache/ode/bpel/compiler_2_0/
bpel-obj/src/main/j...
Author: rr
Date: Tue Dec 1 14:18:15 2009
New Revision: 885764
URL: http://svn.apache.org/viewvc?rev=885764&view=rev
Log:
ODE-567: Improve process versioning in JBI - added digest calculation for CBP
Added:
ode/branches/APACHE_ODE_1.X/jbi/src/test/java/org/apache/ode/jbi/DigestJbiTest.java (with props)
ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/DigestJbiTest/
ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/DigestJbiTest/smx.xml (with props)
ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/DigestJbiTest/test.properties (with props)
ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/DigestJbiTest/v1-1/
ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/DigestJbiTest/v1-1/OnEventCorrelation.bpel (with props)
ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/DigestJbiTest/v1-1/OnEventCorrelation.wsdl (with props)
ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/DigestJbiTest/v1-1/OnEventCorrelationArtifacts.wsdl (with props)
ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/DigestJbiTest/v1-1/deploy.xml (with props)
ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/DigestJbiTest/v2-1/
ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/DigestJbiTest/v2-1/OnEventCorrelation.bpel (with props)
ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/DigestJbiTest/v2-1/OnEventCorrelation.wsdl (with props)
ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/DigestJbiTest/v2-1/OnEventCorrelationArtifacts.wsdl (with props)
ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/DigestJbiTest/v2-1/deploy.xml (with props)
Modified:
ode/branches/APACHE_ODE_1.X/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/BpelC.java
ode/branches/APACHE_ODE_1.X/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/BpelCompiler.java
ode/branches/APACHE_ODE_1.X/bpel-compiler/src/test/java/org/apache/ode/bpel/compiler/StaticCheckTCase.java
ode/branches/APACHE_ODE_1.X/bpel-compiler/src/test/java/org/apache/ode/bpel/compiler_2_0/GoodCompileTCase.java
ode/branches/APACHE_ODE_1.X/bpel-obj/src/main/java/org/apache/ode/bpel/o/OActivity.java
ode/branches/APACHE_ODE_1.X/bpel-obj/src/main/java/org/apache/ode/bpel/o/OBase.java
ode/branches/APACHE_ODE_1.X/bpel-obj/src/main/java/org/apache/ode/bpel/o/OProcess.java
ode/branches/APACHE_ODE_1.X/bpel-store/src/main/java/org/apache/ode/store/DeploymentUnitDir.java
ode/branches/APACHE_ODE_1.X/tools/src/main/java/org/apache/ode/tools/bpelc/BpelCompileCommand.java
ode/branches/APACHE_ODE_1.X/utils/src/main/java/org/apache/ode/utils/GUID.java
Modified: ode/branches/APACHE_ODE_1.X/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/BpelC.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/BpelC.java?rev=885764&r1=885763&r2=885764&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/BpelC.java (original)
+++ ode/branches/APACHE_ODE_1.X/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/BpelC.java Tue Dec 1 14:18:15 2009
@@ -181,7 +181,7 @@
* @throws CompilationException
* if one occurs while compiling.
*/
- public void compile(final Process process, String outputPath) throws CompilationException, IOException {
+ public void compile(final Process process, String outputPath, long version) throws CompilationException, IOException {
if (process == null)
throw new NullPointerException("Attempt to compile NULL process.");
@@ -260,7 +260,7 @@
OProcess oprocess;
try {
- oprocess = compiler.compile(process,wf);
+ oprocess = compiler.compile(process,wf,version);
}
catch (CompilationException cex) {
this.invalidate();
@@ -301,7 +301,7 @@
* output.
* @throws CompilationException if one occurs while compiling the process.
*/
- public void compile(File bpelFile) throws CompilationException, IOException {
+ public void compile(File bpelFile, long version) throws CompilationException, IOException {
if (__log.isDebugEnabled()) {
__log.debug("compile(URL)");
}
@@ -330,7 +330,7 @@
String bpelPath = bpelFile.getAbsolutePath();
String cbpPath = bpelPath.substring(0, bpelPath.lastIndexOf(".")) + ".cbp";
- compile(process, cbpPath);
+ compile(process, cbpPath, version);
this.invalidate();
}
Modified: ode/branches/APACHE_ODE_1.X/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/BpelCompiler.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/BpelCompiler.java?rev=885764&r1=885763&r2=885764&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/BpelCompiler.java (original)
+++ ode/branches/APACHE_ODE_1.X/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/BpelCompiler.java Tue Dec 1 14:18:15 2009
@@ -132,7 +132,7 @@
* and XSD documents) into compiled representations suitable for execution by
* the ODE BPEL Service Provider. TODO: Move process validation into this class.
*/
-abstract class BpelCompiler implements CompilerContext {
+public abstract class BpelCompiler implements CompilerContext {
/** Class-severity logger. */
protected static final Log __log = LogFactory.getLog(BpelCompiler.class);
@@ -633,10 +633,18 @@
_errors.add(bce.getCompilationMessage());
}
+ public static long getVersion(String dirName) {
+ try {
+ return Integer.parseInt(dirName.substring(dirName.lastIndexOf("-") + 1));
+ } catch (Throwable t) {
+ return 0;
+ }
+ }
+
/**
* Compile a process.
*/
- public OProcess compile(final Process process, ResourceFinder rf) throws CompilationException {
+ public OProcess compile(final Process process, ResourceFinder rf, long version) throws CompilationException {
if (process == null)
throw new NullPointerException("Null process parameter");
@@ -662,7 +670,7 @@
}
_oprocess = new OProcess(bpelVersionUri);
- _oprocess.guid = new GUID().toString();
+ _oprocess.guid = null;
_oprocess.constants = makeConstants();
_oprocess.debugInfo = createDebugInfo(process, "process");
@@ -773,6 +781,14 @@
if (hasErrors) {
throw new CompilationException(__cmsgs.errCompilationErrors(_errors.size(), sb.toString()));
}
+
+ {
+ String digest = "version:" + version + ";" + _oprocess.digest();
+ _oprocess.guid = GUID.makeGUID(digest);
+ if (__log.isDebugEnabled()) {
+ __log.debug("Compiled process digest: " + digest + "\nguid: " + _oprocess.guid);
+ }
+ }
return _oprocess;
}
Modified: ode/branches/APACHE_ODE_1.X/bpel-compiler/src/test/java/org/apache/ode/bpel/compiler/StaticCheckTCase.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/bpel-compiler/src/test/java/org/apache/ode/bpel/compiler/StaticCheckTCase.java?rev=885764&r1=885763&r2=885764&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/bpel-compiler/src/test/java/org/apache/ode/bpel/compiler/StaticCheckTCase.java (original)
+++ ode/branches/APACHE_ODE_1.X/bpel-compiler/src/test/java/org/apache/ode/bpel/compiler/StaticCheckTCase.java Tue Dec 1 14:18:15 2009
@@ -86,7 +86,7 @@
public void runTest() throws Exception {
try {
- _compiler.compile(new File(_bpelURL.toURI()));
+ _compiler.compile(new File(_bpelURL.toURI()), 0);
fail("Expected compilation exception.");
} catch (CompilationException ce) {
_errors.add(ce.getCompilationMessage());
Modified: ode/branches/APACHE_ODE_1.X/bpel-compiler/src/test/java/org/apache/ode/bpel/compiler_2_0/GoodCompileTCase.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/bpel-compiler/src/test/java/org/apache/ode/bpel/compiler_2_0/GoodCompileTCase.java?rev=885764&r1=885763&r2=885764&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/bpel-compiler/src/test/java/org/apache/ode/bpel/compiler_2_0/GoodCompileTCase.java (original)
+++ ode/branches/APACHE_ODE_1.X/bpel-compiler/src/test/java/org/apache/ode/bpel/compiler_2_0/GoodCompileTCase.java Tue Dec 1 14:18:15 2009
@@ -61,7 +61,7 @@
public void runTest() throws Exception {
try {
File bpelFile = new File(getClass().getResource(_bpel).toURI().getPath());
- _compiler.compile(bpelFile);
+ _compiler.compile(bpelFile, 0);
} catch (Exception ex) {
ex.printStackTrace();
fail("Compilation did not succeed.");
Modified: ode/branches/APACHE_ODE_1.X/bpel-obj/src/main/java/org/apache/ode/bpel/o/OActivity.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/bpel-obj/src/main/java/org/apache/ode/bpel/o/OActivity.java?rev=885764&r1=885763&r2=885764&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/bpel-obj/src/main/java/org/apache/ode/bpel/o/OActivity.java (original)
+++ ode/branches/APACHE_ODE_1.X/bpel-obj/src/main/java/org/apache/ode/bpel/o/OActivity.java Tue Dec 1 14:18:15 2009
@@ -18,9 +18,11 @@
*/
package org.apache.ode.bpel.o;
-import org.apache.ode.utils.ObjectPrinter;
-
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
import java.util.HashSet;
+import java.util.List;
import java.util.Set;
@@ -77,4 +79,29 @@
return buf.toString();
}
+ @Override
+ public String digest() {
+ StringBuffer buf = new StringBuffer(getClass().getSimpleName());
+ buf.append('#');
+ buf.append(getId());
+ buf.append("{");
+ List<OAgent> l = new ArrayList<OAgent>();
+ l.addAll(nested);
+ Collections.sort(l, new Comparator<OAgent>() {
+ private String key(OAgent o) {
+ return o.getClass().getSimpleName() + "#" + o.getId();
+ }
+
+ public int compare(OAgent o1, OAgent o2) {
+ return key(o1).compareTo(key(o2));
+ }
+ });
+
+ for (OAgent child : l) {
+ buf.append(child.digest());
+ buf.append(";");
+ }
+ buf.append("}");
+ return buf.toString();
+ }
}
Modified: ode/branches/APACHE_ODE_1.X/bpel-obj/src/main/java/org/apache/ode/bpel/o/OBase.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/bpel-obj/src/main/java/org/apache/ode/bpel/o/OBase.java?rev=885764&r1=885763&r2=885764&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/bpel-obj/src/main/java/org/apache/ode/bpel/o/OBase.java (original)
+++ ode/branches/APACHE_ODE_1.X/bpel-obj/src/main/java/org/apache/ode/bpel/o/OBase.java Tue Dec 1 14:18:15 2009
@@ -78,6 +78,9 @@
debugInfo.extensibilityElements = null;
debugInfo = null;
}
+ }
+ public String digest() {
+ return "";
}
}
Modified: ode/branches/APACHE_ODE_1.X/bpel-obj/src/main/java/org/apache/ode/bpel/o/OProcess.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/bpel-obj/src/main/java/org/apache/ode/bpel/o/OProcess.java?rev=885764&r1=885763&r2=885764&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/bpel-obj/src/main/java/org/apache/ode/bpel/o/OProcess.java (original)
+++ ode/branches/APACHE_ODE_1.X/bpel-obj/src/main/java/org/apache/ode/bpel/o/OProcess.java Tue Dec 1 14:18:15 2009
@@ -216,4 +216,9 @@
xsdTypes.clear();
xslSheets.clear();
}
+
+ @Override
+ public String digest() {
+ return processName + ";" + procesScope.digest();
+ }
}
Modified: ode/branches/APACHE_ODE_1.X/bpel-store/src/main/java/org/apache/ode/store/DeploymentUnitDir.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/bpel-store/src/main/java/org/apache/ode/store/DeploymentUnitDir.java?rev=885764&r1=885763&r2=885764&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/bpel-store/src/main/java/org/apache/ode/store/DeploymentUnitDir.java (original)
+++ ode/branches/APACHE_ODE_1.X/bpel-store/src/main/java/org/apache/ode/store/DeploymentUnitDir.java Tue Dec 1 14:18:15 2009
@@ -39,6 +39,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.ode.bpel.compiler.BpelC;
+import org.apache.ode.bpel.compiler.BpelCompiler;
import org.apache.ode.bpel.compiler.DefaultResourceFinder;
import org.apache.ode.bpel.compiler.WSDLLocatorImpl;
import org.apache.ode.bpel.compiler.wsdl.Definition4BPEL;
@@ -185,7 +186,7 @@
InternPool.runBlock(new InternableBlock() {
public void run() {
try {
- bpelc.compile(bpelFile);
+ bpelc.compile(bpelFile, getVersion());
} catch (IOException e) {
__log.error("Compile error in " + bpelFile, e);
}
@@ -388,11 +389,7 @@
* @return Static DU version number generated from DU name. -1 when package doesn't use versioning.
*/
public long getStaticVersion() {
- try {
- return Integer.parseInt(getName().substring(getName().lastIndexOf("-") + 1));
- } catch (Throwable t) {
- return -1;
- }
+ return BpelCompiler.getVersion(getName());
}
public void setVersion(long version) {
Added: ode/branches/APACHE_ODE_1.X/jbi/src/test/java/org/apache/ode/jbi/DigestJbiTest.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/jbi/src/test/java/org/apache/ode/jbi/DigestJbiTest.java?rev=885764&view=auto
==============================================================================
--- ode/branches/APACHE_ODE_1.X/jbi/src/test/java/org/apache/ode/jbi/DigestJbiTest.java (added)
+++ ode/branches/APACHE_ODE_1.X/jbi/src/test/java/org/apache/ode/jbi/DigestJbiTest.java Tue Dec 1 14:18:15 2009
@@ -0,0 +1,23 @@
+/*
+ * 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;
+
+public class DigestJbiTest extends JbiTestBase {
+ public void testDigest() throws Exception {
+ go();
+ }
+}
Propchange: ode/branches/APACHE_ODE_1.X/jbi/src/test/java/org/apache/ode/jbi/DigestJbiTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/DigestJbiTest/smx.xml
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/DigestJbiTest/smx.xml?rev=885764&view=auto
==============================================================================
--- ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/DigestJbiTest/smx.xml (added)
+++ ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/DigestJbiTest/smx.xml Tue Dec 1 14:18:15 2009
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+-->
+<beans xmlns:sm="http://servicemix.apache.org/config/1.0"
+ xmlns:http="http://servicemix.apache.org/http/1.0"
+ xmlns:eip="http://servicemix.apache.org/eip/1.0"
+ xmlns:util="http://www.springframework.org/schema/util"
+ xmlns:jencks="http://jencks.org/2.0"
+ xmlns:mws="http://ode/bpel/unit-test.wsdl"
+ >
+
+ <util:map id="jndiEntries">
+ <entry key="java:comp/env/jdbc/ode" value-ref="odeDS"/>
+ </util:map>
+
+ <sm:container
+ id="jbi"
+ embedded="true"
+ rootDir="target/test/smx"
+ transactionManager="#transactionManager"
+ depends-on="jndi"
+ >
+ </sm:container>
+</beans>
Propchange: ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/DigestJbiTest/smx.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/DigestJbiTest/test.properties
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/DigestJbiTest/test.properties?rev=885764&view=auto
==============================================================================
--- ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/DigestJbiTest/test.properties (added)
+++ ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/DigestJbiTest/test.properties Tue Dec 1 14:18:15 2009
@@ -0,0 +1,47 @@
+#
+# 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.
+#
+
+manualDeploy=true
+
+1deploy=v1-1
+
+2nmr.service={http://sample.bpel.org/bpel/sample}OnEventCorrelation
+2nmr.operation=initiate
+2request=<msg><payload>test</payload><payload2/></msg>
+2response=.*test1.*
+
+3nmr.service={http://sample.bpel.org/bpel/sample}OnEventCorrelation
+3nmr.operation=complete
+3request=<msg><payload>test</payload><payload2/></msg>
+3response=.*test3-old.*
+
+4nmr.service={http://sample.bpel.org/bpel/sample}OnEventCorrelation
+4nmr.operation=initiate
+4request=<msg><payload>test</payload><payload2/></msg>
+4response=.*test1.*
+
+5undeploy=v1-1
+
+6deploy=v2-1
+
+7nmr.service={http://sample.bpel.org/bpel/sample}OnEventCorrelation
+7nmr.operation=complete
+7request=<msg><payload>test</payload><payload2/></msg>
+7response=.*test3-new.*
+
+8undeploy=v2-1
+
Propchange: ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/DigestJbiTest/test.properties
------------------------------------------------------------------------------
svn:eol-style = native
Added: ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/DigestJbiTest/v1-1/OnEventCorrelation.bpel
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/DigestJbiTest/v1-1/OnEventCorrelation.bpel?rev=885764&view=auto
==============================================================================
--- ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/DigestJbiTest/v1-1/OnEventCorrelation.bpel (added)
+++ ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/DigestJbiTest/v1-1/OnEventCorrelation.bpel Tue Dec 1 14:18:15 2009
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+<bpws:process xmlns:bpws="http://docs.oasis-open.org/wsbpel/2.0/process/executable" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns="http://sample.bpel.org/bpel/sampleArtifacts" xmlns:tns="http://sample.bpel.org/bpel/sample" exitOnStandardFault="yes" name="OnEventCorrelation" suppressJoinFailure="yes" targetNamespace="http://sample.bpel.org/bpel/sample" expressionLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">
+ <bpws:import importType="http://schemas.xmlsoap.org/wsdl/" location="OnEventCorrelation.wsdl" namespace="http://sample.bpel.org/bpel/sample"/>
+ <bpws:import importType="http://schemas.xmlsoap.org/wsdl/" location="OnEventCorrelationArtifacts.wsdl" namespace="http://sample.bpel.org/bpel/sampleArtifacts"/>
+ <bpws:partnerLinks>
+ <bpws:partnerLink myRole="OnEventCorrelationProvider" name="client" partnerLinkType="tns:OnEventCorrelation"/>
+ </bpws:partnerLinks>
+ <bpws:variables>
+ <bpws:variable messageType="tns:OnEventCorrelationMessage" name="input"/>
+ <bpws:variable messageType="tns:OnEventCorrelationMessage" name="output"/>
+ <bpws:variable type="xsd:int" name="i"/>
+ <bpws:variable type="xsd:int" name="j"/>
+ </bpws:variables>
+ <bpws:correlationSets>
+ <bpws:correlationSet name="CorrelationSet" properties="ns:input"/>
+ </bpws:correlationSets>
+ <bpws:sequence name="main">
+ <bpws:scope>
+ <bpws:sequence>
+ <bpws:receive createInstance="yes" operation="initiate" partnerLink="client" portType="tns:OnEventCorrelation" variable="input">
+ <bpws:correlations>
+ <bpws:correlation initiate="yes" set="CorrelationSet"/>
+ </bpws:correlations>
+ </bpws:receive>
+ <bpws:assign>
+ <bpws:copy>
+ <bpws:from>'test1'</bpws:from>
+ <bpws:to>$output.payload</bpws:to>
+ </bpws:copy>
+ </bpws:assign>
+ <bpws:reply operation="initiate" partnerLink="client" variable="output"/>
+
+
+ <bpws:receive operation="complete" partnerLink="client" portType="tns:OnEventCorrelation" variable="input">
+ <bpws:correlations>
+ <bpws:correlation initiate="no" set="CorrelationSet"/>
+ </bpws:correlations>
+ </bpws:receive>
+ <bpws:empty name="e6"/>
+ <bpws:assign>
+ <bpws:copy>
+ <bpws:from>'test3-old'</bpws:from>
+ <bpws:to>$output.payload</bpws:to>
+ </bpws:copy>
+ </bpws:assign>
+ <bpws:reply operation="complete" partnerLink="client" variable="output"/>
+ </bpws:sequence>
+ </bpws:scope>
+ </bpws:sequence>
+</bpws:process>
Propchange: ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/DigestJbiTest/v1-1/OnEventCorrelation.bpel
------------------------------------------------------------------------------
svn:eol-style = native
Added: ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/DigestJbiTest/v1-1/OnEventCorrelation.wsdl
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/DigestJbiTest/v1-1/OnEventCorrelation.wsdl?rev=885764&view=auto
==============================================================================
--- ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/DigestJbiTest/v1-1/OnEventCorrelation.wsdl (added)
+++ ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/DigestJbiTest/v1-1/OnEventCorrelation.wsdl Tue Dec 1 14:18:15 2009
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+<definitions xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype" xmlns:tns="http://sample.bpel.org/bpel/sample" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" name="OnEventCorrelation" targetNamespace="http://sample.bpel.org/bpel/sample"
+xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+>
+ <message name="OnEventCorrelationMessage">
+ <part type="xsd:string" name="payload"/>
+ <part type="xsd:string" name="payload2"/>
+ </message>
+ <portType name="OnEventCorrelation">
+ <operation name="initiate">
+ <input message="tns:OnEventCorrelationMessage"/>
+ <output message="tns:OnEventCorrelationMessage"/>
+ </operation>
+ <operation name="complete">
+ <input message="tns:OnEventCorrelationMessage"/>
+ <output message="tns:OnEventCorrelationMessage"/>
+ </operation>
+ </portType>
+ <binding name="OnEventCorrelationBinding" type="tns:OnEventCorrelation">
+ <wsdlsoap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
+ <operation name="initiate">
+ <wsdlsoap:operation soapAction="initiate"/>
+ <input>
+ <wsdlsoap:body use="literal"/>
+ </input>
+ <output>
+ <wsdlsoap:body use="literal"/>
+ </output>
+ </operation>
+ <operation name="complete">
+ <wsdlsoap:operation soapAction="complete"/>
+ <input>
+ <wsdlsoap:body use="literal"/>
+ </input>
+ <output>
+ <wsdlsoap:body use="literal"/>
+ </output>
+ </operation>
+ </binding>
+ <service name="OnEventCorrelation">
+ <port binding="tns:OnEventCorrelationBinding" name="OnEventCorrelation">
+ <wsdlsoap:address location="http://localhost:8080/ode/processes/OnEventCorrelation/"/>
+ </port>
+ </service>
+ <plnk:partnerLinkType name="OnEventCorrelation">
+ <plnk:role name="OnEventCorrelationProvider" portType="tns:OnEventCorrelation"/>
+ </plnk:partnerLinkType>
+</definitions>
Propchange: ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/DigestJbiTest/v1-1/OnEventCorrelation.wsdl
------------------------------------------------------------------------------
svn:eol-style = native
Added: ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/DigestJbiTest/v1-1/OnEventCorrelationArtifacts.wsdl
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/DigestJbiTest/v1-1/OnEventCorrelationArtifacts.wsdl?rev=885764&view=auto
==============================================================================
--- ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/DigestJbiTest/v1-1/OnEventCorrelationArtifacts.wsdl (added)
+++ ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/DigestJbiTest/v1-1/OnEventCorrelationArtifacts.wsdl Tue Dec 1 14:18:15 2009
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+<definitions
+ xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype"
+ xmlns:tns="http://sample.bpel.org/bpel/sampleArtifacts"
+ xmlns:vprop="http://docs.oasis-open.org/wsbpel/2.0/varprop"
+ xmlns:xs="http://www.w3.org/2001/XMLSchema"
+ xmlns:bpel="http://sample.bpel.org/bpel/sample"
+ name="OnEventCorrelationArtifacts"
+ targetNamespace="http://sample.bpel.org/bpel/sampleArtifacts"
+ xmlns="http://schemas.xmlsoap.org/wsdl/"
+ >
+<vprop:property name="input" type="xs:string"/>
+<vprop:propertyAlias messageType="bpel:OnEventCorrelationMessage" part="payload" propertyName="tns:input">
+<!--vprop:query><![CDATA[bpel:input]]></vprop:query-->
+</vprop:propertyAlias>
+<import location="OnEventCorrelation.wsdl" namespace="http://sample.bpel.org/bpel/sample"/>
+</definitions>
Propchange: ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/DigestJbiTest/v1-1/OnEventCorrelationArtifacts.wsdl
------------------------------------------------------------------------------
svn:eol-style = native
Added: ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/DigestJbiTest/v1-1/deploy.xml
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/DigestJbiTest/v1-1/deploy.xml?rev=885764&view=auto
==============================================================================
--- ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/DigestJbiTest/v1-1/deploy.xml (added)
+++ ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/DigestJbiTest/v1-1/deploy.xml Tue Dec 1 14:18:15 2009
@@ -0,0 +1,31 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+<dd:deploy xmlns:dd="http://www.apache.org/ode/schemas/dd/2007/03"
+ xmlns:bpel="http://sample.bpel.org/bpel/sample"
+ >
+
+ <dd:process
+ name="bpel:OnEventCorrelation" fileName="OnEventCorrelation.bpel">
+ <!--dd:process-events generate="none"/-->
+ <dd:provide partnerLink="client">
+ <dd:service name="bpel:OnEventCorrelation" port="OnEventCorrelation" />
+ </dd:provide>
+ </dd:process>
+</dd:deploy>
Propchange: ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/DigestJbiTest/v1-1/deploy.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/DigestJbiTest/v2-1/OnEventCorrelation.bpel
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/DigestJbiTest/v2-1/OnEventCorrelation.bpel?rev=885764&view=auto
==============================================================================
--- ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/DigestJbiTest/v2-1/OnEventCorrelation.bpel (added)
+++ ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/DigestJbiTest/v2-1/OnEventCorrelation.bpel Tue Dec 1 14:18:15 2009
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+<bpws:process xmlns:bpws="http://docs.oasis-open.org/wsbpel/2.0/process/executable" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns="http://sample.bpel.org/bpel/sampleArtifacts" xmlns:tns="http://sample.bpel.org/bpel/sample" exitOnStandardFault="yes" name="OnEventCorrelation" suppressJoinFailure="yes" targetNamespace="http://sample.bpel.org/bpel/sample" expressionLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">
+ <bpws:import importType="http://schemas.xmlsoap.org/wsdl/" location="OnEventCorrelation.wsdl" namespace="http://sample.bpel.org/bpel/sample"/>
+ <bpws:import importType="http://schemas.xmlsoap.org/wsdl/" location="OnEventCorrelationArtifacts.wsdl" namespace="http://sample.bpel.org/bpel/sampleArtifacts"/>
+ <bpws:partnerLinks>
+ <bpws:partnerLink myRole="OnEventCorrelationProvider" name="client" partnerLinkType="tns:OnEventCorrelation"/>
+ </bpws:partnerLinks>
+ <bpws:variables>
+ <bpws:variable messageType="tns:OnEventCorrelationMessage" name="input"/>
+ <bpws:variable messageType="tns:OnEventCorrelationMessage" name="output"/>
+ <bpws:variable type="xsd:int" name="i"/>
+ <bpws:variable type="xsd:int" name="j"/>
+ </bpws:variables>
+ <bpws:correlationSets>
+ <bpws:correlationSet name="CorrelationSet" properties="ns:input"/>
+ </bpws:correlationSets>
+ <bpws:sequence name="main">
+ <bpws:scope>
+ <bpws:sequence>
+ <bpws:receive createInstance="yes" operation="initiate" partnerLink="client" portType="tns:OnEventCorrelation" variable="input">
+ <bpws:correlations>
+ <bpws:correlation initiate="yes" set="CorrelationSet"/>
+ </bpws:correlations>
+ </bpws:receive>
+ <bpws:assign>
+ <bpws:copy>
+ <bpws:from>'test1'</bpws:from>
+ <bpws:to>$output.payload</bpws:to>
+ </bpws:copy>
+ </bpws:assign>
+ <bpws:reply operation="initiate" partnerLink="client" variable="output"/>
+
+
+ <bpws:receive operation="complete" partnerLink="client" portType="tns:OnEventCorrelation" variable="input">
+ <bpws:correlations>
+ <bpws:correlation initiate="no" set="CorrelationSet"/>
+ </bpws:correlations>
+ </bpws:receive>
+ <bpws:empty name="e6"/>
+ <bpws:assign>
+ <bpws:copy>
+ <bpws:from>'test3-new'</bpws:from>
+ <bpws:to>$output.payload</bpws:to>
+ </bpws:copy>
+ </bpws:assign>
+ <bpws:reply operation="complete" partnerLink="client" variable="output"/>
+ </bpws:sequence>
+ </bpws:scope>
+ </bpws:sequence>
+</bpws:process>
Propchange: ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/DigestJbiTest/v2-1/OnEventCorrelation.bpel
------------------------------------------------------------------------------
svn:eol-style = native
Added: ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/DigestJbiTest/v2-1/OnEventCorrelation.wsdl
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/DigestJbiTest/v2-1/OnEventCorrelation.wsdl?rev=885764&view=auto
==============================================================================
--- ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/DigestJbiTest/v2-1/OnEventCorrelation.wsdl (added)
+++ ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/DigestJbiTest/v2-1/OnEventCorrelation.wsdl Tue Dec 1 14:18:15 2009
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+<definitions xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype" xmlns:tns="http://sample.bpel.org/bpel/sample" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" name="OnEventCorrelation" targetNamespace="http://sample.bpel.org/bpel/sample"
+xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+>
+ <message name="OnEventCorrelationMessage">
+ <part type="xsd:string" name="payload"/>
+ <part type="xsd:string" name="payload2"/>
+ </message>
+ <portType name="OnEventCorrelation">
+ <operation name="initiate">
+ <input message="tns:OnEventCorrelationMessage"/>
+ <output message="tns:OnEventCorrelationMessage"/>
+ </operation>
+ <operation name="complete">
+ <input message="tns:OnEventCorrelationMessage"/>
+ <output message="tns:OnEventCorrelationMessage"/>
+ </operation>
+ </portType>
+ <binding name="OnEventCorrelationBinding" type="tns:OnEventCorrelation">
+ <wsdlsoap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
+ <operation name="initiate">
+ <wsdlsoap:operation soapAction="initiate"/>
+ <input>
+ <wsdlsoap:body use="literal"/>
+ </input>
+ <output>
+ <wsdlsoap:body use="literal"/>
+ </output>
+ </operation>
+ <operation name="complete">
+ <wsdlsoap:operation soapAction="complete"/>
+ <input>
+ <wsdlsoap:body use="literal"/>
+ </input>
+ <output>
+ <wsdlsoap:body use="literal"/>
+ </output>
+ </operation>
+ </binding>
+ <service name="OnEventCorrelation">
+ <port binding="tns:OnEventCorrelationBinding" name="OnEventCorrelation">
+ <wsdlsoap:address location="http://localhost:8080/ode/processes/OnEventCorrelation/"/>
+ </port>
+ </service>
+ <plnk:partnerLinkType name="OnEventCorrelation">
+ <plnk:role name="OnEventCorrelationProvider" portType="tns:OnEventCorrelation"/>
+ </plnk:partnerLinkType>
+</definitions>
Propchange: ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/DigestJbiTest/v2-1/OnEventCorrelation.wsdl
------------------------------------------------------------------------------
svn:eol-style = native
Added: ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/DigestJbiTest/v2-1/OnEventCorrelationArtifacts.wsdl
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/DigestJbiTest/v2-1/OnEventCorrelationArtifacts.wsdl?rev=885764&view=auto
==============================================================================
--- ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/DigestJbiTest/v2-1/OnEventCorrelationArtifacts.wsdl (added)
+++ ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/DigestJbiTest/v2-1/OnEventCorrelationArtifacts.wsdl Tue Dec 1 14:18:15 2009
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+<definitions
+ xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype"
+ xmlns:tns="http://sample.bpel.org/bpel/sampleArtifacts"
+ xmlns:vprop="http://docs.oasis-open.org/wsbpel/2.0/varprop"
+ xmlns:xs="http://www.w3.org/2001/XMLSchema"
+ xmlns:bpel="http://sample.bpel.org/bpel/sample"
+ name="OnEventCorrelationArtifacts"
+ targetNamespace="http://sample.bpel.org/bpel/sampleArtifacts"
+ xmlns="http://schemas.xmlsoap.org/wsdl/"
+ >
+<vprop:property name="input" type="xs:string"/>
+<vprop:propertyAlias messageType="bpel:OnEventCorrelationMessage" part="payload" propertyName="tns:input">
+<!--vprop:query><![CDATA[bpel:input]]></vprop:query-->
+</vprop:propertyAlias>
+<import location="OnEventCorrelation.wsdl" namespace="http://sample.bpel.org/bpel/sample"/>
+</definitions>
Propchange: ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/DigestJbiTest/v2-1/OnEventCorrelationArtifacts.wsdl
------------------------------------------------------------------------------
svn:eol-style = native
Added: ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/DigestJbiTest/v2-1/deploy.xml
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/DigestJbiTest/v2-1/deploy.xml?rev=885764&view=auto
==============================================================================
--- ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/DigestJbiTest/v2-1/deploy.xml (added)
+++ ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/DigestJbiTest/v2-1/deploy.xml Tue Dec 1 14:18:15 2009
@@ -0,0 +1,31 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+<dd:deploy xmlns:dd="http://www.apache.org/ode/schemas/dd/2007/03"
+ xmlns:bpel="http://sample.bpel.org/bpel/sample"
+ >
+
+ <dd:process
+ name="bpel:OnEventCorrelation" fileName="OnEventCorrelation.bpel">
+ <!--dd:process-events generate="none"/-->
+ <dd:provide partnerLink="client">
+ <dd:service name="bpel:OnEventCorrelation" port="OnEventCorrelation" />
+ </dd:provide>
+ </dd:process>
+</dd:deploy>
Propchange: ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/DigestJbiTest/v2-1/deploy.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: ode/branches/APACHE_ODE_1.X/tools/src/main/java/org/apache/ode/tools/bpelc/BpelCompileCommand.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/tools/src/main/java/org/apache/ode/tools/bpelc/BpelCompileCommand.java?rev=885764&r1=885763&r2=885764&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/tools/src/main/java/org/apache/ode/tools/bpelc/BpelCompileCommand.java (original)
+++ ode/branches/APACHE_ODE_1.X/tools/src/main/java/org/apache/ode/tools/bpelc/BpelCompileCommand.java Tue Dec 1 14:18:15 2009
@@ -20,6 +20,7 @@
package org.apache.ode.tools.bpelc;
import org.apache.ode.bpel.compiler.BpelC;
+import org.apache.ode.bpel.compiler.BpelCompiler;
import org.apache.ode.bpel.compiler.api.CompilationException;
import org.apache.ode.bpel.compiler.api.CompilationMessage;
import org.apache.ode.bpel.compiler.api.CompileListener;
@@ -118,7 +119,7 @@
try {
long start = System.currentTimeMillis();
- compiler.compile(bpelFile);
+ compiler.compile(bpelFile, BpelCompiler.getVersion(_outputDir.getAbsolutePath()));
long t = System.currentTimeMillis() - start;
_cc.info("Compilation completed in " + t + "ms");
}
Modified: ode/branches/APACHE_ODE_1.X/utils/src/main/java/org/apache/ode/utils/GUID.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/utils/src/main/java/org/apache/ode/utils/GUID.java?rev=885764&r1=885763&r2=885764&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/utils/src/main/java/org/apache/ode/utils/GUID.java (original)
+++ ode/branches/APACHE_ODE_1.X/utils/src/main/java/org/apache/ode/utils/GUID.java Tue Dec 1 14:18:15 2009
@@ -251,4 +251,18 @@
super("Malformed guid: " + guid);
}
}
+
+ public static String makeGUID(String digest) {
+ String val = "0";
+ int maxlen = 32;
+ int base = 34;
+ int prime = 31;
+ for (int i = 0; i < digest.length(); i++) {
+ char c = digest.charAt(i);
+ val = new BigInteger(val, base).add(BigInteger.valueOf((long) c)).multiply(BigInteger.valueOf(prime)).toString(base);
+ if (val.length() > maxlen) val = val.substring(0, maxlen);
+ }
+
+ return val;
+ }
}