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 2007/08/01 21:41:27 UTC
svn commit: r561929 - in /ode/trunk:
bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/
bpel-store/src/main/java/org/apache/ode/store/
Author: vanto
Date: Wed Aug 1 12:41:24 2007
New Revision: 561929
URL: http://svn.apache.org/viewvc?view=rev&rev=561929
Log:
Pretty printing compiler errors.
Modified:
ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/BpelCompiler.java
ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/CommonCompilationMessages.java
ode/trunk/bpel-store/src/main/java/org/apache/ode/store/Messages.java
ode/trunk/bpel-store/src/main/java/org/apache/ode/store/ProcessStoreImpl.java
Modified: ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/BpelCompiler.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/BpelCompiler.java?view=diff&rev=561929&r1=561928&r2=561929
==============================================================================
--- ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/BpelCompiler.java (original)
+++ ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/BpelCompiler.java Wed Aug 1 12:41:24 2007
@@ -685,14 +685,19 @@
assert _structureStack.size() == 0;
boolean hasErrors = false;
+ StringBuffer sb = new StringBuffer();
for (CompilationMessage msg : _errors) {
- if (msg.severity >= CompilationMessage.ERROR)
+ if (msg.severity >= CompilationMessage.ERROR) {
hasErrors = true;
+ sb.append('\t');
+ sb.append(msg.toErrorString());
+ sb.append('\n');
+ }
}
- if (hasErrors)
- throw new CompilationException(__cmsgs.errCompilationErrors(_errors.size()));
-
+ if (hasErrors) {
+ throw new CompilationException(__cmsgs.errCompilationErrors(_errors.size(), sb.toString()));
+ }
return _oprocess;
}
Modified: ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/CommonCompilationMessages.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/CommonCompilationMessages.java?view=diff&rev=561929&r1=561928&r2=561929
==============================================================================
--- ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/CommonCompilationMessages.java (original)
+++ ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/CommonCompilationMessages.java Wed Aug 1 12:41:24 2007
@@ -40,10 +40,10 @@
.formatCompilationMessage("Error parsing BPEL process: the BPEL is either malformed or is invalid.");
}
- /** Compilation completed with {0} error(s). */
- public CompilationMessage errCompilationErrors(int errorCount) {
- return this.formatCompilationMessage("Compilation completed with {0} error(s).",
- errorCount);
+ /** Compilation completed with {0} error(s): {1} */
+ public CompilationMessage errCompilationErrors(int errorCount, String prettyErrors) {
+ return this.formatCompilationMessage("Compilation completed with {0} error(s):\n{1}",
+ errorCount, prettyErrors);
}
/** Attempt to reference undeclared link "{0}". */
Modified: ode/trunk/bpel-store/src/main/java/org/apache/ode/store/Messages.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-store/src/main/java/org/apache/ode/store/Messages.java?view=diff&rev=561929&r1=561928&r2=561929
==============================================================================
--- ode/trunk/bpel-store/src/main/java/org/apache/ode/store/Messages.java (original)
+++ ode/trunk/bpel-store/src/main/java/org/apache/ode/store/Messages.java Wed Aug 1 12:41:24 2007
@@ -24,6 +24,7 @@
import javax.xml.namespace.QName;
+import org.apache.ode.bpel.compiler.api.CompilationException;
import org.apache.ode.utils.msg.MessageBundle;
/**
@@ -207,8 +208,12 @@
return format("Deploy failed; process \"{0}\" not found in deployment unit \"{1}\".",pid,du);
}
- public String msgDeployFailCompileErrors() {
- return format("Deploy failed; BPEL compilation errors." );
+ public String msgDeployFailCompileErrors(CompilationException ce) {
+ if (ce != null) {
+ return format("Deploy failed; {0}", ce.getMessage());
+ } else {
+ return format("Deploy failed; BPEL compilation errors." );
+ }
}
}
Modified: ode/trunk/bpel-store/src/main/java/org/apache/ode/store/ProcessStoreImpl.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-store/src/main/java/org/apache/ode/store/ProcessStoreImpl.java?view=diff&rev=561929&r1=561928&r2=561929
==============================================================================
--- ode/trunk/bpel-store/src/main/java/org/apache/ode/store/ProcessStoreImpl.java (original)
+++ ode/trunk/bpel-store/src/main/java/org/apache/ode/store/ProcessStoreImpl.java Wed Aug 1 12:41:24 2007
@@ -164,7 +164,7 @@
try {
du.compile();
} catch (CompilationException ce) {
- String errmsg = __msgs.msgDeployFailCompileErrors();
+ String errmsg = __msgs.msgDeployFailCompileErrors(ce);
__log.error(errmsg, ce);
throw new ContextException(errmsg, ce);
}