[jbpm-commits] JBoss JBPM SVN: r6648 - in jbpm3/branches/jbpm-3.2-soa: modules/enterprise and 3 other directories.

do-not-reply at jboss.org do-not-reply at jboss.org
Thu Sep 2 19:20:22 EDT 2010


Author: alex.guizar at jboss.com
Date: 2010-09-02 19:20:21 -0400 (Thu, 02 Sep 2010)
New Revision: 6648

Modified:
   jbpm3/branches/jbpm-3.2-soa/modules/enterprise/pom.xml
   jbpm3/branches/jbpm-3.2-soa/modules/enterprise/scripts/assembly-test-war.xml
   jbpm3/branches/jbpm-3.2-soa/modules/enterprise/src/test/java/org/jbpm/enterprise/console/ConsoleAvailabilityTest.java
   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 abandon assembly/cactus plugin combination in favor of a pure assembly solution not affected by the plugin dependency exclusion limitation

Modified: jbpm3/branches/jbpm-3.2-soa/modules/enterprise/pom.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/enterprise/pom.xml	2010-09-02 14:53:46 UTC (rev 6647)
+++ jbpm3/branches/jbpm-3.2-soa/modules/enterprise/pom.xml	2010-09-02 23:20:21 UTC (rev 6648)
@@ -52,14 +52,8 @@
     <!-- Test Dependencies -->
     <dependency>
       <groupId>org.apache.cactus</groupId>
-      <artifactId>cactus.core.framework.javaEE.13-14</artifactId>
+      <artifactId>cactus.core.framework.uberjar.javaEE.14</artifactId>
       <scope>test</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>org.mortbay.jetty</groupId>
-          <artifactId>org.mortbay.jetty</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
 
     <dependency>
@@ -102,6 +96,8 @@
               <goal>single</goal>
             </goals>
             <configuration>
+              <finalName>enterprise</finalName>
+              <outputDirectory>${project.build.directory}/test-libs</outputDirectory>
               <descriptors>
                 <descriptor>scripts/assembly-test-war.xml</descriptor>
               </descriptors>
@@ -138,24 +134,6 @@
           </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>
 

Modified: 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	2010-09-02 14:53:46 UTC (rev 6647)
+++ jbpm3/branches/jbpm-3.2-soa/modules/enterprise/scripts/assembly-test-war.xml	2010-09-02 23:20:21 UTC (rev 6648)
@@ -15,17 +15,30 @@
     <format>war</format>
   </formats>
   <includeBaseDirectory>false</includeBaseDirectory>
+
   <fileSets>
     <fileSet>
       <directory>src/test/webapp</directory>
-      <outputDirectory>/</outputDirectory>
+      <outputDirectory />
     </fileSet>
     <fileSet>
       <directory>target/test-classes</directory>
-      <outputDirectory>/WEB-INF/classes</outputDirectory>
+      <outputDirectory>WEB-INF/classes</outputDirectory>
       <includes>
         <include>org/jbpm/enterprise/**</include>
       </includes>
     </fileSet>
   </fileSets>
+
+  <dependencySets>
+    <dependencySet>
+      <outputDirectory>WEB-INF/lib</outputDirectory>
+      <scope>test</scope>
+      <includes>
+        <include>aspectj:aspectjrt</include>
+        <include>org.apache.cactus:cactus.core.framework.uberjar.javaEE.14</include>
+        <include>junit:junit</include>
+      </includes>
+    </dependencySet>
+  </dependencySets>
 </assembly>
\ No newline at end of file

Modified: jbpm3/branches/jbpm-3.2-soa/modules/enterprise/src/test/java/org/jbpm/enterprise/console/ConsoleAvailabilityTest.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/enterprise/src/test/java/org/jbpm/enterprise/console/ConsoleAvailabilityTest.java	2010-09-02 14:53:46 UTC (rev 6647)
+++ jbpm3/branches/jbpm-3.2-soa/modules/enterprise/src/test/java/org/jbpm/enterprise/console/ConsoleAvailabilityTest.java	2010-09-02 23:20:21 UTC (rev 6648)
@@ -36,24 +36,11 @@
    * Verify if the console has been deployed successfully
    */
   public void testConsoleDeployment() throws IOException {
-    String host = "localhost";
-    int port = 8080;
+    URL contextUrl = new URL(System.getProperty("cactus.contextURL"));
+    URL consoleUrl = new URL(contextUrl, "/jbpm-console");
+    System.out.println("Console URL: " + consoleUrl);
 
-    String bindAddress = System.getProperty("jboss.bind.address");
-    if (bindAddress != null) {
-      int colonIndex = bindAddress.lastIndexOf(':');
-      if (colonIndex != -1) {
-        host = bindAddress.substring(0, colonIndex);
-        port = Integer.parseInt(bindAddress.substring(colonIndex + 1));
-      }
-      else
-        host = bindAddress;
-    }
-
-    URL url = new URL("http", host, port, "/jbpm-console");
-    System.out.println("Console URL: " + url);
-
-    int responseCode = doGet(url);
+    int responseCode = doGet(consoleUrl);
     assertEquals(HttpURLConnection.HTTP_OK, responseCode);
   }
 

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/webapp/WEB-INF/web.xml	2010-09-02 14:53:46 UTC (rev 6647)
+++ jbpm3/branches/jbpm-3.2-soa/modules/enterprise/src/test/webapp/WEB-INF/web.xml	2010-09-02 23:20:21 UTC (rev 6648)
@@ -2,6 +2,16 @@
 <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>
+
   <ejb-local-ref>
     <ejb-ref-name>ejb/CommandServiceBean</ejb-ref-name>
     <ejb-ref-type>Session</ejb-ref-type>

Modified: jbpm3/branches/jbpm-3.2-soa/pom.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/pom.xml	2010-09-02 14:53:46 UTC (rev 6647)
+++ jbpm3/branches/jbpm-3.2-soa/pom.xml	2010-09-02 23:20:21 UTC (rev 6648)
@@ -41,7 +41,6 @@
 
   <!-- Properties -->
   <properties>
-    <cactus.version>1.8.1</cactus.version>
     <cargo.version>1.0.3</cargo.version>
 
     <!-- Database Driver Versions  -->
@@ -98,16 +97,17 @@
       </dependency>
       <dependency>
         <groupId>org.apache.cactus</groupId>
-        <artifactId>cactus.core.framework.javaEE.13-14</artifactId>
-        <version>${cactus.version}</version>
+        <artifactId>cactus.core.framework.uberjar.javaEE.14</artifactId>
+        <version>1.8.1</version>
+        <exclusions>
+          <exclusion>
+            <groupId>org.mortbay.jetty</groupId>
+            <artifactId>org.mortbay.jetty</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
       <dependency>
         <groupId>org.codehaus.cargo</groupId>
-        <artifactId>cargo</artifactId>
-        <version>${cargo.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.codehaus.cargo</groupId>
         <artifactId>cargo-ant</artifactId>
         <version>${cargo.version}</version>
       </dependency>
@@ -392,78 +392,6 @@
     <pluginManagement>
       <plugins>
         <plugin>
-          <groupId>org.apache.cactus</groupId>
-          <artifactId>cactus.integration.maven2</artifactId>
-          <version>${cactus.version}</version>
-          <dependencies>
-            <dependency>
-              <groupId>org.apache.cactus</groupId>
-              <artifactId>cactus.integration.shared.api</artifactId>
-              <version>${cactus.version}</version>
-              <exclusions>
-                <exclusion>
-                  <groupId>org.codehaus.cargo</groupId>
-                  <artifactId>cargo</artifactId>
-                </exclusion>
-                <exclusion>
-                  <groupId>org.codehaus.cargo</groupId>
-                  <artifactId>cargo-ant</artifactId>
-                </exclusion>
-                <exclusion>
-                  <groupId>org.codehaus.cargo</groupId>
-                  <artifactId>cargo-core-uberjar</artifactId>
-                </exclusion>
-                <exclusion>
-                  <groupId>org.mortbay.jetty</groupId>
-                  <artifactId>org.mortbay.jetty</artifactId>
-                </exclusion>
-              </exclusions>
-            </dependency>
-            <dependency>
-              <groupId>org.apache.cactus</groupId>
-              <artifactId>cactus.core.framework.uberjar.javaEE.14</artifactId>
-              <version>${cactus.version}</version>
-              <exclusions>
-                <exclusion>
-                  <groupId>org.codehaus.cargo</groupId>
-                  <artifactId>cargo</artifactId>
-                </exclusion>
-                <exclusion>
-                  <groupId>org.codehaus.cargo</groupId>
-                  <artifactId>cargo-ant</artifactId>
-                </exclusion>
-                <exclusion>
-                  <groupId>org.codehaus.cargo</groupId>
-                  <artifactId>cargo-core-uberjar</artifactId>
-                </exclusion>
-                <exclusion>
-                  <groupId>org.mortbay.jetty</groupId>
-                  <artifactId>org.mortbay.jetty</artifactId>
-                </exclusion>
-              </exclusions>
-            </dependency>
-            <dependency>
-              <groupId>org.codehaus.cargo</groupId>
-              <artifactId>cargo-ant</artifactId>
-              <version>${cargo.version}</version>
-              <scope>runtime</scope>
-            </dependency>
-            <dependency>
-              <groupId>org.codehaus.cargo</groupId>
-              <artifactId>cargo-core-uberjar</artifactId>
-              <version>${cargo.version}</version>
-              <scope>runtime</scope>
-            </dependency>
-            <dependency>
-              <groupId>org.codehaus.cargo</groupId>
-              <artifactId>cargo-maven2-plugin</artifactId>
-              <version>${cargo.version}</version>
-              <scope>runtime</scope>
-            </dependency>
-          </dependencies>
-        </plugin>
-
-        <plugin>
           <groupId>org.codehaus.izpack</groupId>
           <artifactId>izpack-maven-plugin</artifactId>
           <version>1.0-alpha-5</version>



More information about the jbpm-commits mailing list