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 [12/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/locking/DBLockingService.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/locking/DBLockingService.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/locking/DBLockingService.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/locking/DBLockingService.java Tue Feb 28 09:18:27 2006
@@ -14,7 +14,7 @@
  * limitations under the License.
 */
 
-package org.apache.ode.locking;
+package org.apache.ode.bpe.locking;
 
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -27,7 +27,7 @@
 import java.sql.SQLException;
 import java.sql.ResultSet;
 
-import org.apache.ode.util.BPEProperties;
+import org.apache.ode.bpe.util.BPEProperties;
 
 /**
  *
@@ -52,7 +52,7 @@
 		Logger.getLogger(DBLockingService.class.getName());
 		
 	/* (non-Javadoc)
-	 * @see org.apache.ode.locking.LockingService#lock()
+	 * @see org.apache.ode.bpe.locking.LockingService#lock()
 	 */
 	public void lock(String aKey) {
 		int hashCode = aKey.hashCode() % 1000;
@@ -60,7 +60,7 @@
 	}
 
 	/* (non-Javadoc)
-	 * @see org.apache.ode.locking.LockingService#init(org.apache.ode.util.BPEProperties)
+	 * @see org.apache.ode.bpe.locking.LockingService#init(org.apache.ode.bpe.util.BPEProperties)
 	 */
 	public void init(BPEProperties props) {
 		

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/locking/IMLockingService.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/locking/IMLockingService.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/locking/IMLockingService.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/locking/IMLockingService.java Tue Feb 28 09:18:27 2006
@@ -14,11 +14,11 @@
  * limitations under the License.
 */
 
-package org.apache.ode.locking;
+package org.apache.ode.bpe.locking;
 
 //import java.util.logging.Logger;
 
-import org.apache.ode.util.BPEProperties;
+import org.apache.ode.bpe.util.BPEProperties;
 
 /**
  *
@@ -35,7 +35,7 @@
 //		Logger.getLogger(IMLockingService.class.getName());
 		
 	/* (non-Javadoc)
-	 * @see org.apache.ode.locking.LockingService#lock()
+	 * @see org.apache.ode.bpe.locking.LockingService#lock()
 	 */
 	public void lock(String aKey) {
 
@@ -44,7 +44,7 @@
 	}
 
 	/* (non-Javadoc)
-	 * @see org.apache.ode.locking.LockingService#init(org.apache.ode.util.BPEProperties)
+	 * @see org.apache.ode.bpe.locking.LockingService#init(org.apache.ode.bpe.util.BPEProperties)
 	 */
 	public void init(BPEProperties props) {
 

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

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

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

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

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

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/pool/ObjPoolObject.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/pool/ObjPoolObject.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/pool/ObjPoolObject.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/pool/ObjPoolObject.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.pool;
+package org.apache.ode.bpe.pool;
 
 /**
  * An object that's to be used within the context

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/pool/PoolException.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/pool/PoolException.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/pool/PoolException.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/pool/PoolException.java Tue Feb 28 09:18:27 2006
@@ -17,9 +17,9 @@
  * Created on Apr 25, 2003
  *
  */
-package org.apache.ode.pool;
+package org.apache.ode.bpe.pool;
 
-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/pool/SimpleObjPool.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/pool/SimpleObjPool.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/pool/SimpleObjPool.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/pool/SimpleObjPool.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.pool;
+package org.apache.ode.bpe.pool;
 
 import java.util.ArrayList;
 import java.util.List;

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/scope/service/BPRuntimeException.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/scope/service/BPRuntimeException.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/scope/service/BPRuntimeException.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/scope/service/BPRuntimeException.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.scope.service;
+package org.apache.ode.bpe.scope.service;
 
 import java.util.HashMap;
 
-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/scope/service/IFCScopeInstance.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/scope/service/IFCScopeInstance.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/scope/service/IFCScopeInstance.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/scope/service/IFCScopeInstance.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.scope.service;
+package org.apache.ode.bpe.scope.service;
 
 import java.util.List;
 
-import org.apache.ode.action.bpel.TimerAction;
-import org.apache.ode.context.resolver.ContextResolver;
-import org.apache.ode.correlation.Registration;
-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.timerservice.IBPETimer;
-import org.apache.ode.util.BPException;
+import org.apache.ode.bpe.action.bpel.TimerAction;
+import org.apache.ode.bpe.context.resolver.ContextResolver;
+import org.apache.ode.bpe.correlation.Registration;
+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.timerservice.IBPETimer;
+import org.apache.ode.bpe.util.BPException;
 
 /**
  * This is a scope instance which is stored in the scope

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/scope/service/IScopeService.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/scope/service/IScopeService.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/scope/service/IScopeService.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/scope/service/IScopeService.java Tue Feb 28 09:18:27 2006
@@ -14,13 +14,13 @@
  * limitations under the License.
 */
 
-package org.apache.ode.scope.service;
+package org.apache.ode.bpe.scope.service;
 
-import org.apache.ode.context.IContextService;
-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.IContextService;
+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;
 
 /**
  * Service which manages scope instances.

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/scope/service/ScopePath.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/scope/service/ScopePath.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/scope/service/ScopePath.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/scope/service/ScopePath.java Tue Feb 28 09:18:27 2006
@@ -14,7 +14,7 @@
  * limitations under the License.
 */
 
-package org.apache.ode.scope.service;
+package org.apache.ode.bpe.scope.service;
 
 import java.io.Serializable;
 import java.util.ArrayList;

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/scope/service/ScopeServiceException.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/scope/service/ScopeServiceException.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/scope/service/ScopeServiceException.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/scope/service/ScopeServiceException.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.scope.service;
+package org.apache.ode.bpe.scope.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/scope/service/ScopeServiceFactory.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/scope/service/ScopeServiceFactory.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/scope/service/ScopeServiceFactory.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/scope/service/ScopeServiceFactory.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.scope.service;
+package org.apache.ode.bpe.scope.service;
 
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import org.apache.ode.context.IContextService;
-import org.apache.ode.util.BPEProperties;
-import org.apache.ode.util.BPException;
+import org.apache.ode.bpe.context.IContextService;
+import org.apache.ode.bpe.util.BPEProperties;
+import org.apache.ode.bpe.util.BPException;
 
 /** Creates a ScopeService implementation from a set of properties.
   * <P>

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/scope/service/impl/FCScopeInstanceImpl.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/scope/service/impl/FCScopeInstanceImpl.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/scope/service/impl/FCScopeInstanceImpl.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/scope/service/impl/FCScopeInstanceImpl.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.scope.service.impl;
+package org.apache.ode.bpe.scope.service.impl;
 
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -25,32 +25,32 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import org.apache.ode.action.bpel.TimerAction;
-import org.apache.ode.context.IContainer;
-import org.apache.ode.context.IContextService;
-import org.apache.ode.context.IPart;
-import org.apache.ode.context.resolver.ContextResolvedObject;
-import org.apache.ode.context.resolver.ContextResolver;
-import org.apache.ode.correlation.CorrelationService;
-import org.apache.ode.correlation.Registration;
-import org.apache.ode.definition.IPMDLocator;
-import org.apache.ode.definition.IPMDProcess;
-import org.apache.ode.engine.IEvaluationContext;
-import org.apache.ode.engine.IProcessCallBack;
-import org.apache.ode.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.instance.service.InstanceService;
-import org.apache.ode.lang.ResourceGetter;
-import org.apache.ode.scope.service.BPRuntimeException;
-import org.apache.ode.scope.service.IFCScopeInstance;
-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.bpel.TimerAction;
+import org.apache.ode.bpe.context.IContainer;
+import org.apache.ode.bpe.context.IContextService;
+import org.apache.ode.bpe.context.IPart;
+import org.apache.ode.bpe.context.resolver.ContextResolvedObject;
+import org.apache.ode.bpe.context.resolver.ContextResolver;
+import org.apache.ode.bpe.correlation.CorrelationService;
+import org.apache.ode.bpe.correlation.Registration;
+import org.apache.ode.bpe.definition.IPMDLocator;
+import org.apache.ode.bpe.definition.IPMDProcess;
+import org.apache.ode.bpe.engine.IEvaluationContext;
+import org.apache.ode.bpe.engine.IProcessCallBack;
+import org.apache.ode.bpe.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.instance.service.InstanceService;
+import org.apache.ode.bpe.lang.ResourceGetter;
+import org.apache.ode.bpe.scope.service.BPRuntimeException;
+import org.apache.ode.bpe.scope.service.IFCScopeInstance;
+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;
 
 /**
  *
@@ -158,7 +158,7 @@
 	
 
 	/* (non-Javadoc)
-	 * @see org.apache.ode.scope.service.IFCScopeInstance#createScope(java.lang.String, java.lang.String)
+	 * @see org.apache.ode.bpe.scope.service.IFCScopeInstance#createScope(java.lang.String, java.lang.String)
 	 */
 	public IFCScopeInstance createScope(String newScopeName, String newScopeId, String ctxId) throws BPException {
 		if ( logger.isLoggable(Level.FINE)) {
@@ -170,7 +170,7 @@
 	
 
 	/* (non-Javadoc)
-	 * @see org.apache.ode.scope.service.IFCScopeInstance#addFaultHandler(java.lang.String, java.lang.String, java.lang.String)
+	 * @see org.apache.ode.bpe.scope.service.IFCScopeInstance#addFaultHandler(java.lang.String, java.lang.String, java.lang.String)
 	 */
 	public void addFaultHandler(String faultName, String faultType,
 			String defintionId) throws BPException {
@@ -192,14 +192,14 @@
 	}
 
 	/* (non-Javadoc)
-	 * @see org.apache.ode.scope.service.IFCScopeInstance#setFaultHandlerObserver(java.lang.String, org.apache.ode.context.resolver.ContextResolver, org.apache.ode.engine.IEvaluationContext)
+	 * @see org.apache.ode.bpe.scope.service.IFCScopeInstance#setFaultHandlerObserver(java.lang.String, org.apache.ode.bpe.context.resolver.ContextResolver, org.apache.ode.bpe.engine.IEvaluationContext)
 	 */
 	public void setFaultHandlerObserver(String defintionId) throws BPException {
 		faultObserver = defintionId;
 	}
 
 	/* (non-Javadoc)
-	 * @see org.apache.ode.scope.service.IFCScopeInstance#setCompensationHandler(java.lang.String, org.apache.ode.context.resolver.ContextResolver, org.apache.ode.engine.IEvaluationContext)
+	 * @see org.apache.ode.bpe.scope.service.IFCScopeInstance#setCompensationHandler(java.lang.String, org.apache.ode.bpe.context.resolver.ContextResolver, org.apache.ode.bpe.engine.IEvaluationContext)
 	 */
 	public void setCompensationHandler(String defintionId, List locators,
 			ContextResolver resolver, String ctxId ) throws BPException {
@@ -244,7 +244,7 @@
 	}
 
 	/* (non-Javadoc)
-	 * @see org.apache.ode.scope.service.IFCScopeInstance#setInactive()
+	 * @see org.apache.ode.bpe.scope.service.IFCScopeInstance#setInactive()
 	 */
 	public void setInactive(IPMIProcess proc, 
 			IEvaluationContext ec, IProcessCallBack pcb) throws BPException {
@@ -266,28 +266,28 @@
 	}
 
 	/* (non-Javadoc)
-	 * @see org.apache.ode.scope.service.IFCScopeInstance#isActive()
+	 * @see org.apache.ode.bpe.scope.service.IFCScopeInstance#isActive()
 	 */
 	public boolean isActive() {
 		return active;
 	}
 
 	/* (non-Javadoc)
-	 * @see org.apache.ode.scope.service.IFCScopeInstance#isFaulted()
+	 * @see org.apache.ode.bpe.scope.service.IFCScopeInstance#isFaulted()
 	 */
 	public boolean isFaulted() {
 		return faulted;
 	}
 
 	/* (non-Javadoc)
-	 * @see org.apache.ode.scope.service.IFCScopeInstance#isCompensated()
+	 * @see org.apache.ode.bpe.scope.service.IFCScopeInstance#isCompensated()
 	 */
 	public boolean isCompensated() {
 		return compensated;
 	}
 
 	/* (non-Javadoc)
-	 * @see org.apache.ode.scope.service.IFCScopeInstance#addRegistration(org.apache.ode.correlation.Registration)
+	 * @see org.apache.ode.bpe.scope.service.IFCScopeInstance#addRegistration(org.apache.ode.bpe.correlation.Registration)
 	 */
 	public void addRegistration(Registration registration) {
 		if ( logger.isLoggable(Level.FINE)) {
@@ -298,7 +298,7 @@
 	}
 
 	/* (non-Javadoc)
-	 * @see org.apache.ode.scope.service.IFCScopeInstance#addTimer(org.apache.ode.timerservice.IBPETimer)
+	 * @see org.apache.ode.bpe.scope.service.IFCScopeInstance#addTimer(org.apache.ode.bpe.timerservice.IBPETimer)
 	 */
 	public void addTimer(IBPETimer timer) {
 		if ( logger.isLoggable(Level.FINE)) {
@@ -310,7 +310,7 @@
 	}
 
 	/* (non-Javadoc)
-	 * @see org.apache.ode.scope.service.IFCScopeInstance#getScopePath()
+	 * @see org.apache.ode.bpe.scope.service.IFCScopeInstance#getScopePath()
 	 */
 	public ScopePath getScopePath() {
 		return scopePath;
@@ -410,7 +410,7 @@
 	}
 
 	/* (non-Javadoc)
-	 * @see org.apache.ode.scope.service.IFCScopeInstance#handleFault(org.apache.ode.scope.service.BPRuntimeException, org.apache.ode.engine.IEvaluationContext)
+	 * @see org.apache.ode.bpe.scope.service.IFCScopeInstance#handleFault(org.apache.ode.bpe.scope.service.BPRuntimeException, org.apache.ode.bpe.engine.IEvaluationContext)
 	 */
 	public void handleFault(Throwable exception, IPMIProcess proc, 
 			IEvaluationContext ec, IProcessCallBack pcb)
@@ -606,7 +606,7 @@
 	}
 
 	/* (non-Javadoc)
-	 * @see org.apache.ode.scope.service.IFCScopeInstance#terminate(org.apache.ode.engine.IEvaluationContext)
+	 * @see org.apache.ode.bpe.scope.service.IFCScopeInstance#terminate(org.apache.ode.bpe.engine.IEvaluationContext)
 	 */
 	public void terminate(IPMIProcess proc, 
 			IEvaluationContext ec, IProcessCallBack pcb) throws BPException {
@@ -649,7 +649,7 @@
 	}
 
 	/* (non-Javadoc)
-	 * @see org.apache.ode.scope.service.IFCScopeInstance#compensate(org.apache.ode.engine.IEvaluationContext)
+	 * @see org.apache.ode.bpe.scope.service.IFCScopeInstance#compensate(org.apache.ode.bpe.engine.IEvaluationContext)
 	 */
 	public void compensate(IPMIProcess proc, 
 			IEvaluationContext ec, IProcessCallBack pcb) throws BPException {
@@ -706,7 +706,7 @@
 	}
 
 	/* (non-Javadoc)
-	 * @see org.apache.ode.scope.service.IFCScopeInstance#removeRegistration(org.apache.ode.correlation.Registration)
+	 * @see org.apache.ode.bpe.scope.service.IFCScopeInstance#removeRegistration(org.apache.ode.bpe.correlation.Registration)
 	 */
 	public void removeRegistration(Registration registration) {
 		if ( logger.isLoggable(Level.FINE)) {
@@ -718,7 +718,7 @@
 	}
 
 	/* (non-Javadoc)
-	 * @see org.apache.ode.scope.service.IFCScopeInstance#removeTimer(org.apache.ode.timerservice.IBPETimer)
+	 * @see org.apache.ode.bpe.scope.service.IFCScopeInstance#removeTimer(org.apache.ode.bpe.timerservice.IBPETimer)
 	 */
 	public void removeTimer(IBPETimer timer) {
 		if ( logger.isLoggable(Level.FINE)) {
@@ -730,7 +730,7 @@
 	}
 
 	/* (non-Javadoc)
-	 * @see org.apache.ode.scope.service.IFCScopeInstance#addProcess(org.apache.ode.instance.service.IPMIProcess)
+	 * @see org.apache.ode.bpe.scope.service.IFCScopeInstance#addProcess(org.apache.ode.bpe.instance.service.IPMIProcess)
 	 */
 	public void addProcess(IPMIProcess proc) {
 		procs.add(proc);
@@ -745,7 +745,7 @@
 	}
 
 	/* (non-Javadoc)
-	 * @see org.apache.ode.scope.service.IFCScopeInstance#setTimerAction(org.apache.ode.action.bpel.TimerAction, 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.scope.service.IFCScopeInstance#setTimerAction(org.apache.ode.bpe.action.bpel.TimerAction, 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 void setTimerAction(TimerAction act, ContextResolver resolver ) {
 		this.act = act;
@@ -753,7 +753,7 @@
 	}
 
 	/* (non-Javadoc)
-	 * @see org.apache.ode.scope.service.IFCScopeInstance#executeTimerAction()
+	 * @see org.apache.ode.bpe.scope.service.IFCScopeInstance#executeTimerAction()
 	 */
 	public void executeTimerAction(IEvaluationContext ec, 
 			IProcessCallBack pcb, IPMIProcess processInstance, IPMDProcess processDefinition) throws BPException {

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/scope/service/impl/ScopeServiceImpl.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/scope/service/impl/ScopeServiceImpl.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/scope/service/impl/ScopeServiceImpl.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/scope/service/impl/ScopeServiceImpl.java Tue Feb 28 09:18:27 2006
@@ -14,23 +14,23 @@
  * limitations under the License.
 */
 
-package org.apache.ode.scope.service.impl;
+package org.apache.ode.bpe.scope.service.impl;
 
 import java.util.Iterator;
 import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import org.apache.ode.context.IContainer;
-import org.apache.ode.context.IContextService;
-import org.apache.ode.context.IPart;
-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.context.IContainer;
+import org.apache.ode.bpe.context.IContextService;
+import org.apache.ode.bpe.context.IPart;
+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;
 
 /**
  * 
@@ -45,7 +45,7 @@
 	
 
 	/* (non-Javadoc)
-	 * @see org.apache.ode.scope.service.IScopeService#init(org.apache.ode.context.IContextService)
+	 * @see org.apache.ode.bpe.scope.service.IScopeService#init(org.apache.ode.bpe.context.IContextService)
 	 */
 	public void init(IContextService cs, String ctxId) throws BPException {
 //		this.cs = cs;
@@ -66,14 +66,14 @@
 	}
 
 	/* (non-Javadoc)
-	 * @see org.apache.ode.scope.service.IScopeService#getStcope(java.lang.String)
+	 * @see org.apache.ode.bpe.scope.service.IScopeService#getStcope(java.lang.String)
 	 */
 	public IFCScopeInstance getScope(ScopePath scopePath) throws BPException {
 		return rootScope.getScope(scopePath);
 	}
 
 	/* (non-Javadoc)
-	 * @see org.apache.ode.scope.service.IScopeService#compensate(java.lang.String)
+	 * @see org.apache.ode.bpe.scope.service.IScopeService#compensate(java.lang.String)
 	 */
 	public void compensate(String scopeName, IPMIProcess proc, 
 			IEvaluationContext ec, IProcessCallBack pcb) throws BPException {
@@ -109,7 +109,7 @@
 	}
 
 	/* (non-Javadoc)
-	 * @see org.apache.ode.scope.service.IScopeService#getRootScope()
+	 * @see org.apache.ode.bpe.scope.service.IScopeService#getRootScope()
 	 */
 	public IFCScopeInstance getRootScope() throws BPException {
 		return rootScope;

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/timerservice/BPETimerServiceFactory.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/timerservice/BPETimerServiceFactory.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/timerservice/BPETimerServiceFactory.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/timerservice/BPETimerServiceFactory.java Tue Feb 28 09:18:27 2006
@@ -14,16 +14,16 @@
  * limitations under the License.
 */
 
-package org.apache.ode.timerservice;
+package org.apache.ode.bpe.timerservice;
 
 import java.io.IOException;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import org.apache.ode.bped.EventDirectorFactory;
-import org.apache.ode.inmemory.jndi.IMContext;
-import org.apache.ode.util.BPEProperties;
-import org.apache.ode.util.BPException;
+import org.apache.ode.bpe.bped.EventDirectorFactory;
+import org.apache.ode.bpe.inmemory.jndi.IMContext;
+import org.apache.ode.bpe.util.BPEProperties;
+import org.apache.ode.bpe.util.BPException;
 
 public class BPETimerServiceFactory {
 	

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/timerservice/IBPETimer.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/timerservice/IBPETimer.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/timerservice/IBPETimer.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/timerservice/IBPETimer.java Tue Feb 28 09:18:27 2006
@@ -14,11 +14,11 @@
  * limitations under the License.
 */
 
-package org.apache.ode.timerservice;
+package org.apache.ode.bpe.timerservice;
 
 import java.io.Serializable;
 
-import org.apache.ode.event.ITimerEvent;
+import org.apache.ode.bpe.event.ITimerEvent;
 
 /**
  * BPE Timer 

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/timerservice/IBPETimerService.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/timerservice/IBPETimerService.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/timerservice/IBPETimerService.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/timerservice/IBPETimerService.java Tue Feb 28 09:18:27 2006
@@ -14,13 +14,13 @@
  * limitations under the License.
 */
 
-package org.apache.ode.timerservice;
+package org.apache.ode.bpe.timerservice;
 
 import java.util.Date;
 
-import org.apache.ode.event.ITimerEvent;
-import org.apache.ode.util.BPEProperties;
-import org.apache.ode.util.BPException;
+import org.apache.ode.bpe.event.ITimerEvent;
+import org.apache.ode.bpe.util.BPEProperties;
+import org.apache.ode.bpe.util.BPException;
 
 /**
  * Service used by the timer action.

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/timerservice/noop/NoopTimer.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/timerservice/noop/NoopTimer.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/timerservice/noop/NoopTimer.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/timerservice/noop/NoopTimer.java Tue Feb 28 09:18:27 2006
@@ -19,10 +19,10 @@
  * To change the template for this generated file go to
  * Window - Preferences - Java - Code Generation - Code and Comments
  */
-package org.apache.ode.timerservice.noop;
+package org.apache.ode.bpe.timerservice.noop;
 
-import org.apache.ode.event.ITimerEvent;
-import org.apache.ode.timerservice.IBPETimer;
+import org.apache.ode.bpe.event.ITimerEvent;
+import org.apache.ode.bpe.timerservice.IBPETimer;
 
 /**
  * @author charper
@@ -35,7 +35,7 @@
     static final long serialVersionUID = 1650723050727088370L;
 
 	/* (non-Javadoc)
-	 * @see org.apache.ode.timerservice.IBPETimer#getId()
+	 * @see org.apache.ode.bpe.timerservice.IBPETimer#getId()
 	 */
 	public Object getId() {
 		// TODO Auto-generated method stub
@@ -43,7 +43,7 @@
 	}
 
 	/* (non-Javadoc)
-	 * @see org.apache.ode.timerservice.IBPETimer#getTimerEvent()
+	 * @see org.apache.ode.bpe.timerservice.IBPETimer#getTimerEvent()
 	 */
 	public ITimerEvent getTimerEvent() {
 		// TODO Auto-generated method stub

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/timerservice/noop/NoopTimerService.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/timerservice/noop/NoopTimerService.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/timerservice/noop/NoopTimerService.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/timerservice/noop/NoopTimerService.java Tue Feb 28 09:18:27 2006
@@ -19,15 +19,15 @@
  * To change the template for this generated file go to
  * Window - Preferences - Java - Code Generation - Code and Comments
  */
-package org.apache.ode.timerservice.noop;
+package org.apache.ode.bpe.timerservice.noop;
 
 import java.util.Date;
 
-import org.apache.ode.event.ITimerEvent;
-import org.apache.ode.timerservice.IBPETimer;
-import org.apache.ode.timerservice.IBPETimerService;
-import org.apache.ode.util.BPEProperties;
-import org.apache.ode.util.BPException;
+import org.apache.ode.bpe.event.ITimerEvent;
+import org.apache.ode.bpe.timerservice.IBPETimer;
+import org.apache.ode.bpe.timerservice.IBPETimerService;
+import org.apache.ode.bpe.util.BPEProperties;
+import org.apache.ode.bpe.util.BPException;
 
 /**
  * @author charper
@@ -38,7 +38,7 @@
 public class NoopTimerService implements IBPETimerService {
 
 	/* (non-Javadoc)
-	 * @see org.apache.ode.timerservice.IBPETimerService#createTimer(long, org.apache.ode.event.ITimerEvent)
+	 * @see org.apache.ode.bpe.timerservice.IBPETimerService#createTimer(long, org.apache.ode.bpe.event.ITimerEvent)
 	 */
 	public IBPETimer createTimer(long startDuration, ITimerEvent timerEvent)
 			throws BPException {
@@ -47,7 +47,7 @@
 	}
 
 	/* (non-Javadoc)
-	 * @see org.apache.ode.timerservice.IBPETimerService#createTimer(java.util.Date, org.apache.ode.event.ITimerEvent)
+	 * @see org.apache.ode.bpe.timerservice.IBPETimerService#createTimer(java.util.Date, org.apache.ode.bpe.event.ITimerEvent)
 	 */
 	public IBPETimer createTimer(Date startTime, ITimerEvent timerEvent)
 			throws BPException {
@@ -56,7 +56,7 @@
 	}
 
 	/* (non-Javadoc)
-	 * @see org.apache.ode.timerservice.IBPETimerService#removeTimer(org.apache.ode.timerservice.IBPETimer)
+	 * @see org.apache.ode.bpe.timerservice.IBPETimerService#removeTimer(org.apache.ode.bpe.timerservice.IBPETimer)
 	 */
 	public void removeTimer(IBPETimer timer) throws BPException {
 		// TODO Auto-generated method stub
@@ -64,7 +64,7 @@
 	}
 
 	/* (non-Javadoc)
-	 * @see org.apache.ode.timerservice.IBPETimerService#init(org.apache.ode.util.BPEProperties)
+	 * @see org.apache.ode.bpe.timerservice.IBPETimerService#init(org.apache.ode.bpe.util.BPEProperties)
 	 */
 	public void init(BPEProperties props) throws BPException {
 		// TODO Auto-generated method stub

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/timerservice/quartzimpl/BPETimerJob.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/timerservice/quartzimpl/BPETimerJob.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/timerservice/quartzimpl/BPETimerJob.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/timerservice/quartzimpl/BPETimerJob.java Tue Feb 28 09:18:27 2006
@@ -14,7 +14,7 @@
  * limitations under the License.
 */
 
-package org.apache.ode.timerservice.quartzimpl;
+package org.apache.ode.bpe.timerservice.quartzimpl;
 
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -27,8 +27,8 @@
 import org.quartz.JobExecutionContext;
 import org.quartz.JobExecutionException;
 
-import org.apache.ode.bped.managed.BPEventDirector;
-import org.apache.ode.bped.managed.BPEventDirectorHome;
+import org.apache.ode.bpe.bped.managed.BPEventDirector;
+import org.apache.ode.bpe.bped.managed.BPEventDirectorHome;
 
 /**
  * BPE timer job

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/timerservice/quartzimpl/BPETimerQuartzImpl.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/timerservice/quartzimpl/BPETimerQuartzImpl.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/timerservice/quartzimpl/BPETimerQuartzImpl.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/timerservice/quartzimpl/BPETimerQuartzImpl.java Tue Feb 28 09:18:27 2006
@@ -14,12 +14,12 @@
  * limitations under the License.
 */
 
-package org.apache.ode.timerservice.quartzimpl;
+package org.apache.ode.bpe.timerservice.quartzimpl;
 
 import java.io.Serializable;
 
-import org.apache.ode.event.ITimerEvent;
-import org.apache.ode.timerservice.IBPETimer;
+import org.apache.ode.bpe.event.ITimerEvent;
+import org.apache.ode.bpe.timerservice.IBPETimer;
 
 /**
  * Quartz timer impl
@@ -41,14 +41,14 @@
 		this.te = te;
 	}
 	/* (non-Javadoc)
-	 * @see org.apache.ode.timerservice.IBPETimer#getId()
+	 * @see org.apache.ode.bpe.timerservice.IBPETimer#getId()
 	 */
 	public Object getId() {
 		return te.getProcId();
 	}
 
 	/* (non-Javadoc)
-	 * @see org.apache.ode.timerservice.IBPETimer#getTimerEvent()
+	 * @see org.apache.ode.bpe.timerservice.IBPETimer#getTimerEvent()
 	 */
 	public ITimerEvent getTimerEvent() {
 		return te;

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/timerservice/quartzimpl/BPETimerServiceQuartzImpl.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/timerservice/quartzimpl/BPETimerServiceQuartzImpl.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/timerservice/quartzimpl/BPETimerServiceQuartzImpl.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/timerservice/quartzimpl/BPETimerServiceQuartzImpl.java Tue Feb 28 09:18:27 2006
@@ -14,7 +14,7 @@
  * limitations under the License.
 */
 
-package org.apache.ode.timerservice.quartzimpl;
+package org.apache.ode.bpe.timerservice.quartzimpl;
 
 import java.util.Collections;
 import java.util.Date;
@@ -30,11 +30,11 @@
 import org.quartz.SchedulerFactory;
 import org.quartz.SimpleTrigger;
 
-import org.apache.ode.event.ITimerEvent;
-import org.apache.ode.timerservice.IBPETimer;
-import org.apache.ode.timerservice.IBPETimerService;
-import org.apache.ode.util.BPEProperties;
-import org.apache.ode.util.BPException;
+import org.apache.ode.bpe.event.ITimerEvent;
+import org.apache.ode.bpe.timerservice.IBPETimer;
+import org.apache.ode.bpe.timerservice.IBPETimerService;
+import org.apache.ode.bpe.util.BPEProperties;
+import org.apache.ode.bpe.util.BPException;
 
 /**
  * Quartz timer service impl
@@ -79,7 +79,7 @@
 	}
 	
 	/* (non-Javadoc)
-	 * @see org.apache.ode.timerservice.IBPETimerService#createTimer(long, org.apache.ode.event.ITimerEvent)
+	 * @see org.apache.ode.bpe.timerservice.IBPETimerService#createTimer(long, org.apache.ode.bpe.event.ITimerEvent)
 	 */
 	public IBPETimer createTimer(long startDuration, ITimerEvent timerEvent)
 			throws BPException {
@@ -89,7 +89,7 @@
 	}
 
 	/* (non-Javadoc)
-	 * @see org.apache.ode.timerservice.IBPETimerService#createTimer(java.util.Date, org.apache.ode.event.ITimerEvent)
+	 * @see org.apache.ode.bpe.timerservice.IBPETimerService#createTimer(java.util.Date, org.apache.ode.bpe.event.ITimerEvent)
 	 */
 	public IBPETimer createTimer(Date startTime, ITimerEvent timerEvent)
 			throws BPException {
@@ -97,7 +97,7 @@
 	}
 
 	/* (non-Javadoc)
-	 * @see org.apache.ode.timerservice.IBPETimerService#removeTimer(org.apache.ode.timerservice.IBPETimer)
+	 * @see org.apache.ode.bpe.timerservice.IBPETimerService#removeTimer(org.apache.ode.bpe.timerservice.IBPETimer)
 	 */
 	public void removeTimer(IBPETimer timer) throws BPException {
 		try {
@@ -112,7 +112,7 @@
 	}
 
 	/* (non-Javadoc)
-	 * @see org.apache.ode.timerservice.IBPETimerService#init(org.apache.ode.util.BPEProperties)
+	 * @see org.apache.ode.bpe.timerservice.IBPETimerService#init(org.apache.ode.bpe.util.BPEProperties)
 	 */
 	public void init(BPEProperties props) throws BPException {		
 

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/timerservice/quartzimpl/QuartzService.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/timerservice/quartzimpl/QuartzService.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/timerservice/quartzimpl/QuartzService.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/timerservice/quartzimpl/QuartzService.java Tue Feb 28 09:18:27 2006
@@ -14,7 +14,7 @@
  * limitations under the License.
 */
 
-package org.apache.ode.timerservice.quartzimpl;
+package org.apache.ode.bpe.timerservice.quartzimpl;
 
 import java.io.File;
 import java.util.Properties;

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

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/uo/util/ApplicationLocalStore.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/uo/util/ApplicationLocalStore.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/uo/util/ApplicationLocalStore.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/uo/util/ApplicationLocalStore.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.uo.util;
+package org.apache.ode.bpe.uo.util;
 
 /**
  * Provides classloader level storage.  The classloader the store will reside
@@ -24,7 +24,7 @@
 	private static IApplicationLocal getApplicationLocal() {
 		try {
 			Class clazz = Thread.currentThread().getContextClassLoader().loadClass(
-					"org.apache.ode.uo.util.ApplicationLocal");
+					"org.apache.ode.bpe.uo.util.ApplicationLocal");
 			return (IApplicationLocal) clazz.newInstance();	
 		} catch ( Exception e ) {
 			throw new RuntimeException(e);

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/uo/util/IApplicationLocal.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/uo/util/IApplicationLocal.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/uo/util/IApplicationLocal.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/uo/util/IApplicationLocal.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.uo.util;
+package org.apache.ode.bpe.uo.util;
 
 public interface IApplicationLocal {
 	public void set(Object key, Object value);

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/uo/util/ejb/ApplicationLocalStoreBean.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/uo/util/ejb/ApplicationLocalStoreBean.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/uo/util/ejb/ApplicationLocalStoreBean.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/uo/util/ejb/ApplicationLocalStoreBean.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.uo.util.ejb;
+package org.apache.ode.bpe.uo.util.ejb;
 
 import java.io.Serializable;
 
 import javax.ejb.SessionBean;
 import javax.ejb.SessionContext;
 
-import org.apache.ode.uo.util.ApplicationLocalStore;
+import org.apache.ode.bpe.uo.util.ApplicationLocalStore;
 
 /**
  * This bean holds properties about the package.

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

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

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

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

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

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

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

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

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/util/BPEProperties.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/util/BPEProperties.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/util/BPEProperties.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/util/BPEProperties.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.util;
+package org.apache.ode.bpe.util;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -32,11 +32,11 @@
 import javax.naming.NamingException;
 import javax.rmi.PortableRemoteObject;
 
-import org.apache.ode.bped.EventDirectorFactory;
-import org.apache.ode.info.PackageInfo;
-import org.apache.ode.info.PackageInfoHome;
-import org.apache.ode.interaction.spiimpl.atomic.AtomicInteractionFactory;
-import org.apache.ode.interaction.spiimpl.document.DocumentInteractionFactory;
+import org.apache.ode.bpe.bped.EventDirectorFactory;
+import org.apache.ode.bpe.interaction.spiimpl.atomic.AtomicInteractionFactory;
+import org.apache.ode.bpe.interaction.spiimpl.document.DocumentInteractionFactory;
+import org.apache.ode.bpe.info.PackageInfo;
+import org.apache.ode.bpe.info.PackageInfoHome;
 
 /**
  * @author waterman
@@ -58,14 +58,14 @@
     public static final String UUID_USE_CONNECTOR_DEFAULT = "false";
     public static final String UUID_CLASS_KEY = "UUID_CLASS_KEY";
     public static final String UUID_CLASS_DEFAULT =
-        "org.apache.ode.uuid.AXISUUIDService";
+        "org.apache.ode.bpe.uuid.AXISUUIDService";
     public static final String UUID_SIZE_KEY = "UUID_SIZE_KEY";
     public static final int UUID_SIZE_DEFAULT = 200;
 
     // Definition Service Properties
     public static final String DEF_CLASS_KEY = "DEF_CLASS_KEY";
     public static final String DEF_CLASS_DEFAULT =
-        "org.apache.ode.definition.serialimpl.DefinitionService_SerImpl";
+        "org.apache.ode.bpe.definition.serialimpl.DefinitionService_SerImpl";
     public static final String DEF_PERSISTENT_KEY = "DEF_PERSISTENT_KEY";
     public static final String DEF_PERSISTENT_DEFAULT = "FALSE";
     public static final String DEF_SCHEMA_KEY = "DEF_SCHEMA_KEY";
@@ -74,29 +74,29 @@
     // Instance Service Properties
     public static final String INST_CLASS_KEY = "INST_CLASS_KEY";
     public static final String INST_CLASS_DEFAULT =
-        "org.apache.ode.instance.beanimpl.InstanceServicePersistentImpl";
+        "org.apache.ode.bpe.instance.beanimpl.InstanceServicePersistentImpl";
     public static final String INST_PERSISTENT_KEY = "INST_PERSISTENT_KEY";
     public static final String INST_PERSISTENT_DEFAULT = "FALSE";
 
     // Instance Service Properties
     public static final String SCOPE_CLASS_KEY = "SCOPE_CLASS_KEY";
     public static final String SCOPE_CLASS_DEFAULT =
-        "org.apache.ode.scope.service.impl.ScopeServiceImpl";
+        "org.apache.ode.bpe.scope.service.impl.ScopeServiceImpl";
 
     // Event Director Properties
     public static final String ED_CLASS_KEY = "ED_CLASS_KEY";
     public static final String ED_CLASS_DEFAULT =
-        "org.apache.ode.bped.EventDirectorSLImpl";
+        "org.apache.ode.bpe.bped.EventDirectorSLImpl";
 
     // Correlation Service Properties
     public static final String CORL_CLASS_KEY = "CORL_CLASS_KEY";
     public static final String CORL_CLASS_DEFAULT =
-        "org.apache.ode.correlation.CorrelationServiceSLImpl";
+        "org.apache.ode.bpe.correlation.CorrelationServiceSLImpl";
 
     // Locking Service Properties
     public static final String LOCK_CLASS_KEY = "LOCK_CLASS_KEY";
     public static final String LOCK_CLASS_DEFAULT =
-        "org.apache.ode.locking.IMLockingService";
+        "org.apache.ode.bpe.locking.IMLockingService";
     public static final String LOCK_HASH_BUCKETS_KEY = "LOCK_HASH_BUCKETS_KEY";
     public static final String LOCK_HASH_BUCKETS_DEFAULT = "1000";
 
@@ -108,11 +108,11 @@
     public static final String CTX_CLASS_TRANSIENT_KEY =
         "CTX_CLASS_TRANSIENT_KEY";
     public static final String CTX_CLASS_TRANSIENT_DEFAULT =
-        "org.apache.ode.context.nonpersistent.TransientContextService";
+        "org.apache.ode.bpe.context.nonpersistent.TransientContextService";
     public static final String CTX_CLASS_PERSISTENT_KEY =
         "CTX_CLASS_PERSISTENT_KEY";
     public static final String CTX_CLASS_PERSISTENT_DEFAULT =
-        "org.apache.ode.context.persistent.PersistentContextService";
+        "org.apache.ode.bpe.context.persistent.PersistentContextService";
 
     public static final String CTX_PERSISTENCE_KEY = "CTX_PERSISTENCE_KEY";
     public static final String CTX_PERSISTENT = "CTX_PERSISTENT";
@@ -126,7 +126,7 @@
     public static final String DOF_CLASS_PERSISTENT_KEY =
         "DOF_CLASS_PERSISTENT_KEY";
     public static final String DOF_CLASS_PERSISTENT_DEFAULT =
-        "org.apache.ode.context.ejb.EJBDataObjectFactory";
+        "org.apache.ode.bpe.context.ejb.EJBDataObjectFactory";
 
     // Data Object Factory Properties
     public static final String DOF_CMP_HOME = "java:comp/env/theCMPObjectBean";

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/util/BPEPutMsg.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/util/BPEPutMsg.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/util/BPEPutMsg.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/util/BPEPutMsg.java Tue Feb 28 09:18:27 2006
@@ -17,7 +17,7 @@
  * Created on Aug 18, 2003
  *
  */
-package org.apache.ode.util;
+package org.apache.ode.bpe.util;
 
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
@@ -36,11 +36,11 @@
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
 
-import org.apache.ode.event.BPELStaticKey;
-import org.apache.ode.event.SimpleRequestMessageEvent;
-import org.apache.ode.interaction.IInteraction;
-import org.apache.ode.interaction.InteractionException;
-import org.apache.ode.interaction.InteractionFactory;
+import org.apache.ode.bpe.event.BPELStaticKey;
+import org.apache.ode.bpe.event.SimpleRequestMessageEvent;
+import org.apache.ode.bpe.interaction.IInteraction;
+import org.apache.ode.bpe.interaction.InteractionException;
+import org.apache.ode.bpe.interaction.InteractionFactory;
 
 /**
  * @author charper

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

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

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/util/BenchMarkUtil.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/util/BenchMarkUtil.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/util/BenchMarkUtil.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/util/BenchMarkUtil.java Tue Feb 28 09:18:27 2006
@@ -17,7 +17,7 @@
  * Created on Aug 13, 2003
  *
  */
-package org.apache.ode.util;
+package org.apache.ode.bpe.util;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -29,17 +29,17 @@
 import java.util.Properties;
 //import java.util.logging.Logger;
 
-import org.apache.ode.bped.DeployTypeEnum;
-import org.apache.ode.bped.EventDirectorException;
-import org.apache.ode.bped.EventDirectorFactory;
-import org.apache.ode.bped.IDeployer;
-import org.apache.ode.bped.EventDirector;
-import org.apache.ode.deployment.DefinitionKey;
-import org.apache.ode.event.BPELStaticKey;
-import org.apache.ode.event.IResponseMessage;
-import org.apache.ode.event.SimpleRequestMessageEvent;
-import org.apache.ode.interaction.IInteraction;
-import org.apache.ode.interaction.InteractionFactory;
+import org.apache.ode.bpe.bped.DeployTypeEnum;
+import org.apache.ode.bpe.bped.EventDirector;
+import org.apache.ode.bpe.bped.EventDirectorException;
+import org.apache.ode.bpe.bped.EventDirectorFactory;
+import org.apache.ode.bpe.bped.IDeployer;
+import org.apache.ode.bpe.deployment.DefinitionKey;
+import org.apache.ode.bpe.event.BPELStaticKey;
+import org.apache.ode.bpe.event.IResponseMessage;
+import org.apache.ode.bpe.event.SimpleRequestMessageEvent;
+import org.apache.ode.bpe.interaction.IInteraction;
+import org.apache.ode.bpe.interaction.InteractionFactory;
 
 
 /**

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

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/util/EngineUtil.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/util/EngineUtil.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/util/EngineUtil.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/util/EngineUtil.java Tue Feb 28 09:18:27 2006
@@ -17,12 +17,12 @@
  * Created on Aug 13, 2003
  *
  */
-package org.apache.ode.util;
+package org.apache.ode.bpe.util;
 public class EngineUtil
 {
 	public static void main(String[] args)
 	{
-		org.apache.ode.client.util.EngineUtil eu = new org.apache.ode.client.util.EngineUtil(
+		org.apache.ode.bpe.client.util.EngineUtil eu = new org.apache.ode.bpe.client.util.EngineUtil(
 				args);
 		eu.run();
 	}

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

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

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

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

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

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

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

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/util/XMLDocBuilderByThread.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/util/XMLDocBuilderByThread.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/util/XMLDocBuilderByThread.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/util/XMLDocBuilderByThread.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.util;
+package org.apache.ode.bpe.util;
 
 import java.util.Collections;
 import java.util.HashMap;
@@ -31,8 +31,8 @@
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
 
-import org.apache.ode.interaction.InteractionException;
-import org.apache.ode.interaction.XMLInteractionObject;
+import org.apache.ode.bpe.interaction.InteractionException;
+import org.apache.ode.bpe.interaction.XMLInteractionObject;
 
 public class XMLDocBuilderByThread {
 	

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

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/uuid/AXISUUIDService.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/uuid/AXISUUIDService.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/uuid/AXISUUIDService.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/uuid/AXISUUIDService.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.uuid;
+package org.apache.ode.bpe.uuid;
 
 import org.apache.axis.components.uuid.UUIDGen;
 import org.apache.axis.components.uuid.UUIDGenFactory;
 
-import org.apache.ode.util.BPEProperties;
+import org.apache.ode.bpe.util.BPEProperties;
 
 public class AXISUUIDService implements UUIDService {
 	

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/uuid/ConnectorUUIDService.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/uuid/ConnectorUUIDService.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/uuid/ConnectorUUIDService.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/uuid/ConnectorUUIDService.java Tue Feb 28 09:18:27 2006
@@ -14,7 +14,7 @@
  * limitations under the License.
 */
 
-package org.apache.ode.uuid;
+package org.apache.ode.bpe.uuid;
 
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -24,8 +24,8 @@
 import javax.resource.ResourceException;
 import javax.resource.cci.ConnectionFactory;
 
-import org.apache.ode.util.BPEProperties;
-import org.apache.ode.uuid.connector.IUUIDConnection;
+import org.apache.ode.bpe.util.BPEProperties;
+import org.apache.ode.bpe.uuid.connector.IUUIDConnection;
 
 /**
  * @author charper
@@ -39,7 +39,7 @@
 	
 
 	/* (non-Javadoc)
-	 * @see org.apache.ode.uuid.UUIDService#getUUID()
+	 * @see org.apache.ode.bpe.uuid.UUIDService#getUUID()
 	 */
 	public String getUUID() {
 		try {
@@ -60,13 +60,13 @@
 	}
 
 	/* (non-Javadoc)
-	 * @see org.apache.ode.uuid.UUIDService#init(org.apache.ode.util.BPEProperties)
+	 * @see org.apache.ode.bpe.uuid.UUIDService#init(org.apache.ode.bpe.util.BPEProperties)
 	 */
 	public void init(BPEProperties props) throws UUIDServiceException {
 	}
 
 	/* (non-Javadoc)
-	 * @see org.apache.ode.uuid.UUIDService#close()
+	 * @see org.apache.ode.bpe.uuid.UUIDService#close()
 	 */
 	public void close() {
 	}

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

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/uuid/UUIDServiceException.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/uuid/UUIDServiceException.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/uuid/UUIDServiceException.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/uuid/UUIDServiceException.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.uuid;
+package org.apache.ode.bpe.uuid;
 
-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/uuid/UUIDServiceFactory.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/uuid/UUIDServiceFactory.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/uuid/UUIDServiceFactory.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/uuid/UUIDServiceFactory.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.uuid;
+package org.apache.ode.bpe.uuid;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -21,10 +21,10 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import org.apache.ode.uuid.UUIDService;
-import org.apache.ode.uuid.UUIDServiceException;
-import org.apache.ode.util.BPEProperties;
-import org.apache.ode.util.BPException;
+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;
 
 /**
  * @author waterman

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/uuid/connector/IUUIDConnection.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/uuid/connector/IUUIDConnection.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/uuid/connector/IUUIDConnection.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/uuid/connector/IUUIDConnection.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.uuid.connector;
+package org.apache.ode.bpe.uuid.connector;
 
 import javax.resource.ResourceException;
 import javax.resource.cci.Connection;

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

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

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/uuid/connector/UUIDConnectionManager.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/uuid/connector/UUIDConnectionManager.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/uuid/connector/UUIDConnectionManager.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/uuid/connector/UUIDConnectionManager.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.uuid.connector;
+package org.apache.ode.bpe.uuid.connector;
 
 import java.util.HashSet;
 import java.util.Properties;
@@ -29,9 +29,9 @@
 import javax.resource.spi.ManagedConnectionFactory;
 import javax.security.auth.Subject;
 
-import org.apache.ode.pool.MinMaxObjPool;
-import org.apache.ode.pool.ObjPoolObject;
-import org.apache.ode.pool.PoolException;
+import org.apache.ode.bpe.pool.MinMaxObjPool;
+import org.apache.ode.bpe.pool.ObjPoolObject;
+import org.apache.ode.bpe.pool.PoolException;
 
 /**
  * In a non-managed enviornment the UUIDConnectionManager is used to pool
@@ -96,7 +96,7 @@
 	}
 	
 	/**
-	 * @see org.apache.ode.pool.MinMaxObjPool#getUserIdentifiedObject(Object, Object, Object)
+	 * @see org.apache.ode.bpe.pool.MinMaxObjPool#getUserIdentifiedObject(Object, Object, Object)
 	 */
 	protected ObjPoolObject getUserIdentifiedObject(
 		Object factory,
@@ -134,21 +134,21 @@
 	}
 
 	/**
-	 * @see org.apache.ode.pool.SimpleObjPool#checkinPoolObject(ObjPoolObject)
+	 * @see org.apache.ode.bpe.pool.SimpleObjPool#checkinPoolObject(ObjPoolObject)
 	 */
 	protected void checkinPoolObject(ObjPoolObject o) throws PoolException {
 		pool.add(o);
 	}
 
 	/**
-	 * @see org.apache.ode.pool.SimpleObjPool#checkoutPoolObject(ObjPoolObject)
+	 * @see org.apache.ode.bpe.pool.SimpleObjPool#checkoutPoolObject(ObjPoolObject)
 	 */
 	protected void checkoutPoolObject(ObjPoolObject o) throws PoolException {
 		pool.remove(o);
 	}
 
 	/**
-	 * @see org.apache.ode.pool.SimpleObjPool#createObjPoolObject(Object, Object, Object)
+	 * @see org.apache.ode.bpe.pool.SimpleObjPool#createObjPoolObject(Object, Object, Object)
 	 */
 	protected ObjPoolObject createObjPoolObject(
 		Object factory,

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/uuid/connector/UUIDConnectionMetadata.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/uuid/connector/UUIDConnectionMetadata.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/uuid/connector/UUIDConnectionMetadata.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/uuid/connector/UUIDConnectionMetadata.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.uuid.connector;
+package org.apache.ode.bpe.uuid.connector;
 
 import javax.resource.ResourceException;
 import javax.resource.cci.ConnectionMetaData;

Modified: incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/uuid/connector/UUIDConnectionSpec.java
URL: http://svn.apache.org/viewcvs/incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/uuid/connector/UUIDConnectionSpec.java?rev=381712&r1=381694&r2=381712&view=diff
==============================================================================
--- incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/uuid/connector/UUIDConnectionSpec.java (original)
+++ incubator/ode/scratch/ode/src/main/java/org/apache/ode/bpe/uuid/connector/UUIDConnectionSpec.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.uuid.connector;
+package org.apache.ode.bpe.uuid.connector;
 
 
 import javax.resource.cci.ConnectionSpec;

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