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 [3/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/action/bpel/SequenceAction.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/bpel/SequenceAction.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/bpel/SequenceAction.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/bpel/SequenceAction.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.action.bpel;
+package org.apache.ode.bpe.action.bpel;
 
 import java.util.Enumeration;
 import java.util.Properties;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import org.apache.ode.action.internal.ActionException;
-import org.apache.ode.action.internal.IInternalAction;
-import org.apache.ode.context.resolver.ContextResolver;
-import org.apache.ode.definition.IPMDProcess;
-import org.apache.ode.engine.IEvaluationContext;
-import org.apache.ode.engine.IProcessCallBack;
-import org.apache.ode.engine.ProcessInstance;
-import org.apache.ode.instance.IPMIProcess;
-import org.apache.ode.util.BPException;
+import org.apache.ode.bpe.action.internal.ActionException;
+import org.apache.ode.bpe.action.internal.IInternalAction;
+import org.apache.ode.bpe.context.resolver.ContextResolver;
+import org.apache.ode.bpe.definition.IPMDProcess;
+import org.apache.ode.bpe.engine.IEvaluationContext;
+import org.apache.ode.bpe.engine.IProcessCallBack;
+import org.apache.ode.bpe.engine.ProcessInstance;
+import org.apache.ode.bpe.instance.IPMIProcess;
+import org.apache.ode.bpe.util.BPException;
 /**
  * @author waterman
  *
@@ -50,14 +50,14 @@
 
 	}
 	/**
-	 * @see org.apache.ode.action.bpel.internal.IInternalAction#init(Properties)
+	 * @see org.apache.ode.bpe.action.bpel.internal.IInternalAction#init(Properties)
 	 */
 	public void init(Properties properties) throws ActionException {
 		props = properties;
 	}
 
 	/**
-	 * @see org.apache.ode.action.bpel.internal.IInternalAction#execute(Iterator, Iterator, EventDirector, IPMIProcess)
+	 * @see org.apache.ode.bpe.action.bpel.internal.IInternalAction#execute(Iterator, Iterator, EventDirector, IPMIProcess)
 	 */
 	public boolean execute(ContextResolver resovler,
 		IEvaluationContext ec,
@@ -95,7 +95,7 @@
 	}
 
 	/**
-	 * @see org.apache.ode.action.bpel.internal.IInternalAction#release()
+	 * @see org.apache.ode.bpe.action.bpel.internal.IInternalAction#release()
 	 */
 	public void release() {
 		props = null;

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/bpel/SimpleUpdateAction.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/bpel/SimpleUpdateAction.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/bpel/SimpleUpdateAction.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/bpel/SimpleUpdateAction.java Tue Feb 28 09:18:27 2006
@@ -14,22 +14,22 @@
  * limitations under the License.
 */
 
-package org.apache.ode.action.bpel;
+package org.apache.ode.bpe.action.bpel;
 
 import java.util.Properties;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import org.apache.ode.action.internal.IInternalAction;
-import org.apache.ode.context.resolver.ContextResolvedObject;
-import org.apache.ode.context.resolver.ContextResolver;
-import org.apache.ode.definition.IPMDProcess;
-import org.apache.ode.engine.IEvaluationContext;
-import org.apache.ode.engine.IProcessCallBack;
-import org.apache.ode.instance.IPMIProcess;
-import org.apache.ode.interaction.IInteraction;
-import org.apache.ode.interaction.IInvocation;
-import org.apache.ode.util.BPException;
+import org.apache.ode.bpe.action.internal.IInternalAction;
+import org.apache.ode.bpe.context.resolver.ContextResolvedObject;
+import org.apache.ode.bpe.context.resolver.ContextResolver;
+import org.apache.ode.bpe.definition.IPMDProcess;
+import org.apache.ode.bpe.engine.IEvaluationContext;
+import org.apache.ode.bpe.engine.IProcessCallBack;
+import org.apache.ode.bpe.instance.IPMIProcess;
+import org.apache.ode.bpe.interaction.IInteraction;
+import org.apache.ode.bpe.interaction.IInvocation;
+import org.apache.ode.bpe.util.BPException;
 
 
 public class SimpleUpdateAction implements IInternalAction

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/bpel/StartCatchAction.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/bpel/StartCatchAction.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/bpel/StartCatchAction.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/bpel/StartCatchAction.java Tue Feb 28 09:18:27 2006
@@ -16,28 +16,28 @@
 /*
  * Created on:	Feb 11, 2004
  * Project:		BPEELocal
- * Package:		org.apache.ode.action.bpel 
+ * Package:		org.apache.ode.bpe.action.bpel 
  * Author:		waterman	
  */
-package org.apache.ode.action.bpel;
+package org.apache.ode.bpe.action.bpel;
 
 //import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Properties;
 
-import org.apache.ode.action.internal.IInternalAction;
-import org.apache.ode.context.IContainer;
-import org.apache.ode.context.INode;
-import org.apache.ode.context.IPart;
-import org.apache.ode.context.resolver.ContextResolvedObject;
-import org.apache.ode.context.resolver.ContextResolver;
-import org.apache.ode.definition.IPMDProcess;
-import org.apache.ode.engine.IEvaluationContext;
-import org.apache.ode.engine.IProcessCallBack;
-import org.apache.ode.instance.IPMIProcess;
-import org.apache.ode.scope.service.IFCScopeInstance;
-import org.apache.ode.util.BPException;
-//import org.apache.ode.wsdl.extensions.BPEFault;
+import org.apache.ode.bpe.action.internal.IInternalAction;
+import org.apache.ode.bpe.context.IContainer;
+import org.apache.ode.bpe.context.INode;
+import org.apache.ode.bpe.context.IPart;
+import org.apache.ode.bpe.context.resolver.ContextResolvedObject;
+import org.apache.ode.bpe.context.resolver.ContextResolver;
+import org.apache.ode.bpe.definition.IPMDProcess;
+import org.apache.ode.bpe.engine.IEvaluationContext;
+import org.apache.ode.bpe.engine.IProcessCallBack;
+import org.apache.ode.bpe.instance.IPMIProcess;
+import org.apache.ode.bpe.scope.service.IFCScopeInstance;
+import org.apache.ode.bpe.util.BPException;
+//import org.apache.ode.bpe.wsdl.extensions.BPEFault;
 
 /**
  * 
@@ -62,7 +62,7 @@
 	}
 
 	/**
-	 * @see org.apache.ode.action.bpel.internal.IInternalAction#init(java.util.Properties)
+	 * @see org.apache.ode.bpe.action.bpel.internal.IInternalAction#init(java.util.Properties)
 	 */
 	public void init(Properties properties) throws BPException {
 		props = properties;
@@ -70,7 +70,7 @@
 	}
 
 	/**
-	 * @see org.apache.ode.action.bpel.internal.IInternalAction#execute(org.apache.ode.context.resolver.ContextResolver, org.apache.ode.engine.IEvaluationContext, org.apache.ode.engine.IProcessCallBack, org.apache.ode.instance.IPMIProcess, org.apache.ode.definition.IPMDProcess)
+	 * @see org.apache.ode.bpe.action.bpel.internal.IInternalAction#execute(org.apache.ode.bpe.context.resolver.ContextResolver, org.apache.ode.bpe.engine.IEvaluationContext, org.apache.ode.bpe.engine.IProcessCallBack, org.apache.ode.bpe.instance.IPMIProcess, org.apache.ode.bpe.definition.IPMDProcess)
 	 */
 	public boolean execute(
 		ContextResolver resolver,
@@ -118,7 +118,7 @@
 	}
 
 	/**
-	 * @see org.apache.ode.action.bpel.internal.IInternalAction#release()
+	 * @see org.apache.ode.bpe.action.bpel.internal.IInternalAction#release()
 	 */
 	public void release() {
 		props = null;

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

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/bpel/StartSequenceAction.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/bpel/StartSequenceAction.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/bpel/StartSequenceAction.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/bpel/StartSequenceAction.java Tue Feb 28 09:18:27 2006
@@ -17,21 +17,21 @@
  * Created on Jul 10, 2003
  *
  */
-package org.apache.ode.action.bpel;
+package org.apache.ode.bpe.action.bpel;
 
 import java.util.Properties;
 
-import org.apache.ode.action.internal.IInternalAction;
-import org.apache.ode.bped.EventDirectorException;
-import org.apache.ode.context.resolver.ContextResolver;
-import org.apache.ode.definition.IPMDProcess;
-import org.apache.ode.definition.service.DefinitionService;
-import org.apache.ode.engine.IEvaluationContext;
-import org.apache.ode.engine.IProcessCallBack;
-import org.apache.ode.engine.ProcessDefinitionKey;
-import org.apache.ode.engine.ProcessInstance;
-import org.apache.ode.instance.IPMIProcess;
-import org.apache.ode.util.BPException;
+import org.apache.ode.bpe.action.internal.IInternalAction;
+import org.apache.ode.bpe.bped.EventDirectorException;
+import org.apache.ode.bpe.context.resolver.ContextResolver;
+import org.apache.ode.bpe.definition.IPMDProcess;
+import org.apache.ode.bpe.definition.service.DefinitionService;
+import org.apache.ode.bpe.engine.IEvaluationContext;
+import org.apache.ode.bpe.engine.IProcessCallBack;
+import org.apache.ode.bpe.engine.ProcessDefinitionKey;
+import org.apache.ode.bpe.engine.ProcessInstance;
+import org.apache.ode.bpe.instance.IPMIProcess;
+import org.apache.ode.bpe.util.BPException;
 
 /**
  * @author waterman
@@ -59,7 +59,7 @@
 	private Boolean m_suppressJoinFault;
 
 	/**
-	 * @see org.apache.ode.action.bpel.internal.IInternalAction#init(java.util.Properties)
+	 * @see org.apache.ode.bpe.action.bpel.internal.IInternalAction#init(java.util.Properties)
 	 */
 	public void init(Properties properties) throws BPException {
 		startKey = (ProcessDefinitionKey)properties.get(START_DEF_KEY);
@@ -80,7 +80,7 @@
 	}
 
 	/* (non-Javadoc)
-	 * @see org.apache.ode.action.bpel.Action#execute(org.apache.ode.context.resolver.ContextResolver, org.apache.ode.bped.EventDirector, org.apache.ode.instance.service.IPMIProcess, org.apache.ode.definition.service.IPMDProcess)
+	 * @see org.apache.ode.bpe.action.bpel.Action#execute(org.apache.ode.bpe.context.resolver.ContextResolver, org.apache.ode.bpe.bped.EventDirector, org.apache.ode.bpe.instance.service.IPMIProcess, org.apache.ode.bpe.definition.service.IPMDProcess)
 	 */
 	public boolean execute(
 		ContextResolver resolver,
@@ -111,7 +111,7 @@
 	}
 
 	/* (non-Javadoc)
-	 * @see org.apache.ode.action.bpel.Action#release()
+	 * @see org.apache.ode.bpe.action.bpel.Action#release()
 	 */
 	public void release() {
 	}

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/bpel/TerminateAction.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/bpel/TerminateAction.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/bpel/TerminateAction.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/bpel/TerminateAction.java Tue Feb 28 09:18:27 2006
@@ -14,18 +14,18 @@
  * limitations under the License.
 */
 
-package org.apache.ode.action.bpel;
+package org.apache.ode.bpe.action.bpel;
 
 import java.util.Properties;
 
-import org.apache.ode.action.internal.IInternalAction;
-import org.apache.ode.context.resolver.ContextResolver;
-import org.apache.ode.definition.IPMDProcess;
-import org.apache.ode.engine.IEvaluationContext;
-import org.apache.ode.engine.IProcessCallBack;
-import org.apache.ode.instance.IPMIProcess;
-import org.apache.ode.scope.service.IScopeService;
-import org.apache.ode.util.BPException;
+import org.apache.ode.bpe.action.internal.IInternalAction;
+import org.apache.ode.bpe.context.resolver.ContextResolver;
+import org.apache.ode.bpe.definition.IPMDProcess;
+import org.apache.ode.bpe.engine.IEvaluationContext;
+import org.apache.ode.bpe.engine.IProcessCallBack;
+import org.apache.ode.bpe.instance.IPMIProcess;
+import org.apache.ode.bpe.scope.service.IScopeService;
+import org.apache.ode.bpe.util.BPException;
 
 /**
  * Terminate process
@@ -33,14 +33,14 @@
 public class TerminateAction implements IInternalAction {
 
 	/* (non-Javadoc)
-	 * @see org.apache.ode.action.bpel.Action#init(java.util.Properties)
+	 * @see org.apache.ode.bpe.action.bpel.Action#init(java.util.Properties)
 	 */
 	public void init(Properties properties) throws BPException {
 
 	}
 
 	/* (non-Javadoc)
-	 * @see org.apache.ode.action.bpel.Action#execute(org.apache.ode.context.resolver.ContextResolver, org.apache.ode.engine.IEvaluationContext, org.apache.ode.engine.IProcessCallBack, org.apache.ode.instance.service.IPMIProcess, org.apache.ode.definition.service.IPMDProcess)
+	 * @see org.apache.ode.bpe.action.bpel.Action#execute(org.apache.ode.bpe.context.resolver.ContextResolver, org.apache.ode.bpe.engine.IEvaluationContext, org.apache.ode.bpe.engine.IProcessCallBack, org.apache.ode.bpe.instance.service.IPMIProcess, org.apache.ode.bpe.definition.service.IPMDProcess)
 	 */
 	public boolean execute(ContextResolver resolver, IEvaluationContext ec,
 			IProcessCallBack pcb, IPMIProcess processInstance,
@@ -56,7 +56,7 @@
 	}
 
 	/* (non-Javadoc)
-	 * @see org.apache.ode.action.bpel.Action#release()
+	 * @see org.apache.ode.bpe.action.bpel.Action#release()
 	 */
 	public void release() {
 

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

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/bpel/TimerAction.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/bpel/TimerAction.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/bpel/TimerAction.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/bpel/TimerAction.java Tue Feb 28 09:18:27 2006
@@ -14,7 +14,7 @@
  * limitations under the License.
 */
 
-package org.apache.ode.action.bpel;
+package org.apache.ode.bpe.action.bpel;
 
 import java.util.Calendar;
 import java.util.Date;
@@ -28,23 +28,24 @@
 
 import com.sun.msv.datatype.xsd.DatatypeFactory;
 import com.sun.msv.datatype.xsd.XSDatatype;
-import org.apache.ode.action.internal.ActionException;
-import org.apache.ode.action.internal.IInternalAction;
-import org.apache.ode.context.resolver.ContextResolvedObject;
-import org.apache.ode.context.resolver.ContextResolver;
-import org.apache.ode.definition.IPMDProcess;
-import org.apache.ode.engine.IEvaluationContext;
-import org.apache.ode.engine.IProcessCallBack;
-import org.apache.ode.event.ITimerEvent;
-import org.apache.ode.event.TimerEvent;
-import org.apache.ode.instance.IPMIProcess;
-import org.apache.ode.scope.service.IFCScopeInstance;
-import org.apache.ode.scope.service.IScopeService;
-import org.apache.ode.scope.service.ScopePath;
-import org.apache.ode.timerservice.BPETimerServiceFactory;
-import org.apache.ode.timerservice.IBPETimer;
-import org.apache.ode.timerservice.IBPETimerService;
-import org.apache.ode.util.BPException;
+
+import org.apache.ode.bpe.action.internal.ActionException;
+import org.apache.ode.bpe.action.internal.IInternalAction;
+import org.apache.ode.bpe.context.resolver.ContextResolvedObject;
+import org.apache.ode.bpe.context.resolver.ContextResolver;
+import org.apache.ode.bpe.definition.IPMDProcess;
+import org.apache.ode.bpe.engine.IEvaluationContext;
+import org.apache.ode.bpe.engine.IProcessCallBack;
+import org.apache.ode.bpe.event.ITimerEvent;
+import org.apache.ode.bpe.event.TimerEvent;
+import org.apache.ode.bpe.instance.IPMIProcess;
+import org.apache.ode.bpe.scope.service.IFCScopeInstance;
+import org.apache.ode.bpe.scope.service.IScopeService;
+import org.apache.ode.bpe.scope.service.ScopePath;
+import org.apache.ode.bpe.timerservice.BPETimerServiceFactory;
+import org.apache.ode.bpe.timerservice.IBPETimer;
+import org.apache.ode.bpe.timerservice.IBPETimerService;
+import org.apache.ode.bpe.util.BPException;
 
 /**
  * 

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

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

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/bpel/XPathJaxenExpression.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/bpel/XPathJaxenExpression.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/bpel/XPathJaxenExpression.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/bpel/XPathJaxenExpression.java Tue Feb 28 09:18:27 2006
@@ -17,7 +17,7 @@
  * Created on Jul 10, 2003
  *
  */
-package org.apache.ode.action.bpel;
+package org.apache.ode.bpe.action.bpel;
 
 import java.io.Serializable;
 import java.util.Collections;
@@ -30,7 +30,7 @@
 import org.jaxen.XPathFunctionContext;
 import org.jaxen.dom.DOMXPath;
 
-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/action/bpel/XPathSwitchAction.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/bpel/XPathSwitchAction.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/bpel/XPathSwitchAction.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/bpel/XPathSwitchAction.java Tue Feb 28 09:18:27 2006
@@ -17,7 +17,7 @@
  * Created on Jul 10, 2003
  *
  */
-package org.apache.ode.action.bpel;
+package org.apache.ode.bpe.action.bpel;
 
 import java.util.Iterator;
 import java.util.Properties;
@@ -25,22 +25,22 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import org.apache.ode.action.internal.ActionException;
-import org.apache.ode.action.internal.IInternalAction;
-import org.apache.ode.bped.IInternalEventDirector;
-import org.apache.ode.bped.EventDirectorException;
-import org.apache.ode.context.resolver.ContextResolver;
-import org.apache.ode.definition.IPMDProcess;
-import org.apache.ode.definition.service.DefinitionService;
-import org.apache.ode.engine.IEvaluationContext;
-import org.apache.ode.engine.IProcessCallBack;
-import org.apache.ode.engine.ProcessDefinitionKey;
-import org.apache.ode.engine.ProcessInstance;
-import org.apache.ode.engine.StateEnum;
-import org.apache.ode.event.StateEvent;
-import org.apache.ode.instance.IPMIProcess;
-import org.apache.ode.util.BPException;
-import org.apache.ode.scope.service.BPRuntimeException;
+import org.apache.ode.bpe.action.internal.ActionException;
+import org.apache.ode.bpe.action.internal.IInternalAction;
+import org.apache.ode.bpe.bped.EventDirectorException;
+import org.apache.ode.bpe.bped.IInternalEventDirector;
+import org.apache.ode.bpe.context.resolver.ContextResolver;
+import org.apache.ode.bpe.definition.IPMDProcess;
+import org.apache.ode.bpe.definition.service.DefinitionService;
+import org.apache.ode.bpe.engine.IEvaluationContext;
+import org.apache.ode.bpe.engine.IProcessCallBack;
+import org.apache.ode.bpe.engine.ProcessDefinitionKey;
+import org.apache.ode.bpe.engine.ProcessInstance;
+import org.apache.ode.bpe.engine.StateEnum;
+import org.apache.ode.bpe.event.StateEvent;
+import org.apache.ode.bpe.instance.IPMIProcess;
+import org.apache.ode.bpe.scope.service.BPRuntimeException;
+import org.apache.ode.bpe.util.BPException;
 
 /**
  * @author waterman
@@ -68,7 +68,7 @@
 		Logger.getLogger(XPathSwitchAction.class.getName());
 
 	/**
-	 * @see org.apache.ode.action.bpel.internal.IInternalAction#init(java.util.Properties)
+	 * @see org.apache.ode.bpe.action.bpel.internal.IInternalAction#init(java.util.Properties)
 	 */
 	public void init(Properties properties) throws BPException {
 		cases = (Vector)properties.get(CASES_KEY);
@@ -92,7 +92,7 @@
 	}
 
 	/* (non-Javadoc)
-	 * @see org.apache.ode.action.bpel.Action#execute(org.apache.ode.context.resolver.ContextResolver, org.apache.ode.bped.EventDirector, org.apache.ode.instance.service.IPMIProcess, org.apache.ode.definition.service.IPMDProcess)
+	 * @see org.apache.ode.bpe.action.bpel.Action#execute(org.apache.ode.bpe.context.resolver.ContextResolver, org.apache.ode.bpe.bped.EventDirector, org.apache.ode.bpe.instance.service.IPMIProcess, org.apache.ode.bpe.definition.service.IPMDProcess)
 	 */
 	public boolean execute(
 		ContextResolver resolver,
@@ -151,7 +151,7 @@
 	}
 
 	/* (non-Javadoc)
-	 * @see org.apache.ode.action.bpel.Action#release()
+	 * @see org.apache.ode.bpe.action.bpel.Action#release()
 	 */
 	public void release() {
 	}

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/bpel/XPathSwitchTuple.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/bpel/XPathSwitchTuple.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/bpel/XPathSwitchTuple.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/bpel/XPathSwitchTuple.java Tue Feb 28 09:18:27 2006
@@ -17,12 +17,12 @@
  * Created on Jul 10, 2003
  *
  */
-package org.apache.ode.action.bpel;
+package org.apache.ode.bpe.action.bpel;
 
 import java.io.Serializable;
 //import java.util.logging.Logger;
 
-import org.apache.ode.engine.ProcessDefinitionKey;
+import org.apache.ode.bpe.engine.ProcessDefinitionKey;
 
 /**
  * @author waterman

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

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/external/BusinessProcessInvocationAction.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/external/BusinessProcessInvocationAction.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/external/BusinessProcessInvocationAction.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/external/BusinessProcessInvocationAction.java Tue Feb 28 09:18:27 2006
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
 */
-package org.apache.ode.action.external;
+package org.apache.ode.bpe.action.external;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -28,19 +28,19 @@
 import java.util.Properties;
 import java.util.logging.Logger;
 
-import org.apache.ode.client.BPEClient;
-import org.apache.ode.client.IBPEClient;
-import org.apache.ode.client.IBPEMessage;
-import org.apache.ode.client.IBPEMessagePart;
-import org.apache.ode.client.IDescribedValue;
-import org.apache.ode.client.IFormattableValue;
-import org.apache.ode.client.IOperation;
-import org.apache.ode.client.result.IFaultResult;
-import org.apache.ode.client.result.IResult;
-import org.apache.ode.client.result.ISuccessWithResponse;
-import org.apache.ode.context.base.ContextUtil;
-import org.apache.ode.interaction.spiadapter.SPIAdapterInteraction;
-import org.apache.ode.scope.service.BPRuntimeException;
+import org.apache.ode.bpe.client.BPEClient;
+import org.apache.ode.bpe.client.IBPEClient;
+import org.apache.ode.bpe.client.IBPEMessage;
+import org.apache.ode.bpe.client.IBPEMessagePart;
+import org.apache.ode.bpe.client.IDescribedValue;
+import org.apache.ode.bpe.client.IFormattableValue;
+import org.apache.ode.bpe.client.IOperation;
+import org.apache.ode.bpe.client.result.IFaultResult;
+import org.apache.ode.bpe.client.result.IResult;
+import org.apache.ode.bpe.client.result.ISuccessWithResponse;
+import org.apache.ode.bpe.context.base.ContextUtil;
+import org.apache.ode.bpe.interaction.spiadapter.SPIAdapterInteraction;
+import org.apache.ode.bpe.scope.service.BPRuntimeException;
 
 
 public class BusinessProcessInvocationAction implements IExternalAction

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/external/DeadlockInvokeTestAction.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/external/DeadlockInvokeTestAction.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/external/DeadlockInvokeTestAction.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/external/DeadlockInvokeTestAction.java Tue Feb 28 09:18:27 2006
@@ -14,7 +14,7 @@
  * limitations under the License.
 */
 
-package org.apache.ode.action.external;
+package org.apache.ode.bpe.action.external;
 
 import java.util.HashMap;
 import java.util.Properties;
@@ -24,19 +24,19 @@
 import javax.naming.InitialContext;
 import javax.rmi.PortableRemoteObject;
 
-import org.apache.ode.client.BPEClient;
-import org.apache.ode.client.DescribedValue;
-import org.apache.ode.client.IBPEClient;
-import org.apache.ode.client.IBPEMessage;
-import org.apache.ode.client.IBPEMessagePart;
-import org.apache.ode.client.IOperation;
-import org.apache.ode.client.exceptions.BPEUserException;
-import org.apache.ode.client.formats.INativeFormat;
-import org.apache.ode.client.result.IResult;
-import org.apache.ode.client.result.ISuccessWithResponse;
-import org.apache.ode.info.PackageInfo;
-import org.apache.ode.info.PackageInfoHome;
-import org.apache.ode.scope.service.BPRuntimeException;
+import org.apache.ode.bpe.client.BPEClient;
+import org.apache.ode.bpe.client.DescribedValue;
+import org.apache.ode.bpe.client.IBPEClient;
+import org.apache.ode.bpe.client.IBPEMessage;
+import org.apache.ode.bpe.client.IBPEMessagePart;
+import org.apache.ode.bpe.client.IOperation;
+import org.apache.ode.bpe.client.exceptions.BPEUserException;
+import org.apache.ode.bpe.client.formats.INativeFormat;
+import org.apache.ode.bpe.client.result.IResult;
+import org.apache.ode.bpe.client.result.ISuccessWithResponse;
+import org.apache.ode.bpe.scope.service.BPRuntimeException;
+import org.apache.ode.bpe.info.PackageInfo;
+import org.apache.ode.bpe.info.PackageInfoHome;
 
 /**
  * 
@@ -58,14 +58,14 @@
 	}
 
 	/**
-	 * @see org.apache.ode.action.bpel.external.IExternalAction#init(java.util.Properties)
+	 * @see org.apache.ode.bpe.action.bpel.external.IExternalAction#init(java.util.Properties)
 	 */
 	public void init(Properties props) throws BPRuntimeException {	
 		operationName = props.getProperty(OPERATION_NAME);
 	}
 
 	/**
-	 * @see org.apache.ode.action.bpel.external.IExternalAction#execute(java.util.HashMap, java.util.HashMap, org.apache.ode.action.bpel.external.IURIResolver)
+	 * @see org.apache.ode.bpe.action.bpel.external.IExternalAction#execute(java.util.HashMap, java.util.HashMap, org.apache.ode.bpe.action.bpel.external.IURIResolver)
 	 */
 	public void execute(HashMap input, HashMap output, IURIResolver resolver)
 		throws BPRuntimeException {
@@ -106,7 +106,7 @@
 	}
 
 	/**
-	 * @see org.apache.ode.action.bpel.external.IExternalAction#release()
+	 * @see org.apache.ode.bpe.action.bpel.external.IExternalAction#release()
 	 */
 	public void release() {
 	}

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/external/FaultAction.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/external/FaultAction.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/external/FaultAction.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/external/FaultAction.java Tue Feb 28 09:18:27 2006
@@ -16,17 +16,17 @@
 /*
  * Created on:	Feb 12, 2004
  * Project:		BPEELocal
- * Package:		org.apache.ode.action.bpel.external 
+ * Package:		org.apache.ode.bpe.action.bpel.external 
  * Author:		waterman	
  */
-package org.apache.ode.action.external;
+package org.apache.ode.bpe.action.external;
 
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Iterator;
 import java.util.Properties;
 
-import org.apache.ode.scope.service.BPRuntimeException;
+import org.apache.ode.bpe.scope.service.BPRuntimeException;
 
 /**
  * 
@@ -45,14 +45,14 @@
 	}
 
 	/**
-	 * @see org.apache.ode.action.bpel.external.IExternalAction#init(java.util.Properties)
+	 * @see org.apache.ode.bpe.action.bpel.external.IExternalAction#init(java.util.Properties)
 	 */
 	public void init(Properties props) throws BPRuntimeException {
 
 	}
 
 	/**
-	 * @see org.apache.ode.action.bpel.external.IExternalAction#execute(java.util.HashMap, java.util.HashMap, org.apache.ode.action.bpel.external.IURIResolver)
+	 * @see org.apache.ode.bpe.action.bpel.external.IExternalAction#execute(java.util.HashMap, java.util.HashMap, org.apache.ode.bpe.action.bpel.external.IURIResolver)
 	 */
 	public void execute(HashMap input, HashMap output, IURIResolver resolver)
 		throws BPRuntimeException {
@@ -74,7 +74,7 @@
 	}
 
 	/**
-	 * @see org.apache.ode.action.bpel.external.IExternalAction#release()
+	 * @see org.apache.ode.bpe.action.bpel.external.IExternalAction#release()
 	 */
 	public void release() {
 	}

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/external/IExternalAction.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/external/IExternalAction.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/external/IExternalAction.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/external/IExternalAction.java Tue Feb 28 09:18:27 2006
@@ -16,16 +16,16 @@
 /*
  * Created on:	Oct 31, 2003
  * Project:		BPEELocal
- * Package:		org.apache.ode.action.bpel.external 
+ * Package:		org.apache.ode.bpe.action.bpel.external 
  * Author:		waterman	
  */
-package org.apache.ode.action.external;
+package org.apache.ode.bpe.action.external;
 
 import java.io.Serializable;
 import java.util.HashMap;
 import java.util.Properties;
 
-import org.apache.ode.scope.service.BPRuntimeException;
+import org.apache.ode.bpe.scope.service.BPRuntimeException;
 
 /**
  * The interface is the plugin point for extending a business process with

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/external/IURIResolver.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/external/IURIResolver.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/external/IURIResolver.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/external/IURIResolver.java Tue Feb 28 09:18:27 2006
@@ -16,10 +16,10 @@
 /*
  * Created on:	Oct 31, 2003
  * Project:		BPEELocal
- * Package:		org.apache.ode.action.bpel.external 
+ * Package:		org.apache.ode.bpe.action.bpel.external 
  * Author:		waterman	
  */
-package org.apache.ode.action.external;
+package org.apache.ode.bpe.action.external;
 
 /**
  * Provides access to the BPE runtime repository through a URI naming

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

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/external/LocalInvokeTestAction.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/external/LocalInvokeTestAction.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/external/LocalInvokeTestAction.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/external/LocalInvokeTestAction.java Tue Feb 28 09:18:27 2006
@@ -14,7 +14,7 @@
  * limitations under the License.
 */
 
-package org.apache.ode.action.external;
+package org.apache.ode.bpe.action.external;
 
 import java.util.HashMap;
 import java.util.Properties;
@@ -24,19 +24,19 @@
 import javax.naming.InitialContext;
 import javax.rmi.PortableRemoteObject;
 
-import org.apache.ode.client.BPEClient;
-import org.apache.ode.client.DescribedValue;
-import org.apache.ode.client.IBPEClient;
-import org.apache.ode.client.IBPEMessage;
+import org.apache.ode.bpe.client.BPEClient;
+import org.apache.ode.bpe.client.DescribedValue;
+import org.apache.ode.bpe.client.IBPEClient;
+import org.apache.ode.bpe.client.IBPEMessage;
+import org.apache.ode.bpe.client.IOperation;
+import org.apache.ode.bpe.client.exceptions.BPEUserException;
+import org.apache.ode.bpe.client.formats.INativeFormat;
+import org.apache.ode.bpe.client.result.IResult;
+import org.apache.ode.bpe.client.result.ISuccessWithResponse;
+import org.apache.ode.bpe.scope.service.BPRuntimeException;
 //import org.apache.ode.client.IBPEMessagePart;
-import org.apache.ode.client.IOperation;
-import org.apache.ode.client.exceptions.BPEUserException;
-import org.apache.ode.client.formats.INativeFormat;
-import org.apache.ode.client.result.IResult;
-import org.apache.ode.client.result.ISuccessWithResponse;
-import org.apache.ode.info.PackageInfo;
-import org.apache.ode.info.PackageInfoHome;
-import org.apache.ode.scope.service.BPRuntimeException;
+import org.apache.ode.bpe.info.PackageInfo;
+import org.apache.ode.bpe.info.PackageInfoHome;
 
 /**
  * 
@@ -58,14 +58,14 @@
 	}
 
 	/**
-	 * @see org.apache.ode.action.bpel.external.IExternalAction#init(java.util.Properties)
+	 * @see org.apache.ode.bpe.action.bpel.external.IExternalAction#init(java.util.Properties)
 	 */
 	public void init(Properties props) throws BPRuntimeException {	
 		m_targetPart = props.getProperty(TARGET_PART_KEY);
 	}
 
 	/**
-	 * @see org.apache.ode.action.bpel.external.IExternalAction#execute(java.util.HashMap, java.util.HashMap, org.apache.ode.action.bpel.external.IURIResolver)
+	 * @see org.apache.ode.bpe.action.bpel.external.IExternalAction#execute(java.util.HashMap, java.util.HashMap, org.apache.ode.bpe.action.bpel.external.IURIResolver)
 	 */
 	public void execute(HashMap input, HashMap output, IURIResolver resolver)
 		throws BPRuntimeException {
@@ -105,7 +105,7 @@
 	}
 
 	/**
-	 * @see org.apache.ode.action.bpel.external.IExternalAction#release()
+	 * @see org.apache.ode.bpe.action.bpel.external.IExternalAction#release()
 	 */
 	public void release() {
 	}

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/external/NoOpAction.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/external/NoOpAction.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/external/NoOpAction.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/external/NoOpAction.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.action.external;
+package org.apache.ode.bpe.action.external;
 
 import java.util.HashMap;
 import java.util.Properties;
 
-import org.apache.ode.scope.service.BPRuntimeException;
+import org.apache.ode.bpe.scope.service.BPRuntimeException;
 
 /**
  * @author charper
@@ -37,7 +37,7 @@
     static final long serialVersionUID = 2399765581384302793L;
 
 	/* (non-Javadoc)
-	 * @see org.apache.ode.action.bpel.external.IExternalAction#init(java.util.Properties)
+	 * @see org.apache.ode.bpe.action.bpel.external.IExternalAction#init(java.util.Properties)
 	 */
 	public void init(Properties props) throws BPRuntimeException,
 			ActionSystemException {
@@ -46,7 +46,7 @@
 	}
 
 	/* (non-Javadoc)
-	 * @see org.apache.ode.action.bpel.external.IExternalAction#execute(java.util.HashMap, java.util.HashMap, org.apache.ode.action.bpel.external.IURIResolver)
+	 * @see org.apache.ode.bpe.action.bpel.external.IExternalAction#execute(java.util.HashMap, java.util.HashMap, org.apache.ode.bpe.action.bpel.external.IURIResolver)
 	 */
 	public void execute(HashMap input, HashMap output, IURIResolver resolver)
 			throws BPRuntimeException, ActionSystemException {
@@ -55,7 +55,7 @@
 	}
 
 	/* (non-Javadoc)
-	 * @see org.apache.ode.action.bpel.external.IExternalAction#release()
+	 * @see org.apache.ode.bpe.action.bpel.external.IExternalAction#release()
 	 */
 	public void release() {
 		// TODO Auto-generated method stub

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/external/OOBTestAction.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/external/OOBTestAction.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/external/OOBTestAction.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/external/OOBTestAction.java Tue Feb 28 09:18:27 2006
@@ -14,15 +14,15 @@
  * limitations under the License.
 */
 
-package org.apache.ode.action.external;
+package org.apache.ode.bpe.action.external;
 
 import java.util.HashMap;
 import java.util.Properties;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import org.apache.ode.action.bpel.ReceiveAction;
-import org.apache.ode.scope.service.BPRuntimeException;
+import org.apache.ode.bpe.action.bpel.ReceiveAction;
+import org.apache.ode.bpe.scope.service.BPRuntimeException;
 
 /**
  * 
@@ -47,7 +47,7 @@
 	}
 
 	/**
-	 * @see org.apache.ode.action.bpel.external.IExternalAction#init(java.util.Properties)
+	 * @see org.apache.ode.bpe.action.bpel.external.IExternalAction#init(java.util.Properties)
 	 */
 	public void init(Properties props) throws BPRuntimeException {
 //		m_sourcePart = props.getProperty(SOURCE_PART_KEY);
@@ -56,7 +56,7 @@
 	}
 
 	/**
-	 * @see org.apache.ode.action.bpel.external.IExternalAction#execute(java.util.HashMap, java.util.HashMap, org.apache.ode.action.bpel.external.IURIResolver)
+	 * @see org.apache.ode.bpe.action.bpel.external.IExternalAction#execute(java.util.HashMap, java.util.HashMap, org.apache.ode.bpe.action.bpel.external.IURIResolver)
 	 */
 	public void execute(HashMap input, HashMap output, IURIResolver resolver)
 		throws BPRuntimeException {
@@ -70,7 +70,7 @@
 	}
 
 	/**
-	 * @see org.apache.ode.action.bpel.external.IExternalAction#release()
+	 * @see org.apache.ode.bpe.action.bpel.external.IExternalAction#release()
 	 */
 	public void release() {
 		logger.log(Level.FINE,"Invoke - ** RELEASE ** ");

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/external/ProbeAction.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/external/ProbeAction.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/external/ProbeAction.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/external/ProbeAction.java Tue Feb 28 09:18:27 2006
@@ -16,17 +16,17 @@
 /*
  * Created on:	Nov 3, 2003
  * Project:		BPEELocal
- * Package:		org.apache.ode.action.bpel.external 
+ * Package:		org.apache.ode.bpe.action.bpel.external 
  * Author:		waterman	
  */
-package org.apache.ode.action.external;
+package org.apache.ode.bpe.action.external;
 
 import java.util.HashMap;
 import java.util.Properties;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import org.apache.ode.scope.service.BPRuntimeException;
+import org.apache.ode.bpe.scope.service.BPRuntimeException;
 
 /**
  * 
@@ -52,7 +52,7 @@
 	}
 
 	/**
-	 * @see org.apache.ode.action.bpel.external.IExternalAction#init(java.util.Properties)
+	 * @see org.apache.ode.bpe.action.bpel.external.IExternalAction#init(java.util.Properties)
 	 */
 	public void init(Properties props) throws BPRuntimeException {
 		m_sourcePart = props.getProperty(SOURCE_PART_KEY);
@@ -61,7 +61,7 @@
 	}
 
 	/**
-	 * @see org.apache.ode.action.bpel.external.IExternalAction#execute(java.util.HashMap, java.util.HashMap, org.apache.ode.action.bpel.external.IURIResolver)
+	 * @see org.apache.ode.bpe.action.bpel.external.IExternalAction#execute(java.util.HashMap, java.util.HashMap, org.apache.ode.bpe.action.bpel.external.IURIResolver)
 	 */
 	public void execute(HashMap input, HashMap output, IURIResolver resolver)
 		throws BPRuntimeException {
@@ -78,7 +78,7 @@
 	}
 
 	/**
-	 * @see org.apache.ode.action.bpel.external.IExternalAction#release()
+	 * @see org.apache.ode.bpe.action.bpel.external.IExternalAction#release()
 	 */
 	public void release() {
 		logger.log(Level.FINE,"Invoke - ** RELEASE ** ");

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/external/TestInvokeAction.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/external/TestInvokeAction.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/external/TestInvokeAction.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/external/TestInvokeAction.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.action.external;
+package org.apache.ode.bpe.action.external;
 
 import java.util.HashMap;
 import java.util.Properties;
 
-import org.apache.ode.scope.service.BPRuntimeException;
+import org.apache.ode.bpe.scope.service.BPRuntimeException;
 
 /**
  * @author charper
@@ -38,14 +38,14 @@
 
 
 	/* (non-Javadoc)
-	 * @see org.apache.ode.action.bpel.external.IExternalAction#init(java.util.Properties)
+	 * @see org.apache.ode.bpe.action.bpel.external.IExternalAction#init(java.util.Properties)
 	 */
 	public void init(Properties props) throws BPRuntimeException, ActionSystemException {
 		
 	}
 
 	/* (non-Javadoc)
-	 * @see org.apache.ode.action.bpel.external.IExternalAction#execute(java.util.HashMap, java.util.HashMap, org.apache.ode.action.bpel.external.IURIResolver)
+	 * @see org.apache.ode.bpe.action.bpel.external.IExternalAction#execute(java.util.HashMap, java.util.HashMap, org.apache.ode.bpe.action.bpel.external.IURIResolver)
 	 */
 	public void execute(HashMap input, HashMap output, IURIResolver resolver) throws BPRuntimeException, ActionSystemException {
 		output.put("newParameter2","testinvoke");
@@ -53,7 +53,7 @@
 	}
 
 	/* (non-Javadoc)
-	 * @see org.apache.ode.action.bpel.external.IExternalAction#release()
+	 * @see org.apache.ode.bpe.action.bpel.external.IExternalAction#release()
 	 */
 	public void release() {
 		// TODO Auto-generated method stub

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/external/ThrowStuffAction.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/external/ThrowStuffAction.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/external/ThrowStuffAction.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/external/ThrowStuffAction.java Tue Feb 28 09:18:27 2006
@@ -19,13 +19,13 @@
  * To change the template for this generated file go to
  * Window - Preferences - Java - Code Generation - Code and Comments
  */
-package org.apache.ode.action.external;
+package org.apache.ode.bpe.action.external;
 
 import java.util.HashMap;
 import java.util.Properties;
 
-import org.apache.ode.client.IFormattableValue;
-import org.apache.ode.scope.service.BPRuntimeException;
+import org.apache.ode.bpe.client.IFormattableValue;
+import org.apache.ode.bpe.scope.service.BPRuntimeException;
 
 /**
  * @author charper
@@ -38,7 +38,7 @@
 	static final long serialVersionUID = 746014774602572069L;
 	
 	/* (non-Javadoc)
-	 * @see org.apache.ode.action.bpel.external.IExternalAction#init(java.util.Properties)
+	 * @see org.apache.ode.bpe.action.bpel.external.IExternalAction#init(java.util.Properties)
 	 */
 	public void init(Properties props) throws BPRuntimeException, ActionSystemException {
 		// TODO Auto-generated method stub
@@ -46,7 +46,7 @@
 	}
 
 	/* (non-Javadoc)
-	 * @see org.apache.ode.action.bpel.external.IExternalAction#execute(java.util.HashMap, java.util.HashMap, org.apache.ode.action.bpel.external.IURIResolver)
+	 * @see org.apache.ode.bpe.action.bpel.external.IExternalAction#execute(java.util.HashMap, java.util.HashMap, org.apache.ode.bpe.action.bpel.external.IURIResolver)
 	 */
 	public void execute(HashMap input, HashMap output, IURIResolver resolver) throws BPRuntimeException, ActionSystemException {
 		// TODO Auto-generated method stub
@@ -63,7 +63,7 @@
 	}
 
 	/* (non-Javadoc)
-	 * @see org.apache.ode.action.bpel.external.IExternalAction#release()
+	 * @see org.apache.ode.bpe.action.bpel.external.IExternalAction#release()
 	 */
 	public void release() {
 		// TODO Auto-generated method stub

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/external/TransformerURIResolver.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/external/TransformerURIResolver.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/external/TransformerURIResolver.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/external/TransformerURIResolver.java Tue Feb 28 09:18:27 2006
@@ -16,10 +16,10 @@
 /*
  * Created on:	Oct 31, 2003
  * Project:		BPEELocal
- * Package:		org.apache.ode.action.bpel.external 
+ * Package:		org.apache.ode.bpe.action.bpel.external 
  * Author:		waterman	
  */
-package org.apache.ode.action.external;
+package org.apache.ode.bpe.action.external;
 
 import java.util.HashMap;
 
@@ -30,7 +30,7 @@
 
 import org.w3c.dom.Document;
 
-import org.apache.ode.action.internal.ActionException;
+import org.apache.ode.bpe.action.internal.ActionException;
 
 
 /**

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/external/WSHFStartAction.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/external/WSHFStartAction.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/external/WSHFStartAction.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/external/WSHFStartAction.java Tue Feb 28 09:18:27 2006
@@ -18,12 +18,12 @@
  * Author waterman
  * 
  */
-package org.apache.ode.action.external;
+package org.apache.ode.bpe.action.external;
 
 import java.util.HashMap;
 import java.util.Properties;
 
-import org.apache.ode.scope.service.BPRuntimeException;
+import org.apache.ode.bpe.scope.service.BPRuntimeException;
 
 /**
  * @author waterman
@@ -34,18 +34,18 @@
     static final long serialVersionUID = 4269994163030310022L;
     
 	/* (non-Javadoc)
-	 * @see org.apache.ode.action.bpel.external.IExternalAction#init(java.util.Properties)
+	 * @see org.apache.ode.bpe.action.bpel.external.IExternalAction#init(java.util.Properties)
 	 */
 	public void init(Properties props) throws BPRuntimeException {
 	}
 	/* (non-Javadoc)
-	 * @see org.apache.ode.action.bpel.external.IExternalAction#execute(java.util.HashMap, java.util.HashMap, org.apache.ode.action.bpel.external.IURIResolver)
+	 * @see org.apache.ode.bpe.action.bpel.external.IExternalAction#execute(java.util.HashMap, java.util.HashMap, org.apache.ode.bpe.action.bpel.external.IURIResolver)
 	 */
 	public void execute(HashMap input, HashMap output, IURIResolver resolver)
 			throws BPRuntimeException {
 	}
 	/* (non-Javadoc)
-	 * @see org.apache.ode.action.bpel.external.IExternalAction#release()
+	 * @see org.apache.ode.bpe.action.bpel.external.IExternalAction#release()
 	 */
 	public void release() {
 	}

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/external/WSIFAction.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/external/WSIFAction.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/external/WSIFAction.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/external/WSIFAction.java Tue Feb 28 09:18:27 2006
@@ -16,15 +16,15 @@
 /*
  * Created on:	Feb 12, 2004
  * Project:		BPEELocal
- * Package:		org.apache.ode.action.bpel.external 
+ * Package:		org.apache.ode.bpe.action.bpel.external 
  * Author:		waterman	
  */
-package org.apache.ode.action.external;
+package org.apache.ode.bpe.action.external;
 
 import java.util.HashMap;
 import java.util.Properties;
 
-import org.apache.ode.scope.service.BPRuntimeException;
+import org.apache.ode.bpe.scope.service.BPRuntimeException;
 
 /**
  * 
@@ -45,7 +45,7 @@
 	}
 
 	/**
-	 * @see org.apache.ode.action.bpel.external.IExternalAction#init(java.util.Properties)
+	 * @see org.apache.ode.bpe.action.bpel.external.IExternalAction#init(java.util.Properties)
 	 */
 	public void init(Properties props) throws BPRuntimeException {
 		// TODO: Auto-generated method stub
@@ -53,7 +53,7 @@
 	}
 
 	/**
-	 * @see org.apache.ode.action.bpel.external.IExternalAction#execute(java.util.HashMap, java.util.HashMap, org.apache.ode.action.bpel.external.IURIResolver)
+	 * @see org.apache.ode.bpe.action.bpel.external.IExternalAction#execute(java.util.HashMap, java.util.HashMap, org.apache.ode.bpe.action.bpel.external.IURIResolver)
 	 */
 	public void execute(HashMap input, HashMap output, IURIResolver resolver)
 		throws BPRuntimeException {
@@ -62,7 +62,7 @@
 	}
 
 	/**
-	 * @see org.apache.ode.action.bpel.external.IExternalAction#release()
+	 * @see org.apache.ode.bpe.action.bpel.external.IExternalAction#release()
 	 */
 	public void release() {
 		// TODO: Auto-generated method stub

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/external/XSLTranslatorAction.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/external/XSLTranslatorAction.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/external/XSLTranslatorAction.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/external/XSLTranslatorAction.java Tue Feb 28 09:18:27 2006
@@ -16,10 +16,10 @@
 /*
  * Created on:	Oct 31, 2003
  * Project:		BPEELocal
- * Package:		org.apache.ode.action.bpel.external 
+ * Package:		org.apache.ode.bpe.action.bpel.external 
  * Author:		waterman	
  */
-package org.apache.ode.action.external;
+package org.apache.ode.bpe.action.external;
 
 import java.io.ByteArrayOutputStream;
 import java.io.StringReader;
@@ -34,7 +34,7 @@
 import javax.xml.transform.stream.StreamResult;
 import javax.xml.transform.stream.StreamSource;
 
-import org.apache.ode.scope.service.BPRuntimeException;
+import org.apache.ode.bpe.scope.service.BPRuntimeException;
 
 
 /**
@@ -67,7 +67,7 @@
 	}
 
 	/**
-	 * @see org.apache.ode.action.bpel.external.IExternalAction#init(java.util.Properties, org.apache.ode.action.bpel.external.IURIResolver)
+	 * @see org.apache.ode.bpe.action.bpel.external.IExternalAction#init(java.util.Properties, org.apache.ode.bpe.action.bpel.external.IURIResolver)
 	 */
 	public void init(Properties props)
 		throws BPRuntimeException {
@@ -79,7 +79,7 @@
 	}
 
 	/**
-	 * @see org.apache.ode.action.bpel.external.IExternalAction#execute(java.util.HashMap)
+	 * @see org.apache.ode.bpe.action.bpel.external.IExternalAction#execute(java.util.HashMap)
 	 */
 	public void execute(HashMap input, HashMap output, IURIResolver resolver) throws BPRuntimeException {
 		
@@ -128,7 +128,7 @@
 	}
 
 	/**
-	 * @see org.apache.ode.action.bpel.external.IExternalAction#release()
+	 * @see org.apache.ode.bpe.action.bpel.external.IExternalAction#release()
 	 */
 	public void release() {
 		m_transformer = null;

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/internal/ActionException.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/internal/ActionException.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/internal/ActionException.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/internal/ActionException.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.action.internal;
+package org.apache.ode.bpe.action.internal;
 
-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/action/internal/ActionFactory.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/internal/ActionFactory.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/internal/ActionFactory.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/internal/ActionFactory.java Tue Feb 28 09:18:27 2006
@@ -19,15 +19,15 @@
  * Purpose: Defines the Class ActionFactory
  ***********************************************************************/
 
-package org.apache.ode.action.internal;
+package org.apache.ode.bpe.action.internal;
 
 import java.util.Properties;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import org.apache.ode.action.bpel.ExternalServiceAction;
-import org.apache.ode.definition.IPMDAction;
-import org.apache.ode.util.BPException;
+import org.apache.ode.bpe.action.bpel.ExternalServiceAction;
+import org.apache.ode.bpe.definition.IPMDAction;
+import org.apache.ode.bpe.util.BPException;
 
 
 /** The factory will instantiate Action implementations. 

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/internal/IInternalAction.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/internal/IInternalAction.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/internal/IInternalAction.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/internal/IInternalAction.java Tue Feb 28 09:18:27 2006
@@ -19,14 +19,14 @@
  * Purpose: Defines the Interface Action
  ***********************************************************************/
 
-package org.apache.ode.action.internal;
+package org.apache.ode.bpe.action.internal;
 
-import org.apache.ode.context.resolver.ContextResolver;
-import org.apache.ode.definition.IPMDProcess;
-import org.apache.ode.engine.IEvaluationContext;
-import org.apache.ode.engine.IProcessCallBack;
-import org.apache.ode.instance.IPMIProcess;
-import org.apache.ode.util.BPException;
+import org.apache.ode.bpe.context.resolver.ContextResolver;
+import org.apache.ode.bpe.definition.IPMDProcess;
+import org.apache.ode.bpe.engine.IEvaluationContext;
+import org.apache.ode.bpe.engine.IProcessCallBack;
+import org.apache.ode.bpe.instance.IPMIProcess;
+import org.apache.ode.bpe.util.BPException;
 
 /** The action interface defines a method invocation interface. The business process algorithm will invoke executable code through this interface. 
   * <P>

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/param/ActionParamFactory.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/param/ActionParamFactory.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/param/ActionParamFactory.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/param/ActionParamFactory.java Tue Feb 28 09:18:27 2006
@@ -19,9 +19,9 @@
  * Package:		com.sybase.action.param 
  * Author:		waterman	
  */
-package org.apache.ode.action.param;
+package org.apache.ode.bpe.action.param;
 
-import org.apache.ode.context.resolver.ContextResolvedObject;
+import org.apache.ode.bpe.context.resolver.ContextResolvedObject;
 
 /**
  * 

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/param/GenericActionParam.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/param/GenericActionParam.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/param/GenericActionParam.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/param/GenericActionParam.java Tue Feb 28 09:18:27 2006
@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
 */
-package org.apache.ode.action.param;
+package org.apache.ode.bpe.action.param;
 
-import org.apache.ode.action.internal.ActionException;
-import org.apache.ode.context.resolver.ContextResolvedObject;
-import org.apache.ode.interaction.IInteraction;
-import org.apache.ode.interaction.IObjectAccessible;
-import org.apache.ode.interaction.IObjectMutable;
+import org.apache.ode.bpe.action.internal.ActionException;
+import org.apache.ode.bpe.context.resolver.ContextResolvedObject;
+import org.apache.ode.bpe.interaction.IInteraction;
+import org.apache.ode.bpe.interaction.IObjectAccessible;
+import org.apache.ode.bpe.interaction.IObjectMutable;
 
 public class GenericActionParam implements IActionParam
 {

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/param/IActionParam.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/param/IActionParam.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/param/IActionParam.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/action/param/IActionParam.java Tue Feb 28 09:18:27 2006
@@ -19,10 +19,10 @@
  * Package:		com.sybase.action.param 
  * Author:		waterman	
  */
-package org.apache.ode.action.param;
+package org.apache.ode.bpe.action.param;
 
-import org.apache.ode.action.internal.ActionException;
-import org.apache.ode.interaction.IInteraction;
+import org.apache.ode.bpe.action.internal.ActionException;
+import org.apache.ode.bpe.interaction.IInteraction;
 
 /**
  * 

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/bped/DeployTypeEnum.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/bped/DeployTypeEnum.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/bped/DeployTypeEnum.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/bped/DeployTypeEnum.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.bped;
+package org.apache.ode.bpe.bped;
 
 /**
  * Enumeration of deploy types. 

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/bped/EventContext.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/bped/EventContext.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/bped/EventContext.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/bped/EventContext.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.bped;
-import org.apache.ode.engine.ReturnMessageLocatorHolder;
-import org.apache.ode.event.IRequestMessageEvent;
+package org.apache.ode.bpe.bped;
+import org.apache.ode.bpe.engine.ReturnMessageLocatorHolder;
+import org.apache.ode.bpe.event.IRequestMessageEvent;
 
 /**
  * @author blorenz

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/bped/EventDirector.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/bped/EventDirector.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/bped/EventDirector.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/bped/EventDirector.java Tue Feb 28 09:18:27 2006
@@ -16,9 +16,9 @@
 /*
  * Created on Aug 13, 2003
  */
-package org.apache.ode.bped;
+package org.apache.ode.bpe.bped;
 
-import org.apache.ode.client.impl.IInternalRequestConsumer;
+import org.apache.ode.bpe.client.impl.IInternalRequestConsumer;
 
 /**
  * Message router interface.
@@ -39,8 +39,8 @@
 	 * Get a defintion deployer.
 	 * @param type the type of deployer to get 
 	 * @return a deployer
-	 * @see org.apache.ode.bped.IDeployer
-	 * @see org.apache.ode.bped.DeployTypeEnum
+	 * @see org.apache.ode.bpe.bped.IDeployer
+	 * @see org.apache.ode.bpe.bped.DeployTypeEnum
 	 */
 	IDeployer getDeployer(DeployTypeEnum type);
 

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/bped/EventDirectorException.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/bped/EventDirectorException.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/bped/EventDirectorException.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/bped/EventDirectorException.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.bped;
+package org.apache.ode.bpe.bped;
 
-import org.apache.ode.util.BPException;
+import org.apache.ode.bpe.util.BPException;
 
 /**
  * Exception class for the EventDirector.

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/bped/EventDirectorFactory.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/bped/EventDirectorFactory.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/bped/EventDirectorFactory.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/bped/EventDirectorFactory.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.bped;
+package org.apache.ode.bpe.bped;
 import java.io.IOException;
 import java.rmi.RemoteException;
 import java.util.logging.Level;
@@ -24,25 +24,25 @@
 import javax.naming.NamingException;
 import javax.rmi.PortableRemoteObject;
 
-import org.apache.ode.bped.managed.BPEventDirectorLocal;
-import org.apache.ode.bped.managed.BPEventDirectorLocalHome;
-import org.apache.ode.bped.managed.BPEventDirector;
-import org.apache.ode.bped.managed.BPEventDirectorHome;
-import org.apache.ode.bped.managed.EventDirectorLocal;
-import org.apache.ode.bped.managed.EventDirectorRemote;
-import org.apache.ode.correlation.CorrelationService;
-import org.apache.ode.correlation.CorrelationServiceFactory;
-import org.apache.ode.definition.service.managed.ProcessDefinition;
-import org.apache.ode.definition.service.managed.ProcessDefinitionHome;
-import org.apache.ode.engine.ProcessService;
-import org.apache.ode.enginestate.service.EngineStateFactory;
-import org.apache.ode.inmemory.jndi.IMContext;
-import org.apache.ode.util.BPEProperties;
-import org.apache.ode.util.BPException;
-import org.apache.ode.uuid.UUIDService;
-import org.apache.ode.uuid.UUIDServiceFactory;
-import org.apache.ode.locking.LockingService;
-import org.apache.ode.locking.LockingServiceFactory;
+import org.apache.ode.bpe.bped.managed.EventDirectorLocal;
+import org.apache.ode.bpe.bped.managed.EventDirectorRemote;
+import org.apache.ode.bpe.correlation.CorrelationService;
+import org.apache.ode.bpe.correlation.CorrelationServiceFactory;
+import org.apache.ode.bpe.engine.ProcessService;
+import org.apache.ode.bpe.enginestate.service.EngineStateFactory;
+import org.apache.ode.bpe.inmemory.jndi.IMContext;
+import org.apache.ode.bpe.locking.LockingService;
+import org.apache.ode.bpe.locking.LockingServiceFactory;
+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.UUIDServiceFactory;
+import org.apache.ode.bpe.bped.managed.BPEventDirectorLocal;
+import org.apache.ode.bpe.bped.managed.BPEventDirectorLocalHome;
+import org.apache.ode.bpe.bped.managed.BPEventDirector;
+import org.apache.ode.bpe.bped.managed.BPEventDirectorHome;
+import org.apache.ode.bpe.definition.service.managed.ProcessDefinition;
+import org.apache.ode.bpe.definition.service.managed.ProcessDefinitionHome;
 /**
  * Factory for Event Director's
  * 
@@ -54,7 +54,7 @@
 	public static final String IM_ENGINE_PROPERTY_FILE_NAME = "odeEngine.properties";
 	public static final String JNFI = "java.naming.factory.initial";
 	public static final String IMJNFI =
-		"org.apache.ode.inmemory.jndi.IMContextFactory";
+		"org.apache.ode.bpe.inmemory.jndi.IMContextFactory";
 	private static Logger logger = Logger.getLogger(EventDirectorFactory.class
 			.getName());
 	private static UUIDService us;

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/bped/EventDirectorUtil.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/bped/EventDirectorUtil.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/bped/EventDirectorUtil.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/bped/EventDirectorUtil.java Tue Feb 28 09:18:27 2006
@@ -13,27 +13,27 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
 */
-package org.apache.ode.bped;
+package org.apache.ode.bpe.bped;
 
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import org.apache.ode.correlation.CorrelationService;
-import org.apache.ode.definition.IPMDProcess;
-import org.apache.ode.definition.service.DefinitionService;
-import org.apache.ode.engine.ProcessDefinitionKey;
-import org.apache.ode.engine.ProcessInstance;
-import org.apache.ode.engine.ProcessService;
-import org.apache.ode.engine.StateEnum;
-import org.apache.ode.event.ITimerEvent;
-import org.apache.ode.event.LoadDefinitionEvent;
-import org.apache.ode.event.StateEvent;
-import org.apache.ode.instance.IPMIProcess;
-import org.apache.ode.instance.service.InstanceService;
-import org.apache.ode.scope.service.IFCScopeInstance;
-import org.apache.ode.scope.service.IScopeService;
-import org.apache.ode.timerservice.IBPETimer;
-import org.apache.ode.util.BPException;
+import org.apache.ode.bpe.correlation.CorrelationService;
+import org.apache.ode.bpe.definition.IPMDProcess;
+import org.apache.ode.bpe.definition.service.DefinitionService;
+import org.apache.ode.bpe.engine.ProcessDefinitionKey;
+import org.apache.ode.bpe.engine.ProcessInstance;
+import org.apache.ode.bpe.engine.ProcessService;
+import org.apache.ode.bpe.engine.StateEnum;
+import org.apache.ode.bpe.event.ITimerEvent;
+import org.apache.ode.bpe.event.LoadDefinitionEvent;
+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.scope.service.IFCScopeInstance;
+import org.apache.ode.bpe.scope.service.IScopeService;
+import org.apache.ode.bpe.timerservice.IBPETimer;
+import org.apache.ode.bpe.util.BPException;
 
 /**
  * Utilities for EventDirectors

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/bped/ExternalEventDirectorBase.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/bped/ExternalEventDirectorBase.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/bped/ExternalEventDirectorBase.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/bped/ExternalEventDirectorBase.java Tue Feb 28 09:18:27 2006
@@ -14,20 +14,20 @@
  * limitations under the License.
 */
 
-package org.apache.ode.bped;
+package org.apache.ode.bpe.bped;
 
-import org.apache.ode.client.impl.IInternalMessage;
-import org.apache.ode.client.impl.IInternalResult;
-import org.apache.ode.client.impl.MessageConverter;
-import org.apache.ode.client.impl.def.InternalResult;
-import org.apache.ode.engine.InactiveDefinitionException;
-import org.apache.ode.engine.ProcessInstancePausedException;
-import org.apache.ode.event.IRequestMessageEvent;
-import org.apache.ode.event.IResponseMessage;
-import org.apache.ode.event.IStaticKey;
-import org.apache.ode.event.StateEvent;
-import org.apache.ode.scope.service.BPRuntimeException;
-import org.apache.ode.util.BPException;
+import org.apache.ode.bpe.client.impl.IInternalMessage;
+import org.apache.ode.bpe.client.impl.IInternalResult;
+import org.apache.ode.bpe.client.impl.MessageConverter;
+import org.apache.ode.bpe.client.impl.def.InternalResult;
+import org.apache.ode.bpe.engine.InactiveDefinitionException;
+import org.apache.ode.bpe.engine.ProcessInstancePausedException;
+import org.apache.ode.bpe.event.IRequestMessageEvent;
+import org.apache.ode.bpe.event.IResponseMessage;
+import org.apache.ode.bpe.event.IStaticKey;
+import org.apache.ode.bpe.event.StateEvent;
+import org.apache.ode.bpe.scope.service.BPRuntimeException;
+import org.apache.ode.bpe.util.BPException;
 
 /**
  * Serves as an implementation base class for 
@@ -95,7 +95,7 @@
 	}
 
 	/* (non-Javadoc)
-	 * @see org.apache.ode.bped.ISendEvent#sendEvent(org.apache.ode.event.StateEvent, boolean)
+	 * @see org.apache.ode.bpe.bped.ISendEvent#sendEvent(org.apache.ode.bpe.event.StateEvent, boolean)
 	 */
 	public void sendEvent(StateEvent me, boolean sync) throws BPException {
 		// TODO Auto-generated method stub

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/bped/IDeployer.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/bped/IDeployer.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/bped/IDeployer.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/bped/IDeployer.java Tue Feb 28 09:18:27 2006
@@ -17,12 +17,12 @@
  * Created on Aug 13, 2003
  *
  */
-package org.apache.ode.bped;
+package org.apache.ode.bpe.bped;
 
 import java.io.InputStream;
 import java.util.Collection;
 
-import org.apache.ode.util.BPException;
+import org.apache.ode.bpe.util.BPException;
 
 /**
  * Interface to definition services.
@@ -36,7 +36,7 @@
 	 * @param is input stream for the defintion; a zip file that holds the BPEL definiton and supporting documents
 	 * @param validating if the defintion is to be validated
 	 * @return a Collection of DefinitionKeys
-	 * @see org.apache.ode.deployment.DefinitionKey
+	 * @see org.apache.ode.bpe.deployment.DefinitionKey
 	 */
 	public Collection loadDefinition(InputStream is, boolean validating) throws BPException;
 	
@@ -45,7 +45,7 @@
 	 * @param resource resrouce path the the bpel deploy file
 	 * @param validating if the defintion is to be validated
 	 * @return a Collection of DefinitionKeys
-	 * @see org.apache.ode.deployment.DefinitionKey
+	 * @see org.apache.ode.bpe.deployment.DefinitionKey
 	 */
 	public Collection loadDefinition(String resource, boolean validating) throws BPException;