[jbpm-commits] JBoss JBPM SVN: r2315 - in jbpm3/trunk: modules/enterprise/ear and 3 other directories.

do-not-reply at jboss.org do-not-reply at jboss.org
Tue Sep 23 13:36:43 EDT 2008


Author: thomas.diesler at jboss.com
Date: 2008-09-23 13:36:43 -0400 (Tue, 23 Sep 2008)
New Revision: 2315

Added:
   jbpm3/trunk/modules/enterprise/jar/src/test/java/org/jbpm/enterprise/ContainerProvidedJarsTest.java
   jbpm3/trunk/modules/enterprise/jar/src/test/resources/jboss422-dependencies.txt
   jbpm3/trunk/modules/enterprise/jar/src/test/resources/jboss423-dependencies.txt
   jbpm3/trunk/modules/enterprise/jar/src/test/resources/jboss500-dependencies.txt
Modified:
   jbpm3/trunk/modules/enterprise/ear/pom.xml
   jbpm3/trunk/modules/enterprise/jar/pom.xml
   jbpm3/trunk/pom.xml
Log:
Fix Container provided jars

Modified: jbpm3/trunk/modules/enterprise/ear/pom.xml
===================================================================
--- jbpm3/trunk/modules/enterprise/ear/pom.xml	2008-09-23 16:21:54 UTC (rev 2314)
+++ jbpm3/trunk/modules/enterprise/ear/pom.xml	2008-09-23 17:36:43 UTC (rev 2315)
@@ -13,7 +13,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   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 - Enterprise Bundle</name>
+  <name>JBoss jBPM3 - Enterprise (EAR)</name>
   <groupId>org.jbpm.jbpm3</groupId>
   <artifactId>jbpm-enterprise-bundle</artifactId>
   <packaging>ear</packaging>
@@ -27,9 +27,20 @@
 
   <!-- Dependencies -->
   <dependencies>
-    <!-- jBPM Dependencies -->
     <dependency>
       <groupId>org.jbpm.jbpm3</groupId>
+      <artifactId>jbpm-enterprise-beans</artifactId>
+      <version>${version}</version>
+      <type>ejb</type>
+      <exclusions>
+        <exclusion>
+          <groupId>org.jbpm.jbpm3</groupId>
+          <artifactId>jbpm-core</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.jbpm.jbpm3</groupId>
       <artifactId>jbpm-console</artifactId>
       <version>${version}</version>
       <type>war</type>
@@ -73,18 +84,6 @@
     </dependency>
     <dependency>
       <groupId>org.jbpm.jbpm3</groupId>
-      <artifactId>jbpm-enterprise-beans</artifactId>
-      <version>${version}</version>
-      <type>ejb</type>
-      <exclusions>
-        <exclusion>
-          <groupId>org.jbpm.jbpm3</groupId>
-          <artifactId>jbpm-core</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.jbpm.jbpm3</groupId>
       <artifactId>jbpm-identity</artifactId>
       <version>${version}</version>
       <exclusions>
@@ -129,7 +128,7 @@
               <contextRoot>/jbpm-console</contextRoot>
               <unpack>true</unpack>
             </webModule>
-             <webModule>
+            <webModule>
               <groupId>org.jbpm.jbpm3</groupId>
               <artifactId>gwt-console-war</artifactId>
               <bundleFileName>gwt-console.war</bundleFileName>

Modified: jbpm3/trunk/modules/enterprise/jar/pom.xml
===================================================================
--- jbpm3/trunk/modules/enterprise/jar/pom.xml	2008-09-23 16:21:54 UTC (rev 2314)
+++ jbpm3/trunk/modules/enterprise/jar/pom.xml	2008-09-23 17:36:43 UTC (rev 2315)
@@ -13,7 +13,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   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 - Enterprise Beans</name>
+  <name>JBoss jBPM3 - Enterprise (JAR)</name>
   <groupId>org.jbpm.jbpm3</groupId>
   <artifactId>jbpm-enterprise-beans</artifactId>
   <packaging>ejb</packaging>
@@ -33,10 +33,6 @@
       <artifactId>jbpm-core</artifactId>
       <version>${version}</version>
     </dependency>
-    <dependency>
-      <groupId>org.jbpm.spec</groupId>
-      <artifactId>jbpm-spec-api</artifactId>
-    </dependency>
 
     <!-- Provided Dependencies -->
     <dependency>
@@ -73,13 +69,6 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.jboss.client</groupId>
-      <artifactId>jbossall-client</artifactId>
-      <!-- verify that this version works for all target containers  -->
-      <version>4.2.2.GA</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
       <groupId>org.apache.cactus</groupId>
       <artifactId>cactus.integration.shared.api</artifactId>
       <scope>test</scope>
@@ -90,6 +79,18 @@
         </exclusion>
       </exclusions>
     </dependency>
+    <dependency>
+      <groupId>org.jboss.client</groupId>
+      <artifactId>jbossall-client</artifactId>
+      <!-- verify that this version works for all target containers  -->
+      <version>4.2.2.GA</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.jbpm.spec</groupId>
+      <artifactId>jbpm-spec-api</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <!-- Plugins -->

Added: jbpm3/trunk/modules/enterprise/jar/src/test/java/org/jbpm/enterprise/ContainerProvidedJarsTest.java
===================================================================
--- jbpm3/trunk/modules/enterprise/jar/src/test/java/org/jbpm/enterprise/ContainerProvidedJarsTest.java	                        (rev 0)
+++ jbpm3/trunk/modules/enterprise/jar/src/test/java/org/jbpm/enterprise/ContainerProvidedJarsTest.java	2008-09-23 17:36:43 UTC (rev 2315)
@@ -0,0 +1,115 @@
+/*
+ * 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.enterprise;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.management.ObjectName;
+
+import org.jboss.bpm.model.ObjectNameFactory;
+import org.jboss.bpm.test.IntegrationTestCase;
+
+/**
+ * Test that there are jars deployed which should in fact be provided by the container
+ * 
+ * @author thomas.diesler at jboss.com
+ * @since 23-Sep-2008
+ */
+public class ContainerProvidedJarsTest extends IntegrationTestCase
+{
+  public void testDependencies() throws Exception
+  {
+    String targetContainer = null;
+    if (isTargetJBoss422())
+    {
+      targetContainer = "jboss422";
+    }
+    else if (isTargetJBoss423())
+    {
+      targetContainer = "jboss423";
+    }
+    else if (isTargetJBoss500())
+    {
+      targetContainer = "jboss500";
+    }
+    assertNotNull("System property 'target.container' not null", targetContainer);
+    assertTrue("Supported target.container: " + targetContainer, "jboss422,jboss423,jboss500".indexOf(targetContainer) >= 0);
+
+    File jbossJars = getResourceFile(targetContainer + "-dependencies.txt");
+    assertTrue("JBoss jar fixture exists: " + jbossJars, jbossJars.exists());
+
+    // Read the JBoss ServerHomeDir
+    ObjectName oname = ObjectNameFactory.create("jboss.system:type=ServerConfig");
+    File serverHomeDir = (File)getServer().getAttribute(oname, "ServerHomeDir");
+    if (serverHomeDir == null)
+      throw new IllegalStateException("Cannot obtain jboss home dir");
+
+    File jbpmDir = new File(serverHomeDir + "/deploy/jbpm");
+    assertTrue("jBPM dir exists: " + jbpmDir, jbpmDir.exists());
+    
+    // Store the deployed jars in a string builder
+    String deployedJars = getDeployedJars(jbpmDir).toString();
+
+    // Iterate over the known server provided jars
+    List<String> matchingJars = new ArrayList<String>();
+    BufferedReader br = new BufferedReader(new FileReader(jbossJars));
+    String line = br.readLine();
+    while (line != null)
+    {
+      if (line.length() == 0 || line.startsWith("#"))
+      {
+        line = br.readLine();
+        continue;
+      }
+
+      if (deployedJars.indexOf(line) > 0)
+      {
+        matchingJars.add(line);
+      }
+      line = br.readLine();
+    }
+
+    assertEquals("Invalid deployed jars: " + matchingJars, 0, matchingJars.size());
+  }
+
+  private List<String> getDeployedJars(File subdir)
+  {
+    List<String> deployedJars = new ArrayList<String>();
+    for (File file : subdir.listFiles())
+    {
+      if (file.isDirectory())
+      {
+        deployedJars.addAll(getDeployedJars(file));
+        continue;
+      }
+      
+      String fileName = file.getName();
+      if (fileName.endsWith(".jar"))
+        deployedJars.add(fileName);
+    }
+    return deployedJars;
+  }
+}


Property changes on: jbpm3/trunk/modules/enterprise/jar/src/test/java/org/jbpm/enterprise/ContainerProvidedJarsTest.java
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Added: jbpm3/trunk/modules/enterprise/jar/src/test/resources/jboss422-dependencies.txt
===================================================================
--- jbpm3/trunk/modules/enterprise/jar/src/test/resources/jboss422-dependencies.txt	                        (rev 0)
+++ jbpm3/trunk/modules/enterprise/jar/src/test/resources/jboss422-dependencies.txt	2008-09-23 17:36:43 UTC (rev 2315)
@@ -0,0 +1,82 @@
+# This file shows jboss-4.2.2.ga thirdparty dependencies. It was produced running the following command
+# 
+# (ls -1 lib; ls -1 lib/endorsed; ls -1 server/default/lib/) | grep jar | sed s/.jar// | sort -u
+#
+activation
+antlr
+autonumber-plugin
+bcel
+bindingservice-plugin
+bsf
+bsh
+bsh-deployer
+cglib
+commons-codec
+commons-collections
+commons-httpclient
+commons-logging
+concurrent
+dom4j
+ejb3-persistence
+el-api
+getopt
+hibernate3
+hibernate-annotations
+hibernate-entitymanager
+hsqldb
+hsqldb-plugin
+javassist
+jaxen
+jboss
+jboss-cache-jdk50
+jboss-common
+jboss-common-jdbc-wrapper
+jboss-ejb3x
+jboss-hibernate
+jboss-j2ee
+jboss-jaxrpc
+jboss-jaxws
+jboss-jca
+jboss-jmx
+jboss-jsr77
+jboss-jsr88
+jbossjta
+jbossjta-integration
+jboss-management
+jboss-monitoring
+jbossmq
+jboss-remoting
+jboss-remoting-int
+jboss-saaj
+jboss-serialization
+jboss-srp
+jbosssx
+jboss-system
+jboss-transaction
+jbossts-common
+jboss-vfs
+jbossws-common
+jbossws-framework
+jbossws-jboss42
+jbossws-spi
+jboss-xml-binding
+jmx-adaptor-plugin
+jnpserver
+joesnmp
+jpl-pattern
+jpl-util
+jsp-api
+log4j
+log4j-boot
+log4j-snmp-appender
+mail
+mail-plugin
+properties-plugin
+quartz
+scheduler-plugin
+scheduler-plugin-example
+serializer
+servlet-api
+xalan
+xercesImpl
+xmlentitymgr


Property changes on: jbpm3/trunk/modules/enterprise/jar/src/test/resources/jboss422-dependencies.txt
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Added: jbpm3/trunk/modules/enterprise/jar/src/test/resources/jboss423-dependencies.txt
===================================================================
--- jbpm3/trunk/modules/enterprise/jar/src/test/resources/jboss423-dependencies.txt	                        (rev 0)
+++ jbpm3/trunk/modules/enterprise/jar/src/test/resources/jboss423-dependencies.txt	2008-09-23 17:36:43 UTC (rev 2315)
@@ -0,0 +1,83 @@
+# This file shows jboss-4.2.3.ga thirdparty dependencies. It was produced running the following command
+# 
+# (ls -1 lib; ls -1 lib/endorsed; ls -1 server/default/lib/) | grep jar | sed s/.jar// | sort
+#
+activation
+antlr
+autonumber-plugin
+bcel
+bindingservice-plugin
+bsf
+bsh
+bsh-deployer
+cglib
+commons-codec
+commons-collections
+commons-httpclient
+commons-logging
+concurrent
+dom4j
+ejb3-persistence
+el-api
+getopt
+hibernate3
+hibernate-annotations
+hibernate-entitymanager
+hsqldb
+hsqldb-plugin
+javassist
+jaxb-api
+jaxb-impl
+jaxen
+jboss
+jboss-common
+jboss-common-jdbc-wrapper
+jboss-ejb3x
+jboss-hibernate
+jboss-iiop
+jboss-j2ee
+jboss-jaxrpc
+jboss-jaxws
+jboss-jaxws-ext
+jboss-jca
+jboss-jmx
+jboss-jsr77
+jboss-jsr88
+jbossjta
+jbossjta-integration
+jboss-management
+jboss-monitoring
+jbossmq
+jboss-remoting
+jboss-remoting-int
+jboss-saaj
+jboss-serialization
+jboss-srp
+jbosssx
+jboss-system
+jboss-transaction
+jbossts-common
+jboss-vfs
+jbossws-common
+jbossws-framework
+jbossws-jboss42
+jbossws-spi
+jboss-xml-binding
+jmx-adaptor-plugin
+jnpserver
+joesnmp
+jsp-api
+log4j
+log4j-boot
+log4j-snmp-appender
+mail
+mail-plugin
+properties-plugin
+quartz
+scheduler-plugin
+scheduler-plugin-example
+serializer
+servlet-api
+xalan
+xercesImpl
+xmlentitymgr


Property changes on: jbpm3/trunk/modules/enterprise/jar/src/test/resources/jboss423-dependencies.txt
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Added: jbpm3/trunk/modules/enterprise/jar/src/test/resources/jboss500-dependencies.txt
===================================================================
--- jbpm3/trunk/modules/enterprise/jar/src/test/resources/jboss500-dependencies.txt	                        (rev 0)
+++ jbpm3/trunk/modules/enterprise/jar/src/test/resources/jboss500-dependencies.txt	2008-09-23 17:36:43 UTC (rev 2315)
@@ -0,0 +1,151 @@
+# This file shows jboss-5.0.0.cr2 thirdparty dependencies. It was produced running the following command
+# 
+# (ls -1 lib; ls -1 lib/endorsed; ls -1 server/default/lib/) | grep jar | sed s/.jar// | sort -u
+#
+activation
+antlr
+autonumber-plugin
+bcel
+bsf
+bsh
+commons-collections
+commons-httpclient
+commons-logging
+concurrent
+dom4j
+dtdparser121
+ejb3-persistence
+el-api
+getopt
+hibernate-annotations
+hibernate-commons-annotations
+hibernate-core
+hibernate-entitymanager
+hibernate-jmx
+hibernate-validator
+hsqldb
+hsqldb-plugin
+javassist
+jaxb-api
+jaxb-impl
+jaxb-xjc
+jaxen
+jboss
+jboss-aop-deployer-jdk50
+jboss-aop-jboss4-jdk50
+jboss-aop-jboss5
+jboss-aop-jdk50
+jboss-aop-mc-int
+jbossas-remoting
+jboss-bindingservice
+jboss-bootstrap
+jboss-classloader
+jboss-classloading
+jboss-classloading-spi
+jboss-classloading-vfs
+jboss-common-core
+jboss-common-jdbc-wrapper
+jboss-current-invocation-aspects
+jboss-dependency
+jboss-deployers-client
+jboss-deployers-client-spi
+jboss-deployers-core
+jboss-deployers-core-spi
+jboss-deployers-impl
+jboss-deployers-spi
+jboss-deployers-structure-spi
+jboss-deployers-vfs
+jboss-deployers-vfs-spi
+jboss-ejb3-cache
+jboss-ejb3-common
+jboss-ejb3-core
+jboss-ejb3-ext-api
+jboss-ejb3-ext-api-impl
+jboss-ejb3-interceptors
+jboss-ejb3-metadata
+jboss-ejb3-proxy
+jboss-ejb3-proxy-clustered
+jboss-ejb3-security
+jboss-ejb3-transactions
+jbossha
+jboss-ha-client
+jboss-ha-server-api
+jboss-ha-server-cache-jbc
+jboss-ha-server-cache-spi
+jboss-hibernate
+jboss-iiop
+jboss-integration
+jboss-j2se
+jboss-jaspi-api
+jboss-javaee
+jboss-jca
+jboss-jmx
+jboss-jmx-remoting
+jboss-jpa-deployers
+jboss-jsr77
+jboss-jsr88
+jbossjta
+jbossjta-integration
+jboss-kernel
+jboss-logging-jdk
+jboss-logging-log4j
+jboss-logging-spi
+jboss-main
+jboss-managed
+jboss-management
+jboss-mbeans
+jboss-mdr
+jboss-messaging
+jboss-messaging-int
+jboss-metadata
+jboss-metatype
+jboss-monitoring
+jboss-profileservice
+jboss-reflect
+jboss-remoting
+jboss-remoting-aspects
+jboss-security-aspects
+jboss-security-spi
+jboss-serialization
+jboss-srp
+jboss-sunxacml
+jbosssx
+jbosssx-server
+jboss-system
+jboss-system-jmx
+jboss-transaction-aspects
+jbossts-common
+jboss-vfs
+jbossws-common
+jbossws-framework
+jbossws-native-jaxrpc
+jbossws-native-jaxws
+jbossws-native-jaxws-ext
+jbossws-native-saaj
+jbossws-spi
+jboss-xacml
+jboss-xml-binding
+jmx-adaptor-plugin
+jnpserver
+joesnmp
+jsp-api
+log4j
+log4j-boot
+log4j-snmp-appender
+mail
+mail-plugin
+osgi.core
+properties-plugin
+quartz
+resolver
+scheduler-plugin
+scheduler-plugin-example
+serializer
+servlet-api
+slf4j-api
+slf4j-jboss-logging
+stax-api
+trove
+wstx
+xalan
+xercesImpl


Property changes on: jbpm3/trunk/modules/enterprise/jar/src/test/resources/jboss500-dependencies.txt
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Modified: jbpm3/trunk/pom.xml
===================================================================
--- jbpm3/trunk/pom.xml	2008-09-23 16:21:54 UTC (rev 2314)
+++ jbpm3/trunk/pom.xml	2008-09-23 17:36:43 UTC (rev 2315)
@@ -28,15 +28,15 @@
 
   <!-- Modules -->
   <modules>
+    <module>modules/console</module>
     <module>modules/core</module>
+    <module>modules/enterprise</module>
+    <module>modules/examples</module>
+    <module>modules/gwt-console</module>
     <module>modules/identity</module>
     <module>modules/integration</module>
-    <module>modules/examples</module>
+    <module>modules/jbpm4jsf</module>
     <module>modules/simulation</module>
-    <module>modules/console</module>
-    <module>modules/enterprise</module>
-    <module>modules/jbpm4jsf</module>
-    <module>modules/gwt-console</module>
   </modules>
 
   <!-- Properties -->
@@ -69,7 +69,7 @@
     <javax.persistence.version>1.0</javax.persistence.version>
     <javax.jaxb.version>2.1</javax.jaxb.version>
     <jaxen.version>1.1.1</jaxen.version>
-    <jbpm.api.version>1.0.0-Alpha1</jbpm.api.version>
+    <jbpm.api.version>1.0.0-SNAPSHOT</jbpm.api.version>
     <jboss.jbpm.designer.version>3.1.4</jboss.jbpm.designer.version>
     <jboss.gravel.version>1.0.0.GA</jboss.gravel.version>
     <jboss.seam.version>2.0.2.GA</jboss.seam.version>




More information about the jbpm-commits mailing list