You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ode.apache.org by ms...@apache.org on 2006/10/26 23:55:22 UTC
svn commit: r468161 - in
/incubator/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler:
BpelC.java BpelCompiler.java BpelCompiler20.java
Author: mszefler
Date: Thu Oct 26 14:55:21 2006
New Revision: 468161
URL: http://svn.apache.org/viewvc?view=rev&rev=468161
Log:
report error if xpath2.0 not found, but do not fail.
Modified:
incubator/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/BpelC.java
incubator/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/BpelCompiler.java
incubator/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/BpelCompiler20.java
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=468161&r1=468160&r2=468161
==============================================================================
--- 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 Thu Oct 26 14:55:21 2006
@@ -257,7 +257,7 @@
CompilationMessage cmsg = __cmsgs.errBpelParseErr();
logCompilationMessage(cmsg);
this.invalidate();
- throw new CompilationException(cmsg);
+ throw new CompilationException(cmsg,ex);
}
OProcess oprocess;
Modified: incubator/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/BpelCompiler.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/BpelCompiler.java?view=diff&rev=468161&r1=468160&r2=468161
==============================================================================
--- incubator/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/BpelCompiler.java (original)
+++ incubator/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/BpelCompiler.java Thu Oct 26 14:55:21 2006
@@ -114,7 +114,7 @@
*/
abstract class BpelCompiler implements CompilerContext {
/** Class-severity logger. */
- private static final Log __log = LogFactory.getLog(BpelCompiler.class);
+ protected static final Log __log = LogFactory.getLog(BpelCompiler.class);
/** Standardized compiler messages. */
private static final CommonCompilationMessages __cmsgs =
Modified: incubator/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/BpelCompiler20.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/BpelCompiler20.java?view=diff&rev=468161&r1=468160&r2=468161
==============================================================================
--- incubator/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/BpelCompiler20.java (original)
+++ incubator/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/BpelCompiler20.java Thu Oct 26 14:55:21 2006
@@ -21,6 +21,7 @@
import org.apache.ode.bpel.compiler.bom.*;
import org.apache.ode.bpel.compiler.wsdl.WSDLFactory4BPEL;
import org.apache.ode.bpel.compiler.wsdl.WSDLFactoryBPEL20;
+import org.apache.ode.bpel.elang.xpath10.compiler.XPath10ExpressionCompilerBPEL20;
/**
* OASIS BPEL V2.0 Compiler
@@ -50,8 +51,13 @@
registerActivityCompiler(RethrowActivity.class, new RethrowGenerator());
registerActivityCompiler(ForEachActivity.class, new ForEachGenerator());
- registerExpressionLanguage(OASIS_EXPLANG_XPATH_1_0, "org.apache.ode.bpel.elang.xpath10.compiler.XPath10ExpressionCompilerBPEL20");
- registerExpressionLanguage(OASIS_EXPLANG_XPATH_2_0, "org.apache.ode.bpel.elang.xpath20.compiler.XPath20ExpressionCompilerBPEL20");
+ registerExpressionLanguage(OASIS_EXPLANG_XPATH_1_0, new XPath10ExpressionCompilerBPEL20());
+
+ try {
+ registerExpressionLanguage(OASIS_EXPLANG_XPATH_2_0, "org.apache.ode.bpel.elang.xpath20.compiler.XPath20ExpressionCompilerBPEL20");
+ } catch (Exception e) {
+ __log.error("Error loading XPath 2.0 Expression Language: it will not be available.");
+ }
}