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 [9/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/src/main/java/org/apache/ode/bpe/deployment/bpel/BPELLinkedActivity.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/BPELLinkedActivity.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/BPELLinkedActivity.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/BPELLinkedActivity.java Tue Feb 28 09:18:27 2006
@@ -17,7 +17,7 @@
  * Created on May 23, 2003
  *
  */
-package org.apache.ode.deployment.bpel;
+package org.apache.ode.bpe.deployment.bpel;
 
 
 import java.util.Iterator;
@@ -26,12 +26,12 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import org.apache.ode.action.bpel.StartSequenceAction;
-import org.apache.ode.action.bpel.UnInitVariableMetaData;
-import org.apache.ode.definition.IPMDAction;
-import org.apache.ode.definition.IPMDChangeCondition;
-import org.apache.ode.definition.IPMDProcess;
-import org.apache.ode.definition.service.DefinitionServiceException;
+import org.apache.ode.bpe.action.bpel.StartSequenceAction;
+import org.apache.ode.bpe.action.bpel.UnInitVariableMetaData;
+import org.apache.ode.bpe.definition.IPMDAction;
+import org.apache.ode.bpe.definition.IPMDChangeCondition;
+import org.apache.ode.bpe.definition.IPMDProcess;
+import org.apache.ode.bpe.definition.service.DefinitionServiceException;
 
 
 /**
@@ -75,7 +75,7 @@
 	}
 
 	/**
-	 * @see org.apache.ode.deployment.bpel.BPELActivity
+	 * @see org.apache.ode.bpe.deployment.bpel.BPELActivity
 	 */		
 	void linkProcess(BPELProcessType parent_type, BPELLinkedActivity child, BPELProcessType child_type, boolean linkNodes) throws DeploymentException {
 		try {
@@ -89,7 +89,7 @@
 	
 
 	/**
-	 * @see org.apache.ode.deployment.bpel.BPELActivity#createProcess(java.lang.String)
+	 * @see org.apache.ode.bpe.deployment.bpel.BPELActivity#createProcess(java.lang.String)
 	 */
 	IPMDProcess createProcess(String label)
 		throws DeploymentException {
@@ -108,14 +108,14 @@
 	}
 	
 	/**
-	 * @see org.apache.ode.deployment.bpel.BPELNode#getStartProcess()
+	 * @see org.apache.ode.bpe.deployment.bpel.BPELNode#getStartProcess()
 	 */
 	IPMDProcess getStartProcess() {
 		return m_process;
 	}
 	
 	/**
-	 * @see org.apache.ode.deployment.bpel.BPELNode#getEndProcess()
+	 * @see org.apache.ode.bpe.deployment.bpel.BPELNode#getEndProcess()
 	 */
 	IPMDProcess getEndProcess() {
 		return m_process;
@@ -123,7 +123,7 @@
 	
 
 	/**
-	 * @see org.apache.ode.deployment.bpel.BPELNode#pop()
+	 * @see org.apache.ode.bpe.deployment.bpel.BPELNode#pop()
 	 */
 	BPELNode pop() throws DeploymentException {
 		m_parserStack.addActivity(this);
@@ -187,10 +187,10 @@
 
 		try {
 			IPMDChangeCondition precc = process.createPrecondition("PreCondition: " + attr.getName(),
-				org.apache.ode.condition.DefaultConditional.class.getName());
+				org.apache.ode.bpe.condition.DefaultConditional.class.getName());
 			// sequence - create the pre Action
 			IPMDAction preact = precc.createAction("SequenceAction: " + attr.getName(),
-					org.apache.ode.action.bpel.SequenceAction.class.getName());
+					org.apache.ode.bpe.action.bpel.SequenceAction.class.getName());
 			preact.setMetadata(getAttributes());
 		} catch (DefinitionServiceException e) {
 			BPELUtil.throwNewException(m_logger,Level.SEVERE,"BPEL_CREATEACTION",new Object[] {getProcess().getAttributes().getName(), getAttributes().getName()},e);
@@ -203,7 +203,7 @@
 		
 		try {
 			ret = cc.createAction("RegisterAction: " + label,
-			org.apache.ode.action.bpel.RegisterAction.class.getName());
+			org.apache.ode.bpe.action.bpel.RegisterAction.class.getName());
 		} catch (DefinitionServiceException e) {
 			BPELUtil.throwNewException(m_logger,Level.SEVERE,"BPEL_CREATEACTION",new Object[] {getProcess().getAttributes().getName(), label},e);
 		}
@@ -217,7 +217,7 @@
 		
 		try {
 			ret = cc.createAction("UnRegisterAction: " + label,
-			org.apache.ode.action.bpel.UnRegisterAction.class.getName());
+			org.apache.ode.bpe.action.bpel.UnRegisterAction.class.getName());
 		} catch (DefinitionServiceException e) {
 			BPELUtil.throwNewException(m_logger,Level.SEVERE,"BPEL_CREATEACTION",new Object[] {getProcess().getAttributes().getName(), label},e);
 		}
@@ -247,7 +247,7 @@
 				try {
 					// create the action
 					IPMDAction act = cc.createFalseAction("False Join Condition Start Sequence: "+getAttributes().getName(),
-							org.apache.ode.action.bpel.StartSequenceAction.class.getName());
+							org.apache.ode.bpe.action.bpel.StartSequenceAction.class.getName());
 					// add the start key
 					act.getMetadata().put(StartSequenceAction.START_DEF_KEY,getEndProcess().getKey());
 					

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/BPELNode.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/BPELNode.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/BPELNode.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/BPELNode.java Tue Feb 28 09:18:27 2006
@@ -17,7 +17,7 @@
  * Created on May 15, 2003
  *
  */
-package org.apache.ode.deployment.bpel;
+package org.apache.ode.bpe.deployment.bpel;
 
 import java.util.Collection;
 import java.util.Enumeration;
@@ -30,13 +30,13 @@
 
 import javax.xml.namespace.QName;
 
-import org.apache.ode.definition.IPMDLocator;
-import org.apache.ode.definition.IPMDLocatorHolder;
-import org.apache.ode.definition.IPMDProcess;
-import org.apache.ode.definition.service.DefinitionServiceException;
-import org.apache.ode.interaction.IInvocation;
-import org.apache.ode.interaction.builders.IInteractionBuilder;
-import org.apache.ode.util.NamespaceUtil;
+import org.apache.ode.bpe.definition.IPMDLocator;
+import org.apache.ode.bpe.definition.IPMDLocatorHolder;
+import org.apache.ode.bpe.definition.IPMDProcess;
+import org.apache.ode.bpe.definition.service.DefinitionServiceException;
+import org.apache.ode.bpe.interaction.IInvocation;
+import org.apache.ode.bpe.interaction.builders.IInteractionBuilder;
+import org.apache.ode.bpe.util.NamespaceUtil;
 
 /**
  * @author Lance

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/BPELOnAlarm.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/BPELOnAlarm.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/BPELOnAlarm.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/BPELOnAlarm.java Tue Feb 28 09:18:27 2006
@@ -16,16 +16,16 @@
 /*
  * Created on Jul 12, 2003
  */
-package org.apache.ode.deployment.bpel;
+package org.apache.ode.bpe.deployment.bpel;
 
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import org.apache.ode.action.bpel.UnInitVariableMetaData;
-import org.apache.ode.definition.IPMDAction;
-import org.apache.ode.definition.IPMDChangeCondition;
-import org.apache.ode.definition.IPMDOperation;
-import org.apache.ode.definition.service.DefinitionServiceException;
+import org.apache.ode.bpe.action.bpel.UnInitVariableMetaData;
+import org.apache.ode.bpe.definition.IPMDAction;
+import org.apache.ode.bpe.definition.IPMDChangeCondition;
+import org.apache.ode.bpe.definition.IPMDOperation;
+import org.apache.ode.bpe.definition.service.DefinitionServiceException;
 
 
 /**
@@ -59,26 +59,26 @@
 		try {
 			
 			recact = ccB.createAction("TimerAction:" + getAttributes().getName(),
-				org.apache.ode.action.bpel.TimerAction.class.getName());
+				org.apache.ode.bpe.action.bpel.TimerAction.class.getName());
 			timeValue = getAttributes().getUntil();
 			if ( timeValue != null ) {
-				//recact.addMetadata(org.apache.ode.action.bpel.TimerAction.DEADLINE,timeValue);
-				buildExpression(recact,timeValue,org.apache.ode.action.bpel.TimerAction.DEADLINE);
+				//recact.addMetadata(org.apache.ode.bpe.action.bpel.TimerAction.DEADLINE,timeValue);
+				buildExpression(recact,timeValue,org.apache.ode.bpe.action.bpel.TimerAction.DEADLINE);
 			}
 			timeValue = getAttributes().getFor();
 			if ( timeValue != null ) {
-				//recact.addMetadata(org.apache.ode.action.bpel.TimerAction.DURATION,timeValue);
-				buildExpression(recact,timeValue,org.apache.ode.action.bpel.TimerAction.DURATION);
+				//recact.addMetadata(org.apache.ode.bpe.action.bpel.TimerAction.DURATION,timeValue);
+				buildExpression(recact,timeValue,org.apache.ode.bpe.action.bpel.TimerAction.DURATION);
 			}
-			recact.addMetadata(org.apache.ode.action.bpel.CopyAction.UNINITVAR_KEY,new UnInitVariableMetaData(BPELSchema.BPEL_URI,BPELSchema.FAULT_UNINIT_VAR));
+			recact.addMetadata(org.apache.ode.bpe.action.bpel.CopyAction.UNINITVAR_KEY,new UnInitVariableMetaData(BPELSchema.BPEL_URI,BPELSchema.FAULT_UNINIT_VAR));
 			createLocator(false,recact,
-				org.apache.ode.action.bpel.TimerAction.TIMER_ACTION_LOCATOR_KEY, 
+				org.apache.ode.bpe.action.bpel.TimerAction.TIMER_ACTION_LOCATOR_KEY, 
 				getScopePath(new BPELScopePath(inCompensationHandler())).
 					toString()+BPELScopePath.PATH_DELIMITER+
 					getStartProcess().getKey().getValue(), 
 				null, null, 0, true,  false);
-			recact.addMetadata(org.apache.ode.action.bpel.TimerAction.BLOCK,new Boolean(false));
-			recact.addMetadata(org.apache.ode.action.bpel.TimerAction.DEFINITION,getStartProcess().getKey().getValue());
+			recact.addMetadata(org.apache.ode.bpe.action.bpel.TimerAction.BLOCK,new Boolean(false));
+			recact.addMetadata(org.apache.ode.bpe.action.bpel.TimerAction.DEFINITION,getStartProcess().getKey().getValue());
 			
 		} catch (DefinitionServiceException e) {
 			BPELUtil.throwNewException(logger,Level.SEVERE,"BPEL_CREATEACTION",new Object[] {getProcess().getAttributes().getName(), getAttributes().getName()},e);
@@ -103,10 +103,10 @@
 
 
 	/**
-	 * @see org.apache.ode.deployment.bpel.BPELLinkedActivity#getActivityDescription()
+	 * @see org.apache.ode.bpe.deployment.bpel.BPELLinkedActivity#getActivityDescription()
 	 */
 	String getActivityDescription() {
-		return "onAlarm is implemented by: " + org.apache.ode.action.bpel.TimerAction.class.getName() + ". It is used to trigger an alarm event and is deactivated on scope end.";
+		return "onAlarm is implemented by: " + org.apache.ode.bpe.action.bpel.TimerAction.class.getName() + ". It is used to trigger an alarm event and is deactivated on scope end.";
 	}
 
 }

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/BPELOnMessage.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/BPELOnMessage.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/BPELOnMessage.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/BPELOnMessage.java Tue Feb 28 09:18:27 2006
@@ -17,19 +17,19 @@
  * Created on Jul 12, 2003
  *
  */
-package org.apache.ode.deployment.bpel;
+package org.apache.ode.bpe.deployment.bpel;
 
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import org.apache.ode.definition.IPMDAction;
-import org.apache.ode.definition.IPMDChangeCondition;
-import org.apache.ode.definition.IPMDCorrelation;
-import org.apache.ode.definition.IPMDOperation;
-import org.apache.ode.definition.IPMDProcess;
-import org.apache.ode.definition.IPMDRoot;
-import org.apache.ode.definition.service.DefinitionServiceException;
-import org.apache.ode.event.IStaticKey;
+import org.apache.ode.bpe.definition.IPMDAction;
+import org.apache.ode.bpe.definition.IPMDChangeCondition;
+import org.apache.ode.bpe.definition.IPMDCorrelation;
+import org.apache.ode.bpe.definition.IPMDOperation;
+import org.apache.ode.bpe.definition.IPMDProcess;
+import org.apache.ode.bpe.definition.IPMDRoot;
+import org.apache.ode.bpe.definition.service.DefinitionServiceException;
+import org.apache.ode.bpe.event.IStaticKey;
 
 /**
  * Implements the BPEL <i>onMessage</i> node. Message events are held by <i>scopes</i>,
@@ -66,13 +66,13 @@
 		try {
 			IPMDChangeCondition cc = 
 				process.createChangeCondition("ChangeCondition: " + getAttributes().getName(),
-				org.apache.ode.condition.DefaultConditional.class.getName());
+				org.apache.ode.bpe.condition.DefaultConditional.class.getName());
 			
 			recact =
 				cc.createAction(
 					"ReceiveAction:" + getAttributes().getName(),
-					org.apache.ode.action.bpel.ReceiveAction.class.getName());
-			recact.addMetadata(org.apache.ode.action.bpel.ReceiveAction.PARTNER_LINK,
+					org.apache.ode.bpe.action.bpel.ReceiveAction.class.getName());
+			recact.addMetadata(org.apache.ode.bpe.action.bpel.ReceiveAction.PARTNER_LINK,
 					getAttributes().getPartnerLink());
 		} catch (DefinitionServiceException e) {
 			BPELUtil.throwNewException(logger,Level.SEVERE,"BPEL_CREATEACTION",new Object[] {getProcess().getAttributes().getName(), getAttributes().getName()},e);
@@ -95,14 +95,14 @@
 	}
 		
 	/**
-	 * @see org.apache.ode.deployment.bpel.BPELLinkedActivity#getActivityDescription()
+	 * @see org.apache.ode.bpe.deployment.bpel.BPELLinkedActivity#getActivityDescription()
 	 */
 	String getActivityDescription() {
-		return "onMessage is implemented by: " + org.apache.ode.action.bpel.ReceiveAction.class.getName() + ". It is used to handle a message event and is deactivated on scope end.";
+		return "onMessage is implemented by: " + org.apache.ode.bpe.action.bpel.ReceiveAction.class.getName() + ". It is used to handle a message event and is deactivated on scope end.";
 	}
 
 	/* (non-Javadoc)
-	 * @see org.apache.ode.deployment.bpel.BPELIOActivity#createOperation(org.apache.ode.definition.service.IPMDRoot, java.lang.String, org.apache.ode.event.IStaticKey, org.apache.ode.definition.service.IPMDCorrelation, boolean, java.lang.String)
+	 * @see org.apache.ode.bpe.deployment.bpel.BPELIOActivity#createOperation(org.apache.ode.bpe.definition.service.IPMDRoot, java.lang.String, org.apache.ode.bpe.event.IStaticKey, org.apache.ode.bpe.definition.service.IPMDCorrelation, boolean, java.lang.String)
 	 */
 	protected IPMDOperation createOperation(IPMDRoot defRoot,
 			String operationId, IStaticKey key, IPMDCorrelation corrl,

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/BPELOtherwise.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/BPELOtherwise.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/BPELOtherwise.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/BPELOtherwise.java Tue Feb 28 09:18:27 2006
@@ -17,7 +17,7 @@
  * Created on Jul 10, 2003
  *
  */
-package org.apache.ode.deployment.bpel;
+package org.apache.ode.bpe.deployment.bpel;
 
 /**
  * Implements the BPEL <i>otherwise</i> node. The otherwise node is held by <i>swith</i>.

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/BPELParser.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/BPELParser.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/BPELParser.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/BPELParser.java Tue Feb 28 09:18:27 2006
@@ -17,7 +17,7 @@
  * Created on May 13, 2003
  *
  */
-package org.apache.ode.deployment.bpel;
+package org.apache.ode.bpe.deployment.bpel;
 
 
 import java.io.ByteArrayInputStream;
@@ -34,8 +34,8 @@
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
 
-import org.apache.ode.definition.service.DefinitionService;
-import org.apache.ode.util.BPException;
+import org.apache.ode.bpe.definition.service.DefinitionService;
+import org.apache.ode.bpe.util.BPException;
 
 /**
  * @author waterman

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/BPELPatternValue.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/BPELPatternValue.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/BPELPatternValue.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/BPELPatternValue.java Tue Feb 28 09:18:27 2006
@@ -17,7 +17,7 @@
  * Created on Aug 27, 2003
  *
   */
-package org.apache.ode.deployment.bpel;
+package org.apache.ode.bpe.deployment.bpel;
 
 /**
  * @author waterman

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/BPELPick.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/BPELPick.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/BPELPick.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/BPELPick.java Tue Feb 28 09:18:27 2006
@@ -17,7 +17,7 @@
  * Created on Jul 15, 2003
  *
  */
-package org.apache.ode.deployment.bpel;
+package org.apache.ode.bpe.deployment.bpel;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -26,11 +26,11 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import org.apache.ode.action.bpel.RegisterAction;
-import org.apache.ode.definition.IPMDAction;
-import org.apache.ode.definition.IPMDChangeCondition;
-import org.apache.ode.definition.IPMDOperation;
-import org.apache.ode.definition.service.DefinitionServiceException;
+import org.apache.ode.bpe.action.bpel.RegisterAction;
+import org.apache.ode.bpe.definition.IPMDAction;
+import org.apache.ode.bpe.definition.IPMDChangeCondition;
+import org.apache.ode.bpe.definition.IPMDOperation;
+import org.apache.ode.bpe.definition.service.DefinitionServiceException;
 
 
 /**
@@ -62,14 +62,14 @@
 	}
 	
 	/**
-	 * @see org.apache.ode.deployment.bpel.BPELNode#addEventHandler(org.apache.ode.deployment.bpel.BPELEvent)
+	 * @see org.apache.ode.bpe.deployment.bpel.BPELNode#addEventHandler(org.apache.ode.bpe.deployment.bpel.BPELEvent)
 	 */
 	void addEventHandler(BPELEvent event) {
 		m_eventHandlers.add(event);
 	}
 	
 	/**
-	 * @see org.apache.ode.deployment.bpel.BPELNode#pop()
+	 * @see org.apache.ode.bpe.deployment.bpel.BPELNode#pop()
 	 */
 	BPELNode pop() throws DeploymentException {
 
@@ -99,13 +99,13 @@
 		
 			try {
 				IPMDChangeCondition ccB = getStartProcess().createChangeCondition("Start Pick: "+getAttributes().getName(),
-					org.apache.ode.condition.DefaultConditional.class.getName());
+					org.apache.ode.bpe.condition.DefaultConditional.class.getName());
 						
 				IPMDAction regact = createRegisterAction(ccB,getAttributes().getName());
 				
 				// Create the end pick action
 				IPMDChangeCondition ccE = getEndProcess().createChangeCondition("End Pick: "+getAttributes().getName(),
-					org.apache.ode.condition.DefaultConditional.class.getName());
+					org.apache.ode.bpe.condition.DefaultConditional.class.getName());
 				IPMDAction remact = createUnRegisterAction(ccE,getAttributes().getName());
 						
 				// register event handlers
@@ -113,7 +113,7 @@
 				
 				// Create the blocking action
 				ccB.createAction("BlockingAction: " + getAttributes().getName(),
-				org.apache.ode.action.bpel.BlockingAction.class.getName());
+				org.apache.ode.bpe.action.bpel.BlockingAction.class.getName());
 
 			} catch (DefinitionServiceException e) {
 				BPELUtil.throwNewException(logger,Level.SEVERE,"BPEL_CREATEACTION",new Object[] {getProcess().getAttributes().getName(), getAttributes().getName()},e);
@@ -166,7 +166,7 @@
 				for (Iterator actItr = cc.getActions(); actItr.hasNext(); ) {
 					recact = (IPMDAction)actItr.next();
 					
-					if ( recact.getActionClass().equals(org.apache.ode.action.bpel.ReceiveAction.class.getName())) {
+					if ( recact.getActionClass().equals(org.apache.ode.bpe.action.bpel.ReceiveAction.class.getName())) {
 						break;
 					}
 					recact = null;
@@ -194,9 +194,9 @@
 		
 		try {
 			IPMDChangeCondition cc = getStartProcess().createChangeCondition("Start Pick: "+getAttributes().getName(),
-				org.apache.ode.condition.DefaultConditional.class.getName());
+				org.apache.ode.bpe.condition.DefaultConditional.class.getName());
 			IPMDAction ss = cc.createAction("Start Pick: "+getAttributes().getName(),
-				org.apache.ode.action.bpel.PickAction.class.getName());
+				org.apache.ode.bpe.action.bpel.PickAction.class.getName());
 			ss.setMetadata(pickProps);
 		} catch (DefinitionServiceException e) {
 			BPELUtil.throwNewException(logger,Level.SEVERE,"BPEL_CREATEACTION",new Object[] {getProcess().getAttributes().getName(), getAttributes().getName()},e);
@@ -206,10 +206,10 @@
 	}
 	
 	/**
-	 * @see org.apache.ode.deployment.bpel.BPELLinkedActivity#getActivityDescription()
+	 * @see org.apache.ode.bpe.deployment.bpel.BPELLinkedActivity#getActivityDescription()
 	 */
 	String getActivityDescription() {
-		return "pick is implemented by: " + org.apache.ode.action.bpel.BlockingAction.class.getName() + ". It is used to block the business process until a specific message event arrives.";
+		return "pick is implemented by: " + org.apache.ode.bpe.action.bpel.BlockingAction.class.getName() + ". It is used to block the business process until a specific message event arrives.";
 	}
 	
 	BPELLink notifyLink(BPELLink link, BPELFlow node) throws DeploymentException {
@@ -232,9 +232,9 @@
 		// Create the end switch action
 		try {
 			ccE = getEndProcess().createChangeCondition("End Pick: "+getAttributes().getName(),
-				org.apache.ode.condition.DefaultConditional.class.getName());
+				org.apache.ode.bpe.condition.DefaultConditional.class.getName());
 			es = ccE.createAction("End Pick: "+getAttributes().getName(),
-				org.apache.ode.action.bpel.EndConditionalFlowAction.class.getName());
+				org.apache.ode.bpe.action.bpel.EndConditionalFlowAction.class.getName());
 		} catch (DefinitionServiceException e1) {
 			BPELUtil.throwNewException(logger,Level.SEVERE,"BPEL_CREATEACTION",new Object[] {getProcess().getAttributes().getName(), getAttributes().getName()},e1);
 		}	
@@ -248,14 +248,14 @@
 		}
 		
 		Properties md = new Properties();
-		md.put(org.apache.ode.action.bpel.EndConditionalFlowAction.LINKS,linkLocators);
+		md.put(org.apache.ode.bpe.action.bpel.EndConditionalFlowAction.LINKS,linkLocators);
 		
 		es.setMetadata(md);
 		
 	}
 	
 	/* (non-Javadoc)
-	 * @see org.apache.ode.deployment.bpel.BPELNode#getProxy(org.apache.ode.deployment.bpel.BPELFlow, org.apache.ode.deployment.bpel.BPELNode)
+	 * @see org.apache.ode.bpe.deployment.bpel.BPELNode#getProxy(org.apache.ode.bpe.deployment.bpel.BPELFlow, org.apache.ode.bpe.deployment.bpel.BPELNode)
 	 */
 	BPELNode getProxy(BPELFlow linkOwner, BPELNode source) {
 		return this;

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/BPELProcess.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/BPELProcess.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/BPELProcess.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/BPELProcess.java Tue Feb 28 09:18:27 2006
@@ -17,7 +17,7 @@
  * Created on May 23, 2003
  *
  */
-package org.apache.ode.deployment.bpel;
+package org.apache.ode.bpe.deployment.bpel;
 
 import java.util.HashMap;
 import java.util.HashSet;
@@ -27,14 +27,14 @@
 
 import javax.xml.namespace.QName;
 
-import org.apache.ode.definition.IPMDChangeCondition;
-import org.apache.ode.definition.IPMDProcess;
-import org.apache.ode.definition.IPMDRoot;
-import org.apache.ode.definition.service.DefinitionServiceException;
-//import org.apache.ode.definition.service.IPMDAction;
-import org.apache.ode.event.IStaticKey;
-import org.apache.ode.lang.ResourceGetter;
-import org.apache.ode.wsdl.extensions.BPELPropertyAlias;
+import org.apache.ode.bpe.definition.IPMDChangeCondition;
+import org.apache.ode.bpe.definition.IPMDProcess;
+import org.apache.ode.bpe.definition.IPMDRoot;
+import org.apache.ode.bpe.definition.service.DefinitionServiceException;
+import org.apache.ode.bpe.event.IStaticKey;
+import org.apache.ode.bpe.lang.ResourceGetter;
+import org.apache.ode.bpe.wsdl.extensions.BPELPropertyAlias;
+//import org.apache.ode.bpe.definition.service.IPMDAction;
 
 /**
  * Implements the BPEL <i>process</i> node. The process node is the root of a
@@ -84,7 +84,7 @@
 	}
 	
 	/**
-	 * @see org.apache.ode.deployment.bpel.BPELNode#addActivity(org.apache.ode.deployment.bpel.BPELNode)
+	 * @see org.apache.ode.bpe.deployment.bpel.BPELNode#addActivity(org.apache.ode.bpe.deployment.bpel.BPELNode)
 	 */
 	void addActivity(BPELNode activity) throws DeploymentException {
 		
@@ -117,14 +117,14 @@
 	}
 	
 	/**
-	 * @see org.apache.ode.deployment.bpel.BPELNode#getScopeCounter()
+	 * @see org.apache.ode.bpe.deployment.bpel.BPELNode#getScopeCounter()
 	 */
 	int getScopeCounter() {
 		return m_scopeCount++;
 	}
 	
 	/**
-	 * @see org.apache.ode.deployment.bpel.BPELNode#getScopePath(org.apache.ode.deployment.bpel.BPELScopePath)
+	 * @see org.apache.ode.bpe.deployment.bpel.BPELNode#getScopePath(org.apache.ode.bpe.deployment.bpel.BPELScopePath)
 	 */
 	BPELScopePath getScopePath(BPELScopePath path) {
 		
@@ -180,9 +180,9 @@
 				
 			// Create the end process action
 			cc = getEndProcess().createChangeCondition("End Process: "+getAttributes().getName(),
-				org.apache.ode.condition.DefaultConditional.class.getName());
+				org.apache.ode.bpe.condition.DefaultConditional.class.getName());
 			cc.createAction("End Process: "+getAttributes().getName(),
-				org.apache.ode.action.bpel.EndProcessAction.class.getName());
+				org.apache.ode.bpe.action.bpel.EndProcessAction.class.getName());
 		} catch (DefinitionServiceException e) {
 			BPELUtil.throwNewException(logger,Level.SEVERE,"BPEL_CREATEACTION",new Object[] {getProcess().getAttributes().getName(), getAttributes().getName()},e);
 		}
@@ -227,7 +227,7 @@
 	}
 	
 	/* (non-Javadoc)
-	 * @see org.apache.ode.deployment.bpel.BPELNode#getNamespace(java.lang.String)
+	 * @see org.apache.ode.bpe.deployment.bpel.BPELNode#getNamespace(java.lang.String)
 	 */
 	String getNamespace(String prefix) throws DeploymentException  {
 		String uri = super.getNamespace(prefix);
@@ -240,7 +240,7 @@
 	}
 	
 	/* (non-Javadoc)
-	 * @see org.apache.ode.deployment.bpel.BPELNode#getTargetNamespace()
+	 * @see org.apache.ode.bpe.deployment.bpel.BPELNode#getTargetNamespace()
 	 */
 	String getTargetNamespace() throws DeploymentException {
 		String tns = getAttributes().getProperty("targetNamespace");
@@ -263,7 +263,7 @@
 	}
 	
 	/**
-	 * @see org.apache.ode.deployment.bpel.BPELLinkedActivity#getActivityDescription()
+	 * @see org.apache.ode.bpe.deployment.bpel.BPELLinkedActivity#getActivityDescription()
 	 */
 	String getActivityDescription() {
 		return "process is the root node of a business process";

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/BPELProcessType.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/BPELProcessType.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/BPELProcessType.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/BPELProcessType.java Tue Feb 28 09:18:27 2006
@@ -17,7 +17,7 @@
  * Created on Jun 12, 2003
  *
  */
-package org.apache.ode.deployment.bpel;
+package org.apache.ode.bpe.deployment.bpel;
 
 /**
  * An enumeration of the process type. Structured BPEL activities ( BPELWhile,

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/BPELPropertyDefinition.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/BPELPropertyDefinition.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/BPELPropertyDefinition.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/BPELPropertyDefinition.java Tue Feb 28 09:18:27 2006
@@ -17,15 +17,15 @@
  * Created on Aug 12, 2003
  *
  */
-package org.apache.ode.deployment.bpel;
+package org.apache.ode.bpe.deployment.bpel;
 
 import java.util.Iterator;
 import java.util.Vector;
 
 import javax.xml.namespace.QName;
 
-import org.apache.ode.wsdl.extensions.BPELProperty;
-import org.apache.ode.wsdl.extensions.BPELPropertyAlias;
+import org.apache.ode.bpe.wsdl.extensions.BPELProperty;
+import org.apache.ode.bpe.wsdl.extensions.BPELPropertyAlias;
 
 /**
  * @author waterman

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/BPELPrune.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/BPELPrune.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/BPELPrune.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/BPELPrune.java Tue Feb 28 09:18:27 2006
@@ -14,14 +14,14 @@
  * limitations under the License.
 */
 
-package org.apache.ode.deployment.bpel;
+package org.apache.ode.bpe.deployment.bpel;
 
 import java.util.HashMap;
 import java.util.logging.Logger;
 
-import org.apache.ode.interaction.IInvocation;
-import org.apache.ode.interaction.InvocationFactory;
-import org.apache.ode.util.BPException;
+import org.apache.ode.bpe.interaction.IInvocation;
+import org.apache.ode.bpe.interaction.InvocationFactory;
+import org.apache.ode.bpe.util.BPException;
 
 public class BPELPrune extends BPELSimpleUpdate
 {

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/BPELReceive.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/BPELReceive.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/BPELReceive.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/BPELReceive.java Tue Feb 28 09:18:27 2006
@@ -17,24 +17,24 @@
  * Created on Jun 21, 2003
  *
  */
-package org.apache.ode.deployment.bpel;
+package org.apache.ode.bpe.deployment.bpel;
 
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import org.apache.ode.action.bpel.RegisterAction;
-import org.apache.ode.definition.IPMDAction;
-import org.apache.ode.definition.IPMDChangeCondition;
-import org.apache.ode.definition.IPMDCorrelation;
-import org.apache.ode.definition.IPMDOperation;
-import org.apache.ode.definition.IPMDProcess;
-import org.apache.ode.definition.IPMDRoot;
-import org.apache.ode.definition.service.DefinitionServiceException;
-import org.apache.ode.event.BPELStaticKey;
-import org.apache.ode.event.IStaticKey;
-//import org.apache.ode.lang.ResourceGetter;
+import org.apache.ode.bpe.action.bpel.RegisterAction;
+import org.apache.ode.bpe.definition.IPMDAction;
+import org.apache.ode.bpe.definition.IPMDChangeCondition;
+import org.apache.ode.bpe.definition.IPMDCorrelation;
+import org.apache.ode.bpe.definition.IPMDOperation;
+import org.apache.ode.bpe.definition.IPMDProcess;
+import org.apache.ode.bpe.definition.IPMDRoot;
+import org.apache.ode.bpe.definition.service.DefinitionServiceException;
+import org.apache.ode.bpe.event.BPELStaticKey;
+import org.apache.ode.bpe.event.IStaticKey;
+//import org.apache.ode.bpe.lang.ResourceGetter;
 
 
 /**
@@ -62,7 +62,7 @@
 	}
 
 	/**
-	 * @see org.apache.ode.deployment.bpel.BPELNode#collectThreadBoundries(java.util.HashSet)
+	 * @see org.apache.ode.bpe.deployment.bpel.BPELNode#collectThreadBoundries(java.util.HashSet)
 	 */
 	HashSet collectThreadBoundries(HashSet hs) {
 		
@@ -73,7 +73,7 @@
 	
 	
 	/**
-	 * @see org.apache.ode.deployment.bpel.BPELNode#pop()
+	 * @see org.apache.ode.bpe.deployment.bpel.BPELNode#pop()
 	 */
 	BPELNode pop() throws DeploymentException {
 		
@@ -88,7 +88,7 @@
 			// Create the change condition
 			IPMDChangeCondition cc = 
 				process.createChangeCondition("ChangeCondition: " + getAttributes().getName(),
-				org.apache.ode.condition.DefaultConditional.class.getName());
+				org.apache.ode.bpe.condition.DefaultConditional.class.getName());
 			
 			
 			if ( BPELBoolean.YES.equals(getAttributes().getCreateInstance())) {
@@ -105,7 +105,7 @@
 				ops.add(initOp);
 				recact.addMetadata(RegisterAction.OPERATIONS,ops);
 				
-				recact.addMetadata(org.apache.ode.action.bpel.ReceiveAction.PARTNER_LINK,
+				recact.addMetadata(org.apache.ode.bpe.action.bpel.ReceiveAction.PARTNER_LINK,
 						getAttributes().getPartnerLink());
 				
 			
@@ -135,7 +135,7 @@
 				regact.addMetadata(RegisterAction.OPERATIONS,ops);
 				remact.addMetadata(RegisterAction.OPERATIONS,ops);
 				
-				recact.addMetadata(org.apache.ode.action.bpel.ReceiveAction.PARTNER_LINK,
+				recact.addMetadata(org.apache.ode.bpe.action.bpel.ReceiveAction.PARTNER_LINK,
 						getAttributes().getPartnerLink());
 				
 				getProcess().setIsStateFull();
@@ -158,7 +158,7 @@
 		
 		try {
 			ret = cc.createAction("ReceiveAction:" + label,
-			org.apache.ode.action.bpel.ReceiveAction.class.getName());
+			org.apache.ode.bpe.action.bpel.ReceiveAction.class.getName());
 		} catch (DefinitionServiceException e) {
 			BPELUtil.throwNewException(logger,Level.SEVERE,"BPEL_CREATEACTION",new Object[] {getProcess().getAttributes().getName(), label},e);
 		}
@@ -168,14 +168,14 @@
 	}
 	
 	/**
-	 * @see org.apache.ode.deployment.bpel.BPELLinkedActivity#getActivityDescription()
+	 * @see org.apache.ode.bpe.deployment.bpel.BPELLinkedActivity#getActivityDescription()
 	 */
 	String getActivityDescription() {
-		return "receive is implemented by: " + org.apache.ode.action.bpel.ReceiveAction.class.getName() + ". It is used to block the business process until a specific message event arrives.";
+		return "receive is implemented by: " + org.apache.ode.bpe.action.bpel.ReceiveAction.class.getName() + ". It is used to block the business process until a specific message event arrives.";
 	}
 
 	/* (non-Javadoc)
-	 * @see org.apache.ode.deployment.bpel.BPELIOActivity#createOperation(org.apache.ode.definition.service.IPMDRoot, java.lang.String, org.apache.ode.event.IStaticKey, org.apache.ode.definition.service.IPMDCorrelation, boolean, java.lang.String)
+	 * @see org.apache.ode.bpe.deployment.bpel.BPELIOActivity#createOperation(org.apache.ode.bpe.definition.service.IPMDRoot, java.lang.String, org.apache.ode.bpe.event.IStaticKey, org.apache.ode.bpe.definition.service.IPMDCorrelation, boolean, java.lang.String)
 	 */
 	protected IPMDOperation createOperation(IPMDRoot defRoot,
 			String operationId, IStaticKey key, IPMDCorrelation corrl,

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/BPELReply.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/BPELReply.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/BPELReply.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/BPELReply.java Tue Feb 28 09:18:27 2006
@@ -17,19 +17,19 @@
  * Created on Jun 21, 2003
  *
  */
-package org.apache.ode.deployment.bpel;
+package org.apache.ode.bpe.deployment.bpel;
 
 import java.util.ArrayList;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import org.apache.ode.action.bpel.RegisterAction;
-import org.apache.ode.action.bpel.ReplyAction;
-import org.apache.ode.definition.IPMDAction;
-import org.apache.ode.definition.IPMDChangeCondition;
-import org.apache.ode.definition.IPMDOperation;
-import org.apache.ode.definition.IPMDProcess;
-import org.apache.ode.definition.service.DefinitionServiceException;
+import org.apache.ode.bpe.action.bpel.RegisterAction;
+import org.apache.ode.bpe.action.bpel.ReplyAction;
+import org.apache.ode.bpe.definition.IPMDAction;
+import org.apache.ode.bpe.definition.IPMDChangeCondition;
+import org.apache.ode.bpe.definition.IPMDOperation;
+import org.apache.ode.bpe.definition.IPMDProcess;
+import org.apache.ode.bpe.definition.service.DefinitionServiceException;
 
 /**
  * Implements the BPEL <i>reply</i> node. The reply node holds 
@@ -56,14 +56,14 @@
 	}
 
 	/**
-	 * @see org.apache.ode.deployment.bpel.BPELNode#addCorrelation(org.apache.ode.deployment.bpel.BPELCorrelation)
+	 * @see org.apache.ode.bpe.deployment.bpel.BPELNode#addCorrelation(org.apache.ode.bpe.deployment.bpel.BPELCorrelation)
 	 */
 //	void addCorrelation(BPELCorrelation correlation){
 //		correlations.add(correlation);
 //	}
 	
 	/**
-	 * @see org.apache.ode.deployment.bpel.BPELNode#pop()
+	 * @see org.apache.ode.bpe.deployment.bpel.BPELNode#pop()
 	 */
 	BPELNode pop() throws DeploymentException {
 		
@@ -76,12 +76,12 @@
 			// Create the change condition
 			IPMDChangeCondition cc = 
 				process.createChangeCondition("ChangeCondition: " + getAttributes().getName(),
-				org.apache.ode.condition.DefaultConditional.class.getName());
+				org.apache.ode.bpe.condition.DefaultConditional.class.getName());
 				
 			// Create the change action 
 			IPMDAction ccact = 
 				cc.createAction("ChangeAction:" + getAttributes().getName(),
-				org.apache.ode.action.bpel.ReplyAction.class.getName());
+				org.apache.ode.bpe.action.bpel.ReplyAction.class.getName());
 			
 			// The BPEL application can reply with a fault or it can
 			// reply with data. Reply with fault does not cause an
@@ -111,10 +111,10 @@
 	}
 	
 	/**
-	 * @see org.apache.ode.deployment.bpel.BPELLinkedActivity#getActivityDescription()
+	 * @see org.apache.ode.bpe.deployment.bpel.BPELLinkedActivity#getActivityDescription()
 	 */
 	String getActivityDescription() {
-		return "reply is implemented by: " + org.apache.ode.action.bpel.ReplyAction.class.getName() + ". It is used to return a message from a business process.";
+		return "reply is implemented by: " + org.apache.ode.bpe.action.bpel.ReplyAction.class.getName() + ". It is used to return a message from a business process.";
 	}
 
 }

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/BPELReplyVariable.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/BPELReplyVariable.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/BPELReplyVariable.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/BPELReplyVariable.java Tue Feb 28 09:18:27 2006
@@ -17,15 +17,15 @@
  * Created on Jul 1, 2003
  *
  */
-package org.apache.ode.deployment.bpel;
+package org.apache.ode.bpe.deployment.bpel;
 
 import java.util.Iterator;
 import java.util.Vector;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import org.apache.ode.definition.IPMDLocatorHolder;
-import org.apache.ode.definition.service.DefinitionServiceException;
+import org.apache.ode.bpe.definition.IPMDLocatorHolder;
+import org.apache.ode.bpe.definition.service.DefinitionServiceException;
 
 /**
  * @author waterman
@@ -52,7 +52,7 @@
 	}
 
 	/* (non-Javadoc)
-	 * @see org.apache.ode.deployment.bpel.BPELVariable#createLocator(org.apache.ode.definition.service.IPMDLocatorHolder, org.apache.ode.deployment.bpel.BPELNode, org.apache.ode.deployment.bpel.BPELAttributes, boolean)
+	 * @see org.apache.ode.bpe.deployment.bpel.BPELVariable#createLocator(org.apache.ode.bpe.definition.service.IPMDLocatorHolder, org.apache.ode.bpe.deployment.bpel.BPELNode, org.apache.ode.bpe.deployment.bpel.BPELAttributes, boolean)
 	 */
 	Object createLocator(
 		IPMDLocatorHolder locator,

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/BPELRepositoryHandler.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/BPELRepositoryHandler.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/BPELRepositoryHandler.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/BPELRepositoryHandler.java Tue Feb 28 09:18:27 2006
@@ -17,7 +17,7 @@
  * Created on May 13, 2003
  *
  */
-package org.apache.ode.deployment.bpel;
+package org.apache.ode.bpe.deployment.bpel;
 
 import java.util.HashMap;
 import java.util.logging.Level;
@@ -25,16 +25,16 @@
 
 //import java.util.regex.Pattern;
 
-import org.apache.ode.definition.IPMDProcess;
-import org.apache.ode.definition.IPMDRoot;
-import org.apache.ode.definition.service.DefinitionService;
-import org.apache.ode.definition.service.DefinitionServiceException;
-import org.apache.ode.definition.service.DefinitionServiceFactory;
-import org.apache.ode.util.BPEProperties;
-import org.apache.ode.util.BPException;
-import org.apache.ode.uuid.UUIDService;
-import org.apache.ode.uuid.UUIDServiceException;
-import org.apache.ode.uuid.UUIDServiceFactory;
+import org.apache.ode.bpe.definition.IPMDProcess;
+import org.apache.ode.bpe.definition.IPMDRoot;
+import org.apache.ode.bpe.definition.service.DefinitionService;
+import org.apache.ode.bpe.definition.service.DefinitionServiceException;
+import org.apache.ode.bpe.definition.service.DefinitionServiceFactory;
+import org.apache.ode.bpe.util.BPEProperties;
+import org.apache.ode.bpe.util.BPException;
+import org.apache.ode.bpe.uuid.UUIDService;
+import org.apache.ode.bpe.uuid.UUIDServiceException;
+import org.apache.ode.bpe.uuid.UUIDServiceFactory;
 
 
 /**
@@ -80,7 +80,7 @@
 		
 		try {
 			if ( ds == null ) {
-				m_props.setDefinitionServiceClass("org.apache.ode.definition.serialimpl.DefinitionService_SerImpl");
+				m_props.setDefinitionServiceClass("org.apache.ode.bpe.definition.serialimpl.DefinitionService_SerImpl");
 				UUIDService us = UUIDServiceFactory.createUUIDService(m_props);
 				m_ds = DefinitionServiceFactory.createDefinitionService(m_props,us);
 			} else {
@@ -161,9 +161,9 @@
 		
 		pop();
 		
-		if ( m_ds instanceof org.apache.ode.definition.service.unmanaged.DefinitionServiceProxy ) {
+		if ( m_ds instanceof org.apache.ode.bpe.definition.service.unmanaged.DefinitionServiceProxy ) {
 			try {
-				((org.apache.ode.definition.service.unmanaged.DefinitionServiceProxy)m_ds).update();
+				((org.apache.ode.bpe.definition.service.unmanaged.DefinitionServiceProxy)m_ds).update();
 			} catch (DefinitionServiceException e) {
 				BPELUtil.throwNewException(logger,Level.SEVERE,"BPEL_UPDATE",new Object[] {m_bpelName},e);
 			}

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/BPELSAXHandler.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/BPELSAXHandler.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/BPELSAXHandler.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/BPELSAXHandler.java Tue Feb 28 09:18:27 2006
@@ -17,7 +17,7 @@
  * Created on May 13, 2003
  *
  */
-package org.apache.ode.deployment.bpel;
+package org.apache.ode.bpe.deployment.bpel;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
@@ -30,8 +30,8 @@
 import org.xml.sax.SAXParseException;
 import org.xml.sax.helpers.DefaultHandler;
 
-import org.apache.ode.definition.service.DefinitionService;
-import org.apache.ode.lang.ResourceGetter;
+import org.apache.ode.bpe.definition.service.DefinitionService;
+import org.apache.ode.bpe.lang.ResourceGetter;
 
 
 

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/BPELSchema.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/BPELSchema.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/BPELSchema.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/BPELSchema.java Tue Feb 28 09:18:27 2006
@@ -17,7 +17,7 @@
  * Created on May 27, 2003
  *
  */
-package org.apache.ode.deployment.bpel;
+package org.apache.ode.bpe.deployment.bpel;
 
 
 /**

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/BPELScope.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/BPELScope.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/BPELScope.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/BPELScope.java Tue Feb 28 09:18:27 2006
@@ -16,7 +16,7 @@
 /*
  * Created on May 19, 2003
  */
-package org.apache.ode.deployment.bpel;
+package org.apache.ode.bpe.deployment.bpel;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -27,14 +27,14 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import org.apache.ode.action.bpel.EndScopeAction;
-import org.apache.ode.action.bpel.RegisterAction;
-import org.apache.ode.action.bpel.StartScopeAction;
-import org.apache.ode.definition.IPMDAction;
-import org.apache.ode.definition.IPMDChangeCondition;
-import org.apache.ode.definition.IPMDLocator;
-import org.apache.ode.definition.IPMDOperation;
-import org.apache.ode.definition.service.DefinitionServiceException;
+import org.apache.ode.bpe.action.bpel.EndScopeAction;
+import org.apache.ode.bpe.action.bpel.RegisterAction;
+import org.apache.ode.bpe.action.bpel.StartScopeAction;
+import org.apache.ode.bpe.definition.IPMDAction;
+import org.apache.ode.bpe.definition.IPMDChangeCondition;
+import org.apache.ode.bpe.definition.IPMDLocator;
+import org.apache.ode.bpe.definition.IPMDOperation;
+import org.apache.ode.bpe.definition.service.DefinitionServiceException;
 
 
 /**
@@ -79,7 +79,7 @@
 	}
 	
 	/**
-	 * @see org.apache.ode.deployment.bpel.BPELNode#addVariable(org.apache.ode.deployment.bpel.BPELVariable)
+	 * @see org.apache.ode.bpe.deployment.bpel.BPELNode#addVariable(org.apache.ode.bpe.deployment.bpel.BPELVariable)
 	 */
 	void addVariable(BPELVariable var) {
 		m_variables.put(var.getName(),var);
@@ -99,7 +99,7 @@
 	}
 	
 	/**
-	 * @see org.apache.ode.deployment.bpel.BPELNode#getVariable(java.lang.String)
+	 * @see org.apache.ode.bpe.deployment.bpel.BPELNode#getVariable(java.lang.String)
 	 */
 	BPELVariable getVariable(String varName) throws DeploymentException {
 		BPELVariable ret = null;
@@ -113,7 +113,7 @@
 	
 
 	/**
-	 * @see org.apache.ode.deployment.bpel.BPELNode#addActivity(org.apache.ode.deployment.bpel.BPELNode)
+	 * @see org.apache.ode.bpe.deployment.bpel.BPELNode#addActivity(org.apache.ode.bpe.deployment.bpel.BPELNode)
 	 */
 	void addActivity(BPELNode activity) throws DeploymentException {
 		
@@ -131,7 +131,7 @@
 	}
 	
 	/**
-	 * @see org.apache.ode.deployment.bpel.BPELNode#getScopePath(org.apache.ode.deployment.bpel.BPELScopePath)
+	 * @see org.apache.ode.bpe.deployment.bpel.BPELNode#getScopePath(org.apache.ode.bpe.deployment.bpel.BPELScopePath)
 	 */
 	BPELScopePath getScopePath(BPELScopePath path) {
 		
@@ -142,7 +142,7 @@
 	}
 	
 	/**
-	 * @see org.apache.ode.deployment.bpel.BPELNode#getCorrelationSet(java.lang.String)
+	 * @see org.apache.ode.bpe.deployment.bpel.BPELNode#getCorrelationSet(java.lang.String)
 	 */
 	BPELCorrelationSet getCorrelationSet(String name) {
 		BPELCorrelationSet ret = (BPELCorrelationSet)m_correlationSets.get(name);
@@ -152,25 +152,25 @@
 
 
 	/**
-	 * @see org.apache.ode.deployment.bpel.BPELNode#pop()
+	 * @see org.apache.ode.bpe.deployment.bpel.BPELNode#pop()
 	 */
 	BPELNode pop() throws DeploymentException {
 		
 		// Create the start scope action
 		try {
 			IPMDChangeCondition ccB = getStartProcess().createChangeCondition("Start Scope: "+getScopeName(),
-				org.apache.ode.condition.DefaultConditional.class.getName());
+				org.apache.ode.bpe.condition.DefaultConditional.class.getName());
 
 			IPMDAction ss = ccB.createAction("Start Scope: "+getScopeName(),
-				org.apache.ode.action.bpel.StartScopeAction.class.getName());
+				org.apache.ode.bpe.action.bpel.StartScopeAction.class.getName());
 			ss.addMetadata(StartScopeAction.SCOPE_NAME,getScopeName());
 			
 		
 			// Create the end scope action
 			IPMDChangeCondition ccE = getEndProcess().createChangeCondition("End Scope: "+getScopeName(),
-				org.apache.ode.condition.DefaultConditional.class.getName());
+				org.apache.ode.bpe.condition.DefaultConditional.class.getName());
 			IPMDAction es = ccE.createAction("End Scope: "+getScopeName(),
-				org.apache.ode.action.bpel.EndScopeAction.class.getName());
+				org.apache.ode.bpe.action.bpel.EndScopeAction.class.getName());
 			
 				
 			// register event handlers
@@ -321,7 +321,7 @@
 	}
 	
 	/**
-	 * @see org.apache.ode.deployment.bpel.BPELNode#getScope()
+	 * @see org.apache.ode.bpe.deployment.bpel.BPELNode#getScope()
 	 */
 	BPELScope getScope() {
 		if ( this.inCompensationHandler() ) return m_parserStack.getScope();
@@ -341,10 +341,10 @@
 	}
 
 	/**
-	 * @see org.apache.ode.deployment.bpel.BPELLinkedActivity#getActivityDescription()
+	 * @see org.apache.ode.bpe.deployment.bpel.BPELLinkedActivity#getActivityDescription()
 	 */
 	String getActivityDescription() {
-		return "scope is implemented by: " + org.apache.ode.action.bpel.StartScopeAction.class.getName() + ". It is used to initailize/destroy a container which holds a named execution context.";
+		return "scope is implemented by: " + org.apache.ode.bpe.action.bpel.StartScopeAction.class.getName() + ". It is used to initailize/destroy a container which holds a named execution context.";
 	}	
 
 }

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/BPELScopePath.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/BPELScopePath.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/BPELScopePath.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/BPELScopePath.java Tue Feb 28 09:18:27 2006
@@ -17,7 +17,7 @@
  * Created on Jun 20, 2003
  *
  */
-package org.apache.ode.deployment.bpel;
+package org.apache.ode.bpe.deployment.bpel;
 
 import java.util.Stack;
 

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/BPELSequence.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/BPELSequence.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/BPELSequence.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/BPELSequence.java Tue Feb 28 09:18:27 2006
@@ -17,7 +17,7 @@
  * Created on Jun 3, 2003
  *
  */
-package org.apache.ode.deployment.bpel;
+package org.apache.ode.bpe.deployment.bpel;
 
 import java.util.Iterator;
 import java.util.Properties;
@@ -25,13 +25,13 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import org.apache.ode.action.bpel.StartSequenceAction;
-import org.apache.ode.action.bpel.UnInitVariableMetaData;
-import org.apache.ode.action.internal.IInternalAction;
-import org.apache.ode.definition.IPMDAction;
-import org.apache.ode.definition.IPMDChangeCondition;
-import org.apache.ode.definition.service.DefinitionServiceException;
-import org.apache.ode.util.BPException;
+import org.apache.ode.bpe.action.bpel.StartSequenceAction;
+import org.apache.ode.bpe.action.bpel.UnInitVariableMetaData;
+import org.apache.ode.bpe.action.internal.IInternalAction;
+import org.apache.ode.bpe.definition.IPMDAction;
+import org.apache.ode.bpe.definition.IPMDChangeCondition;
+import org.apache.ode.bpe.definition.service.DefinitionServiceException;
+import org.apache.ode.bpe.util.BPException;
 
 /**
  * Implements the BPEL <i>sequence</i> node. The sequence node holds 
@@ -58,14 +58,14 @@
 	}
 	
 	/**
-	 * @see org.apache.ode.deployment.bpel.BPELNode#addActivity(org.apache.ode.deployment.bpel.BPELNode)
+	 * @see org.apache.ode.bpe.deployment.bpel.BPELNode#addActivity(org.apache.ode.bpe.deployment.bpel.BPELNode)
 	 */
 	void addActivity(BPELNode activity) throws DeploymentException {
 		m_activities.add(activity);
 	}
 	
 	/**
-	 * @see org.apache.ode.deployment.bpel.BPELNode#pop()
+	 * @see org.apache.ode.bpe.deployment.bpel.BPELNode#pop()
 	 */
 	BPELNode pop() throws DeploymentException {
 
@@ -156,9 +156,9 @@
 		// Create the end switch action
 		try {
 			ccE = getEndProcess().createChangeCondition("End Sequence: "+getAttributes().getName(),
-				org.apache.ode.condition.DefaultConditional.class.getName());
+				org.apache.ode.bpe.condition.DefaultConditional.class.getName());
 			es = ccE.createAction("End Sequence: "+getAttributes().getName(),
-				org.apache.ode.action.bpel.EndSequenceAction.class.getName());
+				org.apache.ode.bpe.action.bpel.EndSequenceAction.class.getName());
 		} catch (DefinitionServiceException e1) {
 			BPELUtil.throwNewException(logger,Level.SEVERE,"BPEL_CREATEACTION",new Object[] {getProcess().getAttributes().getName(), getAttributes().getName()},e1);
 		}	
@@ -172,7 +172,7 @@
 		}
 		
 		Properties md = new Properties();
-		md.put(org.apache.ode.action.bpel.EndConditionalFlowAction.LINKS,linkLocators);
+		md.put(org.apache.ode.bpe.action.bpel.EndConditionalFlowAction.LINKS,linkLocators);
 		
 		es.setMetadata(md);
 		
@@ -185,24 +185,24 @@
 		
 		try {
 			IPMDChangeCondition ccB = getStartProcess().createChangeCondition("ChangeCondition: " + getAttributes().getName(),
-					org.apache.ode.condition.DefaultConditional.class.getName());
+					org.apache.ode.bpe.condition.DefaultConditional.class.getName());
 			m_ss = ccB.createAction("Start Sequence: "+getAttributes().getName(),
-					org.apache.ode.action.bpel.StartSequenceAction.class.getName());
+					org.apache.ode.bpe.action.bpel.StartSequenceAction.class.getName());
 		} catch (DefinitionServiceException e) {
 			BPELUtil.throwNewException(logger,Level.SEVERE,"BPEL_CREATEACTION",new Object[] {getProcess().getAttributes().getName(), getAttributes().getName()},e);
 		}
 	}
 	
 	private void linkStartProcess(BPELLinkedActivity la) {
-		m_ssProps.put(org.apache.ode.action.bpel.StartSequenceAction.START_DEF_KEY,la.getStartProcess().getKey());
+		m_ssProps.put(org.apache.ode.bpe.action.bpel.StartSequenceAction.START_DEF_KEY,la.getStartProcess().getKey());
 		m_ssProps.put(StartSequenceAction.UNINITVAR_KEY,new UnInitVariableMetaData(BPELSchema.BPEL_URI,BPELSchema.FAULT_UNINIT_VAR));
 	}
 	
 	/**
-	 * @see org.apache.ode.deployment.bpel.BPELLinkedActivity#getActivityDescription()
+	 * @see org.apache.ode.bpe.deployment.bpel.BPELLinkedActivity#getActivityDescription()
 	 */
 	String getActivityDescription() {
-		return "sequence is implemented by: " + org.apache.ode.action.bpel.SequenceAction.class.getName() + ". It is a container used to execute a series of activites.";
+		return "sequence is implemented by: " + org.apache.ode.bpe.action.bpel.SequenceAction.class.getName() + ". It is a container used to execute a series of activites.";
 	}
 	
 }

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/BPELSimpleUpdate.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/BPELSimpleUpdate.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/BPELSimpleUpdate.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/BPELSimpleUpdate.java Tue Feb 28 09:18:27 2006
@@ -14,19 +14,19 @@
  * limitations under the License.
 */
 
-package org.apache.ode.deployment.bpel;
+package org.apache.ode.bpe.deployment.bpel;
 
 import java.util.Iterator;
 import java.util.Properties;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import org.apache.ode.action.bpel.SimpleUpdateAction;
-import org.apache.ode.definition.IPMDAction;
-import org.apache.ode.definition.IPMDChangeCondition;
-import org.apache.ode.definition.service.DefinitionServiceException;
-import org.apache.ode.interaction.IInvocation;
-import org.apache.ode.util.BPException;
+import org.apache.ode.bpe.action.bpel.SimpleUpdateAction;
+import org.apache.ode.bpe.definition.IPMDAction;
+import org.apache.ode.bpe.definition.IPMDChangeCondition;
+import org.apache.ode.bpe.definition.service.DefinitionServiceException;
+import org.apache.ode.bpe.interaction.IInvocation;
+import org.apache.ode.bpe.util.BPException;
 
 
 public abstract class BPELSimpleUpdate extends BPELNode
@@ -65,13 +65,13 @@
 				// create a new change condition
 				cc = getStartProcess().createChangeCondition(
 				    "ChangeCondition: " +  getAttributes().getName(),
-				org.apache.ode.condition.DefaultConditional.class.getName());
+				org.apache.ode.bpe.condition.DefaultConditional.class.getName());
 			}
 				
 			// Create the copy action 
 			ccact = cc.createAction(
 					"ChangeAction: " + getAttributes().getName(),
-					org.apache.ode.action.bpel.SimpleUpdateAction.class.getName());
+					org.apache.ode.bpe.action.bpel.SimpleUpdateAction.class.getName());
 		} 
 		catch (DefinitionServiceException e) 
 		{

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/BPELStructuredActivity.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/BPELStructuredActivity.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/BPELStructuredActivity.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/BPELStructuredActivity.java Tue Feb 28 09:18:27 2006
@@ -13,15 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
 */
-package org.apache.ode.deployment.bpel;
+package org.apache.ode.bpe.deployment.bpel;
 import java.util.Properties;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import org.apache.ode.definition.IPMDAction;
-import org.apache.ode.definition.IPMDChangeCondition;
-import org.apache.ode.definition.IPMDProcess;
-import org.apache.ode.definition.service.DefinitionServiceException;
+import org.apache.ode.bpe.definition.IPMDAction;
+import org.apache.ode.bpe.definition.IPMDChangeCondition;
+import org.apache.ode.bpe.definition.IPMDProcess;
+import org.apache.ode.bpe.definition.service.DefinitionServiceException;
 
 /*
  * Created on Jun 9, 2003
@@ -49,22 +49,22 @@
 		IPMDAction preact=null;
 		try {
 			IPMDChangeCondition precc = target.createPrecondition("PreCondition: " + name,
-				org.apache.ode.condition.DefaultConditional.class.getName());
+				org.apache.ode.bpe.condition.DefaultConditional.class.getName());
 			// Create the pre Action
 			preact =
 				precc.createAction(
 					"MergeAction: " + name,
-					org.apache.ode.action.bpel.MergeAction.class.getName());
+					org.apache.ode.bpe.action.bpel.MergeAction.class.getName());
 		} catch (DefinitionServiceException e) {
 			BPELUtil.throwNewException(logger,Level.SEVERE,"BPEL_CREATEACTION",new Object[] {getProcess().getAttributes().getName(), name},e);
 		}
 	
-		BPELVariable var = new BPELSystemVariable(org.apache.ode.action.bpel.MergeAction.LOCATOR,target.getKey().getValue()+":mergeCount",this);
+		BPELVariable var = new BPELSystemVariable(org.apache.ode.bpe.action.bpel.MergeAction.LOCATOR,target.getKey().getValue()+":mergeCount",this);
 		var.createLocator(preact,this,null,null,true);
 		
 		Properties md = new Properties();
 		
-		md.put(org.apache.ode.action.bpel.MergeAction.THREAD_COUNT_KEY,numberOfSources);
+		md.put(org.apache.ode.bpe.action.bpel.MergeAction.THREAD_COUNT_KEY,numberOfSources);
 		//preact.addMetadata(THREAD_COUNT_KEY,numberOfSources);
 		md.putAll(getAttributes());
 		
@@ -91,7 +91,7 @@
 	}
 	
 	/**
-	 * @see org.apache.ode.deployment.bpel.BPELNode#getEndProcess()
+	 * @see org.apache.ode.bpe.deployment.bpel.BPELNode#getEndProcess()
 	 */
 	IPMDProcess getEndProcess() {
 		return m_endProcess;

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/BPELSwitch.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/BPELSwitch.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/BPELSwitch.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/BPELSwitch.java Tue Feb 28 09:18:27 2006
@@ -17,7 +17,7 @@
  * Created on Jul 10, 2003
  *
  */
-package org.apache.ode.deployment.bpel;
+package org.apache.ode.bpe.deployment.bpel;
 
 import java.util.Iterator;
 import java.util.Properties;
@@ -25,13 +25,13 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import org.apache.ode.action.bpel.UnInitVariableMetaData;
-import org.apache.ode.action.bpel.XPathJaxenExpression;
-import org.apache.ode.action.bpel.XPathSwitchAction;
-import org.apache.ode.action.bpel.XPathSwitchTuple;
-import org.apache.ode.definition.IPMDAction;
-import org.apache.ode.definition.IPMDChangeCondition;
-import org.apache.ode.definition.service.DefinitionServiceException;
+import org.apache.ode.bpe.action.bpel.UnInitVariableMetaData;
+import org.apache.ode.bpe.action.bpel.XPathJaxenExpression;
+import org.apache.ode.bpe.action.bpel.XPathSwitchAction;
+import org.apache.ode.bpe.action.bpel.XPathSwitchTuple;
+import org.apache.ode.bpe.definition.IPMDAction;
+import org.apache.ode.bpe.definition.IPMDChangeCondition;
+import org.apache.ode.bpe.definition.service.DefinitionServiceException;
 
 /**
  * Implements the BPEL <i>switch</i> node. The switch node holds a collection of
@@ -46,9 +46,9 @@
 	private static final Logger logger = Logger.getLogger(BPELStructuredActivity.class.getName());
 
 	
-	private static final String XPATH_SWITCH_CLASS = org.apache.ode.action.bpel.XPathSwitchAction.class.getName();
-	private static final String DEFAULT_CONDITION_CLASS = org.apache.ode.condition.DefaultConditional.class.getName();
-	private static final String UNINITVAR_LABEL = org.apache.ode.action.bpel.XPathSwitchAction.UNINITVAR_KEY;
+	private static final String XPATH_SWITCH_CLASS = org.apache.ode.bpe.action.bpel.XPathSwitchAction.class.getName();
+	private static final String DEFAULT_CONDITION_CLASS = org.apache.ode.bpe.condition.DefaultConditional.class.getName();
+	private static final String UNINITVAR_LABEL = org.apache.ode.bpe.action.bpel.XPathSwitchAction.UNINITVAR_KEY;
 	private static final String SWITCH_COND_LABEL = "Switch Condition: ";
 	private static final String SWITCH_ACTION_LABEL = "Switch Action : ";
 
@@ -73,7 +73,7 @@
 	
 
 	/**
-	 * @see org.apache.ode.deployment.bpel.BPELNode#addActivity(org.apache.ode.deployment.bpel.BPELNode)
+	 * @see org.apache.ode.bpe.deployment.bpel.BPELNode#addActivity(org.apache.ode.bpe.deployment.bpel.BPELNode)
 	 */
 	void addActivity(BPELNode activity) throws DeploymentException {
 		
@@ -91,7 +91,7 @@
 	
 
 	/**
-	 * @see org.apache.ode.deployment.bpel.BPELNode#pop()
+	 * @see org.apache.ode.bpe.deployment.bpel.BPELNode#pop()
 	 */
 	BPELNode pop() throws DeploymentException {
 		
@@ -103,10 +103,10 @@
 	}
 
 	/**
-	 * @see org.apache.ode.deployment.bpel.BPELLinkedActivity#getActivityDescription()
+	 * @see org.apache.ode.bpe.deployment.bpel.BPELLinkedActivity#getActivityDescription()
 	 */
 	String getActivityDescription() {
-		return "switch is implemented by: " + org.apache.ode.action.bpel.XPathSwitchAction.class.getName() + ". It is a container used to execute a single activity from a choice of activities.";
+		return "switch is implemented by: " + org.apache.ode.bpe.action.bpel.XPathSwitchAction.class.getName() + ". It is a container used to execute a single activity from a choice of activities.";
 	}
 	
 	void createCases() throws DeploymentException {
@@ -169,9 +169,9 @@
 		// Create the end switch action
 		try {
 			ccE = getEndProcess().createChangeCondition("End Switch: "+getAttributes().getName(),
-				org.apache.ode.condition.DefaultConditional.class.getName());
+				org.apache.ode.bpe.condition.DefaultConditional.class.getName());
 			es = ccE.createAction("End Switch: "+getAttributes().getName(),
-				org.apache.ode.action.bpel.EndConditionalFlowAction.class.getName());
+				org.apache.ode.bpe.action.bpel.EndConditionalFlowAction.class.getName());
 		} catch (DefinitionServiceException e1) {
 			BPELUtil.throwNewException(logger,Level.SEVERE,"BPEL_CREATEACTION",new Object[] {getProcess().getAttributes().getName(), getAttributes().getName()},e1);
 		}	
@@ -185,7 +185,7 @@
 		}
 		
 		Properties md = new Properties();
-		md.put(org.apache.ode.action.bpel.EndConditionalFlowAction.LINKS,linkLocators);
+		md.put(org.apache.ode.bpe.action.bpel.EndConditionalFlowAction.LINKS,linkLocators);
 		
 		es.setMetadata(md);
 		
@@ -202,7 +202,7 @@
 	
 
 	/* (non-Javadoc)
-	 * @see org.apache.ode.deployment.bpel.BPELNode#getProxy(org.apache.ode.deployment.bpel.BPELFlow, org.apache.ode.deployment.bpel.BPELNode)
+	 * @see org.apache.ode.bpe.deployment.bpel.BPELNode#getProxy(org.apache.ode.bpe.deployment.bpel.BPELFlow, org.apache.ode.bpe.deployment.bpel.BPELNode)
 	 */
 	BPELNode getProxy(BPELFlow linkOwner, BPELNode source) {
 		return this;

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/BPELSystemVariable.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/BPELSystemVariable.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/BPELSystemVariable.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/BPELSystemVariable.java Tue Feb 28 09:18:27 2006
@@ -17,14 +17,14 @@
  * Created on Jun 21, 2003
  *
  */
-package org.apache.ode.deployment.bpel;
+package org.apache.ode.bpe.deployment.bpel;
 
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import org.apache.ode.definition.IPMDLocator;
-import org.apache.ode.definition.IPMDLocatorHolder;
-import org.apache.ode.definition.service.DefinitionServiceException;
+import org.apache.ode.bpe.definition.IPMDLocator;
+import org.apache.ode.bpe.definition.IPMDLocatorHolder;
+import org.apache.ode.bpe.definition.service.DefinitionServiceException;
 
 /**
  * 
@@ -63,7 +63,7 @@
 	}
 
 	/**
-	 * @see org.apache.ode.deployment.bpel.BPELVariable#createLocator(org.apache.ode.definition.IPMDLocatorHolder, org.apache.ode.deployment.bpel.BPELNode, org.apache.ode.deployment.bpel.BPELAttributes, boolean)
+	 * @see org.apache.ode.bpe.deployment.bpel.BPELVariable#createLocator(org.apache.ode.bpe.definition.IPMDLocatorHolder, org.apache.ode.bpe.deployment.bpel.BPELNode, org.apache.ode.bpe.deployment.bpel.BPELAttributes, boolean)
 	 */
 	Object createLocator(
 		IPMDLocatorHolder locator,

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/BPELTerminate.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/BPELTerminate.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/BPELTerminate.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/BPELTerminate.java Tue Feb 28 09:18:27 2006
@@ -17,14 +17,14 @@
  * Created on Jul 16, 2003
  *
  */
-package org.apache.ode.deployment.bpel;
+package org.apache.ode.bpe.deployment.bpel;
 
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import org.apache.ode.action.bpel.TerminateAction;
-import org.apache.ode.definition.IPMDChangeCondition;
-import org.apache.ode.definition.service.DefinitionServiceException;
+import org.apache.ode.bpe.action.bpel.TerminateAction;
+import org.apache.ode.bpe.definition.IPMDChangeCondition;
+import org.apache.ode.bpe.definition.service.DefinitionServiceException;
 
 
 /**
@@ -50,7 +50,7 @@
 	}
 	
 	/**
-	 * @see org.apache.ode.deployment.bpel.BPELNode#pop()
+	 * @see org.apache.ode.bpe.deployment.bpel.BPELNode#pop()
 	 */
 	BPELNode pop() throws DeploymentException {
 		
@@ -58,7 +58,7 @@
 			IPMDChangeCondition cc = getStartProcess()
 					.createChangeCondition(
 							"ChangeCondition: " + getAttributes().getName(),
-							org.apache.ode.condition.DefaultConditional.class
+							org.apache.ode.bpe.condition.DefaultConditional.class
 									.getName());
 			cc.createAction("TerminateAction:" + getAttributes().getName(),
 					TerminateAction.class.getName());
@@ -70,7 +70,7 @@
 	}
 
 	/**
-	 * @see org.apache.ode.deployment.bpel.BPELLinkedActivity#getActivityDescription()
+	 * @see org.apache.ode.bpe.deployment.bpel.BPELLinkedActivity#getActivityDescription()
 	 */
 	String getActivityDescription() {
 		return "terminate implements " + TerminateAction.class.getName() + " This action will terminate the process and remove all context.";

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/BPELThrow.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/BPELThrow.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/BPELThrow.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/BPELThrow.java Tue Feb 28 09:18:27 2006
@@ -17,17 +17,17 @@
  * Created on Jul 16, 2003
  *
  */
-package org.apache.ode.deployment.bpel;
+package org.apache.ode.bpe.deployment.bpel;
 
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import javax.xml.namespace.QName;
 
-import org.apache.ode.action.bpel.ThrowAction;
-import org.apache.ode.definition.IPMDAction;
-import org.apache.ode.definition.IPMDChangeCondition;
-import org.apache.ode.definition.service.DefinitionServiceException;
+import org.apache.ode.bpe.action.bpel.ThrowAction;
+import org.apache.ode.bpe.definition.IPMDAction;
+import org.apache.ode.bpe.definition.IPMDChangeCondition;
+import org.apache.ode.bpe.definition.service.DefinitionServiceException;
 
 /**
  * Implements the BPEL <i>throw</i> node. 
@@ -50,15 +50,15 @@
 	}
 
 	/**
-	 * @see org.apache.ode.deployment.bpel.BPELNode#pop()
+	 * @see org.apache.ode.bpe.deployment.bpel.BPELNode#pop()
 	 */
 	BPELNode pop() throws DeploymentException {
 		
 		try {
 			IPMDChangeCondition cc = getStartProcess().createChangeCondition("Throw: "+getAttributes().getName(),
-				org.apache.ode.condition.DefaultConditional.class.getName());
+				org.apache.ode.bpe.condition.DefaultConditional.class.getName());
 			IPMDAction ccact = cc.createAction("Throw: "+getAttributes().getName(),
-				org.apache.ode.action.bpel.ThrowAction.class.getName());
+				org.apache.ode.bpe.action.bpel.ThrowAction.class.getName());
 			QName faultName = getQName(getAttributes().getFaultName());
 			if ( faultName != null ) {
 				ccact.addMetadata(ThrowAction.EXCEPTION_NAME,faultName.getLocalPart());
@@ -73,10 +73,10 @@
 	}
 	
 	/**
-	 * @see org.apache.ode.deployment.bpel.BPELLinkedActivity#getActivityDescription()
+	 * @see org.apache.ode.bpe.deployment.bpel.BPELLinkedActivity#getActivityDescription()
 	 */
 	String getActivityDescription() {
-		return "throw is implemented by: " + org.apache.ode.action.bpel.ThrowAction.class.getName() + ". It is an exception thrown by the business process.";
+		return "throw is implemented by: " + org.apache.ode.bpe.action.bpel.ThrowAction.class.getName() + ". It is an exception thrown by the business process.";
 	}
 
 }

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/BPELTo.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/BPELTo.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/BPELTo.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/BPELTo.java Tue Feb 28 09:18:27 2006
@@ -17,7 +17,7 @@
  * Created on Jul 10, 2003
  *
  */
-package org.apache.ode.deployment.bpel;
+package org.apache.ode.bpe.deployment.bpel;
 
 import java.util.logging.Logger;
 
@@ -47,7 +47,7 @@
 	}
 
 	/**
-	 * @see org.apache.ode.deployment.bpel.BPELNode#pop()
+	 * @see org.apache.ode.bpe.deployment.bpel.BPELNode#pop()
 	 */
 	BPELNode pop() throws DeploymentException {
 		m_parserStack.addActivity(this);

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/BPELUtil.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/BPELUtil.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/BPELUtil.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/BPELUtil.java Tue Feb 28 09:18:27 2006
@@ -17,7 +17,7 @@
  * Created on Aug 14, 2003
  *
  */
-package org.apache.ode.deployment.bpel;
+package org.apache.ode.bpe.deployment.bpel;
 
 import java.util.Iterator;
 import java.util.List;

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/BPELVariable.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/BPELVariable.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/BPELVariable.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/BPELVariable.java Tue Feb 28 09:18:27 2006
@@ -17,7 +17,7 @@
  * Created on Jun 21, 2003
  *
  */
-package org.apache.ode.deployment.bpel;
+package org.apache.ode.bpe.deployment.bpel;
 
 import java.util.Collection;
 import java.util.HashMap;
@@ -31,16 +31,16 @@
 
 import javax.xml.namespace.QName;
 
-import org.apache.ode.definition.IPMDLocator;
-import org.apache.ode.definition.IPMDLocatorHolder;
-import org.apache.ode.definition.service.DefinitionServiceException;
-import org.apache.ode.interaction.IInvocation;
-import org.apache.ode.interaction.IInvocationFactory;
-import org.apache.ode.interaction.InteractionException;
-import org.apache.ode.interaction.InvocationFactory;
-import org.apache.ode.interaction.builders.DefaultInteractionBuilder;
-import org.apache.ode.interaction.builders.IInteractionBuilder;
-import org.apache.ode.lang.ResourceGetter;
+import org.apache.ode.bpe.definition.IPMDLocator;
+import org.apache.ode.bpe.definition.IPMDLocatorHolder;
+import org.apache.ode.bpe.definition.service.DefinitionServiceException;
+import org.apache.ode.bpe.interaction.IInvocation;
+import org.apache.ode.bpe.interaction.IInvocationFactory;
+import org.apache.ode.bpe.interaction.InteractionException;
+import org.apache.ode.bpe.interaction.InvocationFactory;
+import org.apache.ode.bpe.interaction.builders.DefaultInteractionBuilder;
+import org.apache.ode.bpe.interaction.builders.IInteractionBuilder;
+import org.apache.ode.bpe.lang.ResourceGetter;
 
 
 /**

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/BPELWSDLLocator.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/BPELWSDLLocator.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/BPELWSDLLocator.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/BPELWSDLLocator.java Tue Feb 28 09:18:27 2006
@@ -16,7 +16,7 @@
 /*
  * Created on May 14, 2003
  */
-package org.apache.ode.deployment.bpel;
+package org.apache.ode.bpe.deployment.bpel;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
@@ -28,7 +28,7 @@
 
 import org.xml.sax.InputSource;
 
-import org.apache.ode.lang.ResourceGetter;
+import org.apache.ode.bpe.lang.ResourceGetter;
 
 /**
  * 

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/BPELWSDLVariable.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/BPELWSDLVariable.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/BPELWSDLVariable.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/BPELWSDLVariable.java Tue Feb 28 09:18:27 2006
@@ -17,7 +17,7 @@
  * Created on May 28, 2003
  *
  */
-package org.apache.ode.deployment.bpel;
+package org.apache.ode.bpe.deployment.bpel;
 
 import java.util.HashMap;
 import java.util.Iterator;
@@ -28,11 +28,11 @@
 import javax.wsdl.Part;
 import javax.xml.namespace.QName;
 
-import org.apache.ode.definition.IPMDLocator;
-import org.apache.ode.definition.IPMDLocatorHolder;
-import org.apache.ode.definition.service.DefinitionServiceException;
-//import org.apache.ode.interaction.IInvocationFactory;
-//import org.apache.ode.interaction.builders.IInteractionBuilder;
+import org.apache.ode.bpe.definition.IPMDLocator;
+import org.apache.ode.bpe.definition.IPMDLocatorHolder;
+import org.apache.ode.bpe.definition.service.DefinitionServiceException;
+//import org.apache.ode.bpe.interaction.IInvocationFactory;
+//import org.apache.ode.bpe.interaction.builders.IInteractionBuilder;
 
 
 /**
@@ -75,7 +75,7 @@
 	
 
 	/**
-	 * @see org.apache.ode.deployment.bpel.BPELVariable#createLocator(org.apache.ode.definition.IPMDLocatorHolder, org.apache.ode.deployment.bpel.BPELNode, org.apache.ode.deployment.bpel.BPELAttributes, boolean)
+	 * @see org.apache.ode.bpe.deployment.bpel.BPELVariable#createLocator(org.apache.ode.bpe.definition.IPMDLocatorHolder, org.apache.ode.bpe.deployment.bpel.BPELNode, org.apache.ode.bpe.deployment.bpel.BPELAttributes, boolean)
 	 */
 	Object createLocator(IPMDLocatorHolder locator, BPELNode node, BPELNode tagNode, BPELAttributes attrs, BPELInvocationType type, boolean forOutPut) throws DeploymentException {
 		addUsedInActivity(node);

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/BPELWait.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/BPELWait.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/BPELWait.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/BPELWait.java Tue Feb 28 09:18:27 2006
@@ -17,15 +17,15 @@
  * Created on Jul 16, 2003
  *
  */
-package org.apache.ode.deployment.bpel;
+package org.apache.ode.bpe.deployment.bpel;
 
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import org.apache.ode.action.bpel.UnInitVariableMetaData;
-import org.apache.ode.definition.IPMDAction;
-import org.apache.ode.definition.IPMDChangeCondition;
-import org.apache.ode.definition.service.DefinitionServiceException;
+import org.apache.ode.bpe.action.bpel.UnInitVariableMetaData;
+import org.apache.ode.bpe.definition.IPMDAction;
+import org.apache.ode.bpe.definition.IPMDChangeCondition;
+import org.apache.ode.bpe.definition.service.DefinitionServiceException;
 
 
 /**
@@ -53,7 +53,7 @@
 	}
 	
 	/**
-	 * @see org.apache.ode.deployment.bpel.BPELNode#pop()
+	 * @see org.apache.ode.bpe.deployment.bpel.BPELNode#pop()
 	 */
 	BPELNode pop() throws DeploymentException {
 
@@ -67,30 +67,30 @@
 			
 			IPMDChangeCondition cc = 
 				getStartProcess().createChangeCondition("ChangeCondition: " + getAttributes().getName(),
-				org.apache.ode.condition.DefaultConditional.class.getName());
+				org.apache.ode.bpe.condition.DefaultConditional.class.getName());
 			recact = 
 				cc.createAction("TimerAction:" + getAttributes().getName(),
-				org.apache.ode.action.bpel.TimerAction.class.getName());
+				org.apache.ode.bpe.action.bpel.TimerAction.class.getName());
 				
 			timeValue = getAttributes().getUntil();
 			
 			if ( timeValue != null ) {
-				//recact.addMetadata(org.apache.ode.action.bpel.TimerAction.DEADLINE,timeValue);
-				buildExpression(recact,timeValue,org.apache.ode.action.bpel.TimerAction.DEADLINE);
+				//recact.addMetadata(org.apache.ode.bpe.action.bpel.TimerAction.DEADLINE,timeValue);
+				buildExpression(recact,timeValue,org.apache.ode.bpe.action.bpel.TimerAction.DEADLINE);
 			}
 			timeValue = getAttributes().getFor();
 			if ( timeValue != null ) {
-				//recact.addMetadata(org.apache.ode.action.bpel.TimerAction.DURATION,timeValue);
-				buildExpression(recact,timeValue,org.apache.ode.action.bpel.TimerAction.DURATION);
+				//recact.addMetadata(org.apache.ode.bpe.action.bpel.TimerAction.DURATION,timeValue);
+				buildExpression(recact,timeValue,org.apache.ode.bpe.action.bpel.TimerAction.DURATION);
 			}
-			recact.addMetadata(org.apache.ode.action.bpel.CopyAction.UNINITVAR_KEY,new UnInitVariableMetaData(BPELSchema.BPEL_URI,BPELSchema.FAULT_UNINIT_VAR));
+			recact.addMetadata(org.apache.ode.bpe.action.bpel.CopyAction.UNINITVAR_KEY,new UnInitVariableMetaData(BPELSchema.BPEL_URI,BPELSchema.FAULT_UNINIT_VAR));
 			createLocator(false,recact,
-				org.apache.ode.action.bpel.TimerAction.TIMER_ACTION_LOCATOR_KEY, 
+				org.apache.ode.bpe.action.bpel.TimerAction.TIMER_ACTION_LOCATOR_KEY, 
 				getScopePath(new BPELScopePath(inCompensationHandler())).
 					toString()+BPELScopePath.PATH_DELIMITER+getStartProcess().
 					getKey().getValue(), 
 				null, null, 0, true,  false);
-			recact.addMetadata(org.apache.ode.action.bpel.TimerAction.BLOCK,new Boolean(true));
+			recact.addMetadata(org.apache.ode.bpe.action.bpel.TimerAction.BLOCK,new Boolean(true));
 			
 		} catch (DefinitionServiceException e) {
 			BPELUtil.throwNewException(logger,Level.SEVERE,"BPEL_CREATEACTION",new Object[] {getProcess().getAttributes().getName(), getAttributes().getName()},e);
@@ -107,10 +107,10 @@
 	}
 
 	/**
-	 * @see org.apache.ode.deployment.bpel.BPELLinkedActivity#getActivityDescription()
+	 * @see org.apache.ode.bpe.deployment.bpel.BPELLinkedActivity#getActivityDescription()
 	 */
 	String getActivityDescription() {
-		return "wait is implemented by: " + org.apache.ode.action.bpel.TimerAction.class.getName() + ". It is used to block a business process until the alarm event fires.";
+		return "wait is implemented by: " + org.apache.ode.bpe.action.bpel.TimerAction.class.getName() + ". It is used to block a business process until the alarm event fires.";
 	}
 
 }