[jbpm-commits] JBoss JBPM SVN: r1751 - in jbpm4/pvm/trunk/modules/core/src: main/java/org/jbpm/pvm/internal/hibernate and 25 other directories.

do-not-reply at jboss.org do-not-reply at jboss.org
Tue Jul 29 11:17:43 EDT 2008


Author: tom.baeyens at jboss.com
Date: 2008-07-29 11:17:43 -0400 (Tue, 29 Jul 2008)
New Revision: 1751

Added:
   jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/db/continuation/
   jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/db/continuation/ContinuationTests.java
   jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/db/embedded/
   jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/db/embedded/EmbeddedPersistenceTest.java
   jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/timer/
   jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/util/
   jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/wire/
   jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/wire/WireObservableTest.java
   jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/xml/
   jbpm4/pvm/trunk/modules/core/src/test/resources/org/jbpm/pvm/api/db/continuation/
   jbpm4/pvm/trunk/modules/core/src/test/resources/org/jbpm/pvm/api/db/embedded/
   jbpm4/pvm/trunk/modules/core/src/test/resources/org/jbpm/pvm/api/timer/
Removed:
   jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/db/continuation/ContinuationNode.java
   jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/db/continuation/ContinuationTest.cfg.xml
   jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/db/continuation/ContinuationTest.hbm.xml
   jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/db/continuation/JobExecutorTest.cfg.xml
   jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/db/embedded/ExecutionTypeTest.java
   jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/db/embedded/Order.hbm.xml
   jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/db/embedded/hibernate.cfg.xml
   jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/util/WireObservableTest.java
   jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/timer/
   jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/util/
   jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/svc/hibernate/
   jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/svc/jobexecutor/
   jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/wire/
   jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/xml/
   jbpm4/pvm/trunk/modules/core/src/test/resources/org/jbpm/pvm/api/db/continuation/ContinuationTest.hbm.xml
   jbpm4/pvm/trunk/modules/core/src/test/resources/org/jbpm/pvm/api/db/continuation/JobExecutorTest.cfg.xml
   jbpm4/pvm/trunk/modules/core/src/test/resources/org/jbpm/pvm/timer/
   jbpm4/pvm/trunk/modules/core/src/test/resources/org/jbpm/svc/hibernate/
   jbpm4/pvm/trunk/modules/core/src/test/resources/org/jbpm/svc/jobexecutor/
Modified:
   jbpm4/pvm/trunk/modules/core/src/docbook/doc-reference/en/modules/ch02-SoftwareLogging.xml
   jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/hibernate/ExecutionType.java
   jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/wire/binding/package.html
   jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/wire/package.html
   jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/util/DefaultObservable.java
   jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/DbTests.java
   jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/NonDbTests.java
   jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/db/continuation/AutomaticActivity.java
   jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/db/continuation/ContinuationTest.java
   jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/db/continuation/Recorder.java
   jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/db/continuation/WaitState.java
   jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/db/embedded/Order.java
   jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/timer/IncrementCounterWaitState.java
   jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/timer/TestTimerSession.java
   jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/timer/TestTimerSessionBinding.java
   jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/timer/TimerConfiguration.java
   jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/timer/TimerIntegrationTest.java
   jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/timer/TimerUnitTest.java
   jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/tx/EnlistTest.java
   jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/util/BooleanArrayTest.java
   jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/wire/AutoWireTest.java
   jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/wire/BasicTypeWireTest.java
   jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/wire/ClassWireTest.java
   jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/wire/ConcurrentWiringTest.java
   jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/wire/ContextBlockSubscriptionTest.java
   jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/wire/ContextTest.java
   jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/wire/DelayedInitTest.java
   jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/wire/DependencyTest.java
   jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/wire/EagerInitTest.java
   jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/wire/EnvWireTest.java
   jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/wire/HibernateSessionFactoryWireTest.java
   jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/wire/ListWireTest.java
   jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/wire/MapWireTest.java
   jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/wire/MethodSubscriptionTest.java
   jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/wire/ObjectSubscriptionTest.java
   jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/wire/ObjectWireTest.java
   jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/wire/PropertiesWireTest.java
   jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/wire/RefWireTest.java
   jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/wire/SetWireTest.java
   jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/wire/SubscriptionTestCase.java
   jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/wire/TypeLookupTest.java
   jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/wire/WireEventsSubscriptionTest.java
   jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/wire/WireTestCase.java
   jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/wire/WireTests.java
   jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/xml/DebugDomBuilderTest.java
   jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/xml/WireParserTest.java
   jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/xml/XmlParsingTest.java
   jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/pvm.wire.bindings.xml
   jbpm4/pvm/trunk/modules/core/src/test/resources/logging.properties
   jbpm4/pvm/trunk/modules/core/src/test/resources/org/jbpm/pvm.wire.bindings.xml
   jbpm4/pvm/trunk/modules/core/src/test/resources/org/jbpm/pvm/api/db/continuation/ContinuationTest.cfg.xml
   jbpm4/pvm/trunk/modules/core/src/test/resources/org/jbpm/pvm/api/db/embedded/Order.hbm.xml
   jbpm4/pvm/trunk/modules/core/src/test/resources/org/jbpm/pvm/api/db/embedded/hibernate.cfg.xml
   jbpm4/pvm/trunk/modules/core/src/test/resources/org/jbpm/pvm/api/timer/environment.cfg.xml
Log:
test suite clean up

Modified: jbpm4/pvm/trunk/modules/core/src/docbook/doc-reference/en/modules/ch02-SoftwareLogging.xml
===================================================================
--- jbpm4/pvm/trunk/modules/core/src/docbook/doc-reference/en/modules/ch02-SoftwareLogging.xml	2008-07-29 15:00:31 UTC (rev 1750)
+++ jbpm4/pvm/trunk/modules/core/src/docbook/doc-reference/en/modules/ch02-SoftwareLogging.xml	2008-07-29 15:17:43 UTC (rev 1751)
@@ -51,7 +51,7 @@
 .level = SEVERE
 org.jbpm.level=FINE
 org.jbpm.tx.level=FINE
-org.jbpm.wire.level=FINE</programlisting>
+org.jbpm.pvm.internal.wire.level=FINE</programlisting>
 
 <!-- 
     <para>For production usage, jBPM also includes an error triggered log handler.  This is 

Modified: jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/hibernate/ExecutionType.java
===================================================================
--- jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/hibernate/ExecutionType.java	2008-07-29 15:00:31 UTC (rev 1750)
+++ jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/hibernate/ExecutionType.java	2008-07-29 15:17:43 UTC (rev 1751)
@@ -41,6 +41,7 @@
     String nodeName = rs.getString(names[0]);
     NodeImpl node = (NodeImpl) execution.getProcessDefinition().getNode(nodeName);
     execution.setNode(node);
+    execution.setState(Execution.STATE_ACTIVE);
     return execution;
   }
 

Modified: jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/wire/binding/package.html
===================================================================
--- jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/wire/binding/package.html	2008-07-29 15:00:31 UTC (rev 1750)
+++ jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/wire/binding/package.html	2008-07-29 15:17:43 UTC (rev 1751)
@@ -1,4 +1,4 @@
 <body>
-each {@link org.jbpm.xml.Binding} class creates a 
+each {@link org.jbpm.pvm.internal.xml.Binding} class creates a 
 wire descriptor from a dom element.
 </body>
\ No newline at end of file

Modified: jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/wire/package.html
===================================================================
--- jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/wire/package.html	2008-07-29 15:00:31 UTC (rev 1750)
+++ jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/wire/package.html	2008-07-29 15:17:43 UTC (rev 1751)
@@ -1,3 +1,3 @@
 <body>
-wire context (aka IoC container), start reading {@link org.jbpm.wire.WireContext}.
+wire context (aka IoC container), start reading {@link org.jbpm.pvm.internal.wire.WireContext}.
 </body>
\ No newline at end of file

Modified: jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/util/DefaultObservable.java
===================================================================
--- jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/util/DefaultObservable.java	2008-07-29 15:00:31 UTC (rev 1750)
+++ jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/util/DefaultObservable.java	2008-07-29 15:17:43 UTC (rev 1751)
@@ -67,4 +67,8 @@
       }
     }
   }
+  
+  public List<Listener> getListeners() {
+    return listeners;
+  }
 }

Modified: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/DbTests.java
===================================================================
--- jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/DbTests.java	2008-07-29 15:00:31 UTC (rev 1750)
+++ jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/DbTests.java	2008-07-29 15:17:43 UTC (rev 1751)
@@ -24,6 +24,7 @@
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
+import org.jbpm.pvm.api.db.continuation.ContinuationTests;
 import org.jbpm.pvm.api.db.svc.DbSvcTests;
 import org.jbpm.pvm.api.spring.SpringTests;
 import org.jbpm.pvm.internal.db.langext.DbLangExtTests;
@@ -43,8 +44,9 @@
     suite.addTest(DbLangExtTests.suite());
     suite.addTest(DbModelTests.suite());
     suite.addTest(DbSvcTests.suite());
+    suite.addTest(SpringTests.suite());
     suite.addTest(JobExecutorTests.suite());
-    suite.addTest(SpringTests.suite());
+    suite.addTest(ContinuationTests.suite());
     
     //$JUnit-END$
     return suite;

Modified: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/NonDbTests.java
===================================================================
--- jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/NonDbTests.java	2008-07-29 15:00:31 UTC (rev 1750)
+++ jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/NonDbTests.java	2008-07-29 15:17:43 UTC (rev 1751)
@@ -26,7 +26,7 @@
 
 import org.jbpm.pvm.api.basicfeatures.BasicFeaturesTests;
 import org.jbpm.pvm.api.env.EnvironmentTests;
-import org.jbpm.wire.WireTests;
+import org.jbpm.pvm.internal.wire.WireTests;
 
 
 /**

Copied: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/db/continuation (from rev 1741, jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/svc/jobexecutor)


Property changes on: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/db/continuation
___________________________________________________________________
Name: svn:mergeinfo
   + 

Modified: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/db/continuation/AutomaticActivity.java
===================================================================
--- jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/svc/jobexecutor/AutomaticActivity.java	2008-07-29 08:34:34 UTC (rev 1741)
+++ jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/db/continuation/AutomaticActivity.java	2008-07-29 15:17:43 UTC (rev 1751)
@@ -19,8 +19,9 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jbpm.svc.jobexecutor;
+package org.jbpm.pvm.api.db.continuation;
 
+import org.jbpm.pvm.activity.Activity;
 import org.jbpm.pvm.activity.ActivityExecution;
 import org.jbpm.pvm.env.Environment;
 
@@ -29,7 +30,7 @@
  *  
  * @author Tom Baeyens
  */
-public class AutomaticActivity extends ContinuationNode {
+public class AutomaticActivity implements Activity {
 
   private static final long serialVersionUID = 1L;
   

Deleted: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/db/continuation/ContinuationNode.java
===================================================================
--- jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/svc/jobexecutor/ContinuationNode.java	2008-07-29 08:34:34 UTC (rev 1741)
+++ jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/db/continuation/ContinuationNode.java	2008-07-29 15:17:43 UTC (rev 1751)
@@ -1,34 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jbpm.svc.jobexecutor;
-
-import org.jbpm.pvm.activity.Activity;
-
-/**
- * @author Tom Baeyens
- */
-public abstract class ContinuationNode implements Activity {
-
-  protected long dbid;
-  protected int dbversion;
-  
-}

Deleted: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/db/continuation/ContinuationTest.cfg.xml
===================================================================
--- jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/svc/jobexecutor/ContinuationTest.cfg.xml	2008-07-29 08:34:34 UTC (rev 1741)
+++ jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/db/continuation/ContinuationTest.cfg.xml	2008-07-29 15:17:43 UTC (rev 1751)
@@ -1,40 +0,0 @@
-<contexts>
-
-	<environment-factory>
-
-    <object class="org.jbpm.pvm.internal.hibernate.PvmNamingStrategy" auto-wire="true" />
-
-    <object class="org.jbpm.svc.jobexecutor.Recorder" />
-
-    <hibernate-configuration>
-      <properties resource="hibernate.properties" />
-      <mappings resource="org/jbpm/pvm/pvm.hibernate.mappings.xml" />
-      <mapping resource="org/jbpm/svc/jobexecutor/ContinuationTest.hbm.xml" />
-      <cache-configuration resource="org/jbpm/pvm/pvm.cache.xml" usage="nonstrict-read-write" />
-    </hibernate-configuration>
-
-    <hibernate-session-factory />
-
-    <job-executor auto-start="true" />
-    
-    <command-service>
-      <environment-interceptor />
-      <transaction-interceptor />
-    </command-service>
-
-  </environment-factory>
-
-  <environment>
-  
-<!--    <http-filter-authentication />-->
-
-    <transaction />
-    <hibernate-session />
-
-    <pvm-db-session />
-    <message-session />
-    <job-db-session />
-
-  </environment>
-
-</contexts>

Deleted: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/db/continuation/ContinuationTest.hbm.xml
===================================================================
--- jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/svc/jobexecutor/ContinuationTest.hbm.xml	2008-07-29 08:34:34 UTC (rev 1741)
+++ jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/db/continuation/ContinuationTest.hbm.xml	2008-07-29 15:17:43 UTC (rev 1751)
@@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE hibernate-mapping PUBLIC
-      "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-      "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping package="org.jbpm.svc.jobexecutor" default-access="field">
-
-	<class name="ContinuationNode" abstract="true" 
-	       table="CONTINUATION_TEST_NODES" discriminator-value=" ">
-	       
-		<id name="dbid" column="DBID_">
-			<generator class="native" />
-		</id>
-		<discriminator type="string" />
-		<version name="dbversion" column="DBVERSION_" />
-		
-		<subclass name="AutomaticActivity" discriminator-value="A" />
-		<subclass name="WaitState" discriminator-value="W" />
-		
-  </class>
-  
-</hibernate-mapping>
\ No newline at end of file

Modified: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/db/continuation/ContinuationTest.java
===================================================================
--- jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/svc/jobexecutor/ContinuationTest.java	2008-07-29 08:34:34 UTC (rev 1741)
+++ jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/db/continuation/ContinuationTest.java	2008-07-29 15:17:43 UTC (rev 1751)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jbpm.svc.jobexecutor;
+package org.jbpm.pvm.api.db.continuation;
 
 import java.util.HashSet;
 import java.util.Set;
@@ -27,7 +27,6 @@
 import java.util.TimerTask;
 
 import org.hibernate.Session;
-import org.jbpm.pvm.test.base.JbpmTestCase;
 import org.jbpm.pvm.client.ClientProcessDefinition;
 import org.jbpm.pvm.client.ClientProcessInstance;
 import org.jbpm.pvm.env.Environment;
@@ -36,11 +35,11 @@
 import org.jbpm.pvm.internal.job.JobImpl;
 import org.jbpm.pvm.internal.jobexecutor.JobExecutor;
 import org.jbpm.pvm.internal.log.Log;
-import org.jbpm.pvm.job.Job;
 import org.jbpm.pvm.model.ProcessDefinition;
 import org.jbpm.pvm.model.ProcessFactory;
 import org.jbpm.pvm.session.DbSession;
 import org.jbpm.pvm.session.PvmDbSession;
+import org.jbpm.pvm.test.base.JbpmTestCase;
 
 /**
  * @author Tom Baeyens
@@ -55,7 +54,7 @@
     int checkInterval = 500;
     
     EnvironmentFactory environmentFactory = new PvmEnvironmentFactory(
-        "org/jbpm/svc/jobexecutor/ContinuationTest.cfg.xml"
+        "org/jbpm/pvm/api/db/continuation/ContinuationTest.cfg.xml"
     );
     
     Set<Integer> expected = new HashSet<Integer>();
@@ -94,19 +93,19 @@
     try {
       log.debug("building process 'continuations'");
       ProcessDefinition processDefinition = ProcessFactory.build("continuations")
-        .node("start").initial().behaviour(new AutomaticActivity())
+        .node("start").initial().behaviour(AutomaticActivity.class)
           .asyncExecute()
           .transition().to("a")
-        .node("a").behaviour(new AutomaticActivity())
+        .node("a").behaviour(AutomaticActivity.class)
           .asyncExecute()
           .transition().to("b")
-        .node("b").behaviour(new AutomaticActivity())
+        .node("b").behaviour(AutomaticActivity.class)
           .asyncExecute()
           .transition().to("c")
-        .node("c").behaviour(new AutomaticActivity())
+        .node("c").behaviour(AutomaticActivity.class)
           .asyncExecute()
           .transition().to("end")
-        .node("end").behaviour(new WaitState())
+        .node("end").behaviour(WaitState.class)
         .done();
       
       log.debug("saving process 'continuations'");

Added: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/db/continuation/ContinuationTests.java
===================================================================
--- jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/db/continuation/ContinuationTests.java	                        (rev 0)
+++ jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/db/continuation/ContinuationTests.java	2008-07-29 15:17:43 UTC (rev 1751)
@@ -0,0 +1,41 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jbpm.pvm.api.db.continuation;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+
+/**
+ * @author Tom Baeyens
+ */
+public class ContinuationTests {
+
+  public static Test suite() {
+    TestSuite suite = new TestSuite("Test for org.jbpm.pvm.api.db.continuation");
+    //$JUnit-BEGIN$
+    suite.addTestSuite(ContinuationTest.class);
+    //$JUnit-END$
+    return suite;
+  }
+
+}

Deleted: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/db/continuation/JobExecutorTest.cfg.xml
===================================================================
--- jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/svc/jobexecutor/JobExecutorTest.cfg.xml	2008-07-29 08:34:34 UTC (rev 1741)
+++ jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/db/continuation/JobExecutorTest.cfg.xml	2008-07-29 15:17:43 UTC (rev 1751)
@@ -1,36 +0,0 @@
-<contexts>
-
-	<environment-factory>
-
-	  <list name="messageNumberCollector" synchronized="true" />
-    <object class="org.jbpm.pvm.internal.hibernate.PvmNamingStrategy" auto-wire="true" />
-
-    <hibernate-configuration>
-      <properties resource="hibernate.properties" />
-      <mappings resource="org/jbpm/pvm/pvm.hibernate.mappings.xml" />
-      <mapping resource="org/jbpm/svc/jobexecutor/JobExecutorTest.hbm.xml" />
-      <cache-configuration resource="org/jbpm/pvm/pvm.cache.xml" usage="nonstrict-read-write" />
-    </hibernate-configuration>
-
-    <hibernate-session-factory />
-
-    <job-executor threads="1" auto-start="true" />
-    
-    <command-service>
-      <environment-interceptor />
-      <transaction-interceptor />
-    </command-service>
-
-  </environment-factory>
-
-  <environment>
-
-    <transaction />
-    <hibernate-session />
-    <pvm-db-session />
-    <message-session />
-    <job-session />
-
-  </environment>
-
-</contexts>

Modified: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/db/continuation/Recorder.java
===================================================================
--- jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/svc/jobexecutor/Recorder.java	2008-07-29 08:34:34 UTC (rev 1741)
+++ jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/db/continuation/Recorder.java	2008-07-29 15:17:43 UTC (rev 1751)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jbpm.svc.jobexecutor;
+package org.jbpm.pvm.api.db.continuation;
 
 import java.util.ArrayList;
 import java.util.HashMap;

Modified: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/db/continuation/WaitState.java
===================================================================
--- jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/svc/jobexecutor/WaitState.java	2008-07-29 08:34:34 UTC (rev 1741)
+++ jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/db/continuation/WaitState.java	2008-07-29 15:17:43 UTC (rev 1751)
@@ -19,11 +19,10 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jbpm.svc.jobexecutor;
+package org.jbpm.pvm.api.db.continuation;
 
 import java.util.Map;
 
-import org.jbpm.pvm.Execution;
 import org.jbpm.pvm.activity.ActivityExecution;
 import org.jbpm.pvm.activity.ExternalActivity;
 import org.jbpm.pvm.env.Environment;
@@ -31,7 +30,7 @@
 /**
  * @author Tom Baeyens
  */
-public class WaitState extends ContinuationNode implements ExternalActivity {
+public class WaitState implements ExternalActivity {
 
   private static final long serialVersionUID = 1L;
   

Copied: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/db/embedded (from rev 1741, jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/svc/hibernate)


Property changes on: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/db/embedded
___________________________________________________________________
Name: svn:mergeinfo
   + 

Copied: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/db/embedded/EmbeddedPersistenceTest.java (from rev 1741, jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/svc/hibernate/ExecutionTypeTest.java)
===================================================================
--- jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/db/embedded/EmbeddedPersistenceTest.java	                        (rev 0)
+++ jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/db/embedded/EmbeddedPersistenceTest.java	2008-07-29 15:17:43 UTC (rev 1751)
@@ -0,0 +1,72 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jbpm.pvm.api.db.embedded;
+
+import org.hibernate.Session;
+import org.hibernate.SessionFactory;
+import org.hibernate.Transaction;
+import org.hibernate.cfg.Configuration;
+import org.jbpm.pvm.test.base.JbpmTestCase;
+
+/**
+ * @author Tom Baeyens
+ */
+public class EmbeddedPersistenceTest extends JbpmTestCase {
+
+  public void testOrder() {
+    Configuration configuration = new Configuration();
+    configuration.configure("org/jbpm/pvm/api/db/embedded/hibernate.cfg.xml");
+    SessionFactory sessionFactory = configuration.buildSessionFactory();
+
+    // start transaction
+    Session session = sessionFactory.openSession();
+    Transaction transaction = session.beginTransaction();
+
+    Order order = new Order();
+    session.save(order);
+    assertEquals("child", order.getState().getNode().getName());
+    
+    // new transaction
+    transaction.commit();
+    session.close();
+    session = sessionFactory.openSession();
+    transaction = session.beginTransaction();
+    
+    order = (Order) session.get(Order.class, order.getDbid());
+    assertEquals("child", order.getState().getNode().getName());
+    order.growUp();
+    assertEquals("adult", order.getState().getNode().getName());
+    
+    // new transaction
+    transaction.commit();
+    session.close();
+    session = sessionFactory.openSession();
+    transaction = session.beginTransaction();
+    
+    order = (Order) session.get(Order.class, order.getDbid());
+    assertEquals("adult", order.getState().getNode().getName());
+    
+    transaction.commit();
+    session.close();
+  }
+
+}


Property changes on: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/db/embedded/EmbeddedPersistenceTest.java
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:mergeinfo
   + 
Name: svn:eol-style
   + LF

Deleted: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/db/embedded/ExecutionTypeTest.java
===================================================================
--- jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/svc/hibernate/ExecutionTypeTest.java	2008-07-29 08:34:34 UTC (rev 1741)
+++ jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/db/embedded/ExecutionTypeTest.java	2008-07-29 15:17:43 UTC (rev 1751)
@@ -1,73 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jbpm.svc.hibernate;
-
-import org.hibernate.Session;
-import org.hibernate.SessionFactory;
-import org.hibernate.Transaction;
-import org.hibernate.cfg.Configuration;
-import org.jbpm.pvm.test.base.JbpmTestCase;
-
-/**
- * @author Tom Baeyens
- */
-public class ExecutionTypeTest extends JbpmTestCase
-{
-
-  public void testOrder() {
-    Configuration configuration = new Configuration();
-    configuration.configure("org/jbpm/svc/hibernate/hibernate.cfg.xml");
-    SessionFactory sessionFactory = configuration.buildSessionFactory();
-
-    // start transaction
-    Session session = sessionFactory.openSession();
-    Transaction transaction = session.beginTransaction();
-
-    Order order = new Order();
-    session.save(order);
-    assertEquals("child", order.getState().getNode().getName());
-    
-    // new transaction
-    transaction.commit();
-    session.close();
-    session = sessionFactory.openSession();
-    transaction = session.beginTransaction();
-    
-    order = (Order) session.get(Order.class, order.getDbid());
-    assertEquals("child", order.getState().getNode().getName());
-    order.growUp();
-    assertEquals("adult", order.getState().getNode().getName());
-    
-    // new transaction
-    transaction.commit();
-    session.close();
-    session = sessionFactory.openSession();
-    transaction = session.beginTransaction();
-    
-    order = (Order) session.get(Order.class, order.getDbid());
-    assertEquals("adult", order.getState().getNode().getName());
-    
-    transaction.commit();
-    session.close();
-  }
-
-}

Deleted: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/db/embedded/Order.hbm.xml
===================================================================
--- jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/svc/hibernate/Order.hbm.xml	2008-07-29 08:34:34 UTC (rev 1741)
+++ jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/db/embedded/Order.hbm.xml	2008-07-29 15:17:43 UTC (rev 1751)
@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping package="org.jbpm.svc.hibernate" default-access="field">
-
-  <typedef name="execution" class="org.jbpm.pvm.client.ClientProcessInstance" />
-
-  <class name="Order" table="ORDERS">
-
-    <id name="dbid">
-      <generator class="sequence"/>
-    </id>
-
-    <property name="state" type="execution" />
-    
-  </class>
-
-</hibernate-mapping>
\ No newline at end of file

Modified: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/db/embedded/Order.java
===================================================================
--- jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/svc/hibernate/Order.java	2008-07-29 08:34:34 UTC (rev 1741)
+++ jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/db/embedded/Order.java	2008-07-29 15:17:43 UTC (rev 1751)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jbpm.svc.hibernate;
+package org.jbpm.pvm.api.db.embedded;
 
 
 import org.jbpm.pvm.client.ClientProcessDefinition;
@@ -52,15 +52,15 @@
    private static ClientProcessDefinition createProcessDefinition() {
       ClientProcessDefinition processDefinition = ProcessFactory.build("the meaning of life")
         .node("child").initial().behaviour(WaitState.class)
-        .transition("grow up").to("adult")
+          .transition("grow up").to("adult")
         .node("adult").behaviour(new WaitState())
-        .transition("find a jobImpl").to("employee")
+          .transition("find a jobImpl").to("employee")
         .node("employee").behaviour(new WaitState())
-        .transition("wrinkles").to("retired")
+          .transition("wrinkles").to("retired")
         .node("retired").behaviour(new WaitState())
-        .transition("had enough").to("dead")
+          .transition("had enough").to("dead")
         .node("dead")
-        .done();
+      .done();
 
       return processDefinition;
    }

Deleted: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/db/embedded/hibernate.cfg.xml
===================================================================
--- jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/svc/hibernate/hibernate.cfg.xml	2008-07-29 08:34:34 UTC (rev 1741)
+++ jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/db/embedded/hibernate.cfg.xml	2008-07-29 15:17:43 UTC (rev 1751)
@@ -1,23 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-
-<!DOCTYPE hibernate-configuration PUBLIC
-          "-//Hibernate/Hibernate Configuration DTD 3.0//EN"
-          "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd">
-
-<hibernate-configuration>
-  <session-factory>
-
-    <property name="hibernate.dialect">org.hibernate.dialect.HSQLDialect</property>
-    <property name="hibernate.connection.driver_class">org.hsqldb.jdbcDriver</property>
-    <property name="hibernate.connection.url">jdbc:hsqldb:mem:.</property>
-    <property name="hibernate.connection.username">sa</property>
-    <property name="hibernate.connection.password"></property>
-    <property name="hibernate.hbm2ddl.auto">create</property>
-    <property name="hibernate.show_sql">true"</property>
-    <property name="hibernate.format_sql">true"</property>
-    <property name="hibernate.use_sql_comments">true"</property>
-    
-    <mapping resource="org/jbpm/svc/hibernate/Order.hbm.xml"/>
-    
-  </session-factory>
-</hibernate-configuration>

Copied: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/timer (from rev 1741, jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/timer)


Property changes on: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/timer
___________________________________________________________________
Name: svn:mergeinfo
   + 

Modified: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/timer/IncrementCounterWaitState.java
===================================================================
--- jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/timer/IncrementCounterWaitState.java	2008-07-29 08:34:34 UTC (rev 1741)
+++ jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/timer/IncrementCounterWaitState.java	2008-07-29 15:17:43 UTC (rev 1751)
@@ -11,7 +11,7 @@
  * program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth
  * Floor, Boston, MA  02110-1301, USA.
  **/
-package org.jbpm.pvm.timer;
+package org.jbpm.pvm.api.timer;
 
 import java.util.Map;
 

Modified: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/timer/TestTimerSession.java
===================================================================
--- jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/timer/TestTimerSession.java	2008-07-29 08:34:34 UTC (rev 1741)
+++ jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/timer/TestTimerSession.java	2008-07-29 15:17:43 UTC (rev 1751)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jbpm.pvm.timer;
+package org.jbpm.pvm.api.timer;
 
 import java.util.ArrayList;
 import java.util.Date;

Modified: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/timer/TestTimerSessionBinding.java
===================================================================
--- jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/timer/TestTimerSessionBinding.java	2008-07-29 08:34:34 UTC (rev 1741)
+++ jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/timer/TestTimerSessionBinding.java	2008-07-29 15:17:43 UTC (rev 1751)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jbpm.pvm.timer;
+package org.jbpm.pvm.api.timer;
 
 import org.jbpm.pvm.internal.util.TagBinding;
 import org.jbpm.pvm.internal.wire.descriptor.ObjectDescriptor;

Modified: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/timer/TimerConfiguration.java
===================================================================
--- jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/timer/TimerConfiguration.java	2008-07-29 08:34:34 UTC (rev 1741)
+++ jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/timer/TimerConfiguration.java	2008-07-29 15:17:43 UTC (rev 1751)
@@ -1,4 +1,4 @@
- package org.jbpm.pvm.timer;
+ package org.jbpm.pvm.api.timer;
 
 import org.jbpm.pvm.ExecutionService;
 import org.jbpm.pvm.ManagementService;

Modified: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/timer/TimerIntegrationTest.java
===================================================================
--- jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/timer/TimerIntegrationTest.java	2008-07-29 08:34:34 UTC (rev 1741)
+++ jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/timer/TimerIntegrationTest.java	2008-07-29 15:17:43 UTC (rev 1751)
@@ -11,7 +11,7 @@
  * program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth
  * Floor, Boston, MA  02110-1301, USA.
  **/
-package org.jbpm.pvm.timer;
+package org.jbpm.pvm.api.timer;
 
 import java.util.Date;
 import java.util.List;

Modified: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/timer/TimerUnitTest.java
===================================================================
--- jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/timer/TimerUnitTest.java	2008-07-29 08:34:34 UTC (rev 1741)
+++ jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/timer/TimerUnitTest.java	2008-07-29 15:17:43 UTC (rev 1751)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jbpm.pvm.timer;
+package org.jbpm.pvm.api.timer;
 
 import java.util.Date;
 

Modified: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/tx/EnlistTest.java
===================================================================
--- jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/tx/EnlistTest.java	2008-07-29 15:00:31 UTC (rev 1750)
+++ jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/tx/EnlistTest.java	2008-07-29 15:17:43 UTC (rev 1751)
@@ -9,7 +9,7 @@
 import org.jbpm.pvm.internal.tx.StandardTransaction;
 import org.jbpm.pvm.internal.wire.WireContext;
 import org.jbpm.pvm.internal.wire.WireException;
-import org.jbpm.wire.WireTestCase;
+import org.jbpm.pvm.internal.wire.WireTestCase;
 
 /**
  * @author Guillaume Porcher

Copied: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/util (from rev 1741, jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/util)


Property changes on: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/util
___________________________________________________________________
Name: svn:mergeinfo
   + 

Modified: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/util/BooleanArrayTest.java
===================================================================
--- jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/util/BooleanArrayTest.java	2008-07-29 08:34:34 UTC (rev 1741)
+++ jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/util/BooleanArrayTest.java	2008-07-29 15:17:43 UTC (rev 1751)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jbpm.pvm.util;
+package org.jbpm.pvm.internal.util;
 
 import org.jbpm.pvm.test.base.JbpmTestCase;
 import org.jbpm.pvm.internal.util.BooleanArray;

Deleted: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/util/WireObservableTest.java
===================================================================
--- jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/util/WireObservableTest.java	2008-07-29 08:34:34 UTC (rev 1741)
+++ jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/util/WireObservableTest.java	2008-07-29 15:17:43 UTC (rev 1751)
@@ -1,81 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jbpm.pvm.util;
-
-import java.util.List;
-
-import org.jbpm.pvm.test.base.JbpmTestCase;
-import org.jbpm.pvm.env.Environment;
-import org.jbpm.pvm.env.EnvironmentFactory;
-import org.jbpm.pvm.env.PvmEnvironmentFactory;
-import org.jbpm.pvm.internal.env.DefaultEnvironment;
-import org.jbpm.pvm.internal.wire.WireContext;
-
-/**
- * @author Tom Baeyens
- */
-public class WireObservableTest extends JbpmTestCase
-{
-  
-  public static class Recorder implements Listener {
-    public void event(Object source, String eventName, Object info) {
-    }
-  }
-
-  public void testSubscription() {
-    // <subscribe /> will use the scope as the observable
-    // In this test, there is no eager initialisation
-
-    EnvironmentFactory environmentFactory = PvmEnvironmentFactory.parseXmlString(
-      "<environment-scopes>" +
-      "  <environment-factory />" +
-      "  <environment>" +
-      "    <object name='recorder' class='"+Recorder.class.getName()+"'>" +
-      "      <subscribe />" +
-      "    </object>" +
-      "  </environment>" +
-      "</environment-scopes>"
-    );
-
-    Environment environment = environmentFactory.openEnvironment();
-    try {
-      WireContext environmentContext = (WireContext) environment.getContext(DefaultEnvironment.CONTEXTNAME_ENVIRONMENT);
-
-      // this test also checks non-eager-initialized subscription
-      // subscription should only be done when the object is created the first time
-      List<Listener> listeners = environmentContext.listeners;
-      int beforeListenersSize = (listeners!=null ? listeners.size() : 0);
-      
-      assertNotNull(environment.get("recorder"));
-      
-      listeners = environmentContext.listeners;
-      int afterListenersSize = (listeners!=null ? listeners.size() : 0);
-      int addedListeners = afterListenersSize - beforeListenersSize;
-      assertEquals(1, addedListeners);
-      
-
-    } finally {
-      environment.close();
-    }
-    environmentFactory.close();
-  }
-}

Copied: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/wire (from rev 1741, jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/wire)


Property changes on: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/wire
___________________________________________________________________
Name: svn:mergeinfo
   + 

Modified: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/wire/AutoWireTest.java
===================================================================
--- jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/wire/AutoWireTest.java	2008-07-29 08:34:34 UTC (rev 1741)
+++ jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/wire/AutoWireTest.java	2008-07-29 15:17:43 UTC (rev 1751)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jbpm.wire;
+package org.jbpm.pvm.internal.wire;
 
 import java.util.List;
 

Modified: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/wire/BasicTypeWireTest.java
===================================================================
--- jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/wire/BasicTypeWireTest.java	2008-07-29 08:34:34 UTC (rev 1741)
+++ jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/wire/BasicTypeWireTest.java	2008-07-29 15:17:43 UTC (rev 1751)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jbpm.wire;
+package org.jbpm.pvm.internal.wire;
 
 import java.util.List;
 

Modified: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/wire/ClassWireTest.java
===================================================================
--- jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/wire/ClassWireTest.java	2008-07-29 08:34:34 UTC (rev 1741)
+++ jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/wire/ClassWireTest.java	2008-07-29 15:17:43 UTC (rev 1751)
@@ -1,4 +1,4 @@
-package org.jbpm.wire;
+package org.jbpm.pvm.internal.wire;
 
 import java.util.List;
 
@@ -20,7 +20,7 @@
   public void testClass(){
     WireContext wireContext = createWireContext(
         "<objects>" +
-        "  <class name='o' class-name='org.jbpm.wire.ClassWireTest' />" +
+        "  <class name='o' class-name='"+ClassWireTest.class.getName()+"' />" +
         "</objects>"
     );
 

Modified: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/wire/ConcurrentWiringTest.java
===================================================================
--- jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/wire/ConcurrentWiringTest.java	2008-07-29 08:34:34 UTC (rev 1741)
+++ jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/wire/ConcurrentWiringTest.java	2008-07-29 15:17:43 UTC (rev 1751)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jbpm.wire;
+package org.jbpm.pvm.internal.wire;
 
 import java.util.ArrayList;
 import java.util.List;

Modified: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/wire/ContextBlockSubscriptionTest.java
===================================================================
--- jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/wire/ContextBlockSubscriptionTest.java	2008-07-29 08:34:34 UTC (rev 1741)
+++ jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/wire/ContextBlockSubscriptionTest.java	2008-07-29 15:17:43 UTC (rev 1751)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jbpm.wire;
+package org.jbpm.pvm.internal.wire;
 
 
 import org.jbpm.pvm.env.Environment;

Modified: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/wire/ContextTest.java
===================================================================
--- jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/wire/ContextTest.java	2008-07-29 08:34:34 UTC (rev 1741)
+++ jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/wire/ContextTest.java	2008-07-29 15:17:43 UTC (rev 1751)
@@ -11,7 +11,7 @@
  * program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth
  * Floor, Boston, MA  02110-1301, USA.
  **/
-package org.jbpm.wire;
+package org.jbpm.pvm.internal.wire;
 
 import java.util.HashSet;
 import java.util.Set;

Modified: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/wire/DelayedInitTest.java
===================================================================
--- jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/wire/DelayedInitTest.java	2008-07-29 08:34:34 UTC (rev 1741)
+++ jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/wire/DelayedInitTest.java	2008-07-29 15:17:43 UTC (rev 1751)
@@ -1,4 +1,4 @@
-package org.jbpm.wire;
+package org.jbpm.pvm.internal.wire;
 
 import java.util.List;
 

Modified: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/wire/DependencyTest.java
===================================================================
--- jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/wire/DependencyTest.java	2008-07-29 08:34:34 UTC (rev 1741)
+++ jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/wire/DependencyTest.java	2008-07-29 15:17:43 UTC (rev 1751)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jbpm.wire;
+package org.jbpm.pvm.internal.wire;
 
 import org.jbpm.pvm.internal.wire.WireContext;
 import org.jbpm.pvm.internal.wire.WireException;

Modified: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/wire/EagerInitTest.java
===================================================================
--- jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/wire/EagerInitTest.java	2008-07-29 08:34:34 UTC (rev 1741)
+++ jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/wire/EagerInitTest.java	2008-07-29 15:17:43 UTC (rev 1751)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jbpm.wire;
+package org.jbpm.pvm.internal.wire;
 
 import java.util.ArrayList;
 import java.util.List;

Modified: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/wire/EnvWireTest.java
===================================================================
--- jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/wire/EnvWireTest.java	2008-07-29 08:34:34 UTC (rev 1741)
+++ jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/wire/EnvWireTest.java	2008-07-29 15:17:43 UTC (rev 1751)
@@ -1,4 +1,4 @@
-package org.jbpm.wire;
+package org.jbpm.pvm.internal.wire;
 
 import org.jbpm.pvm.env.Environment;
 import org.jbpm.pvm.env.EnvironmentFactory;

Modified: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/wire/HibernateSessionFactoryWireTest.java
===================================================================
--- jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/wire/HibernateSessionFactoryWireTest.java	2008-07-29 08:34:34 UTC (rev 1741)
+++ jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/wire/HibernateSessionFactoryWireTest.java	2008-07-29 15:17:43 UTC (rev 1751)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jbpm.wire;
+package org.jbpm.pvm.internal.wire;
 
 import org.hibernate.SessionFactory;
 import org.jbpm.pvm.internal.wire.WireContext;

Modified: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/wire/ListWireTest.java
===================================================================
--- jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/wire/ListWireTest.java	2008-07-29 08:34:34 UTC (rev 1741)
+++ jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/wire/ListWireTest.java	2008-07-29 15:17:43 UTC (rev 1751)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jbpm.wire;
+package org.jbpm.pvm.internal.wire;
 
 import java.util.ArrayList;
 import java.util.HashSet;

Modified: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/wire/MapWireTest.java
===================================================================
--- jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/wire/MapWireTest.java	2008-07-29 08:34:34 UTC (rev 1741)
+++ jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/wire/MapWireTest.java	2008-07-29 15:17:43 UTC (rev 1751)
@@ -1,4 +1,4 @@
-package org.jbpm.wire;
+package org.jbpm.pvm.internal.wire;
 
 import java.util.List;
 import java.util.Map;

Modified: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/wire/MethodSubscriptionTest.java
===================================================================
--- jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/wire/MethodSubscriptionTest.java	2008-07-29 08:34:34 UTC (rev 1741)
+++ jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/wire/MethodSubscriptionTest.java	2008-07-29 15:17:43 UTC (rev 1751)
@@ -1,4 +1,4 @@
-package org.jbpm.wire;
+package org.jbpm.pvm.internal.wire;
 
 import org.jbpm.pvm.env.Environment;
 import org.jbpm.pvm.env.EnvironmentFactory;

Modified: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/wire/ObjectSubscriptionTest.java
===================================================================
--- jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/wire/ObjectSubscriptionTest.java	2008-07-29 08:34:34 UTC (rev 1741)
+++ jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/wire/ObjectSubscriptionTest.java	2008-07-29 15:17:43 UTC (rev 1751)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jbpm.wire;
+package org.jbpm.pvm.internal.wire;
 
 import org.jbpm.pvm.env.Environment;
 import org.jbpm.pvm.env.EnvironmentFactory;

Modified: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/wire/ObjectWireTest.java
===================================================================
--- jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/wire/ObjectWireTest.java	2008-07-29 08:34:34 UTC (rev 1741)
+++ jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/wire/ObjectWireTest.java	2008-07-29 15:17:43 UTC (rev 1751)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jbpm.wire;
+package org.jbpm.pvm.internal.wire;
 
 import java.util.List;
 

Modified: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/wire/PropertiesWireTest.java
===================================================================
--- jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/wire/PropertiesWireTest.java	2008-07-29 08:34:34 UTC (rev 1741)
+++ jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/wire/PropertiesWireTest.java	2008-07-29 15:17:43 UTC (rev 1751)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jbpm.wire;
+package org.jbpm.pvm.internal.wire;
 
 import java.util.List;
 import java.util.Properties;

Modified: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/wire/RefWireTest.java
===================================================================
--- jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/wire/RefWireTest.java	2008-07-29 08:34:34 UTC (rev 1741)
+++ jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/wire/RefWireTest.java	2008-07-29 15:17:43 UTC (rev 1751)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jbpm.wire;
+package org.jbpm.pvm.internal.wire;
 
 import java.util.List;
 import java.util.Map;

Modified: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/wire/SetWireTest.java
===================================================================
--- jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/wire/SetWireTest.java	2008-07-29 08:34:34 UTC (rev 1741)
+++ jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/wire/SetWireTest.java	2008-07-29 15:17:43 UTC (rev 1751)
@@ -1,4 +1,4 @@
-package org.jbpm.wire;
+package org.jbpm.pvm.internal.wire;
 
 import java.util.List;
 import java.util.Set;

Modified: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/wire/SubscriptionTestCase.java
===================================================================
--- jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/wire/SubscriptionTestCase.java	2008-07-29 08:34:34 UTC (rev 1741)
+++ jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/wire/SubscriptionTestCase.java	2008-07-29 15:17:43 UTC (rev 1751)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jbpm.wire;
+package org.jbpm.pvm.internal.wire;
 
 import java.util.ArrayList;
 import java.util.List;

Modified: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/wire/TypeLookupTest.java
===================================================================
--- jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/wire/TypeLookupTest.java	2008-07-29 08:34:34 UTC (rev 1741)
+++ jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/wire/TypeLookupTest.java	2008-07-29 15:17:43 UTC (rev 1751)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jbpm.wire;
+package org.jbpm.pvm.internal.wire;
 
 import org.jbpm.pvm.internal.wire.WireContext;
 

Modified: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/wire/WireEventsSubscriptionTest.java
===================================================================
--- jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/wire/WireEventsSubscriptionTest.java	2008-07-29 08:34:34 UTC (rev 1741)
+++ jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/wire/WireEventsSubscriptionTest.java	2008-07-29 15:17:43 UTC (rev 1751)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jbpm.wire;
+package org.jbpm.pvm.internal.wire;
 
 import org.jbpm.pvm.env.Environment;
 import org.jbpm.pvm.env.EnvironmentFactory;

Copied: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/wire/WireObservableTest.java (from rev 1741, jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/util/WireObservableTest.java)
===================================================================
--- jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/wire/WireObservableTest.java	                        (rev 0)
+++ jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/wire/WireObservableTest.java	2008-07-29 15:17:43 UTC (rev 1751)
@@ -0,0 +1,82 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jbpm.pvm.internal.wire;
+
+import java.util.List;
+
+import org.jbpm.pvm.test.base.JbpmTestCase;
+import org.jbpm.pvm.util.Listener;
+import org.jbpm.pvm.env.Environment;
+import org.jbpm.pvm.env.EnvironmentFactory;
+import org.jbpm.pvm.env.PvmEnvironmentFactory;
+import org.jbpm.pvm.internal.env.DefaultEnvironment;
+import org.jbpm.pvm.internal.wire.WireContext;
+
+/**
+ * @author Tom Baeyens
+ */
+public class WireObservableTest extends JbpmTestCase
+{
+  
+  public static class Recorder implements Listener {
+    public void event(Object source, String eventName, Object info) {
+    }
+  }
+
+  public void testSubscription() {
+    // <subscribe /> will use the scope as the observable
+    // In this test, there is no eager initialisation
+
+    EnvironmentFactory environmentFactory = PvmEnvironmentFactory.parseXmlString(
+      "<environment-scopes>" +
+      "  <environment-factory />" +
+      "  <environment>" +
+      "    <object name='recorder' class='"+Recorder.class.getName()+"'>" +
+      "      <subscribe />" +
+      "    </object>" +
+      "  </environment>" +
+      "</environment-scopes>"
+    );
+
+    Environment environment = environmentFactory.openEnvironment();
+    try {
+      WireContext environmentContext = (WireContext) environment.getContext(DefaultEnvironment.CONTEXTNAME_ENVIRONMENT);
+
+      // this test also checks non-eager-initialized subscription
+      // subscription should only be done when the object is created the first time
+      List<Listener> listeners = environmentContext.getListeners();
+      int beforeListenersSize = (listeners!=null ? listeners.size() : 0);
+      
+      assertNotNull(environment.get("recorder"));
+      
+      listeners = environmentContext.getListeners();
+      int afterListenersSize = (listeners!=null ? listeners.size() : 0);
+      int addedListeners = afterListenersSize - beforeListenersSize;
+      assertEquals(1, addedListeners);
+      
+
+    } finally {
+      environment.close();
+    }
+    environmentFactory.close();
+  }
+}


Property changes on: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/wire/WireObservableTest.java
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:mergeinfo
   + 
Name: svn:eol-style
   + LF

Modified: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/wire/WireTestCase.java
===================================================================
--- jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/wire/WireTestCase.java	2008-07-29 08:34:34 UTC (rev 1741)
+++ jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/wire/WireTestCase.java	2008-07-29 15:17:43 UTC (rev 1751)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jbpm.wire;
+package org.jbpm.pvm.internal.wire;
 
 import java.util.List;
 

Modified: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/wire/WireTests.java
===================================================================
--- jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/wire/WireTests.java	2008-07-29 08:34:34 UTC (rev 1741)
+++ jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/wire/WireTests.java	2008-07-29 15:17:43 UTC (rev 1751)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jbpm.wire;
+package org.jbpm.pvm.internal.wire;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
@@ -54,6 +54,7 @@
     suite.addTestSuite(SetWireTest.class);
     suite.addTestSuite(TypeLookupTest.class);
     suite.addTestSuite(WireEventsSubscriptionTest.class);
+    suite.addTestSuite(WireObservableTest.class);
     //$JUnit-END$
     return suite;
   }

Copied: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/xml (from rev 1741, jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/xml)


Property changes on: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/xml
___________________________________________________________________
Name: svn:mergeinfo
   + 

Modified: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/xml/DebugDomBuilderTest.java
===================================================================
--- jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/xml/DebugDomBuilderTest.java	2008-07-29 08:34:34 UTC (rev 1741)
+++ jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/xml/DebugDomBuilderTest.java	2008-07-29 15:17:43 UTC (rev 1751)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jbpm.xml;
+package org.jbpm.pvm.internal.xml;
 
 import java.io.InputStream;
 import java.util.List;

Modified: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/xml/WireParserTest.java
===================================================================
--- jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/xml/WireParserTest.java	2008-07-29 08:34:34 UTC (rev 1741)
+++ jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/xml/WireParserTest.java	2008-07-29 15:17:43 UTC (rev 1751)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jbpm.xml;
+package org.jbpm.pvm.internal.xml;
 
 import org.jbpm.pvm.test.base.JbpmTestCase;
 

Modified: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/xml/XmlParsingTest.java
===================================================================
--- jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/xml/XmlParsingTest.java	2008-07-29 08:34:34 UTC (rev 1741)
+++ jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/xml/XmlParsingTest.java	2008-07-29 15:17:43 UTC (rev 1751)
@@ -1,4 +1,4 @@
-package org.jbpm.xml;
+package org.jbpm.pvm.internal.xml;
 
 import java.util.ArrayList;
 import java.util.List;

Modified: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/pvm.wire.bindings.xml
===================================================================
--- jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/pvm.wire.bindings.xml	2008-07-29 15:00:31 UTC (rev 1750)
+++ jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/pvm.wire.bindings.xml	2008-07-29 15:17:43 UTC (rev 1751)
@@ -1,5 +1,5 @@
 <wire-bindings>
 
-  <binding class="org.jbpm.pvm.timer.TestTimerSessionBinding" />
+  <binding class="org.jbpm.pvm.api.timer.TestTimerSessionBinding" />
 
 </wire-bindings>

Modified: jbpm4/pvm/trunk/modules/core/src/test/resources/logging.properties
===================================================================
--- jbpm4/pvm/trunk/modules/core/src/test/resources/logging.properties	2008-07-29 15:00:31 UTC (rev 1750)
+++ jbpm4/pvm/trunk/modules/core/src/test/resources/logging.properties	2008-07-29 15:17:43 UTC (rev 1751)
@@ -17,7 +17,7 @@
 org.jbpm.level=FINE
 org.jbpm.pvm.internal.tx.level=FINE
 org.jbpm.pvm.internal.wire.level=FINE
-org.jbpm.pvm.util.level=FINE
+org.jbpm.pvm.internal.util.level=FINE
 
 org.hibernate.cfg.HbmBinder.level=SEVERE
 org.hibernate.cfg.SettingsFactory.level=SEVERE

Copied: jbpm4/pvm/trunk/modules/core/src/test/resources/org/jbpm/pvm/api/db/continuation (from rev 1741, jbpm4/pvm/trunk/modules/core/src/test/resources/org/jbpm/svc/jobexecutor)


Property changes on: jbpm4/pvm/trunk/modules/core/src/test/resources/org/jbpm/pvm/api/db/continuation
___________________________________________________________________
Name: svn:mergeinfo
   + 

Modified: jbpm4/pvm/trunk/modules/core/src/test/resources/org/jbpm/pvm/api/db/continuation/ContinuationTest.cfg.xml
===================================================================
--- jbpm4/pvm/trunk/modules/core/src/test/resources/org/jbpm/svc/jobexecutor/ContinuationTest.cfg.xml	2008-07-29 08:34:34 UTC (rev 1741)
+++ jbpm4/pvm/trunk/modules/core/src/test/resources/org/jbpm/pvm/api/db/continuation/ContinuationTest.cfg.xml	2008-07-29 15:17:43 UTC (rev 1751)
@@ -4,12 +4,11 @@
 
     <object class="org.jbpm.pvm.internal.hibernate.PvmNamingStrategy" auto-wire="true" />
 
-    <object class="org.jbpm.svc.jobexecutor.Recorder" />
+    <object class="org.jbpm.pvm.api.db.continuation.Recorder" />
 
     <hibernate-configuration>
       <properties resource="hibernate.properties" />
       <mappings resource="org/jbpm/pvm/pvm.hibernate.mappings.xml" />
-      <mapping resource="org/jbpm/svc/jobexecutor/ContinuationTest.hbm.xml" />
       <cache-configuration resource="org/jbpm/pvm/pvm.cache.xml" usage="nonstrict-read-write" />
     </hibernate-configuration>
 
@@ -25,15 +24,13 @@
   </environment-factory>
 
   <environment>
-  
-<!--    <http-filter-authentication />-->
 
     <transaction />
     <hibernate-session />
+    <message-session />
 
     <pvm-db-session />
-    <message-session />
-    <job-session />
+    <job-db-session />
 
   </environment>
 

Deleted: jbpm4/pvm/trunk/modules/core/src/test/resources/org/jbpm/pvm/api/db/continuation/ContinuationTest.hbm.xml
===================================================================
--- jbpm4/pvm/trunk/modules/core/src/test/resources/org/jbpm/svc/jobexecutor/ContinuationTest.hbm.xml	2008-07-29 08:34:34 UTC (rev 1741)
+++ jbpm4/pvm/trunk/modules/core/src/test/resources/org/jbpm/pvm/api/db/continuation/ContinuationTest.hbm.xml	2008-07-29 15:17:43 UTC (rev 1751)
@@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE hibernate-mapping PUBLIC
-      "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-      "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping package="org.jbpm.svc.jobexecutor" default-access="field">
-
-	<class name="ContinuationNode" abstract="true" 
-	       table="CONTINUATION_TEST_NODES" discriminator-value=" ">
-	       
-		<id name="dbid" column="DBID_">
-			<generator class="native" />
-		</id>
-		<discriminator type="string" />
-		<version name="dbversion" column="DBVERSION_" />
-		
-		<subclass name="AutomaticActivity" extends="org.jbpm.pvm.NodeBehaviour" discriminator-value="A" />
-		<subclass name="WaitState" extends="org.jbpm.pvm.NodeBehaviour" discriminator-value="W" />
-		
-  </class>
-  
-</hibernate-mapping>
\ No newline at end of file

Deleted: jbpm4/pvm/trunk/modules/core/src/test/resources/org/jbpm/pvm/api/db/continuation/JobExecutorTest.cfg.xml
===================================================================
--- jbpm4/pvm/trunk/modules/core/src/test/resources/org/jbpm/svc/jobexecutor/JobExecutorTest.cfg.xml	2008-07-29 08:34:34 UTC (rev 1741)
+++ jbpm4/pvm/trunk/modules/core/src/test/resources/org/jbpm/pvm/api/db/continuation/JobExecutorTest.cfg.xml	2008-07-29 15:17:43 UTC (rev 1751)
@@ -1,36 +0,0 @@
-<contexts>
-
-	<environment-factory>
-
-	  <list name="messageNumberCollector" synchronized="true" />
-    <object class="org.jbpm.pvm.internal.hibernate.PvmNamingStrategy" auto-wire="true" />
-
-    <hibernate-configuration>
-      <properties resource="hibernate.properties" />
-      <mappings resource="org/jbpm/pvm/pvm.hibernate.mappings.xml" />
-      <mapping resource="org/jbpm/svc/jobexecutor/JobExecutorTest.hbm.xml" />
-      <cache-configuration resource="org/jbpm/pvm/pvm.cache.xml" usage="nonstrict-read-write" />
-    </hibernate-configuration>
-
-    <hibernate-session-factory />
-
-    <job-executor threads="1" auto-start="true" />
-    
-    <command-service>
-      <environment-interceptor />
-      <transaction-interceptor />
-    </command-service>
-
-  </environment-factory>
-
-  <environment>
-
-    <transaction />
-    <hibernate-session />
-    <pvm-db-session />
-    <message-session />
-    <job-session />
-
-  </environment>
-
-</contexts>

Copied: jbpm4/pvm/trunk/modules/core/src/test/resources/org/jbpm/pvm/api/db/embedded (from rev 1741, jbpm4/pvm/trunk/modules/core/src/test/resources/org/jbpm/svc/hibernate)


Property changes on: jbpm4/pvm/trunk/modules/core/src/test/resources/org/jbpm/pvm/api/db/embedded
___________________________________________________________________
Name: svn:mergeinfo
   + 

Modified: jbpm4/pvm/trunk/modules/core/src/test/resources/org/jbpm/pvm/api/db/embedded/Order.hbm.xml
===================================================================
--- jbpm4/pvm/trunk/modules/core/src/test/resources/org/jbpm/svc/hibernate/Order.hbm.xml	2008-07-29 08:34:34 UTC (rev 1741)
+++ jbpm4/pvm/trunk/modules/core/src/test/resources/org/jbpm/pvm/api/db/embedded/Order.hbm.xml	2008-07-29 15:17:43 UTC (rev 1751)
@@ -1,9 +1,9 @@
 <?xml version="1.0"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<hibernate-mapping package="org.jbpm.svc.hibernate" default-access="field">
+<hibernate-mapping package="org.jbpm.pvm.api.db.embedded" default-access="field">
 
-  <typedef name="execution" class="org.jbpm.svc.hibernate.ExecutionType" />
+  <typedef name="execution" class="org.jbpm.pvm.internal.hibernate.ExecutionType" />
 
   <class name="Order" table="ORDERS">
 

Modified: jbpm4/pvm/trunk/modules/core/src/test/resources/org/jbpm/pvm/api/db/embedded/hibernate.cfg.xml
===================================================================
--- jbpm4/pvm/trunk/modules/core/src/test/resources/org/jbpm/svc/hibernate/hibernate.cfg.xml	2008-07-29 08:34:34 UTC (rev 1741)
+++ jbpm4/pvm/trunk/modules/core/src/test/resources/org/jbpm/pvm/api/db/embedded/hibernate.cfg.xml	2008-07-29 15:17:43 UTC (rev 1751)
@@ -17,7 +17,7 @@
     <property name="hibernate.format_sql">true"</property>
     <property name="hibernate.use_sql_comments">true"</property>
     
-    <mapping resource="org/jbpm/svc/hibernate/Order.hbm.xml"/>
+    <mapping resource="org/jbpm/pvm/api/db/embedded/Order.hbm.xml"/>
     
   </session-factory>
 </hibernate-configuration>

Copied: jbpm4/pvm/trunk/modules/core/src/test/resources/org/jbpm/pvm/api/timer (from rev 1741, jbpm4/pvm/trunk/modules/core/src/test/resources/org/jbpm/pvm/timer)


Property changes on: jbpm4/pvm/trunk/modules/core/src/test/resources/org/jbpm/pvm/api/timer
___________________________________________________________________
Name: svn:mergeinfo
   + 

Modified: jbpm4/pvm/trunk/modules/core/src/test/resources/org/jbpm/pvm/api/timer/environment.cfg.xml
===================================================================
--- jbpm4/pvm/trunk/modules/core/src/test/resources/org/jbpm/pvm/timer/environment.cfg.xml	2008-07-29 08:34:34 UTC (rev 1741)
+++ jbpm4/pvm/trunk/modules/core/src/test/resources/org/jbpm/pvm/api/timer/environment.cfg.xml	2008-07-29 15:17:43 UTC (rev 1751)
@@ -7,6 +7,8 @@
     <job-test-helper />
     
     <process-service />
+    <execution-service />
+    <management-service />
     
     <command-service>
       <retry-interceptor />

Modified: jbpm4/pvm/trunk/modules/core/src/test/resources/org/jbpm/pvm.wire.bindings.xml
===================================================================
--- jbpm4/pvm/trunk/modules/core/src/test/resources/org/jbpm/pvm.wire.bindings.xml	2008-07-29 15:00:31 UTC (rev 1750)
+++ jbpm4/pvm/trunk/modules/core/src/test/resources/org/jbpm/pvm.wire.bindings.xml	2008-07-29 15:17:43 UTC (rev 1751)
@@ -1,5 +1,5 @@
 <wire-bindings>
 
-  <binding class="org.jbpm.pvm.timer.TestTimerSessionBinding" />
+  <binding class="org.jbpm.pvm.api.timer.TestTimerSessionBinding" />
 
 </wire-bindings>




More information about the jbpm-commits mailing list