[jbpm-commits] JBoss JBPM SVN: r6638 - in jbpm3/branches/jbpm-3.2-soa: hudson/hudson-home and 8 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Tue Aug 31 20:11:12 EDT 2010
Author: alex.guizar at jboss.com
Date: 2010-08-31 20:11:11 -0400 (Tue, 31 Aug 2010)
New Revision: 6638
Added:
jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/context/exe/MySerializableClass.java
jbpm3/branches/jbpm-3.2-soa/modules/enterprise/scripts/assembly-test-war.xml
jbpm3/branches/jbpm-3.2-soa/modules/enterprise/src/test/webapp/
Removed:
jbpm3/branches/jbpm-3.2-soa/modules/enterprise/scripts/antrun-test-jars.xml
jbpm3/branches/jbpm-3.2-soa/modules/enterprise/scripts/assembly-test-dependencies.xml
jbpm3/branches/jbpm-3.2-soa/modules/enterprise/src/test/resources/cactus.properties
jbpm3/branches/jbpm-3.2-soa/modules/enterprise/src/test/resources/deployment/
jbpm3/branches/jbpm-3.2-soa/modules/enterprise/src/test/resources/enterprise/
jbpm3/branches/jbpm-3.2-soa/modules/enterprise/src/test/resources/test.policy
Modified:
jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/container.sh
jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/jpdl/el/impl/Coercions.java
jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/jpdl/el/impl/FunctionInvocation.java
jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/jpdl/el/impl/PrimitiveObjects.java
jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/jpdl/el/impl/UnaryMinusOperator.java
jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/context/exe/VariableInstanceDbTest.java
jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/context/exe/VariableTypeTest.java
jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/jbpm522/JBPM522Test.java
jbpm3/branches/jbpm-3.2-soa/modules/enterprise/pom.xml
jbpm3/branches/jbpm-3.2-soa/modules/enterprise/src/test/webapp/WEB-INF/web.xml
jbpm3/branches/jbpm-3.2-soa/pom.xml
Log:
JBPM-2858 migrate enterprise tests to cactus maven2 plugin
Modified: jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/container.sh
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/container.sh 2010-08-31 17:35:24 UTC (rev 6637)
+++ jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/container.sh 2010-09-01 00:11:11 UTC (rev 6638)
@@ -146,7 +146,7 @@
# Run enterprise test suite
mvn -f modules/enterprise/pom.xml --fail-at-end -Djboss.bind.address=$MYTESTIP_1 \
- -Dsurefire.jvm.args="-Xms64m -Xmx256m" test | tee $WORKSPACE/tests.log
+ -Dsurefire.jvm.args="-Xms64m -Xmx256m" integration-test | tee $WORKSPACE/tests.log
grep -E 'FIXME\|FAILED' $WORKSPACE/tests.log | sort -u > $WORKSPACE/fixme.txt
# Stop JBoss AS
Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/jpdl/el/impl/Coercions.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/jpdl/el/impl/Coercions.java 2010-08-31 17:35:24 UTC (rev 6637)
+++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/jpdl/el/impl/Coercions.java 2010-09-01 00:11:11 UTC (rev 6638)
@@ -440,7 +440,7 @@
if (pLogger.isLoggingError ()) {
pLogger.logError
(Constants.STRING_TO_NUMBER_EXCEPTION,
- (String) pValue,
+ pValue,
pClass.getName ());
}
return coerceToPrimitiveNumber (ZERO, pClass);
@@ -472,7 +472,7 @@
}
else if (pValue instanceof Character) {
return PrimitiveObjects.getInteger
- ((int) (((Character) pValue).charValue ()));
+ (((Character) pValue).charValue ());
}
else if (pValue instanceof Boolean) {
if (pLogger.isLoggingWarning ()) {
@@ -497,7 +497,7 @@
if (pLogger.isLoggingWarning ()) {
pLogger.logWarning
(Constants.STRING_TO_NUMBER_EXCEPTION,
- (String) pValue,
+ pValue,
Integer.class.getName ());
}
return null;
@@ -536,10 +536,10 @@
return PrimitiveObjects.getLong (pValue);
}
else if (pClass == Float.class || pClass == Float.TYPE) {
- return PrimitiveObjects.getFloat ((float) pValue);
+ return PrimitiveObjects.getFloat (pValue);
}
else if (pClass == Double.class || pClass == Double.TYPE) {
- return PrimitiveObjects.getDouble ((double) pValue);
+ return PrimitiveObjects.getDouble (pValue);
}
else {
return PrimitiveObjects.getInteger (0);
@@ -726,7 +726,7 @@
pLogger.logError
(Constants.STRING_TO_BOOLEAN,
exc,
- (String) pValue);
+ pValue);
}
return Boolean.FALSE;
}
Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/jpdl/el/impl/FunctionInvocation.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/jpdl/el/impl/FunctionInvocation.java 2010-08-31 17:35:24 UTC (rev 6637)
+++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/jpdl/el/impl/FunctionInvocation.java 2010-09-01 00:11:11 UTC (rev 6638)
@@ -146,7 +146,7 @@
}
// ensure that the function's name is mapped
- Method target = (Method) functions.resolveFunction(prefix, localName);
+ Method target = functions.resolveFunction(prefix, localName);
if (target == null)
pLogger.logError(Constants.UNKNOWN_FUNCTION, functionName);
Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/jpdl/el/impl/PrimitiveObjects.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/jpdl/el/impl/PrimitiveObjects.java 2010-08-31 17:35:24 UTC (rev 6637)
+++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/jpdl/el/impl/PrimitiveObjects.java 2010-09-01 00:11:11 UTC (rev 6638)
@@ -108,7 +108,7 @@
{
if (pValue >= BYTE_LOWER_BOUND &&
pValue <= BYTE_UPPER_BOUND) {
- return mBytes [((int) pValue) - BYTE_LOWER_BOUND];
+ return mBytes [pValue - BYTE_LOWER_BOUND];
}
else {
return new Byte (pValue);
@@ -120,7 +120,7 @@
{
if (pValue >= CHARACTER_LOWER_BOUND &&
pValue <= CHARACTER_UPPER_BOUND) {
- return mCharacters [((int) pValue) - CHARACTER_LOWER_BOUND];
+ return mCharacters [pValue - CHARACTER_LOWER_BOUND];
}
else {
return new Character (pValue);
@@ -132,7 +132,7 @@
{
if (pValue >= SHORT_LOWER_BOUND &&
pValue <= SHORT_UPPER_BOUND) {
- return mShorts [((int) pValue) - SHORT_LOWER_BOUND];
+ return mShorts [pValue - SHORT_LOWER_BOUND];
}
else {
return new Short (pValue);
@@ -144,7 +144,7 @@
{
if (pValue >= INTEGER_LOWER_BOUND &&
pValue <= INTEGER_UPPER_BOUND) {
- return mIntegers [((int) pValue) - INTEGER_LOWER_BOUND];
+ return mIntegers [pValue - INTEGER_LOWER_BOUND];
}
else {
return new Integer (pValue);
@@ -257,7 +257,7 @@
{
int len = INTEGER_UPPER_BOUND - INTEGER_LOWER_BOUND + 1;
Integer [] ret = new Integer [len];
- int val = (int) INTEGER_LOWER_BOUND;
+ int val = INTEGER_LOWER_BOUND;
for (int i = 0; i < len; i++, val++) {
ret [i] = new Integer (val);
}
@@ -269,7 +269,7 @@
{
int len = LONG_UPPER_BOUND - LONG_LOWER_BOUND + 1;
Long [] ret = new Long [len];
- long val = (long) LONG_LOWER_BOUND;
+ long val = LONG_LOWER_BOUND;
for (int i = 0; i < len; i++, val++) {
ret [i] = new Long (val);
}
Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/jpdl/el/impl/UnaryMinusOperator.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/jpdl/el/impl/UnaryMinusOperator.java 2010-08-31 17:35:24 UTC (rev 6637)
+++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/jpdl/el/impl/UnaryMinusOperator.java 2010-09-01 00:11:11 UTC (rev 6638)
@@ -130,17 +130,15 @@
else if (pValue instanceof String) {
if (Coercions.isFloatingPointString (pValue)) {
double dval =
- ((Number)
- (Coercions.coerceToPrimitiveNumber
- (pValue, Double.class, pLogger))).
+ Coercions.coerceToPrimitiveNumber
+ (pValue, Double.class, pLogger).
doubleValue ();
return PrimitiveObjects.getDouble (-dval);
}
else {
long lval =
- ((Number)
- (Coercions.coerceToPrimitiveNumber
- (pValue, Long.class, pLogger))).
+ Coercions.coerceToPrimitiveNumber
+ (pValue, Long.class, pLogger).
longValue ();
return PrimitiveObjects.getLong (-lval);
}
@@ -148,27 +146,27 @@
else if (pValue instanceof Byte) {
return PrimitiveObjects.getByte
- ((byte) -(((Byte) pValue).byteValue ()));
+ ((byte) -((Byte) pValue).byteValue ());
}
else if (pValue instanceof Short) {
return PrimitiveObjects.getShort
- ((short) -(((Short) pValue).shortValue ()));
+ ((short) -((Short) pValue).shortValue ());
}
else if (pValue instanceof Integer) {
return PrimitiveObjects.getInteger
- ((int) -(((Integer) pValue).intValue ()));
+ (-((Integer) pValue).intValue ());
}
else if (pValue instanceof Long) {
return PrimitiveObjects.getLong
- ((long) -(((Long) pValue).longValue ()));
+ (-((Long) pValue).longValue ());
}
else if (pValue instanceof Float) {
return PrimitiveObjects.getFloat
- ((float) -(((Float) pValue).floatValue ()));
+ (-((Float) pValue).floatValue ());
}
else if (pValue instanceof Double) {
return PrimitiveObjects.getDouble
- ((double) -(((Double) pValue).doubleValue ()));
+ (-((Double) pValue).doubleValue ());
}
else {
Added: jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/context/exe/MySerializableClass.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/context/exe/MySerializableClass.java (rev 0)
+++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/context/exe/MySerializableClass.java 2010-09-01 00:11:11 UTC (rev 6638)
@@ -0,0 +1,45 @@
+/*
+ * 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.context.exe;
+
+import java.io.Serializable;
+
+public class MySerializableClass implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+ int member;
+
+ MySerializableClass(int member) {
+ this.member = member;
+ }
+
+ public int hashCode() {
+ return member;
+ }
+
+ public boolean equals(Object obj) {
+ if (this == obj) return true;
+ if (!(obj instanceof MySerializableClass)) return false;
+ MySerializableClass other = (MySerializableClass) obj;
+ return member == other.member;
+ }
+}
\ No newline at end of file
Property changes on: jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/context/exe/MySerializableClass.java
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/context/exe/VariableInstanceDbTest.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/context/exe/VariableInstanceDbTest.java 2010-08-31 17:35:24 UTC (rev 6637)
+++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/context/exe/VariableInstanceDbTest.java 2010-09-01 00:11:11 UTC (rev 6638)
@@ -21,7 +21,6 @@
*/
package org.jbpm.context.exe;
-import java.io.Serializable;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Date;
@@ -119,21 +118,6 @@
assertEquals(new Double(3.3), contextInstance.getVariable("a"));
}
- public static class MySerializableClass implements Serializable {
-
- private static final long serialVersionUID = 1L;
- int member;
-
- MySerializableClass(int member) {
- this.member = member;
- }
-
- public boolean equals(Object o) {
- if (!(o instanceof MySerializableClass)) return false;
- return (member == ((MySerializableClass) o).member);
- }
- }
-
public void testCustomTypeSerializable() {
contextInstance.setVariable("a", new MySerializableClass(4));
processInstance = saveAndReload(processInstance);
Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/context/exe/VariableTypeTest.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/context/exe/VariableTypeTest.java 2010-08-31 17:35:24 UTC (rev 6637)
+++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/context/exe/VariableTypeTest.java 2010-09-01 00:11:11 UTC (rev 6638)
@@ -21,26 +21,20 @@
*/
package org.jbpm.context.exe;
-import java.io.Serializable;
import java.util.Date;
import org.jbpm.AbstractJbpmTestCase;
-import org.jbpm.context.def.ContextDefinition;
import org.jbpm.graph.def.ProcessDefinition;
import org.jbpm.graph.exe.ProcessInstance;
public class VariableTypeTest extends AbstractJbpmTestCase {
-
- private ProcessDefinition processDefinition = null;
- private ProcessInstance processInstance = null;
- private ContextInstance contextInstance = null;
-
- protected void setUp() throws Exception
- {
+
+ ContextInstance contextInstance;
+
+ protected void setUp() throws Exception {
super.setUp();
- processDefinition = new ProcessDefinition();
- processDefinition.addDefinition(new ContextDefinition());
- processInstance = new ProcessInstance( processDefinition );
+ ProcessDefinition processDefinition = ProcessDefinition.createNewProcessDefinition();
+ ProcessInstance processInstance = new ProcessInstance(processDefinition);
contextInstance = processInstance.getContextInstance();
}
@@ -63,21 +57,12 @@
contextInstance.setVariable("a", new Float(3.3));
assertEquals(new Float(3.3), contextInstance.getVariable("a"));
}
-
+
public void testDouble() {
contextInstance.setVariable("a", new Double(3.3));
assertEquals(new Double(3.3), contextInstance.getVariable("a"));
}
-
- public static class MySerializableClass implements Serializable {
- private static final long serialVersionUID = 1L;
- int member;
- MySerializableClass(int member){this.member = member;}
- public boolean equals(Object o) {
- if (! (o instanceof MySerializableClass)) return false;
- return ( member == ((MySerializableClass)o).member );
- }
- }
+
public void testCustomTypeSerializable() {
contextInstance.setVariable("a", new MySerializableClass(4));
assertEquals(new MySerializableClass(4), contextInstance.getVariable("a"));
@@ -92,17 +77,17 @@
contextInstance.setVariable("a", new Long(3));
assertEquals(new Long(3), contextInstance.getVariable("a"));
}
-
+
public void testByte() {
contextInstance.setVariable("a", new Byte("3"));
assertEquals(new Byte("3"), contextInstance.getVariable("a"));
}
-
+
public void testShort() {
contextInstance.setVariable("a", new Short("3"));
assertEquals(new Short("3"), contextInstance.getVariable("a"));
}
-
+
public void testInteger() {
contextInstance.setVariable("a", new Integer(3));
assertEquals(new Integer(3), contextInstance.getVariable("a"));
Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/jbpm522/JBPM522Test.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/jbpm522/JBPM522Test.java 2010-08-31 17:35:24 UTC (rev 6637)
+++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/jbpm522/JBPM522Test.java 2010-09-01 00:11:11 UTC (rev 6638)
@@ -48,7 +48,7 @@
*/
public class JBPM522Test extends AbstractDbTestCase {
- private static String buildFilePath;
+ static String buildFilePath;
public static Test suite() {
return new TestSetup(new TestSuite(JBPM522Test.class)) {
Modified: jbpm3/branches/jbpm-3.2-soa/modules/enterprise/pom.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/enterprise/pom.xml 2010-08-31 17:35:24 UTC (rev 6637)
+++ jbpm3/branches/jbpm-3.2-soa/modules/enterprise/pom.xml 2010-09-01 00:11:11 UTC (rev 6638)
@@ -52,26 +52,16 @@
<!-- Test Dependencies -->
<dependency>
<groupId>org.apache.cactus</groupId>
- <artifactId>cactus.core.framework.wrapper.javaEE.14</artifactId>
+ <artifactId>cactus.core.framework.javaEE.13-14</artifactId>
<scope>test</scope>
<exclusions>
<exclusion>
- <artifactId>org.mortbay.jetty</artifactId>
<groupId>org.mortbay.jetty</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.cactus</groupId>
- <artifactId>cactus.integration.shared.api</artifactId>
- <scope>test</scope>
- <exclusions>
- <exclusion>
<artifactId>org.mortbay.jetty</artifactId>
- <groupId>org.mortbay.jetty</groupId>
</exclusion>
</exclusions>
</dependency>
+
<dependency>
<groupId>org.jboss.client</groupId>
<artifactId>jbossall-client</artifactId>
@@ -90,26 +80,6 @@
<plugins>
<plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>build-test-jars</id>
- <phase>test-compile</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <property name="tests.output.dir" value="${project.build.directory}" />
- <property name="tests.resources.dir" value="${basedir}/src/test/resources" />
- <ant antfile="scripts/antrun-test-jars.xml" target="build-test-jars" />
- </tasks>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
@@ -126,16 +96,14 @@
</execution>
<execution>
- <id>assembly-test-dependencies</id>
- <phase>generate-test-resources</phase>
+ <id>assembly-test-war</id>
+ <phase>process-test-classes</phase>
<goals>
- <goal>directory-single</goal>
+ <goal>single</goal>
</goals>
<configuration>
- <finalName>test-dependencies</finalName>
- <appendAssemblyId>false</appendAssemblyId>
<descriptors>
- <descriptor>scripts/assembly-test-dependencies.xml</descriptor>
+ <descriptor>scripts/assembly-test-war.xml</descriptor>
</descriptors>
</configuration>
</execution>
@@ -145,18 +113,49 @@
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <systemProperties>
- <property>
- <name>log4j.output.dir</name>
- <value>${project.build.directory}</value>
- </property>
- <property>
- <name>jboss.bind.address</name>
- <value>${jboss.bind.address}</value>
- </property>
- </systemProperties>
+ <skip>true</skip>
</configuration>
+ <executions>
+ <execution>
+ <id>surefire-integration</id>
+ <phase>integration-test</phase>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <skip>false</skip>
+ <systemProperties>
+ <property>
+ <name>cactus.contextURL</name>
+ <value>http://${jboss.bind.address}:8080/enterprise-test</value>
+ </property>
+ <property>
+ <name>log4j.output.dir</name>
+ <value>${project.build.directory}</value>
+ </property>
+ </systemProperties>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
+
+ <plugin>
+ <groupId>org.apache.cactus</groupId>
+ <artifactId>cactus.integration.maven2</artifactId>
+ <configuration>
+ <srcFile>${project.build.directory}/${project.artifactId}-${project.version}-test.war</srcFile>
+ <destFile>${project.build.directory}/test-libs/enterprise-test.war</destFile>
+ </configuration>
+ <executions>
+ <execution>
+ <id>cactify-test-war</id>
+ <phase>process-test-classes</phase>
+ <goals>
+ <goal>cactifywar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
@@ -177,9 +176,14 @@
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <skipTests>true</skipTests>
- </configuration>
+ <executions>
+ <execution>
+ <id>surefire-integration</id>
+ <configuration>
+ <skipTests>true</skipTests>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>
Deleted: jbpm3/branches/jbpm-3.2-soa/modules/enterprise/scripts/antrun-test-jars.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/enterprise/scripts/antrun-test-jars.xml 2010-08-31 17:35:24 UTC (rev 6637)
+++ jbpm3/branches/jbpm-3.2-soa/modules/enterprise/scripts/antrun-test-jars.xml 2010-09-01 00:11:11 UTC (rev 6638)
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ====================================================================== -->
-<!-- jBPM: Workflow in Java -->
-<!-- -->
-<!-- Distributable under LGPL license. -->
-<!-- See terms of license at http://www.gnu.org. -->
-<!-- ====================================================================== -->
-
-<project name="test-jars">
- <description>jBPM enterprise test archive builder</description>
-
- <target name="build-test-jars" description="Build the test deployments">
- <mkdir dir="${tests.output.dir}/test-libs" />
-
- <!-- enterprise-test -->
- <war warfile="${tests.output.dir}/test-libs/enterprise-test.war" webxml="${tests.resources.dir}/enterprise/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/test-classes" includes="org/jbpm/enterprise/**" />
- <lib dir="${tests.output.dir}/test-dependencies" includes="*.jar" />
- <webinf dir="${tests.resources.dir}/enterprise/WEB-INF" excludes="web.xml" />
- </war>
-
- <!-- fork-join-example -->
- <zip destfile="${tests.output.dir}/test-libs/fork-join-example.par">
- <fileset dir="${tests.resources.dir}/deployment/fork-join-example" />
- </zip>
- </target>
-</project>
Deleted: jbpm3/branches/jbpm-3.2-soa/modules/enterprise/scripts/assembly-test-dependencies.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/enterprise/scripts/assembly-test-dependencies.xml 2010-08-31 17:35:24 UTC (rev 6637)
+++ jbpm3/branches/jbpm-3.2-soa/modules/enterprise/scripts/assembly-test-dependencies.xml 2010-09-01 00:11:11 UTC (rev 6638)
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<!-- ====================================================================== -->
-<!-- jBPM: Workflow in Java -->
-<!-- -->
-<!-- Distributable under LGPL license. -->
-<!-- See terms of license at http://www.gnu.org. -->
-<!-- ====================================================================== -->
-
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
- <id>test-dependencies</id>
- <formats>
- <format>dir</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
-
- <dependencySets>
- <dependencySet>
- <outputDirectory>/</outputDirectory>
- <useStrictFiltering>true</useStrictFiltering>
- <includes>
- <include>aspectj:aspectjrt:jar</include>
- <include>org.apache.cactus:cactus.integration.shared.api</include>
- <include>org.apache.cactus:cactus.core.framework.wrapper.javaEE.14</include>
- <include>org.apache.cactus:cactus.core.framework.javaEE.13-14</include>
- <include>org.apache.cactus:cactus.core.framework.javaEE.12-13-14</include>
- <include>junit:junit</include>
- </includes>
- <unpack>false</unpack>
- <scope>test</scope>
- </dependencySet>
- </dependencySets>
-</assembly>
Added: jbpm3/branches/jbpm-3.2-soa/modules/enterprise/scripts/assembly-test-war.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/enterprise/scripts/assembly-test-war.xml (rev 0)
+++ jbpm3/branches/jbpm-3.2-soa/modules/enterprise/scripts/assembly-test-war.xml 2010-09-01 00:11:11 UTC (rev 6638)
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<!-- ====================================================================== -->
+<!-- jBPM: Workflow in Java -->
+<!-- -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at http://www.gnu.org. -->
+<!-- ====================================================================== -->
+
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+ <id>test</id>
+ <formats>
+ <format>war</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>src/test/webapp</directory>
+ <outputDirectory>/</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>target/test-classes</directory>
+ <outputDirectory>/WEB-INF/classes</outputDirectory>
+ <includes>
+ <include>org/jbpm/enterprise/**</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+</assembly>
\ No newline at end of file
Property changes on: jbpm3/branches/jbpm-3.2-soa/modules/enterprise/scripts/assembly-test-war.xml
___________________________________________________________________
Name: svn:eol-style
+ native
Deleted: jbpm3/branches/jbpm-3.2-soa/modules/enterprise/src/test/resources/cactus.properties
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/enterprise/src/test/resources/cactus.properties 2010-08-31 17:35:24 UTC (rev 6637)
+++ jbpm3/branches/jbpm-3.2-soa/modules/enterprise/src/test/resources/cactus.properties 2010-09-01 00:11:11 UTC (rev 6638)
@@ -1 +0,0 @@
-cactus.contextURL = http://@jboss.bind.address@:8080/enterprise-test
\ No newline at end of file
Deleted: jbpm3/branches/jbpm-3.2-soa/modules/enterprise/src/test/resources/test.policy
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/enterprise/src/test/resources/test.policy 2010-08-31 17:35:24 UTC (rev 6637)
+++ jbpm3/branches/jbpm-3.2-soa/modules/enterprise/src/test/resources/test.policy 2010-09-01 00:11:11 UTC (rev 6638)
@@ -1,4 +0,0 @@
-grant {
- permission java.security.AllPermission;
-};
-
Copied: jbpm3/branches/jbpm-3.2-soa/modules/enterprise/src/test/webapp (from rev 6603, jbpm3/branches/jbpm-3.2-soa/modules/enterprise/src/test/resources/enterprise)
Modified: jbpm3/branches/jbpm-3.2-soa/modules/enterprise/src/test/webapp/WEB-INF/web.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/enterprise/src/test/resources/enterprise/WEB-INF/web.xml 2010-08-17 21:50:34 UTC (rev 6603)
+++ jbpm3/branches/jbpm-3.2-soa/modules/enterprise/src/test/webapp/WEB-INF/web.xml 2010-09-01 00:11:11 UTC (rev 6638)
@@ -1,19 +1,7 @@
<?xml version="1.0"?>
<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
- http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
-
- <servlet>
- <servlet-name>ServletRedirector</servlet-name>
- <servlet-class>org.apache.cactus.server.ServletTestRedirector</servlet-class>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>ServletRedirector</servlet-name>
- <url-pattern>/ServletRedirector</url-pattern>
- </servlet-mapping>
-
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
<ejb-local-ref>
<ejb-ref-name>ejb/CommandServiceBean</ejb-ref-name>
<ejb-ref-type>Session</ejb-ref-type>
@@ -38,5 +26,4 @@
<message-destination-type>javax.jms.Queue</message-destination-type>
<message-destination-usage>Produces</message-destination-usage>
</message-destination-ref>
-
</web-app>
Modified: jbpm3/branches/jbpm-3.2-soa/pom.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/pom.xml 2010-08-31 17:35:24 UTC (rev 6637)
+++ jbpm3/branches/jbpm-3.2-soa/pom.xml 2010-09-01 00:11:11 UTC (rev 6638)
@@ -41,6 +41,8 @@
<!-- Properties -->
<properties>
+ <cactus.version>1.8.1</cactus.version>
+
<!-- Database Driver Versions -->
<db2jcc.version>3.1.57</db2jcc.version>
<hsqldb.version>1.8.0.7</hsqldb.version>
@@ -95,15 +97,10 @@
</dependency>
<dependency>
<groupId>org.apache.cactus</groupId>
- <artifactId>cactus.core.framework.wrapper.javaEE.14</artifactId>
- <version>1.8.0</version>
+ <artifactId>cactus.core.framework.javaEE.13-14</artifactId>
+ <version>${cactus.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.cactus</groupId>
- <artifactId>cactus.integration.shared.api</artifactId>
- <version>1.8.0</version>
- </dependency>
- <dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
<version>1.7.0</version>
@@ -380,12 +377,23 @@
<pluginManagement>
<plugins>
<plugin>
+ <groupId>org.apache.cactus</groupId>
+ <artifactId>cactus.integration.maven2</artifactId>
+ <version>${cactus.version}</version>
+ </plugin>
+
+ <plugin>
<groupId>org.codehaus.izpack</groupId>
<artifactId>izpack-maven-plugin</artifactId>
<version>1.0-alpha-5</version>
</plugin>
<plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2-beta-3</version>
+ </plugin>
+
+ <plugin>
<groupId>org.jboss.maven.plugins</groupId>
<artifactId>maven-jdocbook-plugin</artifactId>
<version>2.1.2</version>
@@ -396,11 +404,6 @@
<artifactId>sql-maven-plugin</artifactId>
<version>1.4</version>
</plugin>
-
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-3</version>
- </plugin>
</plugins>
</pluginManagement>
</build>
More information about the jbpm-commits
mailing list