[jboss-svn-commits] JBL Code SVN: r22661 - in labs/jbossrules/trunk/drools-process/drools-bpel: src/main/java/org/drools/bpel/core and 2 other directories.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Wed Sep 10 19:42:17 EDT 2008


Author: KrisVerlaenen
Date: 2008-09-10 19:42:17 -0400 (Wed, 10 Sep 2008)
New Revision: 22661

Added:
   labs/jbossrules/trunk/drools-process/drools-bpel/export.jardesc
   labs/jbossrules/trunk/drools-process/drools-bpel/pom.xml
   labs/jbossrules/trunk/drools-process/drools-bpel/src/main/java/org/drools/bpel/core/BPELFaultHandlerScope.java
Removed:
   labs/jbossrules/trunk/drools-process/drools-bpel/lib/
Modified:
   labs/jbossrules/trunk/drools-process/drools-bpel/
   labs/jbossrules/trunk/drools-process/drools-bpel/.classpath
   labs/jbossrules/trunk/drools-process/drools-bpel/.project
   labs/jbossrules/trunk/drools-process/drools-bpel/src/main/java/org/drools/bpel/core/BPELProcess.java
   labs/jbossrules/trunk/drools-process/drools-bpel/src/main/java/org/drools/bpel/core/BPELScope.java
   labs/jbossrules/trunk/drools-process/drools-bpel/src/main/java/org/drools/bpel/instance/BPELFaultHandlerInstance.java
   labs/jbossrules/trunk/drools-process/drools-bpel/src/main/java/org/drools/bpel/instance/BPELRethrowInstance.java
   labs/jbossrules/trunk/drools-process/drools-bpel/src/main/resources/META-INF/bpelProcessNodeInstanceFactory.conf
Log:
 - Add drools-bpel in Drools build


Property changes on: labs/jbossrules/trunk/drools-process/drools-bpel
___________________________________________________________________
Name: svn:ignore
   + .settings
target


Modified: labs/jbossrules/trunk/drools-process/drools-bpel/.classpath
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-bpel/.classpath	2008-09-10 20:55:48 UTC (rev 22660)
+++ labs/jbossrules/trunk/drools-process/drools-bpel/.classpath	2008-09-10 23:42:17 UTC (rev 22661)
@@ -1,22 +1,35 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src/main/java"/>
-	<classpathentry kind="src" path="src/main/resources"/>
-	<classpathentry kind="src" path="src/test/java"/>
-	<classpathentry kind="src" path="src/test/resources"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/drools-compiler"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/drools-core"/>
-	<classpathentry kind="lib" path="lib/ode-bpel-compiler.jar"/>
-	<classpathentry kind="lib" path="lib/commons-logging-1.1.jar"/>
-	<classpathentry kind="lib" path="lib/saxon-xpath-8.7.jar"/>
-	<classpathentry kind="lib" path="lib/saxon-8.7.jar"/>
-	<classpathentry kind="lib" path="lib/saxon-dom-8.7.jar"/>
-	<classpathentry kind="lib" path="lib/wsdl4j-1.6.1.jar"/>
-	<classpathentry kind="lib" path="lib/ode-utils.jar"/>
-	<classpathentry kind="lib" path="lib/xercesImpl-2.9.0.jar"/>
-	<classpathentry kind="lib" path="lib/ode-bpel-schemas.jar"/>
-	<classpathentry kind="lib" path="lib/xalan-2.7.0.jar"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
+  <classpathentry kind="src" path="src/main/java"/>
+  <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/>
+  <classpathentry kind="src" path="src/test/java" output="target/test-classes"/>
+  <classpathentry kind="src" path="src/test/resources" output="target/test-classes" excluding="**/*.java"/>
+  <classpathentry kind="output" path="target/classes"/>
+  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+  <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.1/commons-logging-1.1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.13/log4j-1.2.13.jar"/>
+  <classpathentry kind="var" path="M2_REPO/logkit/logkit/1.0.1/logkit-1.0.1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/avalon-framework/avalon-framework/4.1.3/avalon-framework-4.1.3.jar"/>
+  <classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.3/servlet-api-2.3.jar"/>
+  <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.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/org/apache/ode/ode-bpel-compiler/1.2/ode-bpel-compiler-1.2.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/apache/ode/ode-bpel-schemas/1.2/ode-bpel-schemas-1.2.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/apache/ode/ode-utils/1.2/ode-utils-1.2.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/drools/drools-compiler/5.0.0.SNAPSHOT/drools-compiler-5.0.0.SNAPSHOT.jar" sourcepath="M2_REPO/org/drools/drools-compiler/5.0.0.SNAPSHOT/drools-compiler-5.0.0.SNAPSHOT-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/drools/drools-core/5.0.0.SNAPSHOT/drools-core-5.0.0.SNAPSHOT.jar" sourcepath="M2_REPO/org/drools/drools-core/5.0.0.SNAPSHOT/drools-core-5.0.0.SNAPSHOT-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/mvel/mvel/2.0-SNAPSHOT/mvel-2.0-SNAPSHOT.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/antlr/antlr-runtime/3.0.1/antlr-runtime-3.0.1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/antlr/gunit/1.0.1/gunit-1.0.1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/antlr/antlr/3.0.1/antlr-3.0.1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/antlr/antlr/2.7.7/antlr-2.7.7.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/eclipse/jdt/core/3.2.3.v_686_R32x/core-3.2.3.v_686_R32x.jar"/>
+  <classpathentry kind="var" path="M2_REPO/janino/janino/2.5.10/janino-2.5.10.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jmock/jmock/2.5.0.1/jmock-2.5.0.1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-library/1.1/hamcrest-library-1.1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/wsdl4j/wsdl4j/1.6.1/wsdl4j-1.6.1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/xalan/xalan/2.7.0/xalan-2.7.0.jar"/>
+  <classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/2.0.2/xml-apis-2.0.2.jar"/>
+  <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.8.0/xercesImpl-2.8.0.jar"/>
+</classpath>
\ No newline at end of file

Modified: labs/jbossrules/trunk/drools-process/drools-bpel/.project
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-bpel/.project	2008-09-10 20:55:48 UTC (rev 22660)
+++ labs/jbossrules/trunk/drools-process/drools-bpel/.project	2008-09-10 23:42:17 UTC (rev 22661)
@@ -1,17 +1,13 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>drools-bpel</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
+<projectDescription>
+  <name>drools-bpel</name>
+  <comment>A rule production system</comment>
+  <projects/>
+  <buildSpec>
+    <buildCommand>
+      <name>org.eclipse.jdt.core.javabuilder</name>
+    </buildCommand>
+  </buildSpec>
+  <natures>
+    <nature>org.eclipse.jdt.core.javanature</nature>
+  </natures>
+</projectDescription>
\ No newline at end of file

Added: labs/jbossrules/trunk/drools-process/drools-bpel/export.jardesc
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-bpel/export.jardesc	                        (rev 0)
+++ labs/jbossrules/trunk/drools-process/drools-bpel/export.jardesc	2008-09-10 23:42:17 UTC (rev 22661)
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jardesc>
+<jar path="/NotBackedUp/kverlaen/workspaces/workspace-bpel/Drools-BPEL/lib/drools-bpel.jar"/>
+<options buildIfNeeded="true" compress="true" descriptionLocation="/drools-bpel/export.jardesc" exportErrors="true" exportWarnings="true" includeDirectoryEntries="false" overwrite="false" saveDescription="true" storeRefactorings="false" useSourceFolders="false"/>
+<storedRefactorings deprecationInfo="true" structuralOnly="false"/>
+<selectedProjects/>
+<manifest generateManifest="true" manifestLocation="" manifestVersion="1.0" reuseManifest="false" saveManifest="false" usesManifest="true">
+<sealing sealJar="false">
+<packagesToSeal/>
+<packagesToUnSeal/>
+</sealing>
+</manifest>
+<selectedElements exportClassFiles="true" exportJavaFiles="false" exportOutputFolder="false">
+<file path="/drools-bpel/.classpath"/>
+<javaElement handleIdentifier="=drools-bpel/src\/main\/java"/>
+<file path="/drools-bpel/event.log"/>
+<file path="/drools-bpel/.project"/>
+<javaElement handleIdentifier="=drools-bpel/src\/main\/resources"/>
+</selectedElements>
+</jardesc>

Added: labs/jbossrules/trunk/drools-process/drools-bpel/pom.xml
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-bpel/pom.xml	                        (rev 0)
+++ labs/jbossrules/trunk/drools-process/drools-bpel/pom.xml	2008-09-10 23:42:17 UTC (rev 22661)
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <artifactId>drools</artifactId>
+    <groupId>org.drools</groupId>
+    <version>5.0.0.SNAPSHOT</version>
+  </parent>
+
+  <artifactId>drools-bpel</artifactId>
+  <packaging>jar</packaging>
+  <name>Drools :: Process :: BPEL</name>
+
+  <build/>
+
+  <dependencies>
+  
+    <!-- Internal dependencies -->
+    <dependency>
+      <groupId>org.drools</groupId>
+      <artifactId>drools-core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.drools</groupId>
+      <artifactId>drools-compiler</artifactId>
+    </dependency>
+
+    <!-- External dependencies -->
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+      <version>1.1</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.ode</groupId>
+      <artifactId>ode-bpel-compiler</artifactId>
+      <version>1.2</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.ode</groupId>
+      <artifactId>ode-bpel-schemas</artifactId>
+      <version>1.2</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.ode</groupId>
+      <artifactId>ode-utils</artifactId>
+      <version>1.2</version>
+    </dependency>
+    <dependency>
+      <groupId>net.sf.saxon</groupId>
+      <artifactId>saxon</artifactId>
+      <version>8.7</version>
+    </dependency>
+    <dependency>
+      <groupId>net.sf.saxon</groupId>
+      <artifactId>saxon-xpath</artifactId>
+      <version>8.7</version>
+    </dependency>
+    <dependency>
+      <groupId>wsdl4j</groupId>
+      <artifactId>wsdl4j</artifactId>
+      <version>1.6.1</version>
+    </dependency>
+    <dependency>
+      <groupId>xalan</groupId>
+      <artifactId>xalan</artifactId>
+      <version>2.7.0</version>
+    </dependency>
+    <dependency>
+      <groupId>xerces</groupId>
+      <artifactId>xercesImpl</artifactId>
+      <version>2.8.0</version>
+    </dependency>
+    
+  </dependencies>
+
+</project>

Added: labs/jbossrules/trunk/drools-process/drools-bpel/src/main/java/org/drools/bpel/core/BPELFaultHandlerScope.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-bpel/src/main/java/org/drools/bpel/core/BPELFaultHandlerScope.java	                        (rev 0)
+++ labs/jbossrules/trunk/drools-process/drools-bpel/src/main/java/org/drools/bpel/core/BPELFaultHandlerScope.java	2008-09-10 23:42:17 UTC (rev 22661)
@@ -0,0 +1,33 @@
+package org.drools.bpel.core;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.drools.process.core.context.variable.Variable;
+import org.drools.process.core.context.variable.VariableScope;
+import org.drools.process.core.datatype.impl.type.StringDataType;
+import org.drools.workflow.core.node.CompositeContextNode;
+
+public class BPELFaultHandlerScope extends CompositeContextNode {
+
+	public static final String INTERNAL_FAULT_DATA_VARIABLE = "DroolsInternalFaultDataVariable";
+	public static final String INTERNAL_FAULT_NAME_VARIABLE = "DroolsInternalFaultNameVariable";
+
+	private static final long serialVersionUID = 4L;
+	
+	public BPELFaultHandlerScope() {
+		VariableScope variableScope = new VariableScope();
+		List<Variable> variables = new ArrayList<Variable>();
+		Variable variable = new Variable();
+		variable.setName(INTERNAL_FAULT_DATA_VARIABLE);
+		variables.add(variable);
+		variable = new Variable();
+		variable.setName(INTERNAL_FAULT_NAME_VARIABLE);
+		variable.setType(new StringDataType());
+		variables.add(variable);
+		variableScope.setVariables(variables);
+	    addContext(variableScope);
+	    setDefaultContext(variableScope);
+	}
+	
+}

Modified: labs/jbossrules/trunk/drools-process/drools-bpel/src/main/java/org/drools/bpel/core/BPELProcess.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-bpel/src/main/java/org/drools/bpel/core/BPELProcess.java	2008-09-10 20:55:48 UTC (rev 22660)
+++ labs/jbossrules/trunk/drools-process/drools-bpel/src/main/java/org/drools/bpel/core/BPELProcess.java	2008-09-10 23:42:17 UTC (rev 22661)
@@ -90,15 +90,21 @@
     		join, Node.CONNECTION_DEFAULT_TYPE,
     		endNode, Node.CONNECTION_DEFAULT_TYPE);
         for (BPELFaultHandler faultHandler: faultHandlers) {
-        	Node activity = faultHandler.getActivity(); 
-        	activity.setId(i++);
-            addNode(activity);
+        	BPELFaultHandlerScope faultHandlerScope = new BPELFaultHandlerScope();
+        	faultHandlerScope.setId(i++);
+            addNode(faultHandlerScope);
+        	Node activity = faultHandler.getActivity();
+        	faultHandlerScope.addNode(activity);
+        	faultHandlerScope.linkIncomingConnections(
+    			Node.CONNECTION_DEFAULT_TYPE, activity.getId(), Node.CONNECTION_DEFAULT_TYPE);
+        	faultHandlerScope.linkOutgoingConnections(
+    			activity.getId(), Node.CONNECTION_DEFAULT_TYPE, Node.CONNECTION_DEFAULT_TYPE);
             exceptionScope.setExceptionHandler(faultHandler.getFaultName(), faultHandler);
             new ConnectionImpl(
         		split, Node.CONNECTION_DEFAULT_TYPE,
-        		activity, Node.CONNECTION_DEFAULT_TYPE);
+        		faultHandlerScope, Node.CONNECTION_DEFAULT_TYPE);
             new ConnectionImpl(
-        		activity, Node.CONNECTION_DEFAULT_TYPE,
+        		faultHandlerScope, Node.CONNECTION_DEFAULT_TYPE,
         		join, Node.CONNECTION_DEFAULT_TYPE);
         }
     }

Modified: labs/jbossrules/trunk/drools-process/drools-bpel/src/main/java/org/drools/bpel/core/BPELScope.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-bpel/src/main/java/org/drools/bpel/core/BPELScope.java	2008-09-10 20:55:48 UTC (rev 22660)
+++ labs/jbossrules/trunk/drools-process/drools-bpel/src/main/java/org/drools/bpel/core/BPELScope.java	2008-09-10 23:42:17 UTC (rev 22661)
@@ -1,12 +1,9 @@
 package org.drools.bpel.core;
 
-import java.util.ArrayList;
 import java.util.List;
 
 import org.drools.process.core.context.exception.ExceptionScope;
-import org.drools.process.core.context.variable.Variable;
 import org.drools.process.core.context.variable.VariableScope;
-import org.drools.process.core.datatype.impl.type.StringDataType;
 import org.drools.workflow.core.Node;
 import org.drools.workflow.core.impl.ConnectionImpl;
 import org.drools.workflow.core.node.CompositeContextNode;
@@ -20,8 +17,6 @@
  */
 public class BPELScope extends CompositeContextNode implements BPELActivity, BPELFaultHandlerContainer {
 
-	public static final String INTERNAL_FAULT_DATA_VARIABLE = "DroolsInternalFaultDataVariable";
-	public static final String INTERNAL_FAULT_NAME_VARIABLE = "DroolsInternalFaultNameVariable";
     private static final long serialVersionUID = 400L;
 
 	private SourceLink[] sourceLinks;
@@ -94,25 +89,4 @@
         this.targetLinks = targetLinks;
     }
     
-    public static class BPELFaultHandlerScope extends CompositeContextNode {
-
-		private static final long serialVersionUID = 4L;
-		
-		public BPELFaultHandlerScope() {
-			VariableScope variableScope = new VariableScope();
-			List<Variable> variables = new ArrayList<Variable>();
-			Variable variable = new Variable();
-			variable.setName(INTERNAL_FAULT_DATA_VARIABLE);
-			variables.add(variable);
-			variable = new Variable();
-			variable.setName(INTERNAL_FAULT_NAME_VARIABLE);
-			variable.setType(new StringDataType());
-			variables.add(variable);
-			variableScope.setVariables(variables);
-		    addContext(variableScope);
-		    setDefaultContext(variableScope);
-		}
-		
-    }
-
 }

Modified: labs/jbossrules/trunk/drools-process/drools-bpel/src/main/java/org/drools/bpel/instance/BPELFaultHandlerInstance.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-bpel/src/main/java/org/drools/bpel/instance/BPELFaultHandlerInstance.java	2008-09-10 20:55:48 UTC (rev 22660)
+++ labs/jbossrules/trunk/drools-process/drools-bpel/src/main/java/org/drools/bpel/instance/BPELFaultHandlerInstance.java	2008-09-10 23:42:17 UTC (rev 22661)
@@ -1,8 +1,7 @@
 package org.drools.bpel.instance;
 
 import org.drools.bpel.core.BPELFaultHandler;
-import org.drools.bpel.core.BPELScope;
-import org.drools.bpel.core.BPELScope.BPELFaultHandlerScope;
+import org.drools.bpel.core.BPELFaultHandlerScope;
 import org.drools.process.core.context.exception.ExceptionHandler;
 import org.drools.process.core.context.variable.VariableScope;
 import org.drools.process.instance.context.exception.ExceptionHandlerInstance;
@@ -45,9 +44,11 @@
         CompositeContextNodeInstance nodeInstance = (CompositeContextNodeInstance)
         	nodeInstanceContainer.getNodeInstance((BPELFaultHandlerScope)
     			faultHandler.getActivity().getNodeContainer());
-        VariableScopeInstance variableScopeInstance = ((VariableScopeInstance) nodeInstance.resolveContextInstance(VariableScope.VARIABLE_SCOPE, BPELScope.INTERNAL_FAULT_NAME_VARIABLE));
-    	variableScopeInstance.setVariable(BPELScope.INTERNAL_FAULT_NAME_VARIABLE, exception);
-    	variableScopeInstance.setVariable(BPELScope.INTERNAL_FAULT_DATA_VARIABLE, param);
+        VariableScopeInstance variableScopeInstance =
+        	((VariableScopeInstance) nodeInstance.resolveContextInstance(
+    			VariableScope.VARIABLE_SCOPE, BPELFaultHandlerScope.INTERNAL_FAULT_NAME_VARIABLE));
+    	variableScopeInstance.setVariable(BPELFaultHandlerScope.INTERNAL_FAULT_NAME_VARIABLE, exception);
+    	variableScopeInstance.setVariable(BPELFaultHandlerScope.INTERNAL_FAULT_DATA_VARIABLE, param);
         String faultVariable = faultHandler.getFaultVariable();
         if (faultVariable != null) {
             variableScopeInstance = (VariableScopeInstance)

Modified: labs/jbossrules/trunk/drools-process/drools-bpel/src/main/java/org/drools/bpel/instance/BPELRethrowInstance.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-bpel/src/main/java/org/drools/bpel/instance/BPELRethrowInstance.java	2008-09-10 20:55:48 UTC (rev 22660)
+++ labs/jbossrules/trunk/drools-process/drools-bpel/src/main/java/org/drools/bpel/instance/BPELRethrowInstance.java	2008-09-10 23:42:17 UTC (rev 22661)
@@ -1,6 +1,6 @@
 package org.drools.bpel.instance;
 
-import org.drools.bpel.core.BPELScope;
+import org.drools.bpel.core.BPELFaultHandlerScope;
 import org.drools.process.core.context.exception.ExceptionScope;
 import org.drools.process.core.context.variable.VariableScope;
 import org.drools.process.instance.ProcessInstance;
@@ -27,7 +27,7 @@
     
     protected ExceptionScopeInstance getExceptionScopeInstance(String faultName) {
     	VariableScopeInstance variableScopeInstance = (VariableScopeInstance)
-    		resolveContextInstance(VariableScope.VARIABLE_SCOPE, BPELScope.INTERNAL_FAULT_NAME_VARIABLE);
+    		resolveContextInstance(VariableScope.VARIABLE_SCOPE, BPELFaultHandlerScope.INTERNAL_FAULT_NAME_VARIABLE);
 		BPELScopeInstance scopeInstance = (BPELScopeInstance)
 			((CompositeContextNodeInstance) variableScopeInstance.getContextInstanceContainer())
 				.getNodeInstanceContainer();
@@ -47,14 +47,14 @@
     
     protected String getFaultName() {
     	VariableScopeInstance variableScopeInstance = (VariableScopeInstance)
-    		resolveContextInstance(VariableScope.VARIABLE_SCOPE, BPELScope.INTERNAL_FAULT_NAME_VARIABLE);
-    	return (String) variableScopeInstance.getVariable(BPELScope.INTERNAL_FAULT_NAME_VARIABLE);
+    		resolveContextInstance(VariableScope.VARIABLE_SCOPE, BPELFaultHandlerScope.INTERNAL_FAULT_NAME_VARIABLE);
+    	return (String) variableScopeInstance.getVariable(BPELFaultHandlerScope.INTERNAL_FAULT_NAME_VARIABLE);
     }
     
     protected Object getFaultData() {
     	VariableScopeInstance variableScopeInstance = (VariableScopeInstance)
-    		resolveContextInstance(VariableScope.VARIABLE_SCOPE, BPELScope.INTERNAL_FAULT_DATA_VARIABLE);
-    	return variableScopeInstance.getVariable(BPELScope.INTERNAL_FAULT_DATA_VARIABLE);
+    		resolveContextInstance(VariableScope.VARIABLE_SCOPE, BPELFaultHandlerScope.INTERNAL_FAULT_DATA_VARIABLE);
+    	return variableScopeInstance.getVariable(BPELFaultHandlerScope.INTERNAL_FAULT_DATA_VARIABLE);
     }
     
     protected void handleException(String faultName, ExceptionScopeInstance exceptionScopeInstance) {

Modified: labs/jbossrules/trunk/drools-process/drools-bpel/src/main/resources/META-INF/bpelProcessNodeInstanceFactory.conf
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-bpel/src/main/resources/META-INF/bpelProcessNodeInstanceFactory.conf	2008-09-10 20:55:48 UTC (rev 22660)
+++ labs/jbossrules/trunk/drools-process/drools-bpel/src/main/resources/META-INF/bpelProcessNodeInstanceFactory.conf	2008-09-10 23:42:17 UTC (rev 22661)
@@ -5,7 +5,7 @@
 import org.drools.bpel.core.BPELReceive;
 import org.drools.bpel.core.BPELReply;
 import org.drools.bpel.core.BPELScope;
-import org.drools.bpel.core.BPELScope$BPELFaultHandlerScope;
+import org.drools.bpel.core.BPELFaultHandlerScope;
 import org.drools.bpel.core.BPELSequence;
 import org.drools.bpel.core.BPELEmpty;
 import org.drools.bpel.core.BPELPick;




More information about the jboss-svn-commits mailing list