Author: alex.guizar(a)jboss.com Date: 2010-12-16 17:12:36 -0500 (Thu, 16 Dec 2010) New Revision: 6873 Added: jbpm4/trunk/test-enterprise-ejb/ jbpm4/trunk/test-enterprise-suite/ Removed: jbpm4/trunk/modules/ jbpm4/trunk/test-enterprise/test-enterprise-ejb/ jbpm4/trunk/test-enterprise/test-enterprise-suite/ Modified: jbpm4/trunk/db/pom.xml jbpm4/trunk/pom.xml jbpm4/trunk/qa/demo.setup.jboss.sh jbpm4/trunk/qa/demo.setup.tomcat.sh jbpm4/trunk/test-cfg/pom.xml jbpm4/trunk/test-enterprise-ejb/pom.xml jbpm4/trunk/test-enterprise-suite/pom.xml Log: JBPM-2986 move test-enterprise modules out of the test-enterprise/ directory; remove modules/ directory Modified: jbpm4/trunk/db/pom.xml =================================================================== --- jbpm4/trunk/db/pom.xml 2010-12-16 19:39:06 UTC (rev 6872) +++ jbpm4/trunk/db/pom.xml 2010-12-16 22:12:36 UTC (rev 6873) @@ -13,7 +13,7 @@ <modelVersion>4.0.0</modelVersion> <!-- Module Info --> - <name>jBPM 4 - DB</name> + <name>jBPM 4 - Database</name> <groupId>org.jbpm.jbpm4</groupId> <artifactId>jbpm-db</artifactId> Modified: jbpm4/trunk/pom.xml =================================================================== --- jbpm4/trunk/pom.xml 2010-12-16 19:39:06 UTC (rev 6872) +++ jbpm4/trunk/pom.xml 2010-12-16 22:12:36 UTC (rev 6873) @@ -720,8 +720,8 @@ <id>enterprise</id> <modules> <module>test-cactus</module> - <module>test-enterprise/test-enterprise-ejb</module> - <module>test-enterprise/test-enterprise-suite</module> + <module>test-enterprise-ejb</module> + <module>test-enterprise-suite</module> </modules> </profile> @@ -747,8 +747,8 @@ <module>jboss</module> <!-- integration/enterprise --> <module>test-cactus</module> - <module>test-enterprise/test-enterprise-ejb</module> - <module>test-enterprise/test-enterprise-suite</module> + <module>test-enterprise-ejb</module> + <module>test-enterprise-suite</module> <!-- load --> <module>test-load</module> <!-- varia --> Modified: jbpm4/trunk/qa/demo.setup.jboss.sh =================================================================== --- jbpm4/trunk/qa/demo.setup.jboss.sh 2010-12-16 19:39:06 UTC (rev 6872) +++ jbpm4/trunk/qa/demo.setup.jboss.sh 2010-12-16 22:12:36 UTC (rev 6873) @@ -1,5 +1,4 @@ #!/bin/sh -set MAVEN_OPTS=-Xms1024M -Xmx1024M mvn -U -Pdistro clean install ant -f qa/build.xml manual.testrun.setup Modified: jbpm4/trunk/qa/demo.setup.tomcat.sh =================================================================== --- jbpm4/trunk/qa/demo.setup.tomcat.sh 2010-12-16 19:39:06 UTC (rev 6872) +++ jbpm4/trunk/qa/demo.setup.tomcat.sh 2010-12-16 22:12:36 UTC (rev 6873) @@ -1,6 +1,5 @@ #!/bin/sh -set MAVEN_OPTS=-Xms1024M -Xmx1024M mvn -U -Pdistro clean install ant -f qa/build.xml reinstall.jbpm -ant -f modules/distro/src/main/files/install/build.xml demo.setup.tomcat +ant -f distro/src/main/files/install/build.xml demo.setup.tomcat Modified: jbpm4/trunk/test-cfg/pom.xml =================================================================== --- jbpm4/trunk/test-cfg/pom.xml 2010-12-16 19:39:06 UTC (rev 6872) +++ jbpm4/trunk/test-cfg/pom.xml 2010-12-16 22:12:36 UTC (rev 6873) @@ -12,7 +12,7 @@ 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>jBPM 4 - Test Cfg</name> + <name>jBPM 4 - Test Configuration</name> <groupId>org.jbpm.jbpm4</groupId> <artifactId>jbpm-test-cfg</artifactId> Copied: jbpm4/trunk/test-enterprise-ejb (from rev 6872, jbpm4/trunk/test-enterprise/test-enterprise-ejb) Modified: jbpm4/trunk/test-enterprise-ejb/pom.xml =================================================================== --- jbpm4/trunk/test-enterprise/test-enterprise-ejb/pom.xml 2010-12-16 19:39:06 UTC (rev 6872) +++ jbpm4/trunk/test-enterprise-ejb/pom.xml 2010-12-16 22:12:36 UTC (rev 6873) @@ -12,7 +12,7 @@ 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>jBPM 4 - Test Enterprise Ejb</name> + <name>jBPM 4 - Test Enterprise EJB</name> <groupId>org.jbpm.jbpm4</groupId> <artifactId>jbpm-test-enterprise-ejb</artifactId> @@ -21,7 +21,6 @@ <groupId>org.jbpm.jbpm4</groupId> <artifactId>jbpm</artifactId> <version>4.5-SNAPSHOT</version> - <relativePath>../../pom.xml</relativePath> </parent> <dependencies> Copied: jbpm4/trunk/test-enterprise-suite (from rev 6872, jbpm4/trunk/test-enterprise/test-enterprise-suite) Modified: jbpm4/trunk/test-enterprise-suite/pom.xml =================================================================== --- jbpm4/trunk/test-enterprise/test-enterprise-suite/pom.xml 2010-12-16 19:39:06 UTC (rev 6872) +++ jbpm4/trunk/test-enterprise-suite/pom.xml 2010-12-16 22:12:36 UTC (rev 6873) @@ -21,7 +21,6 @@ <groupId>org.jbpm.jbpm4</groupId> <artifactId>jbpm</artifactId> <version>4.5-SNAPSHOT</version> - <relativePath>../../pom.xml</relativePath> </parent> <dependencies>