You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ode.apache.org by va...@apache.org on 2010/05/27 20:10:26 UTC
svn commit: r948937 [14/33] - in /ode/trunk: ./
agents/src/main/java/org/apache/ode/agents/memory/ axis2-war/
axis2-war/src/main/assembly/ axis2-war/src/main/webapp/
axis2-war/src/main/webapp/WEB-INF/
axis2-war/src/main/webapp/WEB-INF/classes/ axis2-wa...
Modified: ode/trunk/bpel-compiler/src/test/java/org/apache/ode/bpel/compiler/WSDLRegistryTest.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-compiler/src/test/java/org/apache/ode/bpel/compiler/WSDLRegistryTest.java?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-compiler/src/test/java/org/apache/ode/bpel/compiler/WSDLRegistryTest.java (original)
+++ ode/trunk/bpel-compiler/src/test/java/org/apache/ode/bpel/compiler/WSDLRegistryTest.java Thu May 27 18:09:53 2010
@@ -68,7 +68,7 @@ public class WSDLRegistryTest extends Te
// load & register wsdl
WSDLFactory4BPEL factory = (WSDLFactory4BPEL)WSDLFactoryBPEL11.newInstance();
WSDLReader reader = factory.newWSDLReader();
-
+
//ResourceFinder finder = new DefaultResourceFinder(new File(wsd.getPath()).getParentFile());
File parent = new File(wsd.toURI().getPath()).getParentFile();
ResourceFinder finder = new DefaultResourceFinder(parent, parent);
@@ -82,8 +82,8 @@ public class WSDLRegistryTest extends Te
assertTrue("WSDL-Define type not visible.",m.knowsSchemaType(new QName("uri:testing", "TComplex1")));
assertTrue("Type from import not visible.",m.knowsSchemaType(new QName("uri:test1", "TComplex2")));
-
-
+
+
}
-
+
}
Modified: ode/trunk/bpel-compiler/src/test/java/org/apache/ode/bpel/compiler/XPathTest.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-compiler/src/test/java/org/apache/ode/bpel/compiler/XPathTest.java?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-compiler/src/test/java/org/apache/ode/bpel/compiler/XPathTest.java (original)
+++ ode/trunk/bpel-compiler/src/test/java/org/apache/ode/bpel/compiler/XPathTest.java Thu May 27 18:09:53 2010
@@ -274,7 +274,7 @@ class MockCompilerContext implements Com
public Part resolveHeaderPart(Variable variable, String partname) throws CompilationException {
return null;
}
-
+
public Map<URI, Source> getSchemaSources() {
return null;
}
Modified: ode/trunk/bpel-compiler/src/test/java/org/apache/ode/bpel/compiler_2_0/GoodCompileTCase.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-compiler/src/test/java/org/apache/ode/bpel/compiler_2_0/GoodCompileTCase.java?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-compiler/src/test/java/org/apache/ode/bpel/compiler_2_0/GoodCompileTCase.java (original)
+++ ode/trunk/bpel-compiler/src/test/java/org/apache/ode/bpel/compiler_2_0/GoodCompileTCase.java Thu May 27 18:09:53 2010
@@ -35,7 +35,7 @@ import org.apache.ode.utils.StreamUtils;
/**
* JUnit {@link TestCase} of the ODE BPEL compiler. This test case provides
* is not very complex, it simply ensures that the given BPEL input compiles
- * succesfully. These test cases are intended to be run as part of a suite.
+ * succesfully. These test cases are intended to be run as part of a suite.
*/
class GoodCompileTCase extends TestCase implements CompileListener {
Modified: ode/trunk/bpel-compiler/src/test/java/org/apache/ode/bpel/compiler_2_0/GoodCompileTest.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-compiler/src/test/java/org/apache/ode/bpel/compiler_2_0/GoodCompileTest.java?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-compiler/src/test/java/org/apache/ode/bpel/compiler_2_0/GoodCompileTest.java (original)
+++ ode/trunk/bpel-compiler/src/test/java/org/apache/ode/bpel/compiler_2_0/GoodCompileTest.java Thu May 27 18:09:53 2010
@@ -75,7 +75,7 @@ public class GoodCompileTest extends Tes
suite.addTest(new GoodCompileTCase("/2.0/good/xpath20-func/GetVariableData4-xp2.0.bpel"));
suite.addTest(new GoodCompileTCase("/2.0/good/xpath20-func/GetVariableProperty1-xp2.0.bpel"));
suite.addTest(new GoodCompileTCase("/2.0/good/xsd-import/helloworld-Server.bpel"));
-
+
return suite;
}
Modified: ode/trunk/bpel-compiler/src/test/java/org/apache/ode/bpel/elang/xpath20/compiler/XPath20ExpressionCompilerImplTest.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-compiler/src/test/java/org/apache/ode/bpel/elang/xpath20/compiler/XPath20ExpressionCompilerImplTest.java?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-compiler/src/test/java/org/apache/ode/bpel/elang/xpath20/compiler/XPath20ExpressionCompilerImplTest.java (original)
+++ ode/trunk/bpel-compiler/src/test/java/org/apache/ode/bpel/elang/xpath20/compiler/XPath20ExpressionCompilerImplTest.java Thu May 27 18:09:53 2010
@@ -26,7 +26,7 @@ import org.junit.*;
public class XPath20ExpressionCompilerImplTest {
-
+
private static final String TEST_NAMESPACE = "http://www.example.com/";
private static final String EXTRACT_FUNCTION_EXPRS = "extractFunctionExprs";
@@ -45,7 +45,7 @@ public class XPath20ExpressionCompilerIm
}
}
}
-
+
@Test
public void testTimeStampInFunction() throws Exception {
XPath20ExpressionCompilerImpl xp20Exp = new XPath20ExpressionCompilerImpl(TEST_NAMESPACE);
@@ -62,7 +62,7 @@ public class XPath20ExpressionCompilerIm
}
}
-
+
@Test
public void testresolvedFunctionsTimeStamp() throws Exception {
XPath20ExpressionCompilerImpl xp20Exp = new XPath20ExpressionCompilerImpl(TEST_NAMESPACE);
@@ -79,8 +79,8 @@ public class XPath20ExpressionCompilerIm
}
}
}
-
-
-
+
+
+
}
Modified: ode/trunk/bpel-compiler/src/test/java/org/apache/ode/bpel/elang/xquery10/compiler/XQuery10ExpressionCompilerImplTest.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-compiler/src/test/java/org/apache/ode/bpel/elang/xquery10/compiler/XQuery10ExpressionCompilerImplTest.java?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-compiler/src/test/java/org/apache/ode/bpel/elang/xquery10/compiler/XQuery10ExpressionCompilerImplTest.java (original)
+++ ode/trunk/bpel-compiler/src/test/java/org/apache/ode/bpel/elang/xquery10/compiler/XQuery10ExpressionCompilerImplTest.java Thu May 27 18:09:53 2010
@@ -25,22 +25,22 @@ import java.util.LinkedHashSet;
import junit.framework.TestCase;
public class XQuery10ExpressionCompilerImplTest extends TestCase {
-
+
public void testGetVariableNames() throws Exception {
- String xq = "let $status := string($SomeVariable/ns:somePath)\n" +
- " return\n" +
- " if ($status = 'ABC' ) then\n" +
- " '123'\n" +
+ String xq = "let $status := string($SomeVariable/ns:somePath)\n" +
+ " return\n" +
+ " if ($status = 'ABC' ) then\n" +
+ " '123'\n" +
" else $status (: workaround :)";
assertMatches(xq);
}
public void testGetVariableNames_endsWithVariableName() throws Exception {
- String xq = "let $status := string($SomeVariable/ns:somePath)\n" +
- " return\n" +
- " if ($status = 'ABC' ) then\n" +
- " '123'\n" +
+ String xq = "let $status := string($SomeVariable/ns:somePath)\n" +
+ " return\n" +
+ " if ($status = 'ABC' ) then\n" +
+ " '123'\n" +
" else $status";
assertMatches(xq);
@@ -49,7 +49,7 @@ public class XQuery10ExpressionCompilerI
private void assertMatches(String xq) {
Collection<String> varNames = XQuery10ExpressionCompilerImpl.getVariableNames(xq);
Collection<String> expected = new LinkedHashSet(Arrays.asList("status", "SomeVariable"));
-
+
assertEquals(2, varNames.size());
assertEquals(expected, varNames);
}
Modified: ode/trunk/bpel-compiler/src/test/resources/log4j.properties
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-compiler/src/test/resources/log4j.properties?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-compiler/src/test/resources/log4j.properties (original)
+++ ode/trunk/bpel-compiler/src/test/resources/log4j.properties Thu May 27 18:09:53 2010
@@ -1,18 +1,18 @@
-#
+#
# 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.
#
@@ -26,11 +26,11 @@ log4j.rootLogger=INFO, file
log4j.appender.file=org.apache.log4j.FileAppender
log4j.appender.file.File=target/test/test.log
log4j.appender.file.layout=org.apache.log4j.PatternLayout
-log4j.appender.file.layout.ConversionPattern=%d{MM-dd@HH:mm:ss} %-5p (%13F:%L) %3x - %m%n
+log4j.appender.file.layout.ConversionPattern=%d{MM-dd@HH:mm:ss} %-5p (%13F:%L) %3x - %m%n
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d{MM-dd@HH:mm:ss} %-5p (%13F:%L) %3x - %m%n
+log4j.appender.stdout.layout.ConversionPattern=%d{MM-dd@HH:mm:ss} %-5p (%13F:%L) %3x - %m%n
log4j.category.org.apache.ode=INFO
Modified: ode/trunk/bpel-compiler/src/test/resources/org/apache/ode/bpel/compiler/CompensateNAtoContext.bpel
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-compiler/src/test/resources/org/apache/ode/bpel/compiler/CompensateNAtoContext.bpel?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-compiler/src/test/resources/org/apache/ode/bpel/compiler/CompensateNAtoContext.bpel (original)
+++ ode/trunk/bpel-compiler/src/test/resources/org/apache/ode/bpel/compiler/CompensateNAtoContext.bpel Thu May 27 18:09:53 2010
@@ -24,7 +24,7 @@
xmlns:tns="http://ode/test/compile"
xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<variables>
- <variable name="var1"
+ <variable name="var1"
type="xsd:string" />
</variables>
<sequence>
Modified: ode/trunk/bpel-compiler/src/test/resources/org/apache/ode/bpel/compiler/CompensateNAtoContext.wsdl
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-compiler/src/test/resources/org/apache/ode/bpel/compiler/CompensateNAtoContext.wsdl?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-compiler/src/test/resources/org/apache/ode/bpel/compiler/CompensateNAtoContext.wsdl (original)
+++ ode/trunk/bpel-compiler/src/test/resources/org/apache/ode/bpel/compiler/CompensateNAtoContext.wsdl Thu May 27 18:09:53 2010
@@ -24,11 +24,11 @@
xmlns="http://schemas.xmlsoap.org/wsdl/"
xmlns:tns="http://ode/test/compile.wsdl"
xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
- xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:bpws="http://schemas.xmlsoap.org/ws/2003/03/business-process/"
xmlns:plnk="http://schemas.xmlsoap.org/ws/2003/05/partner-link/">
-
+
<wsdl:message name="TestMessage">
<wsdl:part name="TestPart" type="xsd:string"/>
</wsdl:message>
@@ -36,11 +36,11 @@
<wsdl:operation name="testOperation">
<wsdl:input message="tns:TestMessage" name="TestIn"/>
<wsdl:output message="tns:TestMessage" name="TestOut"/>
- </wsdl:operation>
- </wsdl:portType>
+ </wsdl:operation>
+ </wsdl:portType>
<bpws:property name="testProp"
type="xsd:string"/>
-
-
+
+
</wsdl:definitions>
Modified: ode/trunk/bpel-compiler/src/test/resources/org/apache/ode/bpel/compiler/DuplicateLinkDecl.bpel
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-compiler/src/test/resources/org/apache/ode/bpel/compiler/DuplicateLinkDecl.bpel?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-compiler/src/test/resources/org/apache/ode/bpel/compiler/DuplicateLinkDecl.bpel (original)
+++ ode/trunk/bpel-compiler/src/test/resources/org/apache/ode/bpel/compiler/DuplicateLinkDecl.bpel Thu May 27 18:09:53 2010
@@ -23,7 +23,7 @@
xmlns:tns="http://jlo/test/compile"
xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<variables>
- <variable name="var1"
+ <variable name="var1"
type="xsd:string" />
</variables>
<flow>
Modified: ode/trunk/bpel-compiler/src/test/resources/org/apache/ode/bpel/compiler/DuplicateLinkDecl.wsdl
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-compiler/src/test/resources/org/apache/ode/bpel/compiler/DuplicateLinkDecl.wsdl?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-compiler/src/test/resources/org/apache/ode/bpel/compiler/DuplicateLinkDecl.wsdl (original)
+++ ode/trunk/bpel-compiler/src/test/resources/org/apache/ode/bpel/compiler/DuplicateLinkDecl.wsdl Thu May 27 18:09:53 2010
@@ -24,7 +24,7 @@
xmlns="http://schemas.xmlsoap.org/wsdl/"
xmlns:tns="http://ode/test/compile.wsdl"
xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
- xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:bpws="http://schemas.xmlsoap.org/ws/2003/03/business-process/"
xmlns:plnk="http://schemas.xmlsoap.org/ws/2003/05/partner-link/">
@@ -35,12 +35,12 @@
<wsdl:operation name="testOperation">
<wsdl:input message="tns:TestMessage" name="TestIn"/>
<wsdl:output message="tns:TestMessage" name="TestOut"/>
- </wsdl:operation>
- </wsdl:portType>
-
+ </wsdl:operation>
+ </wsdl:portType>
+
<bpws:property name="testProp"
type="xsd:string"/>
-
-
+
+
</wsdl:definitions>
Modified: ode/trunk/bpel-compiler/src/test/resources/org/apache/ode/bpel/compiler/DuplicateLinkSource.bpel
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-compiler/src/test/resources/org/apache/ode/bpel/compiler/DuplicateLinkSource.bpel?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-compiler/src/test/resources/org/apache/ode/bpel/compiler/DuplicateLinkSource.bpel (original)
+++ ode/trunk/bpel-compiler/src/test/resources/org/apache/ode/bpel/compiler/DuplicateLinkSource.bpel Thu May 27 18:09:53 2010
@@ -23,7 +23,7 @@
xmlns:tns="http://jlo/test/compile"
xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<variables>
- <variable name="var1"
+ <variable name="var1"
type="xsd:string" />
</variables>
<flow>
Modified: ode/trunk/bpel-compiler/src/test/resources/org/apache/ode/bpel/compiler/DuplicateLinkSource.wsdl
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-compiler/src/test/resources/org/apache/ode/bpel/compiler/DuplicateLinkSource.wsdl?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-compiler/src/test/resources/org/apache/ode/bpel/compiler/DuplicateLinkSource.wsdl (original)
+++ ode/trunk/bpel-compiler/src/test/resources/org/apache/ode/bpel/compiler/DuplicateLinkSource.wsdl Thu May 27 18:09:53 2010
@@ -24,11 +24,11 @@
xmlns="http://schemas.xmlsoap.org/wsdl/"
xmlns:tns="http://ode/test/compile.wsdl"
xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
- xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:bpws="http://schemas.xmlsoap.org/ws/2003/03/business-process/"
xmlns:plnk="http://schemas.xmlsoap.org/ws/2003/05/partner-link/">
-
+
<wsdl:message name="TestMessage">
<wsdl:part name="TestPart" type="xsd:string"/>
</wsdl:message>
@@ -36,11 +36,11 @@
<wsdl:operation name="testOperation">
<wsdl:input message="tns:TestMessage" name="TestIn"/>
<wsdl:output message="tns:TestMessage" name="TestOut"/>
- </wsdl:operation>
- </wsdl:portType>
+ </wsdl:operation>
+ </wsdl:portType>
<bpws:property name="testProp"
type="xsd:string"/>
-
-
+
+
</wsdl:definitions>
Modified: ode/trunk/bpel-compiler/src/test/resources/org/apache/ode/bpel/compiler/DuplicateLinkTarget.bpel
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-compiler/src/test/resources/org/apache/ode/bpel/compiler/DuplicateLinkTarget.bpel?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-compiler/src/test/resources/org/apache/ode/bpel/compiler/DuplicateLinkTarget.bpel (original)
+++ ode/trunk/bpel-compiler/src/test/resources/org/apache/ode/bpel/compiler/DuplicateLinkTarget.bpel Thu May 27 18:09:53 2010
@@ -23,7 +23,7 @@
xmlns:tns="http://jlo/test/compile"
xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<variables>
- <variable name="var1"
+ <variable name="var1"
type="xsd:string" />
</variables>
<flow>
Modified: ode/trunk/bpel-compiler/src/test/resources/org/apache/ode/bpel/compiler/DuplicateLinkTarget.wsdl
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-compiler/src/test/resources/org/apache/ode/bpel/compiler/DuplicateLinkTarget.wsdl?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-compiler/src/test/resources/org/apache/ode/bpel/compiler/DuplicateLinkTarget.wsdl (original)
+++ ode/trunk/bpel-compiler/src/test/resources/org/apache/ode/bpel/compiler/DuplicateLinkTarget.wsdl Thu May 27 18:09:53 2010
@@ -24,11 +24,11 @@
xmlns="http://schemas.xmlsoap.org/wsdl/"
xmlns:tns="http://ode/test/compile.wsdl"
xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
- xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:bpws="http://schemas.xmlsoap.org/ws/2003/03/business-process/"
xmlns:plnk="http://schemas.xmlsoap.org/ws/2003/05/partner-link/">
-
+
<wsdl:message name="TestMessage">
<wsdl:part name="TestPart" type="xsd:string"/>
</wsdl:message>
@@ -36,9 +36,9 @@
<wsdl:operation name="testOperation">
<wsdl:input message="tns:TestMessage" name="TestIn"/>
<wsdl:output message="tns:TestMessage" name="TestOut"/>
- </wsdl:operation>
- </wsdl:portType>
-
+ </wsdl:operation>
+ </wsdl:portType>
+
<bpws:property name="testProp"
type="xsd:string"/>
</wsdl:definitions>
Modified: ode/trunk/bpel-compiler/src/test/resources/org/apache/ode/bpel/compiler/DuplicateVariableDecl.bpel
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-compiler/src/test/resources/org/apache/ode/bpel/compiler/DuplicateVariableDecl.bpel?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-compiler/src/test/resources/org/apache/ode/bpel/compiler/DuplicateVariableDecl.bpel (original)
+++ ode/trunk/bpel-compiler/src/test/resources/org/apache/ode/bpel/compiler/DuplicateVariableDecl.bpel Thu May 27 18:09:53 2010
@@ -24,9 +24,9 @@
xmlns:tns="http://ode/test/compile"
xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<variables>
- <variable name="var1"
+ <variable name="var1"
type="xsd:string" />
- <variable name="var1"
+ <variable name="var1"
type="xsd:string" />
</variables>
<empty />
Modified: ode/trunk/bpel-compiler/src/test/resources/org/apache/ode/bpel/compiler/DuplicateVariableDecl.wsdl
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-compiler/src/test/resources/org/apache/ode/bpel/compiler/DuplicateVariableDecl.wsdl?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-compiler/src/test/resources/org/apache/ode/bpel/compiler/DuplicateVariableDecl.wsdl (original)
+++ ode/trunk/bpel-compiler/src/test/resources/org/apache/ode/bpel/compiler/DuplicateVariableDecl.wsdl Thu May 27 18:09:53 2010
@@ -24,11 +24,11 @@
xmlns="http://schemas.xmlsoap.org/wsdl/"
xmlns:tns="http://ode/test/compile.wsdl"
xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
- xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:bpws="http://schemas.xmlsoap.org/ws/2003/03/business-process/"
xmlns:plnk="http://schemas.xmlsoap.org/ws/2003/05/partner-link/">
-
+
<wsdl:message name="TestMessage">
<wsdl:part name="TestPart" type="xsd:string"/>
</wsdl:message>
@@ -36,11 +36,11 @@
<wsdl:operation name="testOperation">
<wsdl:input message="tns:TestMessage" name="TestIn"/>
<wsdl:output message="tns:TestMessage" name="TestOut"/>
- </wsdl:operation>
- </wsdl:portType>
+ </wsdl:operation>
+ </wsdl:portType>
<bpws:property name="testProp"
type="xsd:string"/>
-
-
+
+
</wsdl:definitions>
Modified: ode/trunk/bpel-compiler/src/test/resources/org/apache/ode/bpel/compiler/LinkMissingSourceActivity.bpel
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-compiler/src/test/resources/org/apache/ode/bpel/compiler/LinkMissingSourceActivity.bpel?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-compiler/src/test/resources/org/apache/ode/bpel/compiler/LinkMissingSourceActivity.bpel (original)
+++ ode/trunk/bpel-compiler/src/test/resources/org/apache/ode/bpel/compiler/LinkMissingSourceActivity.bpel Thu May 27 18:09:53 2010
@@ -23,7 +23,7 @@
xmlns:tns="http://jlo/test/compile"
xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<variables>
- <variable name="var1"
+ <variable name="var1"
type="xsd:string" />
</variables>
<flow>
Modified: ode/trunk/bpel-compiler/src/test/resources/org/apache/ode/bpel/compiler/LinkMissingSourceActivity.wsdl
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-compiler/src/test/resources/org/apache/ode/bpel/compiler/LinkMissingSourceActivity.wsdl?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-compiler/src/test/resources/org/apache/ode/bpel/compiler/LinkMissingSourceActivity.wsdl (original)
+++ ode/trunk/bpel-compiler/src/test/resources/org/apache/ode/bpel/compiler/LinkMissingSourceActivity.wsdl Thu May 27 18:09:53 2010
@@ -24,12 +24,12 @@
xmlns="http://schemas.xmlsoap.org/wsdl/"
xmlns:tns="http://ode/test/compile.wsdl"
xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
- xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:bpws="http://schemas.xmlsoap.org/ws/2003/03/business-process/"
xmlns:plnk="http://schemas.xmlsoap.org/ws/2003/05/partner-link/">
-
-
+
+
<wsdl:message name="TestMessage">
<wsdl:part name="TestPart" type="xsd:string"/>
</wsdl:message>
@@ -37,10 +37,10 @@
<wsdl:operation name="testOperation">
<wsdl:input message="tns:TestMessage" name="TestIn"/>
<wsdl:output message="tns:TestMessage" name="TestOut"/>
- </wsdl:operation>
+ </wsdl:operation>
</wsdl:portType> <bpws:property name="testProp"
type="xsd:string"/>
-
-
+
+
</wsdl:definitions>
Modified: ode/trunk/bpel-compiler/src/test/resources/org/apache/ode/bpel/compiler/LinkMissingTargetActivity.bpel
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-compiler/src/test/resources/org/apache/ode/bpel/compiler/LinkMissingTargetActivity.bpel?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-compiler/src/test/resources/org/apache/ode/bpel/compiler/LinkMissingTargetActivity.bpel (original)
+++ ode/trunk/bpel-compiler/src/test/resources/org/apache/ode/bpel/compiler/LinkMissingTargetActivity.bpel Thu May 27 18:09:53 2010
@@ -23,7 +23,7 @@
xmlns:tns="http://jlo/test/compile"
xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<variables>
- <variable name="var1"
+ <variable name="var1"
type="xsd:string" />
</variables>
<flow>
Modified: ode/trunk/bpel-compiler/src/test/resources/org/apache/ode/bpel/compiler/LinkMissingTargetActivity.wsdl
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-compiler/src/test/resources/org/apache/ode/bpel/compiler/LinkMissingTargetActivity.wsdl?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-compiler/src/test/resources/org/apache/ode/bpel/compiler/LinkMissingTargetActivity.wsdl (original)
+++ ode/trunk/bpel-compiler/src/test/resources/org/apache/ode/bpel/compiler/LinkMissingTargetActivity.wsdl Thu May 27 18:09:53 2010
@@ -24,11 +24,11 @@
xmlns="http://schemas.xmlsoap.org/wsdl/"
xmlns:tns="http://ode/test/compile.wsdl"
xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
- xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:bpws="http://schemas.xmlsoap.org/ws/2003/03/business-process/"
xmlns:plnk="http://schemas.xmlsoap.org/ws/2003/05/partner-link/">
-
+
<wsdl:message name="TestMessage">
<wsdl:part name="TestPart" type="xsd:string"/>
</wsdl:message>
@@ -36,11 +36,11 @@
<wsdl:operation name="testOperation">
<wsdl:input message="tns:TestMessage" name="TestIn"/>
<wsdl:output message="tns:TestMessage" name="TestOut"/>
- </wsdl:operation>
- </wsdl:portType>
+ </wsdl:operation>
+ </wsdl:portType>
<bpws:property name="testProp"
type="xsd:string"/>
-
-
+
+
</wsdl:definitions>
Modified: ode/trunk/bpel-compiler/src/test/resources/org/apache/ode/bpel/compiler/PortTypeMismatch.bpel
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-compiler/src/test/resources/org/apache/ode/bpel/compiler/PortTypeMismatch.bpel?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-compiler/src/test/resources/org/apache/ode/bpel/compiler/PortTypeMismatch.bpel (original)
+++ ode/trunk/bpel-compiler/src/test/resources/org/apache/ode/bpel/compiler/PortTypeMismatch.bpel Thu May 27 18:09:53 2010
@@ -23,30 +23,30 @@
xmlns:tns="http://ode/test/compile"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:test="http://ode/test/compile.wsdl">
-
+
<partnerLinks>
- <partnerLink name="testPartnerLink"
- partnerLinkType="test:TestPartnerLinkType"
+ <partnerLink name="testPartnerLink"
+ partnerLinkType="test:TestPartnerLinkType"
myRole="me" />
</partnerLinks>
<variables>
- <variable name="var1"
+ <variable name="var1"
messageType="test:TestMessage1" />
- <variable name="var2"
+ <variable name="var2"
messageType="test:TestMessage2" />
</variables>
<flow>
<sequence>
- <receive
+ <receive
name="testReceive"
partnerLink="testPartnerLink"
portType="test:BogusPortType"
operation="testOperation"
variable="var1"/>
- <reply name="testReply"
+ <reply name="testReply"
operation="testOperation"
partnerLink="testPartnerLink"
- portType="test:TestPortType"
+ portType="test:TestPortType"
variable="var2"/>
</sequence>
</flow>
Modified: ode/trunk/bpel-compiler/src/test/resources/org/apache/ode/bpel/compiler/PortTypeMismatch.wsdl
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-compiler/src/test/resources/org/apache/ode/bpel/compiler/PortTypeMismatch.wsdl?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-compiler/src/test/resources/org/apache/ode/bpel/compiler/PortTypeMismatch.wsdl (original)
+++ ode/trunk/bpel-compiler/src/test/resources/org/apache/ode/bpel/compiler/PortTypeMismatch.wsdl Thu May 27 18:09:53 2010
@@ -24,7 +24,7 @@
xmlns="http://schemas.xmlsoap.org/wsdl/"
xmlns:tns="http://ode/test/compile.wsdl"
xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
- xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:bpws="http://schemas.xmlsoap.org/ws/2003/03/business-process/"
xmlns:plnk="http://schemas.xmlsoap.org/ws/2003/05/partner-link/">
@@ -38,9 +38,9 @@
<wsdl:operation name="testOperation">
<wsdl:input message="tns:TestMessage1" name="TestIn"/>
<wsdl:output message="tns:TestMessage2" name="TestOut"/>
- </wsdl:operation>
- </wsdl:portType>
-
+ </wsdl:operation>
+ </wsdl:portType>
+
<bpws:property name="testProp"
type="xsd:string"/>
<plnk:partnerLinkType name="TestPartnerLinkType">
@@ -51,7 +51,7 @@
<plnk:portType name="tns:TestPortType"/>
</plnk:role>
</plnk:partnerLinkType>
-
-
+
+
</wsdl:definitions>
Modified: ode/trunk/bpel-compiler/src/test/resources/org/apache/ode/bpel/compiler/UndeclaredPropertyAlias.bpel
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-compiler/src/test/resources/org/apache/ode/bpel/compiler/UndeclaredPropertyAlias.bpel?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-compiler/src/test/resources/org/apache/ode/bpel/compiler/UndeclaredPropertyAlias.bpel (original)
+++ ode/trunk/bpel-compiler/src/test/resources/org/apache/ode/bpel/compiler/UndeclaredPropertyAlias.bpel Thu May 27 18:09:53 2010
@@ -18,7 +18,7 @@
-->
<process
- name="InvalidBpelFunction" suppressJoinFailure="yes"
+ name="InvalidBpelFunction" suppressJoinFailure="yes"
targetNamespace="http://ode/test/compile"
xmlns="http://schemas.xmlsoap.org/ws/2003/03/business-process/"
xmlns:bpws="http://schemas.xmlsoap.org/ws/2003/03/business-process/"
@@ -26,12 +26,12 @@
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:test="http://ode/test/compile.wsdl">
<variables>
- <variable name="var1"
+ <variable name="var1"
messageType="test:TestMessage" />
</variables>
<flow>
<sequence>
- <assign>
+ <assign>
<copy>
<from expression="'yes'"/>
<to variable="var1" property="test:testProp"/>
Modified: ode/trunk/bpel-compiler/src/test/resources/org/apache/ode/bpel/compiler/UndeclaredPropertyAlias.wsdl
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-compiler/src/test/resources/org/apache/ode/bpel/compiler/UndeclaredPropertyAlias.wsdl?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-compiler/src/test/resources/org/apache/ode/bpel/compiler/UndeclaredPropertyAlias.wsdl (original)
+++ ode/trunk/bpel-compiler/src/test/resources/org/apache/ode/bpel/compiler/UndeclaredPropertyAlias.wsdl Thu May 27 18:09:53 2010
@@ -24,11 +24,11 @@
xmlns="http://schemas.xmlsoap.org/wsdl/"
xmlns:tns="http://ode/test/compile.wsdl"
xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
- xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:bpws="http://schemas.xmlsoap.org/ws/2003/03/business-process/"
xmlns:plnk="http://schemas.xmlsoap.org/ws/2003/05/partner-link/">
-
+
<wsdl:message name="TestMessage">
<wsdl:part name="TestPart" type="xsd:string"/>
</wsdl:message>
@@ -36,11 +36,11 @@
<wsdl:operation name="testOperation">
<wsdl:input message="tns:TestMessage" name="TestIn"/>
<wsdl:output message="tns:TestMessage" name="TestOut"/>
- </wsdl:operation>
- </wsdl:portType>
+ </wsdl:operation>
+ </wsdl:portType>
<bpws:property name="testProp"
type="xsd:string"/>
-
-
+
+
</wsdl:definitions>
Modified: ode/trunk/bpel-compiler/src/test/resources/org/apache/ode/bpel/compiler/UndeclaredVariable.bpel
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-compiler/src/test/resources/org/apache/ode/bpel/compiler/UndeclaredVariable.bpel?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-compiler/src/test/resources/org/apache/ode/bpel/compiler/UndeclaredVariable.bpel (original)
+++ ode/trunk/bpel-compiler/src/test/resources/org/apache/ode/bpel/compiler/UndeclaredVariable.bpel Thu May 27 18:09:53 2010
@@ -23,12 +23,12 @@
xmlns:tns="http://jlo/test/compile"
xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<variables>
- <variable name="var1"
+ <variable name="var1"
type="xsd:string" />
</variables>
<flow>
<sequence>
- <assign>
+ <assign>
<copy>
<from expression="'yes'"/>
<to variable="var2" property="testProp"/>
Modified: ode/trunk/bpel-compiler/src/test/resources/org/apache/ode/bpel/compiler/UndeclaredVariable.wsdl
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-compiler/src/test/resources/org/apache/ode/bpel/compiler/UndeclaredVariable.wsdl?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-compiler/src/test/resources/org/apache/ode/bpel/compiler/UndeclaredVariable.wsdl (original)
+++ ode/trunk/bpel-compiler/src/test/resources/org/apache/ode/bpel/compiler/UndeclaredVariable.wsdl Thu May 27 18:09:53 2010
@@ -24,12 +24,12 @@
xmlns="http://schemas.xmlsoap.org/wsdl/"
xmlns:tns="http://ode/test/compile.wsdl"
xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
- xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:bpws="http://schemas.xmlsoap.org/ws/2003/03/business-process/"
xmlns:plnk="http://schemas.xmlsoap.org/ws/2003/05/partner-link/">
-
-
+
+
<wsdl:message name="TestMessage">
<wsdl:part name="TestPart" type="xsd:string"/>
</wsdl:message>
@@ -37,11 +37,11 @@
<wsdl:operation name="testOperation">
<wsdl:input message="tns:TestMessage" name="TestIn"/>
<wsdl:output message="tns:TestMessage" name="TestOut"/>
- </wsdl:operation>
- </wsdl:portType>
-
+ </wsdl:operation>
+ </wsdl:portType>
+
<bpws:property name="testProp"
type="xsd:string"/>
-
+
</wsdl:definitions>
Modified: ode/trunk/bpel-compiler/src/test/resources/org/apache/ode/bpel/compiler/UnknownBpelFunction.bpel
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-compiler/src/test/resources/org/apache/ode/bpel/compiler/UnknownBpelFunction.bpel?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-compiler/src/test/resources/org/apache/ode/bpel/compiler/UnknownBpelFunction.bpel (original)
+++ ode/trunk/bpel-compiler/src/test/resources/org/apache/ode/bpel/compiler/UnknownBpelFunction.bpel Thu May 27 18:09:53 2010
@@ -22,7 +22,7 @@
xmlns:bpws="http://schemas.xmlsoap.org/ws/2003/03/business-process/"
xmlns:tns="http://jlo/test/compile"
xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-
+
<flow>
<sequence>
<while condition="bpws:getBadFunction('foo') = 'false'">
Modified: ode/trunk/bpel-compiler/src/test/resources/org/apache/ode/bpel/compiler/UnknownBpelFunction.wsdl
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-compiler/src/test/resources/org/apache/ode/bpel/compiler/UnknownBpelFunction.wsdl?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-compiler/src/test/resources/org/apache/ode/bpel/compiler/UnknownBpelFunction.wsdl (original)
+++ ode/trunk/bpel-compiler/src/test/resources/org/apache/ode/bpel/compiler/UnknownBpelFunction.wsdl Thu May 27 18:09:53 2010
@@ -24,11 +24,11 @@
xmlns="http://schemas.xmlsoap.org/wsdl/"
xmlns:tns="http://ode/test/compile.wsdl"
xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
- xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:bpws="http://schemas.xmlsoap.org/ws/2003/03/business-process/"
xmlns:plnk="http://schemas.xmlsoap.org/ws/2003/05/partner-link/">
-
+
<wsdl:message name="TestMessage">
<wsdl:part name="TestPart" type="xsd:string"/>
</wsdl:message>
@@ -36,7 +36,7 @@
<wsdl:operation name="testOperation">
<wsdl:input message="tns:TestMessage" name="TestIn"/>
<wsdl:output message="tns:TestMessage" name="TestOut"/>
- </wsdl:operation>
- </wsdl:portType>
+ </wsdl:operation>
+ </wsdl:portType>
</wsdl:definitions>
Modified: ode/trunk/bpel-connector/src/main/java/org/apache/ode/bpel/connector/ConnectionProviderImpl.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-connector/src/main/java/org/apache/ode/bpel/connector/ConnectionProviderImpl.java?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-connector/src/main/java/org/apache/ode/bpel/connector/ConnectionProviderImpl.java (original)
+++ ode/trunk/bpel-connector/src/main/java/org/apache/ode/bpel/connector/ConnectionProviderImpl.java Thu May 27 18:09:53 2010
@@ -28,18 +28,18 @@ import org.apache.ode.jca.server.Connect
/**
* Implementation of the {@link org.apache.ode.jca.server.ConnectionProvider}
* interface: provides {@link org.apache.ode.bpel.pmapi.BpelManagementFacade}
- * objects.
+ * objects.
*/
class ConnectionProviderImpl implements ConnectionProvider {
private BpelServer _server;
private ProcessStore _store;
-
+
ConnectionProviderImpl(BpelServer server, ProcessStore store) {
_server = server;
_store = store;
}
-
+
public String [] getConnectionIntefaces() {
return new String[] { "org.apache.ode.bpel.jca.clientapi.ProcessManagementConnection" };
}
Modified: ode/trunk/bpel-dao/src/main/java/org/apache/ode/bpel/dao/BpelDAOConnection.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-dao/src/main/java/org/apache/ode/bpel/dao/BpelDAOConnection.java?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-dao/src/main/java/org/apache/ode/bpel/dao/BpelDAOConnection.java (original)
+++ ode/trunk/bpel-dao/src/main/java/org/apache/ode/bpel/dao/BpelDAOConnection.java Thu May 27 18:09:53 2010
@@ -75,9 +75,9 @@ public interface BpelDAOConnection {
* Insert a BPEL event into the database.
* @param event a BPEL event
* @param process associated process (optional)
- * @param instance associated instance (optional)
+ * @param instance associated instance (optional)
*/
- void insertBpelEvent(BpelEvent event, ProcessDAO process,
+ void insertBpelEvent(BpelEvent event, ProcessDAO process,
ProcessInstanceDAO instance);
/**
@@ -87,7 +87,7 @@ public interface BpelDAOConnection {
* @return List of event timestamps of events matching the criteria
*/
List<Date> bpelEventTimelineQuery(InstanceFilter ifilter, BpelEventFilter efilter);
-
+
/**
* Execute a query to retrieve the BPEL events matching the criteria.
* @param ifilter instance filter
@@ -103,7 +103,7 @@ public interface BpelDAOConnection {
Collection<CorrelationSetDAO> getActiveCorrelationSets();
ProcessDAO createTransientProcess(Serializable id);
-
+
ProcessDAO createProcess(QName pid, QName type, String guid, long version);
/**
@@ -117,7 +117,7 @@ public interface BpelDAOConnection {
/**
* Returns an interface for process and instance management.
- *
+ *
* @return a ProcessManagement DAO
*/
ProcessManagementDAO getProcessManagement();
Modified: ode/trunk/bpel-dao/src/main/java/org/apache/ode/bpel/dao/BpelDAOConnectionFactory.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-dao/src/main/java/org/apache/ode/bpel/dao/BpelDAOConnectionFactory.java?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-dao/src/main/java/org/apache/ode/bpel/dao/BpelDAOConnectionFactory.java (original)
+++ ode/trunk/bpel-dao/src/main/java/org/apache/ode/bpel/dao/BpelDAOConnectionFactory.java Thu May 27 18:09:53 2010
@@ -33,7 +33,7 @@ public interface BpelDAOConnectionFactor
* store.
*/
public BpelDAOConnection getConnection();
-
+
/**
* Initializes connection factory with properties required to establish a
* connection.
@@ -41,7 +41,7 @@ public interface BpelDAOConnectionFactor
* @param properties
*/
public void init(Properties properties);
-
+
public void shutdown();
public DataSource getDataSource();
Modified: ode/trunk/bpel-dao/src/main/java/org/apache/ode/bpel/dao/BpelDAOConnectionFactoryJDBC.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-dao/src/main/java/org/apache/ode/bpel/dao/BpelDAOConnectionFactoryJDBC.java?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-dao/src/main/java/org/apache/ode/bpel/dao/BpelDAOConnectionFactoryJDBC.java (original)
+++ ode/trunk/bpel-dao/src/main/java/org/apache/ode/bpel/dao/BpelDAOConnectionFactoryJDBC.java Thu May 27 18:09:53 2010
@@ -22,24 +22,24 @@ import javax.sql.DataSource;
/**
* Extension of the {@link BpelDAOConnectionFactory} interface for DAOs that
- * are based on J2EE/JDBC data sources.
- *
+ * are based on J2EE/JDBC data sources.
+ *
* @author Maciej Szefler - m s z e f l e r @ g m a i l . c o m
*/
public interface BpelDAOConnectionFactoryJDBC extends BpelDAOConnectionFactory {
/**
- * Set the managed data source (transactions tied to transaction manager).
+ * Set the managed data source (transactions tied to transaction manager).
* @param ds
*/
public void setDataSource(DataSource ds);
-
+
/**
* Set the unmanaged data source.
* @param ds
*/
public void setUnmanagedDataSource(DataSource ds);
-
+
/**
* Set the transaction manager.
* @param tm
Modified: ode/trunk/bpel-dao/src/main/java/org/apache/ode/bpel/dao/CorrelatorDAO.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-dao/src/main/java/org/apache/ode/bpel/dao/CorrelatorDAO.java?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-dao/src/main/java/org/apache/ode/bpel/dao/CorrelatorDAO.java (original)
+++ ode/trunk/bpel-dao/src/main/java/org/apache/ode/bpel/dao/CorrelatorDAO.java Thu May 27 18:09:53 2010
@@ -90,12 +90,12 @@ public interface CorrelatorDAO {
List<MessageRouteDAO> findRoute(CorrelationKeySet correlationKeySet);
/**
- * Check if corresponding key set is free to register (see ODE-804)
+ * Check if corresponding key set is free to register (see ODE-804)
* @param correlationKeySet
* @return true - available, false - not available
*/
boolean checkRoute(CorrelationKeySet correlationKeySet);
-
+
/**
* Add a route from the given correlation key to the given process instance.
* @param routeGroupId identifier of the group of routes to which this route belongs
Modified: ode/trunk/bpel-dao/src/main/java/org/apache/ode/bpel/dao/DeferredProcessInstanceCleanable.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-dao/src/main/java/org/apache/ode/bpel/dao/DeferredProcessInstanceCleanable.java?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-dao/src/main/java/org/apache/ode/bpel/dao/DeferredProcessInstanceCleanable.java (original)
+++ ode/trunk/bpel-dao/src/main/java/org/apache/ode/bpel/dao/DeferredProcessInstanceCleanable.java Thu May 27 18:09:53 2010
@@ -21,24 +21,24 @@ package org.apache.ode.bpel.dao;
import java.io.Serializable;
/**
- * Instances and associated data for a ProcessDAO implementation that implements this
+ * Instances and associated data for a ProcessDAO implementation that implements this
* interface can be deleted in a deferred fashion.
- *
+ *
* @author sean
*
*/
public interface DeferredProcessInstanceCleanable {
/**
* Returns the database id.
- *
+ *
* @return database id
*/
Serializable getId();
-
+
/**
* Deletes instances and data for this process, the number of rows gets deletes is limited
* by the transaction size.
- *
+ *
* @param transactionSize the number of rows to delete
* @return the number of rows actually deleted
*/
Modified: ode/trunk/bpel-dao/src/main/java/org/apache/ode/bpel/dao/FilteredInstanceDeletable.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-dao/src/main/java/org/apache/ode/bpel/dao/FilteredInstanceDeletable.java?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-dao/src/main/java/org/apache/ode/bpel/dao/FilteredInstanceDeletable.java (original)
+++ ode/trunk/bpel-dao/src/main/java/org/apache/ode/bpel/dao/FilteredInstanceDeletable.java Thu May 27 18:09:53 2010
@@ -26,14 +26,14 @@ import org.apache.ode.bpel.iapi.ProcessC
/**
* An implementation of this interface provides a way to delete runtime process instances
* through the InstanceFilter.
- *
+ *
* @author sean
*
*/
public interface FilteredInstanceDeletable {
/**
* Deletes instance filter by the given instance filter and clean up categories.
- *
+ *
* @param filter instance filter
* @param categories clean up categories
* @return returns the number of instances that are deleted
Modified: ode/trunk/bpel-dao/src/main/java/org/apache/ode/bpel/dao/MessageDAO.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-dao/src/main/java/org/apache/ode/bpel/dao/MessageDAO.java?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-dao/src/main/java/org/apache/ode/bpel/dao/MessageDAO.java (original)
+++ ode/trunk/bpel-dao/src/main/java/org/apache/ode/bpel/dao/MessageDAO.java Thu May 27 18:09:53 2010
@@ -29,7 +29,7 @@ public interface MessageDAO {
void setType(QName type);
QName getType();
- void setData(Element value);
+ void setData(Element value);
Element getData();
void setHeader(Element value);
Modified: ode/trunk/bpel-dao/src/main/java/org/apache/ode/bpel/dao/MessageExchangeDAO.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-dao/src/main/java/org/apache/ode/bpel/dao/MessageExchangeDAO.java?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-dao/src/main/java/org/apache/ode/bpel/dao/MessageExchangeDAO.java (original)
+++ ode/trunk/bpel-dao/src/main/java/org/apache/ode/bpel/dao/MessageExchangeDAO.java Thu May 27 18:09:53 2010
@@ -237,12 +237,12 @@ public interface MessageExchangeDAO {
/**
* Gets the mex id for the message exchange that has been piped with
- * this one in a process to process interaction.
+ * this one in a process to process interaction.
* @return
*/
String getPipedMessageExchangeId();
void setPipedMessageExchangeId(String mexId);
-
+
int getSubscriberCount();
void setSubscriberCount(int subscriberCount);
Modified: ode/trunk/bpel-dao/src/main/java/org/apache/ode/bpel/dao/PartnerLinkDAO.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-dao/src/main/java/org/apache/ode/bpel/dao/PartnerLinkDAO.java?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-dao/src/main/java/org/apache/ode/bpel/dao/PartnerLinkDAO.java (original)
+++ ode/trunk/bpel-dao/src/main/java/org/apache/ode/bpel/dao/PartnerLinkDAO.java Thu May 27 18:09:53 2010
@@ -38,11 +38,11 @@ public interface PartnerLinkDAO {
* @return
*/
public int getPartnerLinkModelId();
-
+
public String getMyRoleName();
public String getPartnerRoleName();
-
+
public String getPartnerLinkName();
/**
@@ -52,7 +52,7 @@ public interface PartnerLinkDAO {
public QName getMyRoleServiceName();
public void setMyRoleServiceName(QName svcName);
-
+
public Element getMyEPR();
public void setMyEPR(Element val);
Modified: ode/trunk/bpel-dao/src/main/java/org/apache/ode/bpel/dao/ProcessDAO.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-dao/src/main/java/org/apache/ode/bpel/dao/ProcessDAO.java?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-dao/src/main/java/org/apache/ode/bpel/dao/ProcessDAO.java (original)
+++ ode/trunk/bpel-dao/src/main/java/org/apache/ode/bpel/dao/ProcessDAO.java Thu May 27 18:09:53 2010
@@ -31,28 +31,28 @@ import java.util.Collection;
public interface ProcessDAO {
/**
* Get the unique process identifier.
- *
+ *
* @return process identifier
*/
QName getProcessId();
/**
* Get the BPEL process name.
- *
+ *
* @return qualified BPEL process name.
*/
QName getType();
/**
* Get the process version
- *
+ *
* @return version
*/
long getVersion();
/**
* Get a message correlator instance.
- *
+ *
* @param correlatorId
* correlator identifier
* @return correlator corresponding to the given identifier
@@ -61,7 +61,7 @@ public interface ProcessDAO {
/**
* Create a new process instance object.
- *
+ *
* @param instantiatingCorrelator
* instantiating {@link CorrelatorDAO}
* @return newly generated instance DAO
@@ -70,7 +70,7 @@ public interface ProcessDAO {
/**
* Get a process instance (by identifier).
- *
+ *
* @param iid
* unique instance identifier.
* @return DAO corresponding to the process instance
@@ -79,7 +79,7 @@ public interface ProcessDAO {
/**
* Locates a process instance based on a correlation key.
- *
+ *
* @param cckey
* correlation key
* @return collection of {@link ProcessInstanceDAO} that match correlation key, ordered by date
@@ -88,7 +88,7 @@ public interface ProcessDAO {
/**
* Remove the routes with the given Id for all the correlators in the process.
- *
+ *
* @todo remove this method.
* @param routeId
*/
@@ -96,18 +96,18 @@ public interface ProcessDAO {
/**
* Callback indicating that a process instance has completed its duties.
- *
+ *
* @param instance
* the completed {@link ProcessInstanceDAO}
*/
void instanceCompleted(ProcessInstanceDAO instance);
/**
- * Deletes only the process and routes without instances. This also deletes any static data to
+ * Deletes only the process and routes without instances. This also deletes any static data to
* the process: correlators.
*/
void deleteProcessAndRoutes();
-
+
CorrelatorDAO addCorrelator(String correlator);
String getGuid();
@@ -115,7 +115,7 @@ public interface ProcessDAO {
int getNumInstances();
/**
- * @return all instances that haven't completed, use with care as there could be a lot of them
+ * @return all instances that haven't completed, use with care as there could be a lot of them
*/
Collection<ProcessInstanceDAO> getActiveInstances();
}
Modified: ode/trunk/bpel-dao/src/main/java/org/apache/ode/bpel/dao/ProcessInstanceDAO.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-dao/src/main/java/org/apache/ode/bpel/dao/ProcessInstanceDAO.java?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-dao/src/main/java/org/apache/ode/bpel/dao/ProcessInstanceDAO.java (original)
+++ ode/trunk/bpel-dao/src/main/java/org/apache/ode/bpel/dao/ProcessInstanceDAO.java Thu May 27 18:09:53 2010
@@ -42,13 +42,13 @@ public interface ProcessInstanceDAO {
* @return time of instance creation
*/
public Date getCreateTime();
-
+
/**
* Get the time when the process instance was last active (re-hydrated).
* @return time of activity
*/
public Date getLastActiveTime();
-
+
/**
* Set last activity time for the process instance
* @param dt tiem of activity
@@ -62,7 +62,7 @@ public interface ProcessInstanceDAO {
* @param fault the fault
*/
void setFault(FaultDAO fault);
-
+
void setFault(QName faultName, String explanation, int faultLineNo, int activityId, Element faultMessage);
/**
@@ -103,7 +103,7 @@ public interface ProcessInstanceDAO {
/**
* Set the state of the process instance; one of the <code>STATE_XXX</code>
* constants defined in ProcessState.
- *
+ *
* This should automatically populate the previous state.
*
* @param state new state of the process instance
@@ -117,9 +117,9 @@ public interface ProcessInstanceDAO {
* @return state of process instance
*/
short getState();
-
+
/**
- * Returns the next to last state.
+ * Returns the next to last state.
* @return
*/
short getPreviousState();
@@ -147,27 +147,27 @@ public interface ProcessInstanceDAO {
* @return
*/
ScopeDAO getScope(Long scopeInstanceId);
-
- /**
+
+ /**
* Returns all the scopes with the associated name.
* @param scopeName
* @return
*/
Collection<ScopeDAO> getScopes(String scopeName);
-
- /**
+
+ /**
* Returns all the scopes belonging to this isntance.
* @param scopeName
* @return
*/
Collection<ScopeDAO> getScopes();
-
+
/**
* Return the correlator which results in the instantiation of the process instance.
* @return
*/
CorrelatorDAO getInstantiatingCorrelator();
-
+
/**
* Returns all variable instances matching the variable name for a specified scope.
*/
@@ -216,7 +216,7 @@ public interface ProcessInstanceDAO {
*/
EventsFirstLastCountTuple getEventsFirstLastCount();
- /**
+ /**
* Get the next number from a monotonically increasing sequence.
* @return next number in seqeunce
*/
Modified: ode/trunk/bpel-dao/src/main/java/org/apache/ode/bpel/dao/ProcessManagementDAO.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-dao/src/main/java/org/apache/ode/bpel/dao/ProcessManagementDAO.java?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-dao/src/main/java/org/apache/ode/bpel/dao/ProcessManagementDAO.java (original)
+++ ode/trunk/bpel-dao/src/main/java/org/apache/ode/bpel/dao/ProcessManagementDAO.java Thu May 27 18:09:53 2010
@@ -30,9 +30,9 @@ import javax.xml.namespace.QName;
* This DAO handles any process and instance management related database
* operations. The idea is to separate out the operational side of database
* tasks from core engine.
- *
+ *
* @author sean
- *
+ *
*/
public interface ProcessManagementDAO {
public static class InstanceSummaryKey {
@@ -83,9 +83,9 @@ public interface ProcessManagementDAO {
return false;
return true;
}
-
+
}
-
+
public static class FailedSummaryValue {
public final Long count;
public final Date lastFailed;
@@ -97,6 +97,6 @@ public interface ProcessManagementDAO {
}
public Map<InstanceSummaryKey, Long> countInstancesSummary(Set<String> pids);
-
+
public Map<String, FailedSummaryValue> findFailedCountAndLastFailedDateForProcessIds(Set<String> pids);
}
\ No newline at end of file
Modified: ode/trunk/bpel-dao/src/main/java/org/apache/ode/bpel/dao/QueryReturnedMultipleResultsException.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-dao/src/main/java/org/apache/ode/bpel/dao/QueryReturnedMultipleResultsException.java?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-dao/src/main/java/org/apache/ode/bpel/dao/QueryReturnedMultipleResultsException.java (original)
+++ ode/trunk/bpel-dao/src/main/java/org/apache/ode/bpel/dao/QueryReturnedMultipleResultsException.java Thu May 27 18:09:53 2010
@@ -20,7 +20,7 @@ package org.apache.ode.bpel.dao;
/**
* Thrown when a query returns multiple results.
- *
+ *
* <p>
* Created on Mar 9, 2004 at 1:51:09 PM.
* </p>
Modified: ode/trunk/bpel-dao/src/main/java/org/apache/ode/bpel/dao/RoleEnum.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-dao/src/main/java/org/apache/ode/bpel/dao/RoleEnum.java?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-dao/src/main/java/org/apache/ode/bpel/dao/RoleEnum.java (original)
+++ ode/trunk/bpel-dao/src/main/java/org/apache/ode/bpel/dao/RoleEnum.java Thu May 27 18:09:53 2010
@@ -52,10 +52,10 @@ public class RoleEnum {
/**
* DOCUMENTME
- *
+ *
* @param code
* DOCUMENTME
- *
+ *
* @return DOCUMENTME
*/
public static RoleEnum fromCode(short code) {
@@ -71,7 +71,7 @@ public class RoleEnum {
/**
* DOCUMENTME
- *
+ *
* @return DOCUMENTME
*/
public short toCode() {
Modified: ode/trunk/bpel-dao/src/main/java/org/apache/ode/bpel/dao/XmlDataDAO.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-dao/src/main/java/org/apache/ode/bpel/dao/XmlDataDAO.java?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-dao/src/main/java/org/apache/ode/bpel/dao/XmlDataDAO.java (original)
+++ ode/trunk/bpel-dao/src/main/java/org/apache/ode/bpel/dao/XmlDataDAO.java Thu May 27 18:09:53 2010
@@ -41,7 +41,7 @@ public interface XmlDataDAO {
*/
public boolean isNull();
-
+
/**
* Retreive the variable data.
*
@@ -64,19 +64,19 @@ public interface XmlDataDAO {
/**
* Return the value of a property. Properties are useful
* for extracting simple type data which can be used for querying
- * and identifying process instances.
+ * and identifying process instances.
* @param propertyName
* @return value of property or <b>null</b> if not set.
*/
public String getProperty(String propertyName);
-
+
/**
* Sets the value of a property
* @param pname
* @param pvalue
*/
public void setProperty(String pname, String pvalue);
-
+
/**
* Gets the scope associated with this xml data.
* @return scope
Modified: ode/trunk/bpel-dao/src/main/java/org/apache/ode/bpel/dao/package.html
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-dao/src/main/java/org/apache/ode/bpel/dao/package.html?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-dao/src/main/java/org/apache/ode/bpel/dao/package.html (original)
+++ ode/trunk/bpel-dao/src/main/java/org/apache/ode/bpel/dao/package.html Thu May 27 18:09:53 2010
@@ -20,8 +20,8 @@
<html>
<head><title>DAO Package</title></head>
<body>
- <p>Data-Access Object (DAO) interfaces used by the BPEL Service Provider
- to communicate with the data store; can be used to customize the
+ <p>Data-Access Object (DAO) interfaces used by the BPEL Service Provider
+ to communicate with the data store; can be used to customize the
BPEL persistence layer.
The BPEL DAO layer is used to maintain persistent state of each
active BPEL process instance. This includes the values of scope
Modified: ode/trunk/bpel-epr/src/main/java/org/apache/ode/bpel/common/evt/DebugBpelEventListener.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-epr/src/main/java/org/apache/ode/bpel/common/evt/DebugBpelEventListener.java?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-epr/src/main/java/org/apache/ode/bpel/common/evt/DebugBpelEventListener.java (original)
+++ ode/trunk/bpel-epr/src/main/java/org/apache/ode/bpel/common/evt/DebugBpelEventListener.java Thu May 27 18:09:53 2010
@@ -28,15 +28,15 @@ import org.apache.ode.bpel.iapi.BpelEven
/**
* Example implementation of the {@link BpelEventListener} interface.
- *
+ *
* Dumps navigation events to a logging appender and optionally to stdout.
- * To use the DebugBpelEventListener add the following lines to your
+ * To use the DebugBpelEventListener add the following lines to your
* ode-xxx.properties file:
* <code>
* ode-jbi.event.listeners=org.apache.ode.bpel.common.evt.DebugBpelEventListener
* debugeventlistener.dumpToStdOut=on/off
* </code>
- *
+ *
* @author Tammo van Lessen (University of Stuttgart)
*/
public class DebugBpelEventListener implements BpelEventListener {
@@ -44,12 +44,12 @@ public class DebugBpelEventListener impl
private static final String SYSOUT_KEY = "debugeventlistener.dumpToStdOut";
private boolean _dumpToStdOut = false;
-
+
public void onEvent(BpelEvent bpelEvent) {
if (__log.isDebugEnabled()) {
__log.debug(bpelEvent.toString());
}
-
+
if (_dumpToStdOut) {
System.out.println(bpelEvent.toString());
}
Modified: ode/trunk/bpel-epr/src/main/java/org/apache/ode/bpel/epr/EndpointFactory.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-epr/src/main/java/org/apache/ode/bpel/epr/EndpointFactory.java?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-epr/src/main/java/org/apache/ode/bpel/epr/EndpointFactory.java (original)
+++ ode/trunk/bpel-epr/src/main/java/org/apache/ode/bpel/epr/EndpointFactory.java Thu May 27 18:09:53 2010
@@ -52,7 +52,7 @@ public class EndpointFactory {
/**
* Creates a ServiceEndpoint using the provided Node. The actual endpoint
* type is detected using the endpoint node (text or element qname).
- *
+ *
* @param endpointElmt
* @return the new ServiceEndpoint
*/
@@ -81,7 +81,7 @@ public class EndpointFactory {
* The target type is actually the qualified name of the root element for
* the target EPR (i.e wsa:MutableEndpoint, wsdl:service) or null to convert
* to a simple URL.
- *
+ *
* @param targetElmtType
* QName to convert to
* @param sourceEndpoint
@@ -118,10 +118,10 @@ public class EndpointFactory {
public static WSAEndpoint convertToWSA(MutableEndpoint source) {
if (source == null)
return null;
-
- if (source instanceof WSAEndpoint)
+
+ if (source instanceof WSAEndpoint)
return (WSAEndpoint) source;
-
+
return new WSAEndpoint(source.toMap());
}
}
Modified: ode/trunk/bpel-epr/src/main/java/org/apache/ode/bpel/epr/WSAEndpoint.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-epr/src/main/java/org/apache/ode/bpel/epr/WSAEndpoint.java?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-epr/src/main/java/org/apache/ode/bpel/epr/WSAEndpoint.java (original)
+++ ode/trunk/bpel-epr/src/main/java/org/apache/ode/bpel/epr/WSAEndpoint.java Thu May 27 18:09:53 2010
@@ -48,7 +48,7 @@ public class WSAEndpoint implements Muta
public WSAEndpoint(WSAEndpoint prototype) {
_eprElmt = (Element)DOMUtils.newDocument().importNode(prototype._eprElmt, true);
}
-
+
public WSAEndpoint(Map map) {
this();
fromMap(map);
@@ -63,7 +63,7 @@ public class WSAEndpoint implements Muta
idNodes = _eprElmt.getElementsByTagNameNS(Namespaces.INTALIO_SESSION_NS, "session");
if (idNodes.getLength() > 0) {
return idNodes.item(0).getTextContent();
- }
+ }
return null;
}
}
Modified: ode/trunk/bpel-epr/src/main/java/org/apache/ode/bpel/epr/WSDL20Endpoint.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-epr/src/main/java/org/apache/ode/bpel/epr/WSDL20Endpoint.java?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-epr/src/main/java/org/apache/ode/bpel/epr/WSDL20Endpoint.java (original)
+++ ode/trunk/bpel-epr/src/main/java/org/apache/ode/bpel/epr/WSDL20Endpoint.java Thu May 27 18:09:53 2010
@@ -49,7 +49,7 @@ public class WSDL20Endpoint implements M
idNodes = endpointElmt.getElementsByTagNameNS(Namespaces.INTALIO_SESSION_NS, "session");
if (idNodes.getLength() > 0) {
return idNodes.item(0).getTextContent();
- }
+ }
return null;
}
}
Modified: ode/trunk/bpel-epr/src/main/java/org/apache/ode/il/DynamicService.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-epr/src/main/java/org/apache/ode/il/DynamicService.java?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-epr/src/main/java/org/apache/ode/il/DynamicService.java (original)
+++ ode/trunk/bpel-epr/src/main/java/org/apache/ode/il/DynamicService.java Thu May 27 18:09:53 2010
@@ -53,13 +53,13 @@ public class DynamicService<T> {
T _service;
Class<T> _clazz;
-
+
@SuppressWarnings("unchecked")
public DynamicService(T service) {
_clazz = (Class<T>) service.getClass();
_service = service;
}
-
+
public OMElement invoke(String operation, OMElement payload) {
if (__log.isDebugEnabled())
__log.debug("Invoke: operation "+operation+" on "+_clazz + ":\n" + payload);
@@ -196,5 +196,5 @@ public class DynamicService<T> {
if (clazz.equals(String.class)) return str;
return null;
}
-
+
}
Modified: ode/trunk/bpel-epr/src/main/java/org/apache/ode/il/MockScheduler.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-epr/src/main/java/org/apache/ode/il/MockScheduler.java?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-epr/src/main/java/org/apache/ode/il/MockScheduler.java (original)
+++ ode/trunk/bpel-epr/src/main/java/org/apache/ode/il/MockScheduler.java Thu May 27 18:09:53 2010
@@ -151,14 +151,14 @@ public class MockScheduler implements Sc
return scheduleVolatileJob(true, new JobDetails());
}
}
-
+
public void cancelJob(String arg0) throws ContextException {
}
public <T> T execTransaction(Callable<T> transaction) throws Exception, ContextException {
return execTransaction(transaction, 0);
}
-
+
public <T> T execTransaction(Callable<T> transaction, int timeout) throws Exception, ContextException {
if (timeout > 0) {
_txm.setTransactionTimeout(timeout);
Modified: ode/trunk/bpel-epr/src/main/java/org/apache/ode/il/OMUtils.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-epr/src/main/java/org/apache/ode/il/OMUtils.java?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-epr/src/main/java/org/apache/ode/il/OMUtils.java (original)
+++ ode/trunk/bpel-epr/src/main/java/org/apache/ode/il/OMUtils.java Thu May 27 18:09:53 2010
@@ -68,10 +68,10 @@ public class OMUtils {
return toDOM(element, DOMUtils.newDocument());
}
- public static Element toDOM(OMElement element, Document doc) {
+ public static Element toDOM(OMElement element, Document doc) {
return toDOM(element,doc,true);
}
-
+
@SuppressWarnings("unchecked")
public static Element toDOM(OMElement element, Document doc, boolean deepNS) {
final Element domElement = doc.createElementNS(element.getQName().getNamespaceURI(), element.getQName().getLocalPart());
@@ -89,10 +89,10 @@ public class OMUtils {
else
domElement.setAttributeNS(DOMUtils.NS_URI_XMLNS, "xmlns:"+ omns.getPrefix(), omns.getNamespaceURI());
}
-
+
}
}
-
+
for (Iterator i = element.getAllAttributes(); i.hasNext();) {
final OMAttribute attr = (OMAttribute) i.next();
Attr newAttr;
@@ -108,7 +108,7 @@ public class OMUtils {
OMNamespace attrValNs = element.findNamespaceURI(attr.getAttributeValue().substring(0, colonIdx));
if (attrValNs != null)
domElement.setAttributeNS(DOMUtils.NS_URI_XMLNS, "xmlns:"+ attrValNs.getPrefix(), attrValNs.getNamespaceURI());
- }
+ }
}
for (Iterator<OMNode> i = element.getChildren(); i.hasNext();) {
@@ -125,27 +125,27 @@ public class OMUtils {
domElement.appendChild(toDOM((OMElement)omn,doc, false));
break;
}
-
+
}
-
+
return domElement;
-
+
}
@SuppressWarnings("unchecked")
private static void buildNScontext(NSContext nscontext, OMElement element) {
if (element == null)
return;
-
+
if (element.getParent() instanceof OMElement)
buildNScontext(nscontext, (OMElement) element.getParent());
-
+
if (element.getAllDeclaredNamespaces() != null)
for (Iterator<OMNamespace> i=element.getAllDeclaredNamespaces(); i.hasNext(); ){
OMNamespace omn = i.next();
nscontext.register(omn.getPrefix(), omn.getNamespaceURI());
}
-
+
if (element.getDefaultNamespace() != null)
nscontext.register("", element.getDefaultNamespace().getNamespaceURI());
}
@@ -162,7 +162,7 @@ public class OMUtils {
omElement.setNamespace(omf.createOMNamespace(src.getNamespaceURI(), src.getPrefix()));
else omElement.declareDefaultNamespace(src.getNamespaceURI());
}
-
+
if (parent == null) {
NSContext nscontext = DOMUtils.getMyNSContext(src);
injectNamespaces(omElement,nscontext.toMap());
@@ -170,11 +170,11 @@ public class OMUtils {
Map<String,String> nss = DOMUtils.getMyNamespaces(src);
injectNamespaces(omElement, nss);
}
-
+
NamedNodeMap attrs = src.getAttributes();
for (int i = 0; i <attrs.getLength(); ++i) {
Attr attr = (Attr)attrs.item(i);
- if (attr.getLocalName().equals("xmlns")
+ if (attr.getLocalName().equals("xmlns")
|| (attr.getNamespaceURI() != null && attr.getNamespaceURI().equals(DOMUtils.NS_URI_XMLNS)))
continue;
OMNamespace attrOmNs = null;
@@ -202,9 +202,9 @@ public class OMUtils {
toOM((Element)n,omf,omElement);
break;
}
-
+
}
-
+
return omElement;
}
@@ -222,7 +222,7 @@ public class OMUtils {
/**
* Axiom is supposed to handle this properly however this method is buggy and doesn't work (whereas setting a QName as text
* works).
- *
+ *
* @param elmt
* @return text qname
*/
Modified: ode/trunk/bpel-epr/src/main/java/org/apache/ode/il/config/OdeConfigProperties.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-epr/src/main/java/org/apache/ode/il/config/OdeConfigProperties.java?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-epr/src/main/java/org/apache/ode/il/config/OdeConfigProperties.java (original)
+++ ode/trunk/bpel-epr/src/main/java/org/apache/ode/il/config/OdeConfigProperties.java Thu May 27 18:09:53 2010
@@ -73,7 +73,7 @@ public class OdeConfigProperties {
public static final String PROP_WORKING_DIR = "working.dir";
public static final String PROP_DEPLOY_DIR = "deploy.dir";
-
+
public static final String PROP_EVENT_LISTENERS = "event.listeners";
public static final String PROP_MEX_INTERCEPTORS = "mex.interceptors";
@@ -83,23 +83,23 @@ public class OdeConfigProperties {
public static final String PROP_PROCESS_DEHYDRATION = "process.dehydration";
public static final String PROP_PROCESS_DEHYDRATION_MAXIMUM_AGE = "process.dehydration.maximum.age";
-
+
public static final String PROP_PROCESS_DEHYDRATION_MAXIMUM_COUNT = "process.dehydration.maximum.count";
-
+
public static final String PROP_PROCESS_HYDRATION_LAZY = "process.hydration.lazy";
-
+
public static final String PROP_PROCESS_HYDRATION_LAZY_MINIMUM_SIZE = "process.hydration.lazy.minimum.size";
-
+
public static final String PROP_PROCESS_HYDRATION_THROTTLED_MAXIMUM_COUNT = "process.hydration.throttled.maximum.count";
-
+
public static final String PROP_PROCESS_HYDRATION_THROTTLED_MAXIMUM_SIZE = "process.hydration.throttled.maximum.size";
-
+
public static final String PROP_PROCESS_INSTANCE_THROTTLED_MAXIMUM_COUNT = "process.instance.throttled.maximum.count";
-
+
public static final String PROP_DAOCF = "dao.factory";
-
+
public static final String PROP_MIGRATION_TRANSACTION_TIMEOUT = "migration.transaction.timeout";
-
+
public static final String DEFAULT_TX_FACTORY_CLASS_NAME = "org.apache.ode.il.EmbeddedGeronimoFactory";
private File _cfgFile;
@@ -204,11 +204,11 @@ public class OdeConfigProperties {
public String getDbIntenralJdbcUrl() {
return getProperty(OdeConfigProperties.PROP_DB_INTERNAL_URL, "jdbc:derby://localhost/ode");
}
-
+
public String getDbInternalMCFClass() {
return getProperty("db.int.mcf");
}
-
+
public Properties getDbInternalMCFProperties() {
String prefix = _prefix + "db.int.mcf.";
Properties p = new Properties();
@@ -261,7 +261,7 @@ public class OdeConfigProperties {
public String getDeployDir() {
return getProperty(OdeConfigProperties.PROP_DEPLOY_DIR);
}
-
+
public String getTxFactoryClass() {
return getProperty(OdeConfigProperties.PROP_TX_FACTORY_CLASS, DEFAULT_TX_FACTORY_CLASS_NAME);
}
@@ -282,38 +282,38 @@ public class OdeConfigProperties {
return Boolean.valueOf(getProperty(OdeConfigProperties.PROP_PROCESS_DEHYDRATION, "false"));
}
- public long getDehydrationMaximumAge() {
+ public long getDehydrationMaximumAge() {
return Long.valueOf(getProperty(PROP_PROCESS_DEHYDRATION_MAXIMUM_AGE, ""+20*60*1000));
}
-
+
public int getDehydrationMaximumCount() {
return Integer.valueOf(getProperty(PROP_PROCESS_DEHYDRATION_MAXIMUM_COUNT, ""+1000));
}
-
+
public boolean isHydrationLazy() {
return Boolean.valueOf(getProperty(OdeConfigProperties.PROP_PROCESS_HYDRATION_LAZY, "true"));
}
-
+
public int getHydrationLazyMinimumSize() {
return Integer.valueOf(getProperty(OdeConfigProperties.PROP_PROCESS_HYDRATION_LAZY_MINIMUM_SIZE, String.valueOf(0)));
}
-
+
public int getProcessThrottledMaximumCount() {
return Integer.valueOf(getProperty(OdeConfigProperties.PROP_PROCESS_HYDRATION_THROTTLED_MAXIMUM_COUNT, String.valueOf(Integer.MAX_VALUE)));
}
-
+
public int getInstanceThrottledMaximumCount() {
return Integer.valueOf(getProperty(OdeConfigProperties.PROP_PROCESS_INSTANCE_THROTTLED_MAXIMUM_COUNT, String.valueOf(Integer.MAX_VALUE)));
}
-
+
public long getProcessThrottledMaximumSize() {
return Long.valueOf(getProperty(OdeConfigProperties.PROP_PROCESS_HYDRATION_THROTTLED_MAXIMUM_SIZE, String.valueOf(Long.MAX_VALUE)));
}
-
+
public boolean isProcessSizeThrottled() {
return getProcessThrottledMaximumSize() == Long.MAX_VALUE;
}
-
+
public boolean isDbLoggingEnabled() {
return Boolean.valueOf(getProperty(OdeConfigProperties.PROP_DB_LOGGING, "false"));
}
@@ -338,7 +338,7 @@ public class OdeConfigProperties {
public String getDbInternalPassword() {
return getProperty(PROP_DB_INTERNAL_PASSWORD);
}
-
+
public int getMigrationTransactionTimeout() {
return Integer.valueOf(getProperty(PROP_MIGRATION_TRANSACTION_TIMEOUT, String.valueOf(0)));
}
Modified: ode/trunk/bpel-epr/src/main/java/org/apache/ode/il/dbutil/Database.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-epr/src/main/java/org/apache/ode/il/dbutil/Database.java?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-epr/src/main/java/org/apache/ode/il/dbutil/Database.java (original)
+++ ode/trunk/bpel-epr/src/main/java/org/apache/ode/il/dbutil/Database.java Thu May 27 18:09:53 2010
@@ -201,7 +201,7 @@ public class Database {
getClass().getName(),
getClass().getClassLoader());
-
+
try {
javax.resource.spi.ManagedConnectionFactory mcf = null;
String mcfClass = _odeConfig.getDbInternalMCFClass();
Modified: ode/trunk/bpel-epr/src/main/test/org/apache/ode/bpel/epr/WSDL11EndpointTest.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-epr/src/main/test/org/apache/ode/bpel/epr/WSDL11EndpointTest.java?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-epr/src/main/test/org/apache/ode/bpel/epr/WSDL11EndpointTest.java (original)
+++ ode/trunk/bpel-epr/src/main/test/org/apache/ode/bpel/epr/WSDL11EndpointTest.java Thu May 27 18:09:53 2010
@@ -41,8 +41,8 @@ public class WSDL11EndpointTest extends
node.appendChild(doc.createTextNode("http://example.com/hello"));
assertTrue(endpoint.accept(node));
}
-
-
+
+
public void testAcceptServiceRefElement() {
WSDL11Endpoint endpoint = new WSDL11Endpoint();
Document doc = DOMUtils.newDocument();
@@ -52,8 +52,8 @@ public class WSDL11EndpointTest extends
child.appendChild(doc.createTextNode("http://example.com/hello"));
assertTrue(endpoint.accept(node));
}
-
-
+
+
public void testAcceptServiceWithRandomElement() {
WSDL11Endpoint endpoint = new WSDL11Endpoint();
Document doc = DOMUtils.newDocument();
@@ -61,11 +61,11 @@ public class WSDL11EndpointTest extends
child.appendChild(doc.createTextNode("http://example.com/hello"));
assertFalse("The endpoint should accept a random element", endpoint.accept(child));
}
-
+
public void testAcceptServiceWithTextNode() {
WSDL11Endpoint endpoint = new WSDL11Endpoint();
Document doc = DOMUtils.newDocument();
- assertFalse("The endpoint should accept a text node",
+ assertFalse("The endpoint should accept a text node",
endpoint.accept(doc.createTextNode("http://example.com/hello")));
}
}
Modified: ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/elang/xpath10/o/OXPath10Expression.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/elang/xpath10/o/OXPath10Expression.java?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/elang/xpath10/o/OXPath10Expression.java (original)
+++ ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/elang/xpath10/o/OXPath10Expression.java Thu May 27 18:09:53 2010
@@ -38,7 +38,7 @@ import org.apache.ode.utils.NSContext;
/**
- * Jaxen-based compiled-xpath representation for XPATH 1.0 expression language.
+ * Jaxen-based compiled-xpath representation for XPATH 1.0 expression language.
*/
public class OXPath10Expression extends OLValueExpression implements Serializable {
private static final long serialVersionUID = -1L;
@@ -102,7 +102,7 @@ public class OXPath10Expression extends
public void addGetVariableDataSig(String varname, String partname, String location, OSigGetVariableData compiled) {
_getVariableDataSigs.put(new SigGetVariableData(varname, partname, location), compiled);
}
-
+
public void setXslSheet(URI projectRelativeXslUri, OXslSheet xslSheet) {
xslSheets.put(projectRelativeXslUri, xslSheet);
}
@@ -110,7 +110,7 @@ public class OXPath10Expression extends
public OXslSheet getXslSheet(URI projectRelativeXslUri) {
return xslSheets.get(projectRelativeXslUri);
}
-
+
public String toString() {
return "{OXPath10Expression " + xpath + "}";
}
Modified: ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/elang/xpath10/o/OXPath10ExpressionBPEL20.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/elang/xpath10/o/OXPath10ExpressionBPEL20.java?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/elang/xpath10/o/OXPath10ExpressionBPEL20.java (original)
+++ ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/elang/xpath10/o/OXPath10ExpressionBPEL20.java Thu May 27 18:09:53 2010
@@ -26,7 +26,7 @@ import javax.xml.namespace.QName;
/**
- * Jaxen-based compiled-xpath representation for XPATH 1.0 expression language.
+ * Jaxen-based compiled-xpath representation for XPATH 1.0 expression language.
*/
public class OXPath10ExpressionBPEL20 extends OXPath10Expression
implements Serializable {
Modified: ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/elang/xquery10/o/OXQuery10ExpressionBPEL20.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/elang/xquery10/o/OXQuery10ExpressionBPEL20.java?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/elang/xquery10/o/OXQuery10ExpressionBPEL20.java (original)
+++ ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/elang/xquery10/o/OXQuery10ExpressionBPEL20.java Thu May 27 18:09:53 2010
@@ -28,12 +28,12 @@ import org.apache.ode.bpel.elang.xpath20
import org.apache.ode.bpel.o.OProcess;
/**
- * A representation of an XQuery expression
+ * A representation of an XQuery expression
*/
public class OXQuery10ExpressionBPEL20 extends OXPath20ExpressionBPEL20 {
private static final long serialVersionUID = -1L;
-
+
public String xquery;
public OXQuery10ExpressionBPEL20(OProcess owner, QName qname_getVariableData,
Modified: ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/DebugInfo.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/DebugInfo.java?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/DebugInfo.java (original)
+++ ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/DebugInfo.java Thu May 27 18:09:53 2010
@@ -62,7 +62,7 @@ public class DebugInfo implements Serial
/**
* Do not load the description and extensibilityElements fields,
* as they may be big and are not really required at run-time.
- *
+ *
* @param ois
* @throws IOException
* @throws ClassNotFoundException
Modified: ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/FailureHandling.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/FailureHandling.java?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/FailureHandling.java (original)
+++ ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/FailureHandling.java Thu May 27 18:09:53 2010
@@ -26,7 +26,7 @@ import java.io.Serializable;
*/
public class FailureHandling implements Serializable {
private static final long serialVersionUID = 5637366976949702880L;
-
+
public static final String EXTENSION_NS_URI = "http://ode.apache.org/activityRecovery";
public static final QName FAILURE_FAULT_NAME = new QName(EXTENSION_NS_URI, "activityFailure");
public static final QName FAILURE_EXT_ELEMENT = new QName(EXTENSION_NS_URI, "failureHandling");
Modified: ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/OActivity.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/OActivity.java?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/OActivity.java (original)
+++ ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/OActivity.java Thu May 27 18:09:53 2010
@@ -31,7 +31,7 @@ import java.util.Set;
*/
public abstract class OActivity extends OAgent {
static final long serialVersionUID = -1L ;
-
+
public OExpression joinCondition;
public boolean suppressJoinFailure;
public final Set<OLink>sourceLinks = new HashSet<OLink>();
@@ -60,7 +60,7 @@ public abstract class OActivity extends
while (parent != null && handling == null) {
handling = parent.failureHandling;
parent = parent.parent;
- }
+ }
}
return handling;
}
@@ -91,12 +91,12 @@ public abstract class OActivity extends
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(";");