[jbpm-commits] JBoss JBPM SVN: r3063 - in projects/spec/trunk/modules: api/src/main/java/org/jbpm/api/client/internal and 2 other directories.

[do-not-reply at jboss.org]

Author: thomas.diesler at jboss.com
Date: 2008-11-24 15:31:10 -0500 (Mon, 24 Nov 2008)
New Revision: 3063

Modified:
   projects/spec/trunk/modules/api/pom.xml
   projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/client/internal/MicrocontainerConfigurationProvider.java
   projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/test/IntegrationTestCase.java
   projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/test/IntegrationTestHelper.java
   projects/spec/trunk/modules/ri/src/main/resources/jbpm-cfg-beans.xml
Log:
Update integration tests

Modified: projects/spec/trunk/modules/api/pom.xml
===================================================================
--- projects/spec/trunk/modules/api/pom.xml	2008-11-24 18:11:09 UTC (rev 3062)
+++ projects/spec/trunk/modules/api/pom.xml	2008-11-24 20:31:10 UTC (rev 3063)
@@ -58,13 +58,13 @@
       <artifactId>hibernate</artifactId>
     </dependency>
     <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+    </dependency>
+    <dependency>
       <groupId>org.jboss.microcontainer</groupId>
       <artifactId>jboss-kernel</artifactId>
     </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-    </dependency>
   </dependencies>
   
   <!-- Plugins -->

Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/client/internal/MicrocontainerConfigurationProvider.java
===================================================================
--- projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/client/internal/MicrocontainerConfigurationProvider.java	2008-11-24 18:11:09 UTC (rev 3062)
+++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/client/internal/MicrocontainerConfigurationProvider.java	2008-11-24 20:31:10 UTC (rev 3063)
@@ -26,7 +26,6 @@
 import java.net.URL;
 
 import org.jboss.kernel.Kernel;
-import org.jboss.kernel.plugins.util.KernelLocator;
 import org.jboss.kernel.spi.registry.KernelRegistryEntry;
 import org.jbpm.api.NotImplementedException;
 import org.jbpm.api.client.ConfigurationProvider;
@@ -57,21 +56,25 @@
     }
     return engine;
   }
-  
+
   @Override
   public ProcessEngine getProcessEngine(URL cfgURL)
   {
-    EmbeddedBeansDeployer deployer = new EmbeddedBeansDeployer();
-    deployer.deploy(cfgURL);
+    Kernel kernel = KernelLocator.getKernel();
+    if (kernel == null)
+    {
+      EmbeddedBeansDeployer deployer = new EmbeddedBeansDeployer();
+      deployer.deploy(cfgURL);
+    }
     return getProcessEngineBean();
   }
-  
+
   @Override
   public ProcessEngine getProcessEngine(String cfgXML)
   {
     throw new NotImplementedException();
   }
-  
+
   @SuppressWarnings("deprecation")
   private ProcessEngine getProcessEngineBean()
   {
@@ -80,7 +83,7 @@
     ProcessEngine engine = (ProcessEngine)entry.getTarget();
     return engine;
   }
-  
+
   private URL getDefaultConfigURL()
   {
     URL cfgURL = Thread.currentThread().getContextClassLoader().getResource(JBPM_ENGINE_CONFIG);

Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/test/IntegrationTestCase.java
===================================================================
--- projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/test/IntegrationTestCase.java	2008-11-24 18:11:09 UTC (rev 3062)
+++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/test/IntegrationTestCase.java	2008-11-24 20:31:10 UTC (rev 3063)
@@ -38,7 +38,7 @@
  * @author Thomas.Diesler at jboss.org
  * @since 25-Sep-2008
  */
-public class IntegrationTestCase extends CTSTestCase
+public class IntegrationTestCase extends APITestCase
 {
   // Provide logging
   final Logger log = LoggerFactory.getLogger(IntegrationTestCase.class);
@@ -75,11 +75,21 @@
     delegate.deploy(archive);
   }
 
+  public void deploy(URL archive) throws Exception
+  {
+    delegate.deploy(archive);
+  }
+
   public void undeploy(String archive) throws Exception
   {
     delegate.undeploy(archive);
   }
 
+  public void undeploy(URL archive) throws Exception
+  {
+    delegate.undeploy(archive);
+  }
+
   public MBeanServerConnection getServer()
   {
     return delegate.getServer();

Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/test/IntegrationTestHelper.java
===================================================================
--- projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/test/IntegrationTestHelper.java	2008-11-24 18:11:09 UTC (rev 3062)
+++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/test/IntegrationTestHelper.java	2008-11-24 20:31:10 UTC (rev 3063)
@@ -50,15 +50,25 @@
   public void deploy(String archive) throws Exception
   {
     URL url = getArchiveFile(archive).toURI().toURL();
-    getDeployer().deploy(url);
+    deploy(url);
   }
 
+  public void deploy(URL archive) throws Exception
+  {
+    getDeployer().deploy(archive);
+  }
+
   public void undeploy(String archive) throws Exception
   {
     URL url = getArchiveFile(archive).toURI().toURL();
-    getDeployer().undeploy(url);
+    undeploy(url);
   }
 
+  public void undeploy(URL archive) throws Exception
+  {
+    getDeployer().undeploy(archive);
+  }
+
   public boolean isTargetJBoss500()
   {
     String target = getIntegrationTarget();

Modified: projects/spec/trunk/modules/ri/src/main/resources/jbpm-cfg-beans.xml
===================================================================
--- projects/spec/trunk/modules/ri/src/main/resources/jbpm-cfg-beans.xml	2008-11-24 18:11:09 UTC (rev 3062)
+++ projects/spec/trunk/modules/ri/src/main/resources/jbpm-cfg-beans.xml	2008-11-24 20:31:10 UTC (rev 3063)
@@ -1,8 +1,10 @@
 <deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer:2.0 bean-deployer_2_0.xsd"
   xmlns="urn:jboss:bean-deployer:2.0">
   
-    <!-- The KernelLocator -->
-    <bean name="KernelLocator" class="org.jboss.kernel.plugins.util.KernelLocator" />
+    <!-- Locate the single instance of the kernel -->
+    <bean name="WSKernelLocator" class="org.jbpm.api.client.internal.KernelLocator">
+      <property name="kernel"><inject bean="jboss.kernel:service=Kernel" /></property>
+    </bean>
 
     <!-- The ProcessEngine -->
     <bean name="jBPMProcessEngine" class="org.jbpm.ri.client.ProcessEngineImpl">