[jbpm-commits] JBoss JBPM SVN: r3332 - in jbpm3/trunk/modules: distribution/scripts and 4 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Thu Dec 11 06:30:21 EST 2008
Author: thomas.diesler at jboss.com
Date: 2008-12-11 06:30:20 -0500 (Thu, 11 Dec 2008)
New Revision: 3332
Added:
jbpm3/trunk/modules/integration/src/test/resources/jndi.properties
Modified:
jbpm3/trunk/modules/distribution/pom.xml
jbpm3/trunk/modules/distribution/scripts/assembly-deploy-artifacts.xml
jbpm3/trunk/modules/distribution/src/main/resources/installer/install-definition.xml
jbpm3/trunk/modules/integration/.project
jbpm3/trunk/modules/integration/pom.xml
jbpm3/trunk/modules/integration/src/test/java/org/jbpm/test/integration/spec/deployment/DeploymentPARTest.java
Log:
Add remote deployer tests
Modified: jbpm3/trunk/modules/distribution/pom.xml
===================================================================
--- jbpm3/trunk/modules/distribution/pom.xml 2008-12-11 10:56:36 UTC (rev 3331)
+++ jbpm3/trunk/modules/distribution/pom.xml 2008-12-11 11:30:20 UTC (rev 3332)
@@ -41,12 +41,12 @@
</dependency>
<dependency>
<groupId>org.jbpm.jbpm3</groupId>
- <artifactId>bpm-spec-integration-jbpm3</artifactId>
+ <artifactId>jbpm-integration-spec</artifactId>
<version>${version}</version>
</dependency>
<dependency>
<groupId>org.jbpm.jbpm3</groupId>
- <artifactId>bpm-spec-integration-jbpm3</artifactId>
+ <artifactId>jbpm-integration-spec</artifactId>
<classifier>config</classifier>
<version>${version}</version>
</dependency>
Modified: jbpm3/trunk/modules/distribution/scripts/assembly-deploy-artifacts.xml
===================================================================
--- jbpm3/trunk/modules/distribution/scripts/assembly-deploy-artifacts.xml 2008-12-11 10:56:36 UTC (rev 3331)
+++ jbpm3/trunk/modules/distribution/scripts/assembly-deploy-artifacts.xml 2008-12-11 11:30:20 UTC (rev 3332)
@@ -54,7 +54,7 @@
<outputDirectory>resources/jbpm-integration-config</outputDirectory>
<useStrictFiltering>true</useStrictFiltering>
<includes>
- <include>*:bpm-spec-integration-jbpm3:jar:config</include>
+ <include>*:jbpm-integration-spec:jar:config</include>
<include>*:bpm-spec-integration-jboss42:jar:config</include>
</includes>
<unpack>true</unpack>
Modified: jbpm3/trunk/modules/distribution/src/main/resources/installer/install-definition.xml
===================================================================
--- jbpm3/trunk/modules/distribution/src/main/resources/installer/install-definition.xml 2008-12-11 10:56:36 UTC (rev 3331)
+++ jbpm3/trunk/modules/distribution/src/main/resources/installer/install-definition.xml 2008-12-11 11:30:20 UTC (rev 3332)
@@ -148,7 +148,6 @@
<include name="activation.jar" />
<include name="antlr.jar" />
<include name="asm.jar" />
- <include name="bpm-spec-integration-jbpm3" />
<include name="bpm-spec-integration-jboss42.jar" />
<include name="bsh.jar" />
<include name="cglib.jar" />
@@ -158,6 +157,7 @@
<include name="hibernate.jar" />
<include name="hsqldb.jar" />
<include name="jbpm-enterprise-bundle.ear" />
+ <include name="jbpm-integration-spec.jar"/>
<include name="jbpm-jpdl.jar" />
<include name="jbpm-identity.jar" />
<include name="junit.jar" />
@@ -199,7 +199,7 @@
<!-- jbpm/jbpm-integration.beans -->
<fileset dir="@{deploy.artifacts.dir}/lib" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-integration.beans" override="true">
<include name="bpm-spec-dialect-api10.jar" />
- <include name="bpm-spec-integration-jbpm3.jar" />
+ <include name="jbpm-integration-spec.jar" />
</fileset>
<fileset dir="@{deploy.artifacts.dir}/resources/jbpm-integration-config" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-integration.beans/META-INF" override="true">
<include name="jboss-beans.xml" />
Modified: jbpm3/trunk/modules/integration/.project
===================================================================
--- jbpm3/trunk/modules/integration/.project 2008-12-11 10:56:36 UTC (rev 3331)
+++ jbpm3/trunk/modules/integration/.project 2008-12-11 11:30:20 UTC (rev 3332)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>bpm-spec-integration-jbpm3</name>
+ <name>jbpm-integration-spec</name>
<comment></comment>
<projects>
</projects>
Modified: jbpm3/trunk/modules/integration/pom.xml
===================================================================
--- jbpm3/trunk/modules/integration/pom.xml 2008-12-11 10:56:36 UTC (rev 3331)
+++ jbpm3/trunk/modules/integration/pom.xml 2008-12-11 11:30:20 UTC (rev 3332)
@@ -15,9 +15,9 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <name>JBoss jBPM3 - Integration</name>
+ <name>JBoss jBPM3 - Spec Integration</name>
<groupId>org.jbpm.jbpm3</groupId>
- <artifactId>bpm-spec-integration-jbpm3</artifactId>
+ <artifactId>jbpm-integration-spec</artifactId>
<packaging>jar</packaging>
<!-- Parent -->
@@ -30,6 +30,7 @@
<!-- Properties -->
<properties>
+ <jboss.version>4.2.2.GA</jboss.version>
<mvel.version>1.3.7-java1.5</mvel.version>
</properties>
@@ -68,6 +69,12 @@
</dependency>
<dependency>
+ <groupId>org.jboss.client</groupId>
+ <artifactId>jbossall-client</artifactId>
+ <version>${jboss.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<scope>test</scope>
@@ -89,6 +96,7 @@
<testResources>
<testResource>
<directory>src/test/resources</directory>
+ <filtering>true</filtering>
</testResource>
<testResource>
<directory>src/cts/resources</directory>
@@ -202,4 +210,31 @@
</plugins>
</build>
+ <!-- Profiles -->
+ <profiles>
+
+ <!--
+ Name: no-jboss-bind-address
+ Descr: Skip tests if no jboss.bind address is given
+ -->
+ <profile>
+ <id>no-jboss-bind-address</id>
+ <activation>
+ <property>
+ <name>!jboss.bind.address</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <skipTests>true</skipTests>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ </profiles>
</project>
Modified: jbpm3/trunk/modules/integration/src/test/java/org/jbpm/test/integration/spec/deployment/DeploymentPARTest.java
===================================================================
--- jbpm3/trunk/modules/integration/src/test/java/org/jbpm/test/integration/spec/deployment/DeploymentPARTest.java 2008-12-11 10:56:36 UTC (rev 3331)
+++ jbpm3/trunk/modules/integration/src/test/java/org/jbpm/test/integration/spec/deployment/DeploymentPARTest.java 2008-12-11 11:30:20 UTC (rev 3332)
@@ -29,11 +29,11 @@
import java.util.Map;
import org.jboss.bpm.api.deployment.Deployment;
+import org.jboss.bpm.api.model.ProcessDefinition;
import org.jboss.bpm.api.model.ProcessInstance;
-import org.jboss.bpm.api.model.ProcessDefinition;
import org.jboss.bpm.api.runtime.Token;
import org.jboss.bpm.api.service.DeploymentService;
-import org.jboss.bpm.api.test.APITestCase;
+import org.jboss.bpm.api.test.IntegrationTestCase;
import org.jboss.bpm.incubator.service.TaskInstanceService;
/**
@@ -42,8 +42,9 @@
* @author thomas.diesler at jboss.com
* @since 24-Nov-2008
*/
-public class DeploymentPARTest extends APITestCase
+public class DeploymentPARTest extends IntegrationTestCase
{
+
public void testSimplePARDeploy() throws Exception
{
URL parURL = getTestArchiveURL("fork-join-example.par");
@@ -75,6 +76,16 @@
assertTrue("Undeploy successful", depService.undeploy(dep));
}
+ public void testRemoteDeploy() throws Exception
+ {
+ deploy("fork-join-example.par");
+ }
+
+ public void testRemoteUndeploy() throws Exception
+ {
+ undeploy("fork-join-example.par");
+ }
+
private Token getChildToken(Token token, String nodeName)
{
Map<String, Token> childToks = new HashMap<String, Token>();
Added: jbpm3/trunk/modules/integration/src/test/resources/jndi.properties
===================================================================
--- jbpm3/trunk/modules/integration/src/test/resources/jndi.properties (rev 0)
+++ jbpm3/trunk/modules/integration/src/test/resources/jndi.properties 2008-12-11 11:30:20 UTC (rev 3332)
@@ -0,0 +1,3 @@
+java.naming.provider.url=jnp://@jboss.bind.address@:1099
+java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
+java.naming.factory.url.pkgs=org.jboss.naming.client
More information about the jbpm-commits
mailing list