svn commit: r537980 - in /incubator/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler: BpelCompiler.java CompensateGenerator.java bom/Bpel20QNames.java

[mszefler]

Author: mszefler
Date: Mon May 14 14:10:39 2007
New Revision: 537980

URL: http://svn.apache.org/viewvc?view=rev&rev=537980
Log:
Report error when the scope to compensate is not specified in the 
<compensate> activity. 

Modified:
    
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/CompensateGenerator.java
    
incubator/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/Bpel20QNames.java

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=537980&r1=537979&r2=537980
==============================================================================
--- 
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
 Mon May 14 14:10:39 2007
@@ -324,7 +324,7 @@
         if (scopeToComp == null)
             throw new 
CompilationException(__cmsgs.errCompensateOfInvalidScope(scopeToCompensate));
 
-        return scopeToComp;
+        return scopeToComp; 
     }
 
     public String getSourceLocation() {

Modified: 
incubator/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/CompensateGenerator.java
URL: 
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/CompensateGenerator.java?view=diff&rev=537980&r1=537979&r2=537980
==============================================================================
--- 
incubator/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/CompensateGenerator.java
 (original)
+++ 
incubator/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/CompensateGenerator.java
 Mon May 14 14:10:39 2007
@@ -18,19 +18,24 @@
  */
 package org.apache.ode.bpel.compiler;
 
+import org.apache.ode.bpel.compiler.api.CompilationException;
 import org.apache.ode.bpel.compiler.bom.Activity;
 import org.apache.ode.bpel.compiler.bom.CompensateActivity;
 import org.apache.ode.bpel.o.OActivity;
 import org.apache.ode.bpel.o.OCompensate;
+import org.apache.ode.utils.msg.MessageBundle;
 
 
 /**
- * Generates code for the <code>&lt;switch&gt;</code> activities.
+ * Generates code for the <code>&lt;compensate&gt;</code> activities.
  */
 class CompensateGenerator extends DefaultActivityGenerator {
-
+    private static final CompensateGeneratorMessages __cmsgs = 
MessageBundle.getMessages(CompensateGeneratorMessages.class);
+    
     public void compile(OActivity output, Activity src) {
         CompensateActivity compSrc = (CompensateActivity) src;
+        if (compSrc.getScopeToCompensate() == null)
+            throw new 
CompilationException(__cmsgs.errScopeToCompensateUnspecfied());
         ((OCompensate)output).compensatedScope = 
_context.resolveCompensatableScope(compSrc.getScopeToCompensate());
     }
 

Modified: 
incubator/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/Bpel20QNames.java
URL: 
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/Bpel20QNames.java?view=diff&rev=537980&r1=537979&r2=537980
==============================================================================
--- 
incubator/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/Bpel20QNames.java
 (original)
+++ 
incubator/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/Bpel20QNames.java
 Mon May 14 14:10:39 2007
@@ -21,7 +21,6 @@
 import javax.xml.namespace.QName;
 
 public abstract class Bpel20QNames {
-
     /**
      * The XML namespace for schema of WS-BPEL 2.0, i.e., the first
      * OASIS-sanctioned version of the specification.