You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ode.apache.org by ad...@apache.org on 2006/02/28 18:19:16 UTC
svn commit: r381712 [2/13] - in /incubator/ode/scratch/ode: ./ bpelTests/test1/ bpelTests/test10/ bpelTests/test12/ bpelTests/test13/ bpelTests/test14/ bpelTests/test15/ bpelTests/test16/ bpelTests/test17/ bpelTests/test2/ bpelTests/test3/ bpelTests/te...

Modified: incubator/ode/scratch/ode/bpelTests/test9/test9.xml
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/bpelTests/test9/test9.xml?rev=381712&r1=381711&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/bpelTests/test9/test9.xml (original)
+++ incubator/ode/scratch/ode/bpelTests/test9/test9.xml Tue Feb 28 09:18:27 2006
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<BPEBinding xmlns="http://apache.org/ode/binding/ode" xmlns:prb="urn:sybase:bpel:testProbe">
+<BPEBinding xmlns="http://ode.apache.org/bpe/binding/bpe" xmlns:prb="urn:sybase:bpel:testProbe">
 	<ActionBindings>
 		<binding  name="BPEBinding1" nameSpace="urn:sybase:bpel:testProbe" portType="probeMessagePT">
 			<operation name="probe">
-				<action implementation="org.apache.ode.action.external.ProbeAction" prb:rootSourcePart="probeName" prb:targetPart="probeData"/>
+				<action implementation="org.apache.ode.bpe.action.external.ProbeAction" prb:rootSourcePart="probeName" prb:targetPart="probeData"/>
 			</operation>
 		</binding>
 	</ActionBindings>

Modified: incubator/ode/scratch/ode/bpelTests/testBPChain/BP2.wsdl
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/bpelTests/testBPChain/BP2.wsdl?rev=381712&r1=381711&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/bpelTests/testBPChain/BP2.wsdl (original)
+++ incubator/ode/scratch/ode/bpelTests/testBPChain/BP2.wsdl Tue Feb 28 09:18:27 2006
@@ -18,7 +18,7 @@
 	</portType>
 	<binding name="BP2PT" type="tns:BP2PT">
 		<operation name="request">
-			<bpe:action implementation="org.apache.ode.action.external.BusinessProcessInvocationAction" OperationName="request" PortTypeName="BP2PT" PortName="BP2Port" PortTypeNameSpace="urn:sybase:bpel:BP2Processing"/>
+			<bpe:action implementation="org.apache.ode.bpe.action.external.BusinessProcessInvocationAction" OperationName="request" PortTypeName="BP2PT" PortName="BP2Port" PortTypeNameSpace="urn:sybase:bpel:BP2Processing"/>
 			<input name="requestMessage">
 				<bpe:input part="requestMessageData" type="interaction"/>
 			</input>
@@ -28,7 +28,7 @@
 			</output>
 		</operation>
 		<operation name="subsequentRequest">
-			<bpe:action implementation="org.apache.ode.action.external.BusinessProcessInvocationAction" OperationName="subsequentRequest" PortTypeName="BP2PT" PortName="BP2Port" PortTypeNameSpace="urn:sybase:bpel:BP2Processing"/>
+			<bpe:action implementation="org.apache.ode.bpe.action.external.BusinessProcessInvocationAction" OperationName="subsequentRequest" PortTypeName="BP2PT" PortName="BP2Port" PortTypeNameSpace="urn:sybase:bpel:BP2Processing"/>
 			<input name="requestMessage">
 				<bpe:input part="requestMessageData" type="interaction"/>
 			</input>

Modified: incubator/ode/scratch/ode/bpelTests/testBPInvokeDeadlock/BPService.xml
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/bpelTests/testBPInvokeDeadlock/BPService.xml?rev=381712&r1=381711&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/bpelTests/testBPInvokeDeadlock/BPService.xml (original)
+++ incubator/ode/scratch/ode/bpelTests/testBPInvokeDeadlock/BPService.xml Tue Feb 28 09:18:27 2006
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<bpe:BPEBinding xmlns:bpe="http://apache.org/ode/binding/ode" xmlns:bp1="urn:mycompany:/deadlock/BPService1">
+<bpe:BPEBinding xmlns:bpe="http://ode.apache.org/bpe/binding/bpe" xmlns:bp1="urn:mycompany:/deadlock/BPService1">
   <bpe:ActionBindings>
     <bpe:binding name="ID1126550749889265" nameSpace="urn:mycompany:/deadlock/BPService1" portType="BPService1">
       <bpe:operation name="operation1">
-        <bpe:action implementation="org.apache.ode.action.external.DeadlockInvokeTestAction" bp1:operationName="operation1"/>
+        <bpe:action implementation="org.apache.ode.bpe.action.external.DeadlockInvokeTestAction" bp1:operationName="operation1"/>
       </bpe:operation>
     </bpe:binding>
     <bpe:binding name="ID1126550754279266" nameSpace="urn:mycompany:/deadlock/BPService1" portType="BPService1">
       <bpe:operation name="operation2">
-        <bpe:action implementation="org.apache.ode.action.external.DeadlockInvokeTestAction" bp1:operationName="operation2"/>
+        <bpe:action implementation="org.apache.ode.bpe.action.external.DeadlockInvokeTestAction" bp1:operationName="operation2"/>
       </bpe:operation>
     </bpe:binding>
   </bpe:ActionBindings>

Modified: incubator/ode/scratch/ode/bpelTests/testBPInvokeDeadlock/BPService1.xml
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/bpelTests/testBPInvokeDeadlock/BPService1.xml?rev=381712&r1=381711&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/bpelTests/testBPInvokeDeadlock/BPService1.xml (original)
+++ incubator/ode/scratch/ode/bpelTests/testBPInvokeDeadlock/BPService1.xml Tue Feb 28 09:18:27 2006
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<bpe:BPEBinding xmlns:bpe="http://apache.org/ode/binding/ode">
+<bpe:BPEBinding xmlns:bpe="http://ode.apache.org/bpe/binding/bpe">
   <bpe:ActionBindings/>
   <bpe:ActivityBindings/>
 </bpe:BPEBinding>

Modified: incubator/ode/scratch/ode/bpelTests/testCatchAllNonBPError/BPService.xml
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/bpelTests/testCatchAllNonBPError/BPService.xml?rev=381712&r1=381711&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/bpelTests/testCatchAllNonBPError/BPService.xml (original)
+++ incubator/ode/scratch/ode/bpelTests/testCatchAllNonBPError/BPService.xml Tue Feb 28 09:18:27 2006
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<bpe:BPEBinding xmlns:bpe="http://apache.org/ode/binding/ode" xmlns:cta="urn:mycompany:/catchall/JavaService">
+<bpe:BPEBinding xmlns:bpe="http://ode.apache.org/bpe/binding/bpe" xmlns:cta="urn:mycompany:/catchall/JavaService">
   <bpe:ActionBindings>
     <bpe:binding name="ID1126210195549436" nameSpace="urn:mycompany:/catchall/JavaService" portType="ThrowStuff">
       <bpe:operation name="throwStuff">
-        <bpe:action implementation="org.apache.ode.action.external.ThrowStuffAction" cta:InputName="throwStuffRequest" cta:OperationName="throwStuff" cta:OutputName="throwStuffResponse" cta:PortTypeName="ThrowStuff" cta:PortTypeNameSpace="urn:mycompany:/catchall/JavaService" cta:ServiceName="JavaService" cta:ServiceNameSpace="urn:mycompany:/catchall/JavaService"/>
+        <bpe:action implementation="org.apache.ode.bpe.action.external.ThrowStuffAction" cta:InputName="throwStuffRequest" cta:OperationName="throwStuff" cta:OutputName="throwStuffResponse" cta:PortTypeName="ThrowStuff" cta:PortTypeNameSpace="urn:mycompany:/catchall/JavaService" cta:ServiceName="JavaService" cta:ServiceNameSpace="urn:mycompany:/catchall/JavaService"/>
       </bpe:operation>
     </bpe:binding>
   </bpe:ActionBindings>

Modified: incubator/ode/scratch/ode/bpelTests/testCorrlInvokeReply/invokereplycorrls.xml
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/bpelTests/testCorrlInvokeReply/invokereplycorrls.xml?rev=381712&r1=381711&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/bpelTests/testCorrlInvokeReply/invokereplycorrls.xml (original)
+++ incubator/ode/scratch/ode/bpelTests/testCorrlInvokeReply/invokereplycorrls.xml Tue Feb 28 09:18:27 2006
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<bpe:BPEBinding xmlns:bpe="http://apache.org/ode/binding/ode" xmlns:irc="urn:mycompany:/corrlcr/testinvoke">
+<bpe:BPEBinding xmlns:bpe="http://ode.apache.org/bpe/binding/bpe" xmlns:irc="urn:mycompany:/corrlcr/testinvoke">
   <bpe:ActionBindings>
     <bpe:binding name="ID112170680598996" nameSpace="urn:mycompany:/corrlcr/testinvoke" portType="testinvoke">
       <bpe:operation name="operation1">
-        <bpe:action implementation="org.apache.ode.action.external.TestInvokeAction" irc:InputName="operation1Request" irc:OperationName="operation1" irc:OutputName="operation1Response" irc:PortTypeName="testinvoke" irc:PortTypeNameSpace="urn:mycompany:/corrlcr/testinvoke" irc:ServiceName="testinvoke" irc:ServiceNameSpace="urn:mycompany:/corrlcr/testinvoke"/>
+        <bpe:action implementation="org.apache.ode.bpe.action.external.TestInvokeAction" irc:InputName="operation1Request" irc:OperationName="operation1" irc:OutputName="operation1Response" irc:PortTypeName="testinvoke" irc:PortTypeNameSpace="urn:mycompany:/corrlcr/testinvoke" irc:ServiceName="testinvoke" irc:ServiceNameSpace="urn:mycompany:/corrlcr/testinvoke"/>
       </bpe:operation>
     </bpe:binding>
   </bpe:ActionBindings>

Modified: incubator/ode/scratch/ode/bpelTests/testFaultCompHandlerInInvoke/faultCompHandlerInInvoke.xml
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/bpelTests/testFaultCompHandlerInInvoke/faultCompHandlerInInvoke.xml?rev=381712&r1=381711&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/bpelTests/testFaultCompHandlerInInvoke/faultCompHandlerInInvoke.xml (original)
+++ incubator/ode/scratch/ode/bpelTests/testFaultCompHandlerInInvoke/faultCompHandlerInInvoke.xml Tue Feb 28 09:18:27 2006
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<BPEBinding xmlns="http://apache.org/ode/binding/ode">
+<BPEBinding xmlns="http://ode.apache.org/bpe/binding/bpe">
 	<ActionBindings>
 		<binding name="BPEBinding1" nameSpace="urn:sybase:bpel:noOp" portType="noOpPT">
     		<operation name="noOp">
-      			<action implementation="org.apache.ode.action.external.NoOpAction"/>
+      			<action implementation="org.apache.ode.bpe.action.external.NoOpAction"/>
 			</operation>
   		</binding>
 		<binding name="BPEBinding2" nameSpace="urn:sybase:bpel:testFault" portType="faultMessagePT">
     		<operation name="throwFault">
-      			<action implementation="org.apache.ode.action.external.FaultAction"/>
+      			<action implementation="org.apache.ode.bpe.action.external.FaultAction"/>
 			</operation>
   		</binding>
 

Modified: incubator/ode/scratch/ode/bpelTests/testGraftGraftChildren/BPService.xml
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/bpelTests/testGraftGraftChildren/BPService.xml?rev=381712&r1=381711&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/bpelTests/testGraftGraftChildren/BPService.xml (original)
+++ incubator/ode/scratch/ode/bpelTests/testGraftGraftChildren/BPService.xml Tue Feb 28 09:18:27 2006
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<bpe:BPEBinding xmlns:bpe="http://apache.org/ode/binding/ode">
+<bpe:BPEBinding xmlns:bpe="http://ode.apache.org/bpe/binding/bpe">
   <bpe:ActionBindings/>
   <bpe:ActivityBindings>
     <bpe:ActivityBinding activityName="BP11230975736993" interpretation="graftAssign"/>

Modified: incubator/ode/scratch/ode/bpelTests/testLinkInSwitch/testLinkInSwitch.xml
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/bpelTests/testLinkInSwitch/testLinkInSwitch.xml?rev=381712&r1=381711&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/bpelTests/testLinkInSwitch/testLinkInSwitch.xml (original)
+++ incubator/ode/scratch/ode/bpelTests/testLinkInSwitch/testLinkInSwitch.xml Tue Feb 28 09:18:27 2006
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<BPEBinding xmlns="http://apache.org/ode/binding/ode" xmlns:prb="urn:sybase:bpel:testProbe">
+<BPEBinding xmlns="http://ode.apache.org/bpe/binding/bpe" xmlns:prb="urn:sybase:bpel:testProbe">
 	<ActionBindings>
 		<binding  name="BPEBinding1" nameSpace="urn:sybase:bpel:testProbe" portType="probeMessagePT">
 			<operation name="probe">
-				<action implementation="org.apache.ode.action.external.ProbeAction" prb:rootSourcePart="probeName" prb:targetPart="probeData"/>
+				<action implementation="org.apache.ode.bpe.action.external.ProbeAction" prb:rootSourcePart="probeName" prb:targetPart="probeData"/>
 			</operation>
 		</binding>
 	</ActionBindings>

Modified: incubator/ode/scratch/ode/bpelTests/testLocalInvoke/localInvoke.xml
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/bpelTests/testLocalInvoke/localInvoke.xml?rev=381712&r1=381711&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/bpelTests/testLocalInvoke/localInvoke.xml (original)
+++ incubator/ode/scratch/ode/bpelTests/testLocalInvoke/localInvoke.xml Tue Feb 28 09:18:27 2006
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<BPEBinding xmlns="http://apache.org/ode/binding/ode" xmlns:tli="urn:sybase:bpel:testLocalInvoke">
+<BPEBinding xmlns="http://ode.apache.org/bpe/binding/bpe" xmlns:tli="urn:sybase:bpel:testLocalInvoke">
 	<ActionBindings>
 		<binding  name="BPEBinding1" nameSpace="urn:sybase:bpel:testLocalInvoke" portType="localInvokeMessagePT">
 			<operation name="test">
-				<action implementation="org.apache.ode.action.external.LocalInvokeTestAction" tli:targetPart="testText"/>
+				<action implementation="org.apache.ode.bpe.action.external.LocalInvokeTestAction" tli:targetPart="testText"/>
 			</operation>
 		</binding>
 	</ActionBindings>

Modified: incubator/ode/scratch/ode/bpelTests/testLoopedCompensation2/BPAppenderService.wsdl
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/bpelTests/testLoopedCompensation2/BPAppenderService.wsdl?rev=381712&r1=381711&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/bpelTests/testLoopedCompensation2/BPAppenderService.wsdl (original)
+++ incubator/ode/scratch/ode/bpelTests/testLoopedCompensation2/BPAppenderService.wsdl Tue Feb 28 09:18:27 2006
@@ -34,20 +34,20 @@
   <wsdl:binding name="/comploop/.BPAppenderService.bpmn" type="tns:BPAppenderService">
     <sybbpe:binding xmlns:sybbpe="http://schemas.sybase.com/services/bpe/V1.0/"/>
     <wsdl:operation name="append">
-		<bpe:action implementation="org.apache.ode.action.external.BusinessProcessInvocationAction" OperationName="append" PortTypeName="BPAppenderService" PortName="BPAppenderServicePort" PortTypeNameSpace="urn:mycompany:/comploop/BPAppenderService"/>
+		<bpe:action implementation="org.apache.ode.bpe.action.external.BusinessProcessInvocationAction" OperationName="append" PortTypeName="BPAppenderService" PortName="BPAppenderServicePort" PortTypeNameSpace="urn:mycompany:/comploop/BPAppenderService"/>
       <wsdl:input name="append">
 		<bpe:input part="corrl"/>
 		<bpe:input part="str"/>
       </wsdl:input>
     </wsdl:operation>
     <wsdl:operation name="start">
-		<bpe:action implementation="org.apache.ode.action.external.BusinessProcessInvocationAction" OperationName="start" PortTypeName="BPAppenderService" PortName="BPAppenderServicePort" PortTypeNameSpace="urn:mycompany:/comploop/BPAppenderService"/>
+		<bpe:action implementation="org.apache.ode.bpe.action.external.BusinessProcessInvocationAction" OperationName="start" PortTypeName="BPAppenderService" PortName="BPAppenderServicePort" PortTypeNameSpace="urn:mycompany:/comploop/BPAppenderService"/>
       <wsdl:input name="start">
 		<bpe:input part="corrl"/>
       </wsdl:input>
     </wsdl:operation>
     <wsdl:operation name="getVal">
-		<bpe:action implementation="org.apache.ode.action.external.BusinessProcessInvocationAction" OperationName="getVal" PortTypeName="BPAppenderService" PortName="BPAppenderServicePort" PortTypeNameSpace="urn:mycompany:/comploop/BPAppenderService"/>
+		<bpe:action implementation="org.apache.ode.bpe.action.external.BusinessProcessInvocationAction" OperationName="getVal" PortTypeName="BPAppenderService" PortName="BPAppenderServicePort" PortTypeNameSpace="urn:mycompany:/comploop/BPAppenderService"/>
       <wsdl:input name="getValRequest">
 		<bpe:input part="corrl"/>
       </wsdl:input>

Modified: incubator/ode/scratch/ode/bpelTests/testLoopedCompensation2/BPFaultService.wsdl
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/bpelTests/testLoopedCompensation2/BPFaultService.wsdl?rev=381712&r1=381711&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/bpelTests/testLoopedCompensation2/BPFaultService.wsdl (original)
+++ incubator/ode/scratch/ode/bpelTests/testLoopedCompensation2/BPFaultService.wsdl Tue Feb 28 09:18:27 2006
@@ -25,7 +25,7 @@
   <wsdl:binding name="/comploop/.BPFaultService.bpmn" type="tns:BPFaultService">
     <sybbpe:binding xmlns:sybbpe="http://schemas.sybase.com/services/bpe/V1.0/"/>
     <wsdl:operation name="operation1">
-		<bpe:action implementation="org.apache.ode.action.external.BusinessProcessInvocationAction" OperationName="operation1" PortTypeName="BPFaultService" PortName="BPFaultServicePort" PortTypeNameSpace="urn:mycompany:/comploop/BPFaultService"/>
+		<bpe:action implementation="org.apache.ode.bpe.action.external.BusinessProcessInvocationAction" OperationName="operation1" PortTypeName="BPFaultService" PortName="BPFaultServicePort" PortTypeNameSpace="urn:mycompany:/comploop/BPFaultService"/>
       <wsdl:input name="operation1Request">
 				<bpe:input part="val"/>
       </wsdl:input>

Modified: incubator/ode/scratch/ode/bpelTests/testNestedSplits/NSBP.xml
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/bpelTests/testNestedSplits/NSBP.xml?rev=381712&r1=381711&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/bpelTests/testNestedSplits/NSBP.xml (original)
+++ incubator/ode/scratch/ode/bpelTests/testNestedSplits/NSBP.xml Tue Feb 28 09:18:27 2006
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ASCII"?>
-<bpe:BPEBinding xmlns:bpe="http://apache.org/ode/binding/ode">
+<bpe:BPEBinding xmlns:bpe="http://ode.apache.org/bpe/binding/bpe">
   <bpe:ActionBindings/>
   <bpe:ActivityBindings/>
 </bpe:BPEBinding>

Modified: incubator/ode/scratch/ode/bpelTests/testOOBData/oOBData.xml
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/bpelTests/testOOBData/oOBData.xml?rev=381712&r1=381711&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/bpelTests/testOOBData/oOBData.xml (original)
+++ incubator/ode/scratch/ode/bpelTests/testOOBData/oOBData.xml Tue Feb 28 09:18:27 2006
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<BPEBinding xmlns="http://apache.org/ode/binding/ode" xmlns:tod="urn:sybase:bpel:testOOBData">
+<BPEBinding xmlns="http://ode.apache.org/bpe/binding/bpe" xmlns:tod="urn:sybase:bpel:testOOBData">
 	<ActionBindings>
 		<binding  name="BPEBinding1" nameSpace="urn:sybase:bpel:testOOBData" portType="oOBDataMessagePT">
 			<operation name="test">
-				<action implementation="org.apache.ode.action.external.OOBTestAction" tod:targetPart="testText"/>
+				<action implementation="org.apache.ode.bpe.action.external.OOBTestAction" tod:targetPart="testText"/>
 			</operation>
 		</binding>
 	</ActionBindings>

Modified: incubator/ode/scratch/ode/bpelTests/testPartnerLinkAssign/partnerLinkAssign.xml
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/bpelTests/testPartnerLinkAssign/partnerLinkAssign.xml?rev=381712&r1=381711&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/bpelTests/testPartnerLinkAssign/partnerLinkAssign.xml (original)
+++ incubator/ode/scratch/ode/bpelTests/testPartnerLinkAssign/partnerLinkAssign.xml Tue Feb 28 09:18:27 2006
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<BPEBinding xmlns="http://apache.org/ode/binding/ode" xmlns:tod="urn:sybase:bpel:testOOBData">
+<BPEBinding xmlns="http://ode.apache.org/bpe/binding/bpe" xmlns:tod="urn:sybase:bpel:testOOBData">
 	<ActionBindings>
 		<binding  name="BPEBinding1" nameSpace="urn:sybase:bpel:testOOBData" portType="partnerLinkAssignMessagePT">
 			<operation name="test">
-				<action implementation="org.apache.ode.action.external.OOBTestAction" tod:targetPart="testText"/>
+				<action implementation="org.apache.ode.bpe.action.external.OOBTestAction" tod:targetPart="testText"/>
 			</operation>
 		</binding>
 	</ActionBindings>

Modified: incubator/ode/scratch/ode/bpelTests/testReplyWithFault/testReplyWithFault.xml
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/bpelTests/testReplyWithFault/testReplyWithFault.xml?rev=381712&r1=381711&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/bpelTests/testReplyWithFault/testReplyWithFault.xml (original)
+++ incubator/ode/scratch/ode/bpelTests/testReplyWithFault/testReplyWithFault.xml Tue Feb 28 09:18:27 2006
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<BPEBinding xmlns="http://apache.org/ode/binding/ode" xmlns:prb="urn:sybase:bpel:testProbe" >
+<BPEBinding xmlns="http://ode.apache.org/bpe/binding/bpe" xmlns:prb="urn:sybase:bpel:testProbe" >
 	<ActionBindings>
 		<binding  name="BPEBinding1" nameSpace="urn:sybase:bpel:testProbe" portType="probeMessagePT">
 			<operation name="probe">
-				<action implementation="org.apache.ode.action.external.ProbeAction" prb:rootSourcePart="probeName" prb:targetPart="probeData"/>
+				<action implementation="org.apache.ode.bpe.action.external.ProbeAction" prb:rootSourcePart="probeName" prb:targetPart="probeData"/>
 			</operation>
 		</binding>
 
 		<binding name="BPEBinding2" nameSpace="urn:sybase:bpel:testFault" portType="faultMessagePT">
     		<operation name="throwFault">
-      			<action implementation="org.apache.ode.action.external.FaultAction"/>
+      			<action implementation="org.apache.ode.bpe.action.external.FaultAction"/>
 			</operation>
   		</binding>
 

Modified: incubator/ode/scratch/ode/bpelTests/testSingleRuleInCompHandler/BPService1.wsdl
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/bpelTests/testSingleRuleInCompHandler/BPService1.wsdl?rev=381712&r1=381711&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/bpelTests/testSingleRuleInCompHandler/BPService1.wsdl (original)
+++ incubator/ode/scratch/ode/bpelTests/testSingleRuleInCompHandler/BPService1.wsdl Tue Feb 28 09:18:27 2006
@@ -27,12 +27,12 @@
   <wsdl:binding name="/singleruleincompensate/.BPService1.bpmn" type="tns:BPService1">
     <sybbpe:binding xmlns:sybbpe="http://schemas.sybase.com/services/bpe/V1.0/"/>
     <wsdl:operation name="start">
-		<bpe:action implementation="org.apache.ode.action.external.BusinessProcessInvocationAction" OperationName="start" PortTypeName="BPService1" PortName="BPService1Port" PortTypeNameSpace="urn:mycompany:/singleruleincompensate/BPService1"/>
+		<bpe:action implementation="org.apache.ode.bpe.action.external.BusinessProcessInvocationAction" OperationName="start" PortTypeName="BPService1" PortName="BPService1Port" PortTypeNameSpace="urn:mycompany:/singleruleincompensate/BPService1"/>
       <wsdl:input name="start">
       </wsdl:input>
     </wsdl:operation>
     <wsdl:operation name="end">
-		<bpe:action implementation="org.apache.ode.action.external.BusinessProcessInvocationAction" OperationName="end" PortTypeName="BPService1" PortName="BPService1Port" PortTypeNameSpace="urn:mycompany:/singleruleincompensate/BPService1"/>
+		<bpe:action implementation="org.apache.ode.bpe.action.external.BusinessProcessInvocationAction" OperationName="end" PortTypeName="BPService1" PortName="BPService1Port" PortTypeNameSpace="urn:mycompany:/singleruleincompensate/BPService1"/>
       <wsdl:input name="endRequest">
       </wsdl:input>
       <wsdl:output name="endResponse">

Modified: incubator/ode/scratch/ode/bpelTests/testThrowFaultOutsideOfBP/testtfo.xml
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/bpelTests/testThrowFaultOutsideOfBP/testtfo.xml?rev=381712&r1=381711&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/bpelTests/testThrowFaultOutsideOfBP/testtfo.xml (original)
+++ incubator/ode/scratch/ode/bpelTests/testThrowFaultOutsideOfBP/testtfo.xml Tue Feb 28 09:18:27 2006
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<BPEBinding xmlns="http://apache.org/ode/binding/ode">
+<BPEBinding xmlns="http://ode.apache.org/bpe/binding/bpe">
 	<ActionBindings>
 		<binding name="BPEBinding2" nameSpace="urn:sybase:bpel:testFault" portType="faultMessagePT">
 			<operation name="throwFault">
-				<action implementation="org.apache.ode.action.external.FaultAction"/>
+				<action implementation="org.apache.ode.bpe.action.external.FaultAction"/>
 			</operation>
 		</binding>
 	</ActionBindings>

Modified: incubator/ode/scratch/ode/bpelTests/testbenchMark2/benchM2.xml
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/bpelTests/testbenchMark2/benchM2.xml?rev=381712&r1=381711&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/bpelTests/testbenchMark2/benchM2.xml (original)
+++ incubator/ode/scratch/ode/bpelTests/testbenchMark2/benchM2.xml Tue Feb 28 09:18:27 2006
@@ -3,7 +3,7 @@
 	<ActionBindings>
   		<binding name="BPEBinding1" nameSpace="urn:sybase:bpel:benchM2Service" portType="transformationPT1">
 			<operation name="transform">
-				<action implementation="org.apache.ode.action.external.XSLTranslatorAction"
+				<action implementation="org.apache.ode.bpe.action.external.XSLTranslatorAction"
          			instructions="bpelTests/testbenchMark2/benchXSLT1.xslt"
 	   				rootSourcePart="requestMessageData"
 	   				targetPart="replyMessageData"/>
@@ -12,7 +12,7 @@
 		
 		<binding name="BPEBinding2" nameSpace="urn:sybase:bpel:benchM2Service" portType="transformationPT2">
     		<operation name="transform">
-      			<action implementation="org.apache.ode.action.external.XSLTranslatorAction"
+      			<action implementation="org.apache.ode.bpe.action.external.XSLTranslatorAction"
 					instructions="bpelTests/testbenchMark2/benchXSLT2.xslt"
 					rootSourcePart="requestMessageData"
 					targetPart="replyMessageData"/>
@@ -21,7 +21,7 @@
 		
 		<binding name="BPEBinding3" nameSpace="urn:sybase:bpel:benchM2Service" portType="transformationPT3">
 			<operation name="transform">
-				<action implementation="org.apache.ode.action.external.XSLTranslatorAction"
+				<action implementation="org.apache.ode.bpe.action.external.XSLTranslatorAction"
 					instructions="bpelTests/testbenchMark2/benchXSLTDefault.xslt"
 					rootSourcePart="requestMessageData"
 					targetPart="replyMessageData"/>
@@ -30,7 +30,7 @@
 
 		<binding name="jmsPutServiceBinding" nameSpace="urn:sybase:bpel:benchM2Service" portType="jmsPutService">
 			<operation name="sendMessage">
-				<action implementation="org.apache.ode.action.external.JMSPutAction" initialContextFactory="com.sun.jndi.fscontext.RefFSContextFactory" providerURL="file:/C:/fsjndi" jmsQueueConnectionFactory="jms\MyQCF" jmsQueueName="jms\OUT" payload="replyMessageData"/>
+				<action implementation="org.apache.ode.bpe.action.external.JMSPutAction" initialContextFactory="com.sun.jndi.fscontext.RefFSContextFactory" providerURL="file:/C:/fsjndi" jmsQueueConnectionFactory="jms\MyQCF" jmsQueueName="jms\OUT" payload="replyMessageData"/>
 			</operation>
 		</binding>		
 		

Modified: incubator/ode/scratch/ode/bpelTests/testbenchMark3/benchM3.xml
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/bpelTests/testbenchMark3/benchM3.xml?rev=381712&r1=381711&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/bpelTests/testbenchMark3/benchM3.xml (original)
+++ incubator/ode/scratch/ode/bpelTests/testbenchMark3/benchM3.xml Tue Feb 28 09:18:27 2006
@@ -3,7 +3,7 @@
 	<ActionBindings>
   		<binding name="BPEBinding1" nameSpace="urn:sybase:bpel:benchM3Service" portType="transformationPT1">
 			<operation name="transform">
-				<action implementation="org.apache.ode.action.external.XSLTranslatorAction"
+				<action implementation="org.apache.ode.bpe.action.external.XSLTranslatorAction"
          			instructions="bpelTests/testbenchMark2/benchXSLT1.xslt"
 	   				rootSourcePart="requestMessageData"
 	   				targetPart="replyMessageData"/>
@@ -12,7 +12,7 @@
 		
 		<binding name="BPEBinding2" nameSpace="urn:sybase:bpel:benchM3Service" portType="transformationPT2">
     		<operation name="transform">
-      			<action implementation="org.apache.ode.action.external.XSLTranslatorAction"
+      			<action implementation="org.apache.ode.bpe.action.external.XSLTranslatorAction"
 					instructions="bpelTests/testbenchMark2/benchXSLT2.xslt"
 					rootSourcePart="requestMessageData"
 					targetPart="replyMessageData"/>
@@ -21,7 +21,7 @@
 		
 		<binding name="BPEBinding3" nameSpace="urn:sybase:bpel:benchM3Service" portType="transformationPT3">
 			<operation name="transform">
-				<action implementation="org.apache.ode.action.external.XSLTranslatorAction"
+				<action implementation="org.apache.ode.bpe.action.external.XSLTranslatorAction"
 					instructions="bpelTests/testbenchMark2/benchXSLTDefault.xslt"
 					rootSourcePart="requestMessageData"
 					targetPart="replyMessageData"/>

Modified: incubator/ode/scratch/ode/odeEngine.properties
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/odeEngine.properties?rev=381712&r1=381711&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/odeEngine.properties (original)
+++ incubator/ode/scratch/ode/odeEngine.properties Tue Feb 28 09:18:27 2006
@@ -1,15 +1,15 @@
-DEF_CLASS_KEY=org.apache.ode.definition.service.unmanaged.DefinitionServiceProxy
+DEF_CLASS_KEY=org.apache.ode.bpe.definition.service.unmanaged.DefinitionServiceProxy
 DEF_PERSISTENT_KEY=FALSE
 DEF_SCHEMA_KEY=BPEL4WS.XSD
-INST_CLASS_KEY=org.apache.ode.instance.service.nonpersistent.InstanceServiceTransientImpl
+INST_CLASS_KEY=org.apache.ode.bpe.instance.service.nonpersistent.InstanceServiceTransientImpl
 INST_PERSISTENT_KEY=FALSE
-SCOPE_CLASS_KEY=org.apache.ode.scope.service.impl.ScopeServiceImpl
-ED_CLASS_KEY=org.apache.ode.bped.unmanaged.EventDirectorSLImpl
-CORL_CLASS_KEY=org.apache.ode.correlation.unmanaged.CorrelationServiceSLImpl
-LOCK_CLASS_KEY=org.apache.ode.locking.IMLockingService
+SCOPE_CLASS_KEY=org.apache.ode.bpe.scope.service.impl.ScopeServiceImpl
+ED_CLASS_KEY=org.apache.ode.bpe.bped.unmanaged.EventDirectorSLImpl
+CORL_CLASS_KEY=org.apache.ode.bpe.correlation.unmanaged.CorrelationServiceSLImpl
+LOCK_CLASS_KEY=org.apache.ode.bpe.locking.IMLockingService
 LOCK_HASH_BUCKETS_KEY=1000
 BPEL_COMPLIANT_KEY=TRUE
-CTX_CLASS_TRANSIENT_KEY=org.apache.ode.context.nonpersistent.TransientContextService
-CTX_CLASS_PERSISTENT_KEY=org.apache.ode.context.persistent.PersistentContextService
+CTX_CLASS_TRANSIENT_KEY=org.apache.ode.bpe.context.nonpersistent.TransientContextService
+CTX_CLASS_PERSISTENT_KEY=org.apache.ode.bpe.context.persistent.PersistentContextService
 CTX_PERSISTENCE_KEY=CTX_PERSISTENT
-DOF_CLASS_PERSISTENT_KEY=org.apache.ode.context.ejb.EJBDataObjectFactory
+DOF_CLASS_PERSISTENT_KEY=org.apache.ode.bpe.context.ejb.EJBDataObjectFactory

Modified: incubator/ode/scratch/ode/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/pom.xml?rev=381712&r1=381711&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/pom.xml (original)
+++ incubator/ode/scratch/ode/pom.xml Tue Feb 28 09:18:27 2006
@@ -2,7 +2,7 @@
 	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>
-	<groupId>org.apache.ode</groupId>
+	<groupId>org.apache.ode.bpe</groupId>
 	<artifactId>bpe</artifactId>
 	<packaging>jar</packaging>
 	<version>1.0</version>
@@ -97,6 +97,18 @@
 			<version>0.2</version>
 		</dependency>
 
+		<dependency>
+			<groupId>stax</groupId>
+			<artifactId>stax</artifactId>
+			<version>1.1.1-dev</version>
+			<exclusions>
+			  <exclusion>
+			    <groupId>xmlbeans</groupId>
+			    <artifactId>xmlbeans-jsr173-api</artifactId>
+			  </exclusion>
+			</exclusions>
+		</dependency>
+
 
 		<!-- The j2ee jars are not in the Maven central repository because of Sun Licensing issues
 			You need to put this into your local repository directly see - http://maven.apache.org/guides/mini/guide-coping-with-sun-jars.html
@@ -161,6 +173,7 @@
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
 				<configuration>
+				  <forkMode>once</forkMode>
 					<systemProperties>
 						<property>
 							<name>BPEL_TESTS_DIR</name>
@@ -168,11 +181,11 @@
 						</property>
 						<property>
 							<name>java.naming.factory.initial</name>
-							<value>org.apache.ode.inmemory.jndi.IMContextFactory</value>
+							<value>org.apache.ode.bpe.inmemory.jndi.IMContextFactory</value>
 						</property>
 						<property>
 							<name>java.naming.factory.url</name>
-							<value>org.apache.ode.inmemory.jndi</value>
+							<value>org.apache.ode.bpe.inmemory.jndi</value>
 						</property>
 					</systemProperties>
 					<includes>

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/bpel/BlockingAction.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/bpel/BlockingAction.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/bpel/BlockingAction.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/bpel/BlockingAction.java Tue Feb 28 09:18:27 2006
@@ -17,17 +17,17 @@
  * Created on Sep 2, 2003
  *
  */
-package org.apache.ode.action.bpel;
+package org.apache.ode.bpe.action.bpel;
 
 import java.util.Properties;
 
-import org.apache.ode.action.internal.ActionException;
-import org.apache.ode.action.internal.IInternalAction;
-import org.apache.ode.context.resolver.ContextResolver;
-import org.apache.ode.definition.IPMDProcess;
-import org.apache.ode.engine.IEvaluationContext;
-import org.apache.ode.engine.IProcessCallBack;
-import org.apache.ode.instance.IPMIProcess;
+import org.apache.ode.bpe.action.internal.ActionException;
+import org.apache.ode.bpe.action.internal.IInternalAction;
+import org.apache.ode.bpe.context.resolver.ContextResolver;
+import org.apache.ode.bpe.definition.IPMDProcess;
+import org.apache.ode.bpe.engine.IEvaluationContext;
+import org.apache.ode.bpe.engine.IProcessCallBack;
+import org.apache.ode.bpe.instance.IPMIProcess;
 
 /**
  * 
@@ -46,13 +46,13 @@
 	}
 
 	/* (non-Javadoc)
-	 * @see org.apache.ode.action.bpel.Action#init(java.util.Properties)
+	 * @see org.apache.ode.bpe.action.bpel.Action#init(java.util.Properties)
 	 */
 	public void init(Properties properties) throws ActionException {
 	}
 
 	/* (non-Javadoc)
-	 * @see org.apache.ode.action.bpel.Action#execute(org.apache.ode.context.resolver.ContextResolver, org.apache.ode.engine.IEvaluationContext, org.apache.ode.engine.IProcessCallBack, org.apache.ode.instance.service.IPMIProcess, org.apache.ode.definition.service.IPMDProcess)
+	 * @see org.apache.ode.bpe.action.bpel.Action#execute(org.apache.ode.bpe.context.resolver.ContextResolver, org.apache.ode.bpe.engine.IEvaluationContext, org.apache.ode.bpe.engine.IProcessCallBack, org.apache.ode.bpe.instance.service.IPMIProcess, org.apache.ode.bpe.definition.service.IPMDProcess)
 	 */
 	public boolean execute(
 		ContextResolver resolver,
@@ -65,7 +65,7 @@
 	}
 
 	/* (non-Javadoc)
-	 * @see org.apache.ode.action.bpel.Action#release()
+	 * @see org.apache.ode.bpe.action.bpel.Action#release()
 	 */
 	public void release() {
 	}

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/bpel/CompensateAction.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/bpel/CompensateAction.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/bpel/CompensateAction.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/bpel/CompensateAction.java Tue Feb 28 09:18:27 2006
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
 */
-package org.apache.ode.action.bpel;
+package org.apache.ode.bpe.action.bpel;
 
 import java.util.Enumeration;
 import java.util.Iterator;
@@ -21,18 +21,18 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import org.apache.ode.action.internal.ActionException;
-import org.apache.ode.action.internal.IInternalAction;
-import org.apache.ode.bped.EventDirector;
-import org.apache.ode.context.resolver.ContextResolver;
-import org.apache.ode.definition.IPMDProcess;
-import org.apache.ode.engine.IEvaluationContext;
-import org.apache.ode.engine.IProcessCallBack;
-import org.apache.ode.instance.IPMIProcess;
-import org.apache.ode.scope.service.BPRuntimeException;
-import org.apache.ode.scope.service.IFCScopeInstance;
-import org.apache.ode.scope.service.IScopeService;
-import org.apache.ode.util.BPException;
+import org.apache.ode.bpe.action.internal.ActionException;
+import org.apache.ode.bpe.action.internal.IInternalAction;
+import org.apache.ode.bpe.bped.EventDirector;
+import org.apache.ode.bpe.context.resolver.ContextResolver;
+import org.apache.ode.bpe.definition.IPMDProcess;
+import org.apache.ode.bpe.engine.IEvaluationContext;
+import org.apache.ode.bpe.engine.IProcessCallBack;
+import org.apache.ode.bpe.instance.IPMIProcess;
+import org.apache.ode.bpe.scope.service.BPRuntimeException;
+import org.apache.ode.bpe.scope.service.IFCScopeInstance;
+import org.apache.ode.bpe.scope.service.IScopeService;
+import org.apache.ode.bpe.util.BPException;
 
 /**
  * @author charper
@@ -52,14 +52,14 @@
 
 	}
 	/**
-	 * @see org.apache.ode.action.bpel.internal.IInternalAction#init(Properties)
+	 * @see org.apache.ode.bpe.action.bpel.internal.IInternalAction#init(Properties)
 	 */
 	public void init(Properties properties) throws ActionException {
 		props = properties;
 	}
 
 	/**
-	 * @see org.apache.ode.action.bpel.internal.IInternalAction#execute(Iterator, Iterator, EventDirector, IPMIProcess)
+	 * @see org.apache.ode.bpe.action.bpel.internal.IInternalAction#execute(Iterator, Iterator, EventDirector, IPMIProcess)
 	 */
 	public boolean execute(
 		ContextResolver resolver,
@@ -102,7 +102,7 @@
 	}
 
 	/**
-	 * @see org.apache.ode.action.bpel.internal.IInternalAction#release()
+	 * @see org.apache.ode.bpe.action.bpel.internal.IInternalAction#release()
 	 */
 	public void release() {
 		props = null;

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/bpel/CopyAction.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/bpel/CopyAction.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/bpel/CopyAction.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/bpel/CopyAction.java Tue Feb 28 09:18:27 2006
@@ -13,23 +13,23 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
 */
-package org.apache.ode.action.bpel;
+package org.apache.ode.bpe.action.bpel;
 
 import java.util.Properties;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import org.apache.ode.action.internal.ActionException;
-import org.apache.ode.action.internal.IInternalAction;
-import org.apache.ode.context.resolver.ContextResolvedObject;
-import org.apache.ode.context.resolver.ContextResolver;
-import org.apache.ode.context.test.SerializationContext;
-import org.apache.ode.definition.IPMDProcess;
-import org.apache.ode.engine.IEvaluationContext;
-import org.apache.ode.engine.IProcessCallBack;
-import org.apache.ode.instance.IPMIProcess;
-import org.apache.ode.scope.service.BPRuntimeException;
-import org.apache.ode.util.BPException;
+import org.apache.ode.bpe.action.internal.ActionException;
+import org.apache.ode.bpe.action.internal.IInternalAction;
+import org.apache.ode.bpe.context.resolver.ContextResolvedObject;
+import org.apache.ode.bpe.context.resolver.ContextResolver;
+import org.apache.ode.bpe.context.test.SerializationContext;
+import org.apache.ode.bpe.definition.IPMDProcess;
+import org.apache.ode.bpe.engine.IEvaluationContext;
+import org.apache.ode.bpe.engine.IProcessCallBack;
+import org.apache.ode.bpe.instance.IPMIProcess;
+import org.apache.ode.bpe.scope.service.BPRuntimeException;
+import org.apache.ode.bpe.util.BPException;
 
 /**
  * @author charper
@@ -63,7 +63,7 @@
 
 	}
 	/**
-	 * @see org.apache.ode.action.bpel.internal.IInternalAction#init(Properties)
+	 * @see org.apache.ode.bpe.action.bpel.internal.IInternalAction#init(Properties)
 	 */
 	public void init(Properties properties) throws BPException {
 		
@@ -84,7 +84,7 @@
 	}
 
 	/**
-	 * @see org.apache.ode.action.bpel.internal.IInternalAction#execute(Iterator, Iterator, EventDirector, IPMIProcess)
+	 * @see org.apache.ode.bpe.action.bpel.internal.IInternalAction#execute(Iterator, Iterator, EventDirector, IPMIProcess)
 	 */
 	public boolean execute(
 		ContextResolver resolver,
@@ -168,7 +168,7 @@
 	}
 
 	/**
-	 * @see org.apache.ode.action.bpel.internal.IInternalAction#release()
+	 * @see org.apache.ode.bpe.action.bpel.internal.IInternalAction#release()
 	 */
 	public void release() {
 		expressionTree = null;

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/bpel/CopyContextNodeAction.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/bpel/CopyContextNodeAction.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/bpel/CopyContextNodeAction.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/bpel/CopyContextNodeAction.java Tue Feb 28 09:18:27 2006
@@ -13,16 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
 */
-package org.apache.ode.action.bpel;
+package org.apache.ode.bpe.action.bpel;
 
-import org.apache.ode.context.INode;
-import org.apache.ode.context.resolver.ContextResolvedObject;
-import org.apache.ode.context.resolver.ContextResolver;
-import org.apache.ode.definition.IPMDProcess;
-import org.apache.ode.engine.IEvaluationContext;
-import org.apache.ode.engine.IProcessCallBack;
-import org.apache.ode.instance.IPMIProcess;
-import org.apache.ode.util.BPException;
+import org.apache.ode.bpe.context.INode;
+import org.apache.ode.bpe.context.resolver.ContextResolvedObject;
+import org.apache.ode.bpe.context.resolver.ContextResolver;
+import org.apache.ode.bpe.definition.IPMDProcess;
+import org.apache.ode.bpe.engine.IEvaluationContext;
+import org.apache.ode.bpe.engine.IProcessCallBack;
+import org.apache.ode.bpe.instance.IPMIProcess;
+import org.apache.ode.bpe.util.BPException;
 
 public class CopyContextNodeAction extends CopyAction
 {

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/bpel/DeployAction.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/bpel/DeployAction.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/bpel/DeployAction.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/bpel/DeployAction.java Tue Feb 28 09:18:27 2006
@@ -18,7 +18,7 @@
  * Author waterman
  * 
  */
-package org.apache.ode.action.bpel;
+package org.apache.ode.bpe.action.bpel;
 
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
@@ -30,24 +30,24 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import org.apache.ode.action.internal.IInternalAction;
-import org.apache.ode.action.param.ActionParamFactory;
-import org.apache.ode.action.param.IActionParam;
-import org.apache.ode.client.IFormattableValue;
-import org.apache.ode.context.resolver.ContextResolvedObject;
-import org.apache.ode.context.resolver.ContextResolver;
-import org.apache.ode.definition.IPMDProcess;
-import org.apache.ode.definition.service.DefinitionService;
-import org.apache.ode.deployment.DefinitionKey;
-import org.apache.ode.deployment.Deploy;
-import org.apache.ode.deployment.bpel.BPELDeploy;
-import org.apache.ode.engine.IEvaluationContext;
-import org.apache.ode.engine.IProcessCallBack;
-import org.apache.ode.engine.ProcessDefinitionKey;
-import org.apache.ode.instance.IPMIProcess;
-import org.apache.ode.scope.service.BPRuntimeException;
-import org.apache.ode.util.BPException;
-import org.apache.ode.wsdl.extensions.BPEInput;
+import org.apache.ode.bpe.action.internal.IInternalAction;
+import org.apache.ode.bpe.action.param.ActionParamFactory;
+import org.apache.ode.bpe.action.param.IActionParam;
+import org.apache.ode.bpe.client.IFormattableValue;
+import org.apache.ode.bpe.context.resolver.ContextResolvedObject;
+import org.apache.ode.bpe.context.resolver.ContextResolver;
+import org.apache.ode.bpe.definition.IPMDProcess;
+import org.apache.ode.bpe.definition.service.DefinitionService;
+import org.apache.ode.bpe.deployment.DefinitionKey;
+import org.apache.ode.bpe.deployment.Deploy;
+import org.apache.ode.bpe.deployment.bpel.BPELDeploy;
+import org.apache.ode.bpe.engine.IEvaluationContext;
+import org.apache.ode.bpe.engine.IProcessCallBack;
+import org.apache.ode.bpe.engine.ProcessDefinitionKey;
+import org.apache.ode.bpe.instance.IPMIProcess;
+import org.apache.ode.bpe.scope.service.BPRuntimeException;
+import org.apache.ode.bpe.util.BPException;
+import org.apache.ode.bpe.wsdl.extensions.BPEInput;
 
 /**
  * @author waterman
@@ -60,7 +60,7 @@
 	private static final String ISVALIDATING = "validating";
 	
 	/* (non-Javadoc)
-	 * @see org.apache.ode.action.bpel.external.IExternalAction#init(java.util.Properties)
+	 * @see org.apache.ode.bpe.action.bpel.external.IExternalAction#init(java.util.Properties)
 	 */
 	protected static Logger logger = 
 		Logger.getLogger(DeployAction.class.getName());
@@ -86,7 +86,7 @@
 
 	}
 	/* (non-Javadoc)
-	 * @see org.apache.ode.action.bpel.external.IExternalAction#execute(java.util.HashMap, java.util.HashMap, org.apache.ode.action.bpel.external.IURIResolver)
+	 * @see org.apache.ode.bpe.action.bpel.external.IExternalAction#execute(java.util.HashMap, java.util.HashMap, org.apache.ode.bpe.action.bpel.external.IURIResolver)
 	 */
 	  public boolean execute(ContextResolver resolver, IEvaluationContext ec, IProcessCallBack pcb, IPMIProcess processInstance, IPMDProcess processDefinition) throws BPException {
 
@@ -139,7 +139,7 @@
 	}
 	  
 	/* (non-Javadoc)
-	 * @see org.apache.ode.action.bpel.external.IExternalAction#release()
+	 * @see org.apache.ode.bpe.action.bpel.external.IExternalAction#release()
 	 */
 	public void release() {
 	}

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/bpel/EndConditionalFlowAction.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/bpel/EndConditionalFlowAction.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/bpel/EndConditionalFlowAction.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/bpel/EndConditionalFlowAction.java Tue Feb 28 09:18:27 2006
@@ -19,21 +19,21 @@
  * TODO To change the template for this generated file go to
  * Window - Preferences - Java - Code Style - Code Templates
  */
-package org.apache.ode.action.bpel;
+package org.apache.ode.bpe.action.bpel;
 
 import java.util.Iterator;
 import java.util.Properties;
 import java.util.Vector;
 
-import org.apache.ode.action.internal.IInternalAction;
-import org.apache.ode.context.resolver.ContextResolvedObject;
-import org.apache.ode.context.resolver.ContextResolver;
-import org.apache.ode.definition.IPMDProcess;
-import org.apache.ode.engine.IEvaluationContext;
-import org.apache.ode.engine.IProcessCallBack;
-import org.apache.ode.instance.IPMIProcess;
-import org.apache.ode.util.BPException;
-import org.apache.ode.util.xpath.XPathBoolean;
+import org.apache.ode.bpe.action.internal.IInternalAction;
+import org.apache.ode.bpe.context.resolver.ContextResolvedObject;
+import org.apache.ode.bpe.context.resolver.ContextResolver;
+import org.apache.ode.bpe.definition.IPMDProcess;
+import org.apache.ode.bpe.engine.IEvaluationContext;
+import org.apache.ode.bpe.engine.IProcessCallBack;
+import org.apache.ode.bpe.instance.IPMIProcess;
+import org.apache.ode.bpe.util.BPException;
+import org.apache.ode.bpe.util.xpath.XPathBoolean;
 
 /**
  * @author waterman
@@ -47,7 +47,7 @@
 	private Vector links;
 
 	/* (non-Javadoc)
-	 * @see org.apache.ode.action.bpel.Action#init(java.util.Properties)
+	 * @see org.apache.ode.bpe.action.bpel.Action#init(java.util.Properties)
 	 */
 	public void init(Properties properties) throws BPException {
 		links = (Vector)properties.get(LINKS);
@@ -55,7 +55,7 @@
 	}
 
 	/* (non-Javadoc)
-	 * @see org.apache.ode.action.bpel.Action#execute(org.apache.ode.context.resolver.ContextResolver, org.apache.ode.engine.IEvaluationContext, org.apache.ode.engine.IProcessCallBack, org.apache.ode.instance.service.IPMIProcess, org.apache.ode.definition.service.IPMDProcess)
+	 * @see org.apache.ode.bpe.action.bpel.Action#execute(org.apache.ode.bpe.context.resolver.ContextResolver, org.apache.ode.bpe.engine.IEvaluationContext, org.apache.ode.bpe.engine.IProcessCallBack, org.apache.ode.bpe.instance.service.IPMIProcess, org.apache.ode.bpe.definition.service.IPMDProcess)
 	 */
 	public boolean execute(ContextResolver resolver, IEvaluationContext ec,
 			IProcessCallBack pcb, IPMIProcess processInstance,
@@ -79,7 +79,7 @@
 	}
 
 	/* (non-Javadoc)
-	 * @see org.apache.ode.action.bpel.Action#release()
+	 * @see org.apache.ode.bpe.action.bpel.Action#release()
 	 */
 	public void release() {
 		// TODO Auto-generated method stub

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/bpel/EndProcessAction.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/bpel/EndProcessAction.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/bpel/EndProcessAction.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/bpel/EndProcessAction.java Tue Feb 28 09:18:27 2006
@@ -17,18 +17,18 @@
  * Created on Aug 15, 2003
  *
  */
-package org.apache.ode.action.bpel;
+package org.apache.ode.bpe.action.bpel;
 
 import java.util.Properties;
 
-import org.apache.ode.action.internal.ActionException;
-import org.apache.ode.action.internal.IInternalAction;
-import org.apache.ode.context.resolver.ContextResolver;
-import org.apache.ode.definition.IPMDProcess;
-import org.apache.ode.engine.IEvaluationContext;
-import org.apache.ode.engine.IProcessCallBack;
-import org.apache.ode.instance.IPMIProcess;
-import org.apache.ode.util.BPException;
+import org.apache.ode.bpe.action.internal.ActionException;
+import org.apache.ode.bpe.action.internal.IInternalAction;
+import org.apache.ode.bpe.context.resolver.ContextResolver;
+import org.apache.ode.bpe.definition.IPMDProcess;
+import org.apache.ode.bpe.engine.IEvaluationContext;
+import org.apache.ode.bpe.engine.IProcessCallBack;
+import org.apache.ode.bpe.instance.IPMIProcess;
+import org.apache.ode.bpe.util.BPException;
 
 /**
  * @author waterman
@@ -44,14 +44,14 @@
 	}
 
 	/* (non-Javadoc)
-	 * @see org.apache.ode.action.bpel.Action#init(java.util.Properties)
+	 * @see org.apache.ode.bpe.action.bpel.Action#init(java.util.Properties)
 	 */
 	public void init(Properties properties) throws ActionException {
 
 	}
 
 	/* (non-Javadoc)
-	 * @see org.apache.ode.action.bpel.Action#execute(org.apache.ode.context.resolver.ContextResolver, org.apache.ode.engine.IEvaluationContext, org.apache.ode.engine.IProcessCallBack, org.apache.ode.instance.service.IPMIProcess, org.apache.ode.definition.service.IPMDProcess)
+	 * @see org.apache.ode.bpe.action.bpel.Action#execute(org.apache.ode.bpe.context.resolver.ContextResolver, org.apache.ode.bpe.engine.IEvaluationContext, org.apache.ode.bpe.engine.IProcessCallBack, org.apache.ode.bpe.instance.service.IPMIProcess, org.apache.ode.bpe.definition.service.IPMDProcess)
 	 */
 	public boolean execute(
 		ContextResolver resolver,
@@ -69,7 +69,7 @@
 	}
 
 	/* (non-Javadoc)
-	 * @see org.apache.ode.action.bpel.Action#release()
+	 * @see org.apache.ode.bpe.action.bpel.Action#release()
 	 */
 	public void release() {
 	}

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/bpel/EndScopeAction.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/bpel/EndScopeAction.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/bpel/EndScopeAction.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/bpel/EndScopeAction.java Tue Feb 28 09:18:27 2006
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
 */
-package org.apache.ode.action.bpel;
+package org.apache.ode.bpe.action.bpel;
 
 //import java.util.ArrayList;
 import java.util.Iterator;
@@ -22,18 +22,18 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import org.apache.ode.action.internal.ActionException;
-import org.apache.ode.action.internal.IInternalAction;
-import org.apache.ode.bped.EventDirector;
-import org.apache.ode.context.resolver.ContextResolver;
-import org.apache.ode.definition.IPMDProcess;
-import org.apache.ode.engine.IEvaluationContext;
-import org.apache.ode.engine.IProcessCallBack;
-import org.apache.ode.instance.IPMIProcess;
-import org.apache.ode.scope.service.IFCScopeInstance;
-import org.apache.ode.scope.service.IScopeService;
-import org.apache.ode.scope.service.ScopePath;
-import org.apache.ode.util.BPException;
+import org.apache.ode.bpe.action.internal.ActionException;
+import org.apache.ode.bpe.action.internal.IInternalAction;
+import org.apache.ode.bpe.bped.EventDirector;
+import org.apache.ode.bpe.context.resolver.ContextResolver;
+import org.apache.ode.bpe.definition.IPMDProcess;
+import org.apache.ode.bpe.engine.IEvaluationContext;
+import org.apache.ode.bpe.engine.IProcessCallBack;
+import org.apache.ode.bpe.instance.IPMIProcess;
+import org.apache.ode.bpe.scope.service.IFCScopeInstance;
+import org.apache.ode.bpe.scope.service.IScopeService;
+import org.apache.ode.bpe.scope.service.ScopePath;
+import org.apache.ode.bpe.util.BPException;
 
 /**
  * @author charper
@@ -55,14 +55,14 @@
 
 	}
 	/**
-	 * @see org.apache.ode.action.bpel.internal.IInternalAction#init(Properties)
+	 * @see org.apache.ode.bpe.action.bpel.internal.IInternalAction#init(Properties)
 	 */
 	public void init(Properties properties) throws ActionException {
 		props = properties;
 	}
 
 	/**
-	 * @see org.apache.ode.action.bpel.internal.IInternalAction#execute(Iterator, Iterator, EventDirector, IPMIProcess)
+	 * @see org.apache.ode.bpe.action.bpel.internal.IInternalAction#execute(Iterator, Iterator, EventDirector, IPMIProcess)
 	 */
 	public boolean execute(
 		ContextResolver resolver,
@@ -106,7 +106,7 @@
 	}
 
 	/**
-	 * @see org.apache.ode.action.bpel.internal.IInternalAction#release()
+	 * @see org.apache.ode.bpe.action.bpel.internal.IInternalAction#release()
 	 */
 	public void release() {
 		props = null;

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/bpel/EndSequenceAction.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/bpel/EndSequenceAction.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/bpel/EndSequenceAction.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/bpel/EndSequenceAction.java Tue Feb 28 09:18:27 2006
@@ -19,21 +19,21 @@
  * TODO To change the template for this generated file go to
  * Window - Preferences - Java - Code Style - Code Templates
  */
-package org.apache.ode.action.bpel;
+package org.apache.ode.bpe.action.bpel;
 
 import java.util.Iterator;
 import java.util.Properties;
 import java.util.Vector;
 
-import org.apache.ode.action.internal.IInternalAction;
-import org.apache.ode.context.resolver.ContextResolvedObject;
-import org.apache.ode.context.resolver.ContextResolver;
-import org.apache.ode.definition.IPMDProcess;
-import org.apache.ode.engine.IEvaluationContext;
-import org.apache.ode.engine.IProcessCallBack;
-import org.apache.ode.instance.IPMIProcess;
-import org.apache.ode.util.BPException;
-import org.apache.ode.util.xpath.XPathBoolean;
+import org.apache.ode.bpe.action.internal.IInternalAction;
+import org.apache.ode.bpe.context.resolver.ContextResolvedObject;
+import org.apache.ode.bpe.context.resolver.ContextResolver;
+import org.apache.ode.bpe.definition.IPMDProcess;
+import org.apache.ode.bpe.engine.IEvaluationContext;
+import org.apache.ode.bpe.engine.IProcessCallBack;
+import org.apache.ode.bpe.instance.IPMIProcess;
+import org.apache.ode.bpe.util.BPException;
+import org.apache.ode.bpe.util.xpath.XPathBoolean;
 
 /**
  * @author waterman
@@ -47,7 +47,7 @@
 	private Vector links;
 
 	/* (non-Javadoc)
-	 * @see org.apache.ode.action.bpel.Action#init(java.util.Properties)
+	 * @see org.apache.ode.bpe.action.bpel.Action#init(java.util.Properties)
 	 */
 	public void init(Properties properties) throws BPException {
 		links = (Vector)properties.get(LINKS);
@@ -55,7 +55,7 @@
 	}
 
 	/* (non-Javadoc)
-	 * @see org.apache.ode.action.bpel.Action#execute(org.apache.ode.context.resolver.ContextResolver, org.apache.ode.engine.IEvaluationContext, org.apache.ode.engine.IProcessCallBack, org.apache.ode.instance.service.IPMIProcess, org.apache.ode.definition.service.IPMDProcess)
+	 * @see org.apache.ode.bpe.action.bpel.Action#execute(org.apache.ode.bpe.context.resolver.ContextResolver, org.apache.ode.bpe.engine.IEvaluationContext, org.apache.ode.bpe.engine.IProcessCallBack, org.apache.ode.bpe.instance.service.IPMIProcess, org.apache.ode.bpe.definition.service.IPMDProcess)
 	 */
 	public boolean execute(ContextResolver resolver, IEvaluationContext ec,
 			IProcessCallBack pcb, IPMIProcess processInstance,
@@ -79,7 +79,7 @@
 	}
 
 	/* (non-Javadoc)
-	 * @see org.apache.ode.action.bpel.Action#release()
+	 * @see org.apache.ode.bpe.action.bpel.Action#release()
 	 */
 	public void release() {
 		// TODO Auto-generated method stub

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/bpel/ExclusiveChoiceEvaluator.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/bpel/ExclusiveChoiceEvaluator.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/bpel/ExclusiveChoiceEvaluator.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/bpel/ExclusiveChoiceEvaluator.java Tue Feb 28 09:18:27 2006
@@ -14,16 +14,16 @@
  * limitations under the License.
 */
 
-package org.apache.ode.action.bpel;
+package org.apache.ode.bpe.action.bpel;
 
 import java.util.Properties;
 
-import org.apache.ode.action.internal.ActionException;
-import org.apache.ode.context.resolver.ContextResolver;
-import org.apache.ode.definition.IPMDProcess;
-import org.apache.ode.engine.IEvaluationContext;
-import org.apache.ode.instance.IPMIProcess;
-import org.apache.ode.util.BPException;
+import org.apache.ode.bpe.action.internal.ActionException;
+import org.apache.ode.bpe.context.resolver.ContextResolver;
+import org.apache.ode.bpe.definition.IPMDProcess;
+import org.apache.ode.bpe.engine.IEvaluationContext;
+import org.apache.ode.bpe.instance.IPMIProcess;
+import org.apache.ode.bpe.util.BPException;
 
 /**
  * @author charper

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/bpel/ExternalServiceAction.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/bpel/ExternalServiceAction.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/bpel/ExternalServiceAction.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/bpel/ExternalServiceAction.java Tue Feb 28 09:18:27 2006
@@ -16,10 +16,10 @@
 /*
  * Created on:	Oct 31, 2003
  * Project:		BPEELocal
- * Package:		org.apache.ode.action.bpel 
+ * Package:		org.apache.ode.bpe.action.bpel 
  * Author:		waterman	
  */
-package org.apache.ode.action.bpel;
+package org.apache.ode.bpe.action.bpel;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -29,32 +29,32 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import org.apache.ode.action.external.IExternalAction;
-import org.apache.ode.action.external.IURIResolver;
-import org.apache.ode.action.param.ActionParamFactory;
-import org.apache.ode.action.param.IActionParam;
-import org.apache.ode.context.IContainer;
-import org.apache.ode.context.IContextService;
-import org.apache.ode.context.IPart;
-import org.apache.ode.context.resolver.ContextResolvedObject;
-import org.apache.ode.context.resolver.ContextResolver;
-import org.apache.ode.correlation.keys.CorrelationKeysUtil;
-import org.apache.ode.definition.IPMDAction;
-import org.apache.ode.definition.IPMDProcess;
-import org.apache.ode.definition.IPMDRoot;
-import org.apache.ode.definition.service.DefinitionURIResolver;
-import org.apache.ode.engine.IEvaluationContext;
-import org.apache.ode.engine.IProcessCallBack;
-import org.apache.ode.instance.IPMIProcess;
-import org.apache.ode.interaction.IInteraction;
-import org.apache.ode.scope.service.BPRuntimeException;
-import org.apache.ode.util.BPException;
-import org.apache.ode.wsdl.extensions.BPEInput;
-import org.apache.ode.wsdl.extensions.BPEOutput;
-import org.apache.ode.action.external.ActionSystemException;
-import org.apache.ode.action.internal.ActionException;
-import org.apache.ode.action.internal.IInternalAction;
-import org.apache.ode.interaction.spiadapter.SPIAdapterInteraction;
+import org.apache.ode.bpe.action.external.ActionSystemException;
+import org.apache.ode.bpe.action.external.IExternalAction;
+import org.apache.ode.bpe.action.external.IURIResolver;
+import org.apache.ode.bpe.action.internal.ActionException;
+import org.apache.ode.bpe.action.internal.IInternalAction;
+import org.apache.ode.bpe.action.param.ActionParamFactory;
+import org.apache.ode.bpe.action.param.IActionParam;
+import org.apache.ode.bpe.context.IContainer;
+import org.apache.ode.bpe.context.IContextService;
+import org.apache.ode.bpe.context.IPart;
+import org.apache.ode.bpe.context.resolver.ContextResolvedObject;
+import org.apache.ode.bpe.context.resolver.ContextResolver;
+import org.apache.ode.bpe.correlation.keys.CorrelationKeysUtil;
+import org.apache.ode.bpe.definition.IPMDAction;
+import org.apache.ode.bpe.definition.IPMDProcess;
+import org.apache.ode.bpe.definition.IPMDRoot;
+import org.apache.ode.bpe.definition.service.DefinitionURIResolver;
+import org.apache.ode.bpe.engine.IEvaluationContext;
+import org.apache.ode.bpe.engine.IProcessCallBack;
+import org.apache.ode.bpe.instance.IPMIProcess;
+import org.apache.ode.bpe.interaction.IInteraction;
+import org.apache.ode.bpe.interaction.spiadapter.SPIAdapterInteraction;
+import org.apache.ode.bpe.scope.service.BPRuntimeException;
+import org.apache.ode.bpe.util.BPException;
+import org.apache.ode.bpe.wsdl.extensions.BPEInput;
+import org.apache.ode.bpe.wsdl.extensions.BPEOutput;
 
 /**
  * 
@@ -94,7 +94,7 @@
 	}
 
 	/**
-	 * @see org.apache.ode.action.bpel.internal.IInternalAction#init(java.util.Properties)
+	 * @see org.apache.ode.bpe.action.bpel.internal.IInternalAction#init(java.util.Properties)
 	 */
 	public void init(Properties properties) throws BPException {
 		
@@ -156,7 +156,7 @@
 	}
 
 	/**
-	 * @see org.apache.ode.action.bpel.internal.IInternalAction#execute(org.apache.ode.context.resolver.ContextResolver, org.apache.ode.engine.IEvaluationContext, org.apache.ode.engine.IProcessCallBack, org.apache.ode.instance.IPMIProcess, org.apache.ode.definition.IPMDProcess)
+	 * @see org.apache.ode.bpe.action.bpel.internal.IInternalAction#execute(org.apache.ode.bpe.context.resolver.ContextResolver, org.apache.ode.bpe.engine.IEvaluationContext, org.apache.ode.bpe.engine.IProcessCallBack, org.apache.ode.bpe.instance.IPMIProcess, org.apache.ode.bpe.definition.IPMDProcess)
 	 */
 	public boolean execute(
 		ContextResolver resolver,
@@ -329,7 +329,7 @@
 	}
 
 	/**
-	 * @see org.apache.ode.action.bpel.internal.IInternalAction#release()
+	 * @see org.apache.ode.bpe.action.bpel.internal.IInternalAction#release()
 	 */
 	public void release() {
 		action.release();

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/bpel/JaxenUtil.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/bpel/JaxenUtil.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/bpel/JaxenUtil.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/bpel/JaxenUtil.java Tue Feb 28 09:18:27 2006
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
 */
-package org.apache.ode.action.bpel;
+package org.apache.ode.bpe.action.bpel;
 
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -22,11 +22,11 @@
 import org.jaxen.UnresolvableException;
 import org.jaxen.dom.DOMXPath;
 
-import org.apache.ode.context.resolver.ContextResolver;
-import org.apache.ode.context.resolver.ResolverVariableContext;
-import org.apache.ode.scope.service.BPRuntimeException;
-import org.apache.ode.util.BPException;
-import org.apache.ode.deployment.bpel.BPELSchema;
+import org.apache.ode.bpe.context.resolver.ContextResolver;
+import org.apache.ode.bpe.context.resolver.ResolverVariableContext;
+import org.apache.ode.bpe.deployment.bpel.BPELSchema;
+import org.apache.ode.bpe.scope.service.BPRuntimeException;
+import org.apache.ode.bpe.util.BPException;
 
 /**
  * @author charper

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/bpel/MergeAction.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/bpel/MergeAction.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/bpel/MergeAction.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/bpel/MergeAction.java Tue Feb 28 09:18:27 2006
@@ -13,27 +13,27 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
 */
-package org.apache.ode.action.bpel;
+package org.apache.ode.bpe.action.bpel;
 
 import java.util.Enumeration;
 import java.util.Properties;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import org.apache.ode.action.internal.ActionException;
-import org.apache.ode.action.internal.IInternalAction;
-import org.apache.ode.bped.IInternalEventDirector;
-import org.apache.ode.context.resolver.ContextResolvedObject;
-import org.apache.ode.context.resolver.ContextResolver;
-//import org.apache.ode.definition.service.DefinitionService;
-import org.apache.ode.definition.IPMDProcess;
-import org.apache.ode.engine.IEvaluationContext;
-import org.apache.ode.engine.IProcessCallBack;
-import org.apache.ode.engine.ProcessInstance;
-import org.apache.ode.engine.StateEnum;
-import org.apache.ode.event.StateEvent;
-import org.apache.ode.instance.IPMIProcess;
-import org.apache.ode.util.BPException;
+import org.apache.ode.bpe.action.internal.ActionException;
+import org.apache.ode.bpe.action.internal.IInternalAction;
+import org.apache.ode.bpe.bped.IInternalEventDirector;
+import org.apache.ode.bpe.context.resolver.ContextResolvedObject;
+import org.apache.ode.bpe.context.resolver.ContextResolver;
+import org.apache.ode.bpe.definition.IPMDProcess;
+import org.apache.ode.bpe.engine.IEvaluationContext;
+import org.apache.ode.bpe.engine.IProcessCallBack;
+import org.apache.ode.bpe.engine.ProcessInstance;
+import org.apache.ode.bpe.engine.StateEnum;
+import org.apache.ode.bpe.event.StateEvent;
+import org.apache.ode.bpe.instance.IPMIProcess;
+import org.apache.ode.bpe.util.BPException;
+//import org.apache.ode.bpe.definition.service.DefinitionService;
 
 /**
  * @author waterman
@@ -62,14 +62,14 @@
 
 	}
 	/**
-	 * @see org.apache.ode.action.bpel.internal.IInternalAction#init(Properties)
+	 * @see org.apache.ode.bpe.action.bpel.internal.IInternalAction#init(Properties)
 	 */
 	public void init(Properties properties) throws ActionException {
 		props = properties;
 	}
 
 	/**
-	 * @see org.apache.ode.action.bpel.internal.IInternalAction#execute(Iterator, Iterator, EventDirector, IPMIProcess)
+	 * @see org.apache.ode.bpe.action.bpel.internal.IInternalAction#execute(Iterator, Iterator, EventDirector, IPMIProcess)
 	 */
 	public boolean execute(ContextResolver resolver,
 		IEvaluationContext ec,
@@ -145,7 +145,7 @@
 	}
 
 	/**
-	 * @see org.apache.ode.action.bpel.internal.IInternalAction#release()
+	 * @see org.apache.ode.bpe.action.bpel.internal.IInternalAction#release()
 	 */
 	public void release() {
 		props = null;

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/bpel/PickAction.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/bpel/PickAction.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/bpel/PickAction.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/bpel/PickAction.java Tue Feb 28 09:18:27 2006
@@ -17,7 +17,7 @@
  * Created on Aug 22, 2003
  *
  */
-package org.apache.ode.action.bpel;
+package org.apache.ode.bpe.action.bpel;
 
 import java.util.Map;
 import java.util.Iterator;
@@ -25,20 +25,20 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import org.apache.ode.action.internal.ActionException;
-import org.apache.ode.action.internal.IInternalAction;
-import org.apache.ode.context.resolver.ContextResolver;
-import org.apache.ode.definition.IPMDProcess;
-import org.apache.ode.definition.service.DefinitionService;
-import org.apache.ode.engine.IEvaluationContext;
-import org.apache.ode.engine.IProcessCallBack;
-import org.apache.ode.engine.ProcessDefinitionKey;
-import org.apache.ode.engine.ProcessInstance;
-//import org.apache.ode.event.BPELStaticKey;
-import org.apache.ode.event.IRequestMessageEvent;
-import org.apache.ode.event.IStaticKey;
-import org.apache.ode.instance.IPMIProcess;
-import org.apache.ode.util.BPException;
+import org.apache.ode.bpe.action.internal.ActionException;
+import org.apache.ode.bpe.action.internal.IInternalAction;
+import org.apache.ode.bpe.context.resolver.ContextResolver;
+import org.apache.ode.bpe.definition.IPMDProcess;
+import org.apache.ode.bpe.definition.service.DefinitionService;
+import org.apache.ode.bpe.engine.IEvaluationContext;
+import org.apache.ode.bpe.engine.IProcessCallBack;
+import org.apache.ode.bpe.engine.ProcessDefinitionKey;
+import org.apache.ode.bpe.engine.ProcessInstance;
+import org.apache.ode.bpe.event.IRequestMessageEvent;
+import org.apache.ode.bpe.event.IStaticKey;
+import org.apache.ode.bpe.instance.IPMIProcess;
+import org.apache.ode.bpe.util.BPException;
+//import org.apache.ode.bpe.event.BPELStaticKey;
 
 /**
  * @author waterman
@@ -59,14 +59,14 @@
 	}
 
 	/* (non-Javadoc)
-	 * @see org.apache.ode.action.bpel.Action#init(java.util.Properties)
+	 * @see org.apache.ode.bpe.action.bpel.Action#init(java.util.Properties)
 	 */
 	public void init(Properties properties) throws ActionException {
 		m_staticKeys = properties;
 	}
 
 	/* (non-Javadoc)
-	 * @see org.apache.ode.action.bpel.Action#execute(org.apache.ode.context.resolver.ContextResolver, org.apache.ode.engine.IEvaluationContext, org.apache.ode.engine.IProcessCallBack, org.apache.ode.instance.service.IPMIProcess, org.apache.ode.definition.service.IPMDProcess)
+	 * @see org.apache.ode.bpe.action.bpel.Action#execute(org.apache.ode.bpe.context.resolver.ContextResolver, org.apache.ode.bpe.engine.IEvaluationContext, org.apache.ode.bpe.engine.IProcessCallBack, org.apache.ode.bpe.instance.service.IPMIProcess, org.apache.ode.bpe.definition.service.IPMDProcess)
 	 */
 	public boolean execute(
 		ContextResolver resolver,
@@ -122,7 +122,7 @@
 	}
 
 	/* (non-Javadoc)
-	 * @see org.apache.ode.action.bpel.Action#release()
+	 * @see org.apache.ode.bpe.action.bpel.Action#release()
 	 */
 	public void release() {
 	}

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/bpel/ReceiveAction.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/bpel/ReceiveAction.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/bpel/ReceiveAction.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/bpel/ReceiveAction.java Tue Feb 28 09:18:27 2006
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
 */
-package org.apache.ode.action.bpel;
+package org.apache.ode.bpe.action.bpel;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -21,26 +21,26 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import org.apache.ode.action.internal.ActionException;
-import org.apache.ode.action.internal.IInternalAction;
-import org.apache.ode.bped.EventDirector;
-import org.apache.ode.context.IContainer;
-import org.apache.ode.context.IContextService;
-import org.apache.ode.context.IPart;
-import org.apache.ode.context.resolver.ContextResolvedObject;
-import org.apache.ode.context.resolver.ContextResolver;
-import org.apache.ode.correlation.keys.CorrelationKeysUtil;
-import org.apache.ode.definition.IPMDLocator;
-import org.apache.ode.definition.IPMDProcess;
-import org.apache.ode.engine.IEvaluationContext;
-import org.apache.ode.engine.IProcessCallBack;
-import org.apache.ode.event.IRequestMessageEvent;
-import org.apache.ode.instance.IPMIProcess;
-import org.apache.ode.interaction.IInteraction;
-import org.apache.ode.lang.ResourceGetter;
-import org.apache.ode.scope.service.IFCScopeInstance;
-import org.apache.ode.scope.service.IScopeService;
-import org.apache.ode.util.BPException;
+import org.apache.ode.bpe.action.internal.ActionException;
+import org.apache.ode.bpe.action.internal.IInternalAction;
+import org.apache.ode.bpe.bped.EventDirector;
+import org.apache.ode.bpe.context.IContainer;
+import org.apache.ode.bpe.context.IContextService;
+import org.apache.ode.bpe.context.IPart;
+import org.apache.ode.bpe.context.resolver.ContextResolvedObject;
+import org.apache.ode.bpe.context.resolver.ContextResolver;
+import org.apache.ode.bpe.correlation.keys.CorrelationKeysUtil;
+import org.apache.ode.bpe.definition.IPMDLocator;
+import org.apache.ode.bpe.definition.IPMDProcess;
+import org.apache.ode.bpe.engine.IEvaluationContext;
+import org.apache.ode.bpe.engine.IProcessCallBack;
+import org.apache.ode.bpe.event.IRequestMessageEvent;
+import org.apache.ode.bpe.instance.IPMIProcess;
+import org.apache.ode.bpe.interaction.IInteraction;
+import org.apache.ode.bpe.lang.ResourceGetter;
+import org.apache.ode.bpe.scope.service.IFCScopeInstance;
+import org.apache.ode.bpe.scope.service.IScopeService;
+import org.apache.ode.bpe.util.BPException;
 
 /**
  * @author charper
@@ -65,7 +65,7 @@
 
 	}
 	/**
-	 * @see org.apache.ode.action.bpel.internal.IInternalAction#init(Properties)
+	 * @see org.apache.ode.bpe.action.bpel.internal.IInternalAction#init(Properties)
 	 */
 	public void init(Properties properties) throws ActionException {
 		props = properties;
@@ -75,7 +75,7 @@
 	}
 
 	/**
-	 * @see org.apache.ode.action.bpel.internal.IInternalAction#execute(Iterator, Iterator, EventDirector, IPMIProcess)
+	 * @see org.apache.ode.bpe.action.bpel.internal.IInternalAction#execute(Iterator, Iterator, EventDirector, IPMIProcess)
 	 */
 	public boolean execute(
 		ContextResolver resolver,
@@ -151,7 +151,7 @@
 	}
 
 	/**
-	 * @see org.apache.ode.action.bpel.internal.IInternalAction#release()
+	 * @see org.apache.ode.bpe.action.bpel.internal.IInternalAction#release()
 	 */
 	public void release() {
 		props = null;

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/bpel/RegisterAction.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/bpel/RegisterAction.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/bpel/RegisterAction.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/bpel/RegisterAction.java Tue Feb 28 09:18:27 2006
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
 */
-package org.apache.ode.action.bpel;
+package org.apache.ode.bpe.action.bpel;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -22,26 +22,26 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import org.apache.ode.action.internal.ActionException;
-import org.apache.ode.action.internal.IInternalAction;
-import org.apache.ode.context.resolver.ContextResolver;
-import org.apache.ode.correlation.CorrelationService;
-import org.apache.ode.correlation.CorrelationServiceException;
-import org.apache.ode.correlation.PartQuery;
-import org.apache.ode.correlation.Registration;
-import org.apache.ode.correlation.keys.CorrelationKeysUtil;
-import org.apache.ode.definition.IPMDCorrelation;
-import org.apache.ode.definition.IPMDCorrelationSet;
-import org.apache.ode.definition.IPMDOperation;
-import org.apache.ode.definition.IPMDProcess;
-import org.apache.ode.engine.IEvaluationContext;
-import org.apache.ode.engine.IProcessCallBack;
-import org.apache.ode.event.BPELStaticKey;
-import org.apache.ode.event.IStaticKey;
-import org.apache.ode.instance.IPMIProcess;
-import org.apache.ode.scope.service.IFCScopeInstance;
-import org.apache.ode.scope.service.IScopeService;
-import org.apache.ode.util.BPException;
+import org.apache.ode.bpe.action.internal.ActionException;
+import org.apache.ode.bpe.action.internal.IInternalAction;
+import org.apache.ode.bpe.context.resolver.ContextResolver;
+import org.apache.ode.bpe.correlation.CorrelationService;
+import org.apache.ode.bpe.correlation.CorrelationServiceException;
+import org.apache.ode.bpe.correlation.PartQuery;
+import org.apache.ode.bpe.correlation.Registration;
+import org.apache.ode.bpe.correlation.keys.CorrelationKeysUtil;
+import org.apache.ode.bpe.definition.IPMDCorrelation;
+import org.apache.ode.bpe.definition.IPMDCorrelationSet;
+import org.apache.ode.bpe.definition.IPMDOperation;
+import org.apache.ode.bpe.definition.IPMDProcess;
+import org.apache.ode.bpe.engine.IEvaluationContext;
+import org.apache.ode.bpe.engine.IProcessCallBack;
+import org.apache.ode.bpe.event.BPELStaticKey;
+import org.apache.ode.bpe.event.IStaticKey;
+import org.apache.ode.bpe.instance.IPMIProcess;
+import org.apache.ode.bpe.scope.service.IFCScopeInstance;
+import org.apache.ode.bpe.scope.service.IScopeService;
+import org.apache.ode.bpe.util.BPException;
 /**
  * @author charper
  * 
@@ -68,7 +68,7 @@
 
 	}
 	/**
-	 * @see org.apache.ode.action.bpel.internal.IInternalAction#init(Properties)
+	 * @see org.apache.ode.bpe.action.bpel.internal.IInternalAction#init(Properties)
 	 */
 	public void init(Properties properties) throws ActionException {
 		props = properties;
@@ -78,7 +78,7 @@
 	}
 
 	/**
-	 * @see org.apache.ode.action.bpel.internal.IInternalAction#execute(Iterator, Iterator, EventDirector, IPMIProcess)
+	 * @see org.apache.ode.bpe.action.bpel.internal.IInternalAction#execute(Iterator, Iterator, EventDirector, IPMIProcess)
 	 */
 	public boolean execute(
 		ContextResolver resolver,
@@ -223,7 +223,7 @@
 	}
 
 	/**
-	 * @see org.apache.ode.action.bpel.internal.IInternalAction#release()
+	 * @see org.apache.ode.bpe.action.bpel.internal.IInternalAction#release()
 	 */
 	public void release() {
 		props = null;

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/bpel/ReplyAction.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/bpel/ReplyAction.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/bpel/ReplyAction.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/bpel/ReplyAction.java Tue Feb 28 09:18:27 2006
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
 */
-package org.apache.ode.action.bpel;
+package org.apache.ode.bpe.action.bpel;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -25,27 +25,27 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import org.apache.ode.action.internal.ActionException;
-import org.apache.ode.action.internal.IInternalAction;
-import org.apache.ode.bped.EventDirector;
-import org.apache.ode.context.resolver.ContextResolvedObject;
-import org.apache.ode.context.resolver.ContextResolver;
-import org.apache.ode.context.resolver.IResolvedObject;
-import org.apache.ode.context.test.SerializationContext;
-import org.apache.ode.correlation.keys.CorrelationKeysUtil;
-import org.apache.ode.definition.IPMDCorrelation;
-import org.apache.ode.definition.IPMDCorrelationSet;
-import org.apache.ode.definition.IPMDLocator;
-import org.apache.ode.definition.IPMDLocatorHolder;
-import org.apache.ode.definition.IPMDOperation;
-import org.apache.ode.definition.IPMDProcess;
-import org.apache.ode.engine.IEvaluationContext;
-import org.apache.ode.engine.IProcessCallBack;
-import org.apache.ode.engine.ReturnMessageLocatorHolder;
-import org.apache.ode.instance.IPMIProcess;
-import org.apache.ode.interaction.IInteraction;
-import org.apache.ode.interaction.InteractionFactory;
-import org.apache.ode.util.BPException;
+import org.apache.ode.bpe.action.internal.ActionException;
+import org.apache.ode.bpe.action.internal.IInternalAction;
+import org.apache.ode.bpe.bped.EventDirector;
+import org.apache.ode.bpe.context.resolver.ContextResolvedObject;
+import org.apache.ode.bpe.context.resolver.ContextResolver;
+import org.apache.ode.bpe.context.resolver.IResolvedObject;
+import org.apache.ode.bpe.context.test.SerializationContext;
+import org.apache.ode.bpe.correlation.keys.CorrelationKeysUtil;
+import org.apache.ode.bpe.definition.IPMDCorrelation;
+import org.apache.ode.bpe.definition.IPMDCorrelationSet;
+import org.apache.ode.bpe.definition.IPMDLocator;
+import org.apache.ode.bpe.definition.IPMDLocatorHolder;
+import org.apache.ode.bpe.definition.IPMDOperation;
+import org.apache.ode.bpe.definition.IPMDProcess;
+import org.apache.ode.bpe.engine.IEvaluationContext;
+import org.apache.ode.bpe.engine.IProcessCallBack;
+import org.apache.ode.bpe.engine.ReturnMessageLocatorHolder;
+import org.apache.ode.bpe.instance.IPMIProcess;
+import org.apache.ode.bpe.interaction.IInteraction;
+import org.apache.ode.bpe.interaction.InteractionFactory;
+import org.apache.ode.bpe.util.BPException;
 
 /**
  * @author charper
@@ -69,7 +69,7 @@
 		
 	}
 	/**
-	 * @see org.apache.ode.action.bpel.internal.IInternalAction#init(Properties)
+	 * @see org.apache.ode.bpe.action.bpel.internal.IInternalAction#init(Properties)
 	 */
 	public void init(Properties properties) throws ActionException {
 		props = properties;
@@ -79,7 +79,7 @@
 	}
 
 	/**
-	 * @see org.apache.ode.action.bpel.internal.IInternalAction#execute(Iterator, Iterator, EventDirector, IPMIProcess)
+	 * @see org.apache.ode.bpe.action.bpel.internal.IInternalAction#execute(Iterator, Iterator, EventDirector, IPMIProcess)
 	 */
 	public boolean execute(
 		ContextResolver resolver,
@@ -168,7 +168,7 @@
 	}
 
 	/**
-	 * @see org.apache.ode.action.bpel.internal.IInternalAction#release()
+	 * @see org.apache.ode.bpe.action.bpel.internal.IInternalAction#release()
 	 */
 	public void release() {
 		props = null;