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 [10/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/t...

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/BPELWhile.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/BPELWhile.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/BPELWhile.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/BPELWhile.java Tue Feb 28 09:18:27 2006
@@ -17,20 +17,20 @@
  * Created on Jul 10, 2003
  *
  */
-package org.apache.ode.deployment.bpel;
+package org.apache.ode.bpe.deployment.bpel;
 
 import java.util.Properties;
 import java.util.Vector;
 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>while</i> node. 
@@ -43,8 +43,8 @@
 
 	private static final Logger logger = Logger.getLogger(BPELWhile.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 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 SWITCH_COND_LABEL = "Switch Condition: ";
 	private static final String SWITCH_ACTION_LABEL = "Switch Action : ";
 
@@ -59,7 +59,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 {
 		
@@ -102,7 +102,7 @@
 		// Add the condition expression as metadata to the switch action
 		//da.addMetadata(XPathSwitchAction.CASES_KEY,v);
 		md.put(XPathSwitchAction.CASES_KEY,v);
-		md.put(org.apache.ode.action.bpel.XPathSwitchAction.UNINITVAR_KEY,new UnInitVariableMetaData(BPELSchema.BPEL_URI,BPELSchema.FAULT_UNINIT_VAR));
+		md.put(org.apache.ode.bpe.action.bpel.XPathSwitchAction.UNINITVAR_KEY,new UnInitVariableMetaData(BPELSchema.BPEL_URI,BPELSchema.FAULT_UNINIT_VAR));
 		
 		// The default value to the switch action will cause the loop to end
 		//da.addMetadata(XPathSwitchAction.DEFAULT_KEY,getEndProcess().getKey());
@@ -114,10 +114,10 @@
 
 
 	/**
-	 * @see org.apache.ode.deployment.bpel.BPELLinkedActivity#getActivityDescription()
+	 * @see org.apache.ode.bpe.deployment.bpel.BPELLinkedActivity#getActivityDescription()
 	 */
 	String getActivityDescription() {
-		return "while is implemented by: " + org.apache.ode.action.bpel.XPathSwitchAction.class.getName() + ". It is used to define the context of a loop pattern.";
+		return "while is implemented by: " + org.apache.ode.bpe.action.bpel.XPathSwitchAction.class.getName() + ". It is used to define the context of a loop pattern.";
 	}
 
 }

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/BPELXMLSchemaVariable.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/BPELXMLSchemaVariable.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/BPELXMLSchemaVariable.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/BPELXMLSchemaVariable.java Tue Feb 28 09:18:27 2006
@@ -17,16 +17,16 @@
  * Created on May 28, 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.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;
 
 
 
@@ -48,7 +48,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/DeploymentException.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/DeploymentException.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/DeploymentException.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/DeploymentException.java Tue Feb 28 09:18:27 2006
@@ -17,10 +17,10 @@
  * Created on May 12, 2003
  *
  */
-package org.apache.ode.deployment.bpel;
+package org.apache.ode.bpe.deployment.bpel;
 
 
-import org.apache.ode.util.BPException;
+import org.apache.ode.bpe.util.BPException;
 
 /**
  * @author waterman

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/ExtensibilityArtifacts.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/ExtensibilityArtifacts.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/ExtensibilityArtifacts.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/ExtensibilityArtifacts.java Tue Feb 28 09:18:27 2006
@@ -18,7 +18,7 @@
  * Author waterman
  * 
  */
-package org.apache.ode.deployment.bpel;
+package org.apache.ode.bpe.deployment.bpel;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
@@ -62,27 +62,27 @@
 import org.xml.sax.InputSource;
 
 
-import org.apache.ode.binding.ode.BPEBindingDocument;
-import org.apache.ode.binding.ode.TActivityBinding;
-import org.apache.ode.binding.ode.TActivityBindings;
-import org.apache.ode.binding.ode.TBinding;
-import org.apache.ode.binding.ode.TOperation;
-import org.apache.ode.binding.ode.TSchema;
-import org.apache.ode.wsdl.extensions.BPEAction;
-import org.apache.ode.wsdl.extensions.BPEActionSerializer;
-import org.apache.ode.wsdl.extensions.BPEFault;
-import org.apache.ode.wsdl.extensions.BPEFaultSerializer;
-import org.apache.ode.wsdl.extensions.BPEInput;
-import org.apache.ode.wsdl.extensions.BPEInputSerializer;
-import org.apache.ode.wsdl.extensions.BPELProperty;
-import org.apache.ode.wsdl.extensions.BPELPropertyAlias;
-import org.apache.ode.wsdl.extensions.BPELPropertyAliasSerializer;
-import org.apache.ode.wsdl.extensions.BPELPropertySerializer;
-import org.apache.ode.wsdl.extensions.BPEOutput;
-import org.apache.ode.wsdl.extensions.BPEOutputSerializer;
-import org.apache.ode.wsdl.extensions.BPEVariableMap;
-import org.apache.ode.wsdl.extensions.BPEVariableMapSerializer;
-import org.apache.ode.wsdl.extensions.ExtentionConstants;
+import org.apache.ode.bpe.binding.bpe.BPEBindingDocument;
+import org.apache.ode.bpe.binding.bpe.TActivityBinding;
+import org.apache.ode.bpe.binding.bpe.TActivityBindings;
+import org.apache.ode.bpe.binding.bpe.TBinding;
+import org.apache.ode.bpe.binding.bpe.TOperation;
+import org.apache.ode.bpe.binding.bpe.TSchema;
+import org.apache.ode.bpe.wsdl.extensions.BPEAction;
+import org.apache.ode.bpe.wsdl.extensions.BPEActionSerializer;
+import org.apache.ode.bpe.wsdl.extensions.BPEFault;
+import org.apache.ode.bpe.wsdl.extensions.BPEFaultSerializer;
+import org.apache.ode.bpe.wsdl.extensions.BPEInput;
+import org.apache.ode.bpe.wsdl.extensions.BPEInputSerializer;
+import org.apache.ode.bpe.wsdl.extensions.BPELProperty;
+import org.apache.ode.bpe.wsdl.extensions.BPELPropertyAlias;
+import org.apache.ode.bpe.wsdl.extensions.BPELPropertyAliasSerializer;
+import org.apache.ode.bpe.wsdl.extensions.BPELPropertySerializer;
+import org.apache.ode.bpe.wsdl.extensions.BPEOutput;
+import org.apache.ode.bpe.wsdl.extensions.BPEOutputSerializer;
+import org.apache.ode.bpe.wsdl.extensions.BPEVariableMap;
+import org.apache.ode.bpe.wsdl.extensions.BPEVariableMapSerializer;
+import org.apache.ode.bpe.wsdl.extensions.ExtentionConstants;
 
 /**
  * @author waterman
@@ -105,7 +105,7 @@
 	// an IExternalAction interface.
 	private static final String DEFAULT_TYPE = "";
 	// A default implementation of IExternalAction;
-	private static final String DEFAULT_IMPL = "org.apache.ode.action.bpel.external.WSIFAction";
+	private static final String DEFAULT_IMPL = "org.apache.ode.bpe.action.bpel.external.WSIFAction";
 
 	// The process holds namespace prefixes used in the BPEL document.
 	private BPELProcess process;

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/WSDLOperationKey.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/WSDLOperationKey.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/WSDLOperationKey.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/deployment/bpel/WSDLOperationKey.java Tue Feb 28 09:18:27 2006
@@ -16,10 +16,10 @@
 /*
  * Created on:	Feb 21, 2004
  * Project:		BPEELocal
- * Package:		org.apache.ode.deployment.bpel 
+ * Package:		org.apache.ode.bpe.deployment.bpel 
  * Author:		waterman	
  */
-package org.apache.ode.deployment.bpel;
+package org.apache.ode.bpe.deployment.bpel;
 
 import java.io.Serializable;
 

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/engine/CleanUpEnum.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/engine/CleanUpEnum.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/engine/CleanUpEnum.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/engine/CleanUpEnum.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.engine;
+package org.apache.ode.bpe.engine;
 
 import java.io.Serializable;
 //import java.util.logging.Logger;

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

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/engine/IProcessCallBack.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/engine/IProcessCallBack.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/engine/IProcessCallBack.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/engine/IProcessCallBack.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.engine;
+package org.apache.ode.bpe.engine;
 
-import org.apache.ode.bped.ISendEvent;
-import org.apache.ode.correlation.CorrelationService;
-import org.apache.ode.locking.LockingService;
-import org.apache.ode.event.IRequestMessageEvent;
-import org.apache.ode.util.BPEProperties;
-import org.apache.ode.util.BPException;
-import org.apache.ode.uuid.UUIDService;
+import org.apache.ode.bpe.bped.ISendEvent;
+import org.apache.ode.bpe.correlation.CorrelationService;
+import org.apache.ode.bpe.event.IRequestMessageEvent;
+import org.apache.ode.bpe.locking.LockingService;
+import org.apache.ode.bpe.util.BPEProperties;
+import org.apache.ode.bpe.util.BPException;
+import org.apache.ode.bpe.uuid.UUIDService;
 
 /**
  * The event director is responsible for routing web service event messages

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/engine/InactiveDefinitionException.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/engine/InactiveDefinitionException.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/engine/InactiveDefinitionException.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/engine/InactiveDefinitionException.java Tue Feb 28 09:18:27 2006
@@ -14,9 +14,9 @@
  * limitations under the License.
 */
 
-package org.apache.ode.engine;
+package org.apache.ode.bpe.engine;
 
-import org.apache.ode.util.BPException;
+import org.apache.ode.bpe.util.BPException;
 
 
 public class InactiveDefinitionException extends BPException

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/engine/ProcessDefinitionKey.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/engine/ProcessDefinitionKey.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/engine/ProcessDefinitionKey.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/engine/ProcessDefinitionKey.java Tue Feb 28 09:18:27 2006
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
 */
-package org.apache.ode.engine;
+package org.apache.ode.bpe.engine;
 
 //import java.util.logging.Logger;
 
-import org.apache.ode.uuid.UUIDService;
+import org.apache.ode.bpe.uuid.UUIDService;
 
 /** A unique identifier for a process definition.
   * <P>

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/engine/ProcessDefinitionQuery.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/engine/ProcessDefinitionQuery.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/engine/ProcessDefinitionQuery.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/engine/ProcessDefinitionQuery.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.engine;
+package org.apache.ode.bpe.engine;
 
 //import java.util.logging.Logger;
 

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/engine/ProcessInstance.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/engine/ProcessInstance.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/engine/ProcessInstance.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/engine/ProcessInstance.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.engine;
+package org.apache.ode.bpe.engine;
 
 //import java.util.Collection;
 import java.util.Iterator;
@@ -21,27 +21,27 @@
 import java.util.logging.LogManager;
 import java.util.logging.Logger;
 
-import org.apache.ode.action.internal.IInternalAction;
-import org.apache.ode.condition.Conditional;
-import org.apache.ode.context.IContextService;
-import org.apache.ode.context.resolver.ContextResolvedObject;
-import org.apache.ode.context.resolver.ContextResolver;
-import org.apache.ode.definition.IPMDAction;
-import org.apache.ode.definition.IPMDChangeCondition;
-import org.apache.ode.definition.IPMDLocator;
-import org.apache.ode.definition.IPMDLocatorHolder;
-import org.apache.ode.definition.IPMDProcess;
-import org.apache.ode.event.IEvent;
-import org.apache.ode.event.IInternalEvent;
-import org.apache.ode.event.StateEvent;
-import org.apache.ode.instance.IPMIProcess;
-import org.apache.ode.instance.service.InstanceService;
-import org.apache.ode.interaction.spiadapter.SPIAdapterInteraction;
-import org.apache.ode.lang.ResourceGetter;
-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.IInternalAction;
+import org.apache.ode.bpe.condition.Conditional;
+import org.apache.ode.bpe.context.IContextService;
+import org.apache.ode.bpe.context.resolver.ContextResolvedObject;
+import org.apache.ode.bpe.context.resolver.ContextResolver;
+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.IPMDLocatorHolder;
+import org.apache.ode.bpe.definition.IPMDProcess;
+import org.apache.ode.bpe.event.IEvent;
+import org.apache.ode.bpe.event.IInternalEvent;
+import org.apache.ode.bpe.event.StateEvent;
+import org.apache.ode.bpe.instance.IPMIProcess;
+import org.apache.ode.bpe.instance.service.InstanceService;
+import org.apache.ode.bpe.interaction.spiadapter.SPIAdapterInteraction;
+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.scope.service.ScopePath;
+import org.apache.ode.bpe.util.BPException;
 
 /**
  * @author waterman

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/engine/ProcessInstanceKey.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/engine/ProcessInstanceKey.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/engine/ProcessInstanceKey.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/engine/ProcessInstanceKey.java Tue Feb 28 09:18:27 2006
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
 */
-package org.apache.ode.engine;
+package org.apache.ode.bpe.engine;
 
 import java.io.Serializable;
 //import java.util.logging.Logger;
 
-import org.apache.ode.uuid.UUIDService;
+import org.apache.ode.bpe.uuid.UUIDService;
 
 /** A unique identifier for a process instance.
   * <P>

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

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/engine/ProcessInstanceQuery.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/engine/ProcessInstanceQuery.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/engine/ProcessInstanceQuery.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/engine/ProcessInstanceQuery.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.engine;
+package org.apache.ode.bpe.engine;
 
 //import java.util.logging.Logger;
 

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/engine/ProcessKey.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/engine/ProcessKey.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/engine/ProcessKey.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/engine/ProcessKey.java Tue Feb 28 09:18:27 2006
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
 */
-package org.apache.ode.engine;
+package org.apache.ode.bpe.engine;
 
 import java.io.Serializable;
 //import java.util.logging.Logger;
 
-import org.apache.ode.uuid.UUIDService;
+import org.apache.ode.bpe.uuid.UUIDService;
 
 /** A unique identifier for a process definition or process instance. */
 public class ProcessKey implements Serializable

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/engine/ProcessQuery.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/engine/ProcessQuery.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/engine/ProcessQuery.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/engine/ProcessQuery.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.engine;
+package org.apache.ode.bpe.engine;
 
 //import java.util.logging.Logger;
 

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/engine/ProcessService.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/engine/ProcessService.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/engine/ProcessService.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/engine/ProcessService.java Tue Feb 28 09:18:27 2006
@@ -19,7 +19,7 @@
  * Purpose: Defines the Class ProcessService
  ***********************************************************************/
 
-package org.apache.ode.engine;
+package org.apache.ode.bpe.engine;
 
 import java.util.HashMap;
 import java.util.logging.Level;
@@ -28,24 +28,24 @@
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
 
-import org.apache.ode.context.IContextService;
-import org.apache.ode.context.base.ContextServiceException;
-import org.apache.ode.context.base.ContextServiceFactory;
-import org.apache.ode.context.base.ContextTypeEnum;
-import org.apache.ode.definition.IPMDProcess;
-import org.apache.ode.definition.IPMDRoot;
-import org.apache.ode.definition.service.DefinitionServiceException;
-import org.apache.ode.instance.IPMIProcess;
-import org.apache.ode.instance.service.InstanceService;
-import org.apache.ode.instance.service.InstanceServiceException;
-import org.apache.ode.instance.service.InstanceServiceFactory;
-import org.apache.ode.scope.service.IScopeService;
-import org.apache.ode.scope.service.ScopeServiceException;
-import org.apache.ode.scope.service.ScopeServiceFactory;
-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.bpe.context.IContextService;
+import org.apache.ode.bpe.context.base.ContextServiceException;
+import org.apache.ode.bpe.context.base.ContextServiceFactory;
+import org.apache.ode.bpe.context.base.ContextTypeEnum;
+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.instance.IPMIProcess;
+import org.apache.ode.bpe.instance.service.InstanceService;
+import org.apache.ode.bpe.instance.service.InstanceServiceException;
+import org.apache.ode.bpe.instance.service.InstanceServiceFactory;
+import org.apache.ode.bpe.scope.service.IScopeService;
+import org.apache.ode.bpe.scope.service.ScopeServiceException;
+import org.apache.ode.bpe.scope.service.ScopeServiceFactory;
+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;
 
 
 /**

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/engine/ReturnMessageLocatorHolder.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/engine/ReturnMessageLocatorHolder.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/engine/ReturnMessageLocatorHolder.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/engine/ReturnMessageLocatorHolder.java Tue Feb 28 09:18:27 2006
@@ -17,18 +17,18 @@
  * Created on Jul 28, 2003
  *
  */
-package org.apache.ode.engine;
+package org.apache.ode.bpe.engine;
 
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Iterator;
 
-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.builders.IInteractionBuilder;
-import org.apache.ode.scope.service.ScopePath;
+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.builders.IInteractionBuilder;
+import org.apache.ode.bpe.scope.service.ScopePath;
 
 /**
  * @author charper
@@ -46,14 +46,14 @@
 
 
 	/* (non-Javadoc)
-	 * @see org.apache.ode.definition.service.IPMDLocatorHolder#getLocator(java.lang.String)
+	 * @see org.apache.ode.bpe.definition.service.IPMDLocatorHolder#getLocator(java.lang.String)
 	 */
 	public IPMDLocator getLocator(String name) {
 		return (IPMDLocator)locators.get(name);
 	}
 
 	/* (non-Javadoc)
-	 * @see org.apache.ode.definition.service.IPMDLocatorHolder#createLocator(java.lang.String, java.lang.String, java.lang.String, int, boolean, boolean)
+	 * @see org.apache.ode.bpe.definition.service.IPMDLocatorHolder#createLocator(java.lang.String, java.lang.String, java.lang.String, int, boolean, boolean)
 	 */
 	public IPMDLocator createLocator(
 		String name,
@@ -69,7 +69,7 @@
 	}
 
 	/* (non-Javadoc)
-	 * @see org.apache.ode.definition.service.IPMDLocatorHolder#addLocator(java.lang.String, org.apache.ode.definition.service.IPMDLocator)
+	 * @see org.apache.ode.bpe.definition.service.IPMDLocatorHolder#addLocator(java.lang.String, org.apache.ode.bpe.definition.service.IPMDLocator)
 	 */
 	public IPMDLocator addLocator(String name, IPMDLocator locatorObj) {
 		locators.put(name,locatorObj);
@@ -77,14 +77,14 @@
 	}
 
 	/* (non-Javadoc)
-	 * @see org.apache.ode.definition.service.IPMDLocatorHolder#getLocators()
+	 * @see org.apache.ode.bpe.definition.service.IPMDLocatorHolder#getLocators()
 	 */
 	public Iterator getLocators() {
 		return locators.values().iterator();
 	}
 
 	/* (non-Javadoc)
-	 * @see org.apache.ode.definition.service.IPMDLocatorHolder#getLocatorSize()
+	 * @see org.apache.ode.bpe.definition.service.IPMDLocatorHolder#getLocatorSize()
 	 */
 	public int getLocatorSize() {
 		return locators.size();

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/engine/ScopeEnum.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/engine/ScopeEnum.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/engine/ScopeEnum.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/engine/ScopeEnum.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.engine;
+package org.apache.ode.bpe.engine;
 
 //import java.util.logging.Logger;
 

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/engine/StateEnum.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/engine/StateEnum.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/engine/StateEnum.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/engine/StateEnum.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.engine;
+package org.apache.ode.bpe.engine;
 
 import java.io.Serializable;
 //import java.util.logging.Logger;

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/enginestate/service/EngineStateException.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/enginestate/service/EngineStateException.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/enginestate/service/EngineStateException.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/enginestate/service/EngineStateException.java Tue Feb 28 09:18:27 2006
@@ -19,9 +19,9 @@
  * To change the template for this generated file go to
  * Window - Preferences - Java - Code Generation - Code and Comments
  */
-package org.apache.ode.enginestate.service;
+package org.apache.ode.bpe.enginestate.service;
 
-import org.apache.ode.util.BPException;
+import org.apache.ode.bpe.util.BPException;
 
 /**
  * @author charper

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/enginestate/service/EngineStateFactory.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/enginestate/service/EngineStateFactory.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/enginestate/service/EngineStateFactory.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/enginestate/service/EngineStateFactory.java Tue Feb 28 09:18:27 2006
@@ -19,7 +19,7 @@
  * To change the template for this generated file go to
  * Window - Preferences - Java - Code Generation - Code and Comments
  */
-package org.apache.ode.enginestate.service;
+package org.apache.ode.bpe.enginestate.service;
 
 import java.util.HashMap;
 
@@ -28,13 +28,13 @@
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
 
-import org.apache.ode.bped.EventDirectorFactory;
-import org.apache.ode.engine.CleanUpEnum;
-import org.apache.ode.engine.StateEnum;
-import org.apache.ode.enginestate.service.managed.EngineStateLocal;
-import org.apache.ode.enginestate.service.managed.EngineStateLocalHome;
-import org.apache.ode.enginestate.service.unmanaged.EngineStateImImpl;
-import org.apache.ode.util.BPException;
+import org.apache.ode.bpe.bped.EventDirectorFactory;
+import org.apache.ode.bpe.engine.CleanUpEnum;
+import org.apache.ode.bpe.engine.StateEnum;
+import org.apache.ode.bpe.enginestate.service.unmanaged.EngineStateImImpl;
+import org.apache.ode.bpe.util.BPException;
+import org.apache.ode.bpe.enginestate.service.managed.EngineStateLocal;
+import org.apache.ode.bpe.enginestate.service.managed.EngineStateLocalHome;
 
 /**
  * @author charper

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/enginestate/service/IEngineState.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/enginestate/service/IEngineState.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/enginestate/service/IEngineState.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/enginestate/service/IEngineState.java Tue Feb 28 09:18:27 2006
@@ -19,9 +19,9 @@
  * To change the template for this generated file go to
  * Window - Preferences - Java - Code Generation - Code and Comments
  */
-package org.apache.ode.enginestate.service;
+package org.apache.ode.bpe.enginestate.service;
 
-import org.apache.ode.util.BPException;
+import org.apache.ode.bpe.util.BPException;
 
 /**
  * This is the root node of the data model for the engine.

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/enginestate/service/managed/EngineStateCoarseBean.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/enginestate/service/managed/EngineStateCoarseBean.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/enginestate/service/managed/EngineStateCoarseBean.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/enginestate/service/managed/EngineStateCoarseBean.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.enginestate.service.managed;
+package org.apache.ode.bpe.enginestate.service.managed;
 import java.rmi.RemoteException;
 //import java.util.logging.Logger;
 
@@ -21,8 +21,8 @@
 import javax.ejb.EntityBean;
 import javax.ejb.EntityContext;
 
-import org.apache.ode.enginestate.service.IEngineState;
-import org.apache.ode.util.BPException;
+import org.apache.ode.bpe.enginestate.service.IEngineState;
+import org.apache.ode.bpe.util.BPException;
 
 /**
  * This bean stores engine state.
@@ -42,10 +42,10 @@
  * @ejb.pk
  * 	class="java.lang.String"
  * @ejb.home
- *		local-class="org.apache.ode.enginestate.service.managed.EngineStateLocalHome"
+ *		local-class="org.apache.ode.bpe.enginestate.service.managed.EngineStateLocalHome"
  * @ejb.interface
- *		local-class="org.apache.ode.enginestate.service.managed.EngineStateLocal"
- *		local-extends="javax.ejb.EJBLocalObject, org.apache.ode.enginestate.service.IEngineState"
+ *		local-class="org.apache.ode.bpe.enginestate.service.managed.EngineStateLocal"
+ *		local-extends="javax.ejb.EJBLocalObject, org.apache.ode.bpe.enginestate.service.IEngineState"
  * @ejb.transaction type="Mandatory"
  * 
 */

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/enginestate/service/unmanaged/EngineStateImImpl.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/enginestate/service/unmanaged/EngineStateImImpl.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/enginestate/service/unmanaged/EngineStateImImpl.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/enginestate/service/unmanaged/EngineStateImImpl.java Tue Feb 28 09:18:27 2006
@@ -19,12 +19,12 @@
  * To change the template for this generated file go to
  * Window - Preferences - Java - Code Generation - Code and Comments
  */
-package org.apache.ode.enginestate.service.unmanaged;
+package org.apache.ode.bpe.enginestate.service.unmanaged;
 
 import java.io.Serializable;
 
-import org.apache.ode.enginestate.service.IEngineState;
-import org.apache.ode.util.BPException;
+import org.apache.ode.bpe.enginestate.service.IEngineState;
+import org.apache.ode.bpe.util.BPException;
 
 /**
  *
@@ -43,38 +43,38 @@
 	}
 	
 	/* (non-Javadoc)
-	 * @see org.apache.ode.enginestate.service.IEngineState#getState()
+	 * @see org.apache.ode.bpe.enginestate.service.IEngineState#getState()
 	 */
 	public String getState() throws BPException {
 		return this.state;
 	}
 	/* (non-Javadoc)
-	 * @see org.apache.ode.enginestate.service.IEngineState#setState(java.lang.String)
+	 * @see org.apache.ode.bpe.enginestate.service.IEngineState#setState(java.lang.String)
 	 */
 	public void setState(String state) throws BPException {
 		this.state = state;
 	}
 	/* (non-Javadoc)
-	 * @see org.apache.ode.enginestate.service.IEngineState#getCleanUp()
+	 * @see org.apache.ode.bpe.enginestate.service.IEngineState#getCleanUp()
 	 */
 	public String getCleanUp() throws BPException {
 		return this.cleanUp;
 	}
 	/* (non-Javadoc)
-	 * @see org.apache.ode.enginestate.service.IEngineState#setCleanUp(java.lang.String)
+	 * @see org.apache.ode.bpe.enginestate.service.IEngineState#setCleanUp(java.lang.String)
 	 */
 	public void setCleanUp(String cleanUp) throws BPException {
 		this.cleanUp = cleanUp;
 	}
 	/* (non-Javadoc)
-	 * @see org.apache.ode.enginestate.service.IEngineState#getId()
+	 * @see org.apache.ode.bpe.enginestate.service.IEngineState#getId()
 	 */
 	public String getId() throws BPException {
 		return id;
 	}
 	
 	/* (non-Javadoc)
-	 * @see org.apache.ode.enginestate.service.IEngineState#setId(java.lang.String)
+	 * @see org.apache.ode.bpe.enginestate.service.IEngineState#setId(java.lang.String)
 	 */
 	public void setId(String id) throws BPException {
 		this.id = id;

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/event/BPELStaticKey.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/event/BPELStaticKey.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/event/BPELStaticKey.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/event/BPELStaticKey.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.event;
+package org.apache.ode.bpe.event;
 
 import java.io.Serializable;
 

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/event/EventException.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/event/EventException.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/event/EventException.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/event/EventException.java Tue Feb 28 09:18:27 2006
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
 */
-package org.apache.ode.event;
+package org.apache.ode.bpe.event;
 
-import org.apache.ode.util.BPException;
+import org.apache.ode.bpe.util.BPException;
 
 /**
  * @author waterman

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/event/EventParseException.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/event/EventParseException.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/event/EventParseException.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/event/EventParseException.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.event;
+package org.apache.ode.bpe.event;
 public class EventParseException extends EventException
 {
 	

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/event/Fault.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/event/Fault.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/event/Fault.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/event/Fault.java Tue Feb 28 09:18:27 2006
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
 */
-package org.apache.ode.event;
+package org.apache.ode.bpe.event;
 
 import java.io.Serializable;
 import java.util.Iterator;
 
-import org.apache.ode.scope.service.BPRuntimeException;
+import org.apache.ode.bpe.scope.service.BPRuntimeException;
 
 public class Fault implements Serializable
 {

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/event/IEvent.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/event/IEvent.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/event/IEvent.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/event/IEvent.java Tue Feb 28 09:18:27 2006
@@ -19,7 +19,7 @@
  * Purpose: Defines the Interface Event
  ***********************************************************************/
 
-package org.apache.ode.event;
+package org.apache.ode.bpe.event;
 
 
 

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/event/IInternalEvent.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/event/IInternalEvent.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/event/IInternalEvent.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/event/IInternalEvent.java Tue Feb 28 09:18:27 2006
@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
 */
-package org.apache.ode.event;
+package org.apache.ode.bpe.event;
 
 import java.util.Properties;
 
-import org.apache.ode.engine.IEvaluationContext;
-import org.apache.ode.engine.IProcessCallBack;
-import org.apache.ode.engine.ProcessInstance;
-import org.apache.ode.util.BPException;
+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.util.BPException;
 
 public interface IInternalEvent extends IEvent
 {

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/event/IReadableMessage.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/event/IReadableMessage.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/event/IReadableMessage.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/event/IReadableMessage.java Tue Feb 28 09:18:27 2006
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
 */
-package org.apache.ode.event;
+package org.apache.ode.bpe.event;
 
 import java.util.Map;
 
-import org.apache.ode.interaction.IInteraction;
-import org.apache.ode.util.BPException;
+import org.apache.ode.bpe.interaction.IInteraction;
+import org.apache.ode.bpe.util.BPException;
 
 public interface IReadableMessage
 {

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/event/IRequestMessageEvent.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/event/IRequestMessageEvent.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/event/IRequestMessageEvent.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/event/IRequestMessageEvent.java Tue Feb 28 09:18:27 2006
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
 */
-package org.apache.ode.event;
+package org.apache.ode.bpe.event;
 
-import org.apache.ode.util.BPException;
+import org.apache.ode.bpe.util.BPException;
 
 public interface IRequestMessageEvent extends IReadableMessage, IEvent
 {  

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/event/IResponseMessage.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/event/IResponseMessage.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/event/IResponseMessage.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/event/IResponseMessage.java Tue Feb 28 09:18:27 2006
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
 */
-package org.apache.ode.event;
+package org.apache.ode.bpe.event;
 
-import org.apache.ode.util.BPException;
+import org.apache.ode.bpe.util.BPException;
 
 public interface IResponseMessage extends IReadableMessage, IWriteableMessage
 {  

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/event/IStaticKey.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/event/IStaticKey.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/event/IStaticKey.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/event/IStaticKey.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.event;
+package org.apache.ode.bpe.event;
 public interface IStaticKey
 {
 	public String toString();

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

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/event/IWriteableMessage.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/event/IWriteableMessage.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/event/IWriteableMessage.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/event/IWriteableMessage.java Tue Feb 28 09:18:27 2006
@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
 */
-package org.apache.ode.event;
+package org.apache.ode.bpe.event;
 
-import org.apache.ode.interaction.IInteraction;
-import org.apache.ode.util.BPException;
+import org.apache.ode.bpe.interaction.IInteraction;
+import org.apache.ode.bpe.util.BPException;
 
 public interface IWriteableMessage
 {

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/event/LoadDefinitionEvent.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/event/LoadDefinitionEvent.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/event/LoadDefinitionEvent.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/event/LoadDefinitionEvent.java Tue Feb 28 09:18:27 2006
@@ -16,12 +16,12 @@
 /*
  * Created on Jul 17, 2003
  */
-package org.apache.ode.event;
+package org.apache.ode.bpe.event;
 
 import java.io.Serializable;
 import java.util.Properties;
 
-import org.apache.ode.engine.ProcessInstance;
+import org.apache.ode.bpe.engine.ProcessInstance;
 
 /**
  * @author charper
@@ -55,7 +55,7 @@
 	}
 
 	/* (non-Javadoc)
-	 * @see org.apache.ode.event.Event#init(java.util.Properties)
+	 * @see org.apache.ode.bpe.event.Event#init(java.util.Properties)
 	 */
 	public void init(Properties attributes) throws EventException {
 
@@ -63,14 +63,14 @@
 	}
 
 	/* (non-Javadoc)
-	 * @see org.apache.ode.event.Event#apply(org.apache.ode.engine.ProcessInstance)
+	 * @see org.apache.ode.bpe.event.Event#apply(org.apache.ode.bpe.engine.ProcessInstance)
 	 */
 	public void apply(ProcessInstance processInstance) throws EventException {
 
 	}
 
 	/* (non-Javadoc)
-	 * @see org.apache.ode.event.Event#getAttributes()
+	 * @see org.apache.ode.bpe.event.Event#getAttributes()
 	 */
 	public Properties getAttributes() {
 		return null;

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/event/NoResponseAllowedException.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/event/NoResponseAllowedException.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/event/NoResponseAllowedException.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/event/NoResponseAllowedException.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.event;
+package org.apache.ode.bpe.event;
 public class NoResponseAllowedException extends EventException
 {
 

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/event/OperationMissingException.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/event/OperationMissingException.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/event/OperationMissingException.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/event/OperationMissingException.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.event;
+package org.apache.ode.bpe.event;
 public class OperationMissingException extends EventException
 {
 	

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/event/ProcessInstanceEvent.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/event/ProcessInstanceEvent.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/event/ProcessInstanceEvent.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/event/ProcessInstanceEvent.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.event;
+package org.apache.ode.bpe.event;
 
 import java.io.Serializable;
 import java.util.Properties;
 
-import org.apache.ode.engine.IEvaluationContext;
-import org.apache.ode.engine.IProcessCallBack;
-import org.apache.ode.engine.ProcessInstance;
-import org.apache.ode.util.BPException;
+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.util.BPException;
 
 
 /**
@@ -46,7 +46,7 @@
 	}
 
 	/**
-	 * @see org.apache.ode.event.Event#init(Properties)
+	 * @see org.apache.ode.bpe.event.Event#init(Properties)
 	 */
 	public void init(Properties attributes) throws EventException {
 		Object obj = attributes.get(PROCESS_KEY_NAME);
@@ -59,7 +59,7 @@
 	}
 
 	/**
-	 * @see org.apache.ode.event.Event#apply(IPMIProcess_Mutate)
+	 * @see org.apache.ode.bpe.event.Event#apply(IPMIProcess_Mutate)
 	 */
 	public void apply(ProcessInstance processInstance, IEvaluationContext ec, IProcessCallBack pcb) throws BPException {
 		
@@ -70,7 +70,7 @@
 	}
 
 	/**
-	 * @see org.apache.ode.event.Event#getAttributes()
+	 * @see org.apache.ode.bpe.event.Event#getAttributes()
 	 */
 	public Properties getAttributes() {
 		Properties retVal = new Properties();

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/event/ReadOnlyEventException.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/event/ReadOnlyEventException.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/event/ReadOnlyEventException.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/event/ReadOnlyEventException.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.event;
+package org.apache.ode.bpe.event;
 public class ReadOnlyEventException extends EventException
 {
 	static final long serialVersionUID = 6969059915601172358L;

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/event/SOAPRequestMessageEvent.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/event/SOAPRequestMessageEvent.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/event/SOAPRequestMessageEvent.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/event/SOAPRequestMessageEvent.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.event;
+package org.apache.ode.bpe.event;
 
 import java.util.HashMap;
 import java.util.Iterator;
@@ -27,9 +27,9 @@
 import org.apache.axis.message.MessageElement;
 import org.apache.axis.message.SOAPEnvelope;
 
-import org.apache.ode.interaction.IInteraction;
-import org.apache.ode.interaction.InteractionFactory;
-import org.apache.ode.util.BPException;
+import org.apache.ode.bpe.interaction.IInteraction;
+import org.apache.ode.bpe.interaction.InteractionFactory;
+import org.apache.ode.bpe.util.BPException;
 
 public class SOAPRequestMessageEvent implements IRequestMessageEvent
 {

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/event/SOAPResponseMessage.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/event/SOAPResponseMessage.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/event/SOAPResponseMessage.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/event/SOAPResponseMessage.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.event;
+package org.apache.ode.bpe.event;
 
 import java.util.Iterator;
 
@@ -27,9 +27,9 @@
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
-import org.apache.ode.interaction.IInteraction;
-import org.apache.ode.interaction.XMLInteractionObject;
-import org.apache.ode.util.BPException;
+import org.apache.ode.bpe.interaction.IInteraction;
+import org.apache.ode.bpe.interaction.XMLInteractionObject;
+import org.apache.ode.bpe.util.BPException;
 
 public class SOAPResponseMessage extends SimpleResponseMessage
 {

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/event/SimpleMessage.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/event/SimpleMessage.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/event/SimpleMessage.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/event/SimpleMessage.java Tue Feb 28 09:18:27 2006
@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
 */
-package org.apache.ode.event;
+package org.apache.ode.bpe.event;
 
 import java.io.Serializable;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.ode.interaction.IInteraction;
-import org.apache.ode.util.BPException;
+import org.apache.ode.bpe.interaction.IInteraction;
+import org.apache.ode.bpe.util.BPException;
 
 public abstract class SimpleMessage implements IReadableMessage, IWriteableMessage, Serializable
 {

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/event/SimpleRequestMessageEvent.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/event/SimpleRequestMessageEvent.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/event/SimpleRequestMessageEvent.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/event/SimpleRequestMessageEvent.java Tue Feb 28 09:18:27 2006
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
 */
-package org.apache.ode.event;
+package org.apache.ode.bpe.event;
 
-import org.apache.ode.util.BPException;
+import org.apache.ode.bpe.util.BPException;
 
 public class SimpleRequestMessageEvent
 	extends SimpleMessage

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/event/SimpleResponseMessage.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/event/SimpleResponseMessage.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/event/SimpleResponseMessage.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/event/SimpleResponseMessage.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.event;
+package org.apache.ode.bpe.event;
 
 import java.util.Iterator;
 

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/event/StateEvent.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/event/StateEvent.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/event/StateEvent.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/event/StateEvent.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.event;
+package org.apache.ode.bpe.event;
 
 import java.io.Serializable;
 import java.util.Properties;
 
-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.util.BPException;
+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.util.BPException;
 
 
 /**
@@ -92,7 +92,7 @@
    }
    
 	/**
-	 * @see org.apache.ode.event.Event#getAttributes()
+	 * @see org.apache.ode.bpe.event.Event#getAttributes()
 	 */
 	public Properties getAttributes() {
 		Properties retVal = super.getAttributes();

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

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/event/UnsupportedInteractionTypeException.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/event/UnsupportedInteractionTypeException.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/event/UnsupportedInteractionTypeException.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/event/UnsupportedInteractionTypeException.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.event;
+package org.apache.ode.bpe.event;
 public class UnsupportedInteractionTypeException extends EventException
 {
 	static final long serialVersionUID = 2282121520764580017L;

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/info/PackageInfoBean.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/info/PackageInfoBean.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/info/PackageInfoBean.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/info/PackageInfoBean.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.info;
+package org.apache.ode.bpe.info;
 
 import java.util.Properties;
 //import java.util.logging.Logger;

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/inmemory/jndi/IMContext.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/inmemory/jndi/IMContext.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/inmemory/jndi/IMContext.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/inmemory/jndi/IMContext.java Tue Feb 28 09:18:27 2006
@@ -19,7 +19,7 @@
  * To change the template for this generated file go to
  * Window&gt;Preferences&gt;Java&gt;Code Generation&gt;Code and Comments
  */
-package org.apache.ode.inmemory.jndi;
+package org.apache.ode.bpe.inmemory.jndi;
 
 import java.io.FileInputStream;
 import java.io.IOException;

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/inmemory/jndi/IMContextFactory.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/inmemory/jndi/IMContextFactory.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/inmemory/jndi/IMContextFactory.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/inmemory/jndi/IMContextFactory.java Tue Feb 28 09:18:27 2006
@@ -19,7 +19,7 @@
  * To change the template for this generated file go to
  * Window&gt;Preferences&gt;Java&gt;Code Generation&gt;Code and Comments
  */
-package org.apache.ode.inmemory.jndi;
+package org.apache.ode.bpe.inmemory.jndi;
 
 import java.util.Hashtable;
 

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/inmemory/jndi/java/javaURLContextFactory.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/inmemory/jndi/java/javaURLContextFactory.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/inmemory/jndi/java/javaURLContextFactory.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/inmemory/jndi/java/javaURLContextFactory.java Tue Feb 28 09:18:27 2006
@@ -19,7 +19,7 @@
  * To change the template for this generated file go to
  * Window&gt;Preferences&gt;Java&gt;Code Generation&gt;Code and Comments
  */
-package org.apache.ode.inmemory.jndi.java;
+package org.apache.ode.bpe.inmemory.jndi.java;
 
 import java.util.Hashtable;
 
@@ -27,7 +27,7 @@
 import javax.naming.Name;
 import javax.naming.spi.ObjectFactory;
 
-import org.apache.ode.inmemory.jndi.IMContext;
+import org.apache.ode.bpe.inmemory.jndi.IMContext;
 
 /**
  * @author jjin

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/instance/IPMIProcess.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/instance/IPMIProcess.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/instance/IPMIProcess.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/instance/IPMIProcess.java Tue Feb 28 09:18:27 2006
@@ -19,13 +19,13 @@
  * Purpose: Defines the Interface IPMIProcess
  ***********************************************************************/
 
-package org.apache.ode.instance;
+package org.apache.ode.bpe.instance;
 
-import org.apache.ode.definition.IPMDProcess;
-import org.apache.ode.instance.service.InstanceService;
-import org.apache.ode.instance.service.InstanceServiceException;
-import org.apache.ode.scope.service.ScopePath;
-import org.apache.ode.util.BPException;
+import org.apache.ode.bpe.definition.IPMDProcess;
+import org.apache.ode.bpe.instance.service.InstanceService;
+import org.apache.ode.bpe.instance.service.InstanceServiceException;
+import org.apache.ode.bpe.scope.service.ScopePath;
+import org.apache.ode.bpe.util.BPException;
 
 /**
  * The interface defines attributes of process instance state. Process instances

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/instance/nonpersistent/PMIProcessTransientImpl.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/instance/nonpersistent/PMIProcessTransientImpl.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/instance/nonpersistent/PMIProcessTransientImpl.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/instance/nonpersistent/PMIProcessTransientImpl.java Tue Feb 28 09:18:27 2006
@@ -13,22 +13,22 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
 */
-package org.apache.ode.instance.nonpersistent;
+package org.apache.ode.bpe.instance.nonpersistent;
 
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import org.apache.ode.definition.IPMDProcess;
-import org.apache.ode.definition.service.DefinitionService;
-import org.apache.ode.definition.service.DefinitionServiceException;
-import org.apache.ode.engine.ProcessDefinitionKey;
-import org.apache.ode.engine.StateEnum;
-import org.apache.ode.instance.IPMIProcess;
-import org.apache.ode.instance.service.InstanceServiceException;
-import org.apache.ode.instance.service.nonpersistent.InstanceServiceTransientImpl;
-import org.apache.ode.scope.service.IFCScopeInstance;
-import org.apache.ode.scope.service.ScopePath;
-import org.apache.ode.util.BPException;
+import org.apache.ode.bpe.definition.IPMDProcess;
+import org.apache.ode.bpe.definition.service.DefinitionService;
+import org.apache.ode.bpe.definition.service.DefinitionServiceException;
+import org.apache.ode.bpe.engine.ProcessDefinitionKey;
+import org.apache.ode.bpe.engine.StateEnum;
+import org.apache.ode.bpe.instance.IPMIProcess;
+import org.apache.ode.bpe.instance.service.InstanceServiceException;
+import org.apache.ode.bpe.instance.service.nonpersistent.InstanceServiceTransientImpl;
+import org.apache.ode.bpe.scope.service.IFCScopeInstance;
+import org.apache.ode.bpe.scope.service.ScopePath;
+import org.apache.ode.bpe.util.BPException;
 
 /**
  * Implements a stateless process instance node.
@@ -110,7 +110,7 @@
 	
 
 	/* (non-Javadoc)
-	 * @see org.apache.ode.instance.service.IPMIProcess#remove()
+	 * @see org.apache.ode.bpe.instance.service.IPMIProcess#remove()
 	 */
 	public void remove() throws InstanceServiceException {
 	}
@@ -136,7 +136,7 @@
 
 
 	/**
-	 * @see org.apache.ode.instance.IPMIProcess#getDefinition()
+	 * @see org.apache.ode.bpe.instance.IPMIProcess#getDefinition()
 	 */
 	public IPMDProcess getDefinition() throws InstanceServiceException,
 		DefinitionServiceException {
@@ -151,7 +151,7 @@
 	}
 
 	/**
-	 * @see org.apache.ode.instance.IPMIProcess#isStateless()
+	 * @see org.apache.ode.bpe.instance.IPMIProcess#isStateless()
 	 */
 	public boolean isStateless() {
 		return true;
@@ -166,14 +166,14 @@
 	}
 
 	/* (non-Javadoc)
-	 * @see org.apache.ode.instance.service.IPMIProcess#getScopePath()
+	 * @see org.apache.ode.bpe.instance.service.IPMIProcess#getScopePath()
 	 */
 	public ScopePath getScopePath(){
 		return scopePath;
 	}
 
 	/* (non-Javadoc)
-	 * @see org.apache.ode.instance.service.IPMIProcess#setScopePath(java.lang.String)
+	 * @see org.apache.ode.bpe.instance.service.IPMIProcess#setScopePath(java.lang.String)
 	 */
 	public void setScopePath(ScopePath scopePath){
 		this.scopePath = scopePath;
@@ -181,7 +181,7 @@
 
 
 	/* (non-Javadoc)
-	 * @see org.apache.ode.instance.service.IPMIProcess#getContextContainerId()
+	 * @see org.apache.ode.bpe.instance.service.IPMIProcess#getContextContainerId()
 	 */
 	public String getContextContainerId() {
 		return contextContainerId;
@@ -189,7 +189,7 @@
 
 
 	/* (non-Javadoc)
-	 * @see org.apache.ode.instance.service.IPMIProcess#setContextContaionerId()
+	 * @see org.apache.ode.bpe.instance.service.IPMIProcess#setContextContaionerId()
 	 */
 	public void setContextContaionerId(String id) {
 		contextContainerId = id;
@@ -199,7 +199,7 @@
 
 
 	/* (non-Javadoc)
-	 * @see org.apache.ode.instance.service.IPMIProcess#getExecutionContext()
+	 * @see org.apache.ode.bpe.instance.service.IPMIProcess#getExecutionContext()
 	 */
 	public String getExecutionContext() {
 		return this.executionCtx;
@@ -207,7 +207,7 @@
 
 
 	/* (non-Javadoc)
-	 * @see org.apache.ode.instance.service.IPMIProcess#setExecutionContext(java.lang.String)
+	 * @see org.apache.ode.bpe.instance.service.IPMIProcess#setExecutionContext(java.lang.String)
 	 */
 	public void setExecutionContext(String executionCtx) {
 		this.executionCtx = executionCtx;

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/instance/persistent/PMIProcessPersistentImpl.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/instance/persistent/PMIProcessPersistentImpl.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/instance/persistent/PMIProcessPersistentImpl.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/instance/persistent/PMIProcessPersistentImpl.java Tue Feb 28 09:18:27 2006
@@ -13,19 +13,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
 */
-package org.apache.ode.instance.persistent;
+package org.apache.ode.bpe.instance.persistent;
 
 import java.io.Serializable;
 //import java.util.logging.Logger;
 
-import org.apache.ode.definition.IPMDProcess;
-import org.apache.ode.engine.ProcessDefinitionKey;
-import org.apache.ode.engine.StateEnum;
-import org.apache.ode.instance.IPMIProcess;
-import org.apache.ode.instance.service.persistent.InstanceServicePersistentImpl;
-import org.apache.ode.scope.service.IFCScopeInstance;
-import org.apache.ode.scope.service.ScopePath;
-import org.apache.ode.util.BPException;
+import org.apache.ode.bpe.definition.IPMDProcess;
+import org.apache.ode.bpe.engine.ProcessDefinitionKey;
+import org.apache.ode.bpe.engine.StateEnum;
+import org.apache.ode.bpe.instance.IPMIProcess;
+import org.apache.ode.bpe.instance.service.persistent.InstanceServicePersistentImpl;
+import org.apache.ode.bpe.scope.service.IFCScopeInstance;
+import org.apache.ode.bpe.scope.service.ScopePath;
+import org.apache.ode.bpe.util.BPException;
 
 /**
  * The persistent implementation of a business process activity
@@ -115,7 +115,7 @@
 	
 
 	/**
-	 * @see org.apache.ode.instance.IPMIProcess#remove()
+	 * @see org.apache.ode.bpe.instance.IPMIProcess#remove()
 	 */
 	public void remove() throws BPException {
 		if (!rootKey.equals(key)) {
@@ -132,7 +132,7 @@
 	}
 
 	/**
-	 * @see org.apache.ode.instance.IPMIProcess#getDefinition()
+	 * @see org.apache.ode.bpe.instance.IPMIProcess#getDefinition()
 	 */
 	public IPMDProcess getDefinition() throws BPException {
 			
@@ -151,7 +151,7 @@
 	}
 	
 	/**
-	 * @see org.apache.ode.instance.IPMIProcess#isStateless()
+	 * @see org.apache.ode.bpe.instance.IPMIProcess#isStateless()
 	 */
 	public boolean isStateless() {
 		return false;
@@ -203,7 +203,7 @@
         }
     }	 
 	/* (non-Javadoc)
-	 * @see org.apache.ode.instance.service.IPMIProcess#getScopePath()
+	 * @see org.apache.ode.bpe.instance.service.IPMIProcess#getScopePath()
 	 */
 	public ScopePath getScopePath(){
 		return scopePath;
@@ -211,7 +211,7 @@
 
 
 	/* (non-Javadoc)
-	 * @see org.apache.ode.instance.service.IPMIProcess#setScopePath(java.lang.String)
+	 * @see org.apache.ode.bpe.instance.service.IPMIProcess#setScopePath(java.lang.String)
 	 */
 	public void setScopePath(ScopePath scopePath){
 		this.scopePath = scopePath;
@@ -220,7 +220,7 @@
 
 
 	/* (non-Javadoc)
-	 * @see org.apache.ode.instance.service.IPMIProcess#getContextContainerId()
+	 * @see org.apache.ode.bpe.instance.service.IPMIProcess#getContextContainerId()
 	 */
 	public String getContextContainerId() {
 		return contextContainerId;
@@ -228,7 +228,7 @@
 
 
 	/* (non-Javadoc)
-	 * @see org.apache.ode.instance.service.IPMIProcess#setContextContaionerId(java.lang.String)
+	 * @see org.apache.ode.bpe.instance.service.IPMIProcess#setContextContaionerId(java.lang.String)
 	 */
 	public void setContextContaionerId(String id) {
 		contextContainerId = id;
@@ -237,7 +237,7 @@
 
 
 	/* (non-Javadoc)
-	 * @see org.apache.ode.instance.service.IPMIProcess#getExecutionContext()
+	 * @see org.apache.ode.bpe.instance.service.IPMIProcess#getExecutionContext()
 	 */
 	public String getExecutionContext() {
 		return executionCtx;
@@ -245,7 +245,7 @@
 
 
 	/* (non-Javadoc)
-	 * @see org.apache.ode.instance.service.IPMIProcess#setExecutionContext()
+	 * @see org.apache.ode.bpe.instance.service.IPMIProcess#setExecutionContext()
 	 */
 	public void setExecutionContext(String executionCtx) {
 		this.executionCtx = executionCtx;

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/instance/service/InstanceService.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/instance/service/InstanceService.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/instance/service/InstanceService.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/instance/service/InstanceService.java Tue Feb 28 09:18:27 2006
@@ -19,18 +19,18 @@
  * Purpose: Defines the Interface InstanceService
  ***********************************************************************/
 
-package org.apache.ode.instance.service;
+package org.apache.ode.bpe.instance.service;
 
 import java.util.Collection;
 
-import org.apache.ode.definition.IPMDRoot;
-import org.apache.ode.definition.service.DefinitionService;
-import org.apache.ode.engine.IEvaluationContext;
-import org.apache.ode.engine.IProcessCallBack;
-import org.apache.ode.engine.ProcessService;
-import org.apache.ode.instance.IPMIProcess;
-import org.apache.ode.util.BPException;
-import org.apache.ode.uuid.UUIDService;
+import org.apache.ode.bpe.definition.IPMDRoot;
+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.ProcessService;
+import org.apache.ode.bpe.instance.IPMIProcess;
+import org.apache.ode.bpe.util.BPException;
+import org.apache.ode.bpe.uuid.UUIDService;
 
 
 /**

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/instance/service/InstanceServiceException.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/instance/service/InstanceServiceException.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/instance/service/InstanceServiceException.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/instance/service/InstanceServiceException.java Tue Feb 28 09:18:27 2006
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
 */
-package org.apache.ode.instance.service;
+package org.apache.ode.bpe.instance.service;
 
-import org.apache.ode.util.BPException;
+import org.apache.ode.bpe.util.BPException;
 
 /**
  * @author waterman

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/instance/service/InstanceServiceFactory.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/instance/service/InstanceServiceFactory.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/instance/service/InstanceServiceFactory.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/instance/service/InstanceServiceFactory.java Tue Feb 28 09:18:27 2006
@@ -13,19 +13,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
 */
-package org.apache.ode.instance.service;
+package org.apache.ode.bpe.instance.service;
 
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-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.engine.ProcessService;
-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.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.engine.ProcessService;
+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;
 
 public class InstanceServiceFactory
 {