You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ode.apache.org by ms...@apache.org on 2006/10/06 19:29:30 UTC
svn commit: r453694 - in /incubator/ode/trunk/bpel-compiler: ./
src/main/java/org/apache/ode/bpel/compiler/
src/test/java/org/apache/ode/bpel/compiler/
Author: mszefler
Date: Fri Oct 6 10:29:30 2006
New Revision: 453694
URL: http://svn.apache.org/viewvc?view=rev&rev=453694
Log:
Fixed test cases.
Modified:
incubator/ode/trunk/bpel-compiler/.classpath
incubator/ode/trunk/bpel-compiler/.project
incubator/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/BpelC.java
incubator/ode/trunk/bpel-compiler/src/test/java/org/apache/ode/bpel/compiler/StaticCheckTCase.java
incubator/ode/trunk/bpel-compiler/src/test/java/org/apache/ode/bpel/compiler/WSDLRegistryTest.java
Modified: incubator/ode/trunk/bpel-compiler/.classpath
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-compiler/.classpath?view=diff&rev=453694&r1=453693&r2=453694
==============================================================================
--- incubator/ode/trunk/bpel-compiler/.classpath (original)
+++ incubator/ode/trunk/bpel-compiler/.classpath Fri Oct 6 10:29:30 2006
@@ -4,35 +4,36 @@
<classpathentry kind="src" path="src/test/resources" output="target/test-classes"/>
<classpathentry kind="output" path="target/classes"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="var" path="M2_REPO/org/ccil/cowan/tagsoup/tagsoup/0.9.7/tagsoup-0.9.7.jar"/>
- <classpathentry kind="var" path="M2_REPO/wsdl4j/wsdl4j/1.5.2/wsdl4j-1.5.2.jar"/>
- <classpathentry kind="src" path="/ode-bpel-el-xpath10"/>
- <classpathentry kind="src" path="/ode-utils"/>
- <classpathentry kind="src" path="/ode-bpel-bom"/>
- <classpathentry kind="var" path="M2_REPO/saxon/saxon-dom/8.4/saxon-dom-8.4.jar"/>
- <classpathentry kind="var" path="M2_REPO/stax/stax-api/1.0/stax-api-1.0.jar"/>
+ <classpathentry kind="src" path="/ode-bpel-schemas"/>
<classpathentry kind="var" path="M2_REPO/commons-pool/commons-pool/1.2/commons-pool-1.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/jdom/jdom/1.0/jdom-1.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/xmlbeans/xbean/2.1.0/xbean-2.1.0.jar"/>
+ <classpathentry kind="src" path="/ode-bpel-bom"/>
<classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.0.3/commons-logging-1.0.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/net/sf/saxon/saxon/8.7/saxon-8.7.jar"/>
+ <classpathentry kind="var" path="M2_REPO/net/sf/saxon/saxon-xpath/8.7/saxon-xpath-8.7.jar"/>
+ <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jaxen/jaxen/1.1-beta-8/jaxen-1.1-beta-8.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/ccil/cowan/tagsoup/tagsoup/0.9.7/tagsoup-0.9.7.jar"/>
+ <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.6.2/xercesImpl-2.6.2.jar"/>
<classpathentry kind="src" path="/ode-bpel-parser"/>
- <classpathentry kind="src" path="/ode-bpel-api"/>
<classpathentry kind="var" path="M2_REPO/xalan/xalan/2.6.0/xalan-2.6.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/xerces/xmlParserAPIs/2.6.2/xmlParserAPIs-2.6.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/xmlbeans/xbean/2.1.0/xbean-2.1.0.jar"/>
- <classpathentry kind="src" path="/ode-bpel-obj"/>
+ <classpathentry kind="src" path="/ode-bpel-api"/>
<classpathentry kind="var" path="M2_REPO/commons-lang/commons-lang/2.1/commons-lang-2.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/jaxen/jaxen/1.1-beta-8/jaxen-1.1-beta-8.jar"/>
- <classpathentry kind="var" path="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/xom/xom/1.0b3/xom-1.0b3.jar"/>
- <classpathentry kind="var" path="M2_REPO/xmlbeans/xmlpublic/2.1.0/xmlpublic-2.1.0.jar"/>
<classpathentry kind="src" path="/ode-bpel-dd"/>
- <classpathentry kind="src" path="/ode-bpel-schemas"/>
- <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.6.2/xercesImpl-2.6.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.1/commons-collections-3.1.jar"/>
<classpathentry kind="var" path="M2_REPO/com/ibm/icu/icu4j/2.6.1/icu4j-2.6.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jdom/jdom/1.0/jdom-1.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.1/commons-collections-3.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/xerces/xmlParserAPIs/2.6.2/xmlParserAPIs-2.6.2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar"/>
+ <classpathentry kind="src" path="/ode-bpel-el-xpath10"/>
+ <classpathentry kind="src" path="/ode-utils"/>
+ <classpathentry kind="var" path="M2_REPO/net/sf/saxon/saxon-dom/8.7/saxon-dom-8.7.jar"/>
+ <classpathentry kind="var" path="M2_REPO/wsdl4j/wsdl4j/1.5.2/wsdl4j-1.5.2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/xmlbeans/xmlpublic/2.1.0/xmlpublic-2.1.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.13/log4j-1.2.13.jar"/>
+ <classpathentry kind="var" path="M2_REPO/xom/xom/1.0b3/xom-1.0b3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/stax/stax-api/1.0/stax-api-1.0.jar"/>
+ <classpathentry kind="src" path="/ode-bpel-obj"/>
<classpathentry kind="src" path="/ode-bpel-el-xpath20"/>
<classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar"/>
- <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.12/log4j-1.2.12.jar"/>
- <classpathentry kind="var" path="M2_REPO/saxon/saxon/8.4/saxon-8.4.jar"/>
</classpath>
Modified: incubator/ode/trunk/bpel-compiler/.project
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-compiler/.project?view=diff&rev=453694&r1=453693&r2=453694
==============================================================================
--- incubator/ode/trunk/bpel-compiler/.project (original)
+++ incubator/ode/trunk/bpel-compiler/.project Fri Oct 6 10:29:30 2006
@@ -2,14 +2,14 @@
<name>ode-bpel-compiler</name>
<comment>Converts BPEL object model into compiled BPEL representation.</comment>
<projects>
- <project>ode-bpel-el-xpath10</project>
- <project>ode-utils</project>
+ <project>ode-bpel-schemas</project>
<project>ode-bpel-bom</project>
<project>ode-bpel-parser</project>
<project>ode-bpel-api</project>
- <project>ode-bpel-obj</project>
<project>ode-bpel-dd</project>
- <project>ode-bpel-schemas</project>
+ <project>ode-bpel-el-xpath10</project>
+ <project>ode-utils</project>
+ <project>ode-bpel-obj</project>
<project>ode-bpel-el-xpath20</project>
</projects>
<buildSpec>
Modified: incubator/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/BpelC.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/BpelC.java?view=diff&rev=453694&r1=453693&r2=453694
==============================================================================
--- incubator/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/BpelC.java (original)
+++ incubator/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/BpelC.java Fri Oct 6 10:29:30 2006
@@ -199,6 +199,9 @@
* if one occurs while compiling.
*/
public void compile(Process process) throws CompilationException, IOException {
+ if (process == null)
+ throw new NullPointerException("Attempt to compile NULL process.");
+
logCompilationMessage(__cmsgs.infCompilingProcess());
BpelCompiler compiler;
Modified: incubator/ode/trunk/bpel-compiler/src/test/java/org/apache/ode/bpel/compiler/StaticCheckTCase.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-compiler/src/test/java/org/apache/ode/bpel/compiler/StaticCheckTCase.java?view=diff&rev=453694&r1=453693&r2=453694
==============================================================================
--- incubator/ode/trunk/bpel-compiler/src/test/java/org/apache/ode/bpel/compiler/StaticCheckTCase.java (original)
+++ incubator/ode/trunk/bpel-compiler/src/test/java/org/apache/ode/bpel/compiler/StaticCheckTCase.java Fri Oct 6 10:29:30 2006
@@ -119,7 +119,7 @@
public void setBaseURI(URI u) {
}
- public Definition4BPEL loadDefinition(WSDLReader f, URI uri) throws WSDLException {
+ public Definition4BPEL loadDefinition(WSDLReader f, File importLoc, URI uri) throws WSDLException {
InputStream is;
try {
is = getClass().getResource(uri.toASCIIString()).openStream();
Modified: incubator/ode/trunk/bpel-compiler/src/test/java/org/apache/ode/bpel/compiler/WSDLRegistryTest.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-compiler/src/test/java/org/apache/ode/bpel/compiler/WSDLRegistryTest.java?view=diff&rev=453694&r1=453693&r2=453694
==============================================================================
--- incubator/ode/trunk/bpel-compiler/src/test/java/org/apache/ode/bpel/compiler/WSDLRegistryTest.java (original)
+++ incubator/ode/trunk/bpel-compiler/src/test/java/org/apache/ode/bpel/compiler/WSDLRegistryTest.java Fri Oct 6 10:29:30 2006
@@ -68,7 +68,7 @@
WSDLFactory4BPEL factory = (WSDLFactory4BPEL)WSDLFactoryBPEL11.newInstance();
WSDLReader reader = factory.newWSDLReader();
WsdlFinder finder = new DefaultWsdlFinder();
- Definition4BPEL def = finder.loadDefinition(reader, wsd.toURI());
+ Definition4BPEL def = finder.loadDefinition(reader, null, wsd.toURI());
_registry.addDefinition(def);
// access model