[jbpm-commits] JBoss JBPM SVN: r2049 - in jbpm3/trunk/modules: distribution and 5 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Fri Aug 29 10:27:59 EDT 2008
Author: thomas.diesler at jboss.com
Date: 2008-08-29 10:27:59 -0400 (Fri, 29 Aug 2008)
New Revision: 2049
Removed:
jbpm3/trunk/modules/enterprise/src/main/config/
jbpm3/trunk/modules/enterprise/src/main/ear/
Modified:
jbpm3/trunk/modules/console/pom.xml
jbpm3/trunk/modules/distribution/pom.xml
jbpm3/trunk/modules/distribution/scripts/install-definition.xml
jbpm3/trunk/modules/enterprise/src/main/java/org/jbpm/ejb/impl/CommandListenerBean.java
jbpm3/trunk/modules/enterprise/src/main/resources/META-INF/jboss.xml
jbpm3/trunk/modules/enterprise/src/main/resources/META-INF/jbosscmp-jdbc.xml
jbpm3/trunk/modules/enterprise/src/test/webapp/WEB-INF/jboss-web.xml
Log:
enterprise deploy ok
Modified: jbpm3/trunk/modules/console/pom.xml
===================================================================
--- jbpm3/trunk/modules/console/pom.xml 2008-08-29 12:45:15 UTC (rev 2048)
+++ jbpm3/trunk/modules/console/pom.xml 2008-08-29 14:27:59 UTC (rev 2049)
@@ -10,122 +10,134 @@
<!-- ====================================================================== -->
<!-- $Id$ -->
-
<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>
+ 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 jBPM - Console</name>
+ <groupId>org.jboss.jbpm</groupId>
+ <artifactId>jbpm-console</artifactId>
+ <packaging>war</packaging>
- <name>JBoss jBPM - Console</name>
- <groupId>org.jboss.jbpm</groupId>
- <artifactId>jbpm-console</artifactId>
- <packaging>war</packaging>
-
<!-- Parent -->
- <parent>
- <groupId>org.jboss.jbpm</groupId>
- <artifactId>jbpm</artifactId>
- <version>3.3.0-SNAPSHOT</version>
- </parent>
+ <parent>
+ <groupId>org.jboss.jbpm</groupId>
+ <artifactId>jbpm</artifactId>
+ <version>3.3.0-SNAPSHOT</version>
+ </parent>
<!-- Dependencies -->
- <dependencies>
- <!--
- The exclusions below are defined such that the war is in sync with
- the one produced by 3.2.3.GA
- -->
- <!-- jBPM Dependencies -->
- <dependency>
- <groupId>org.jboss.jbpm</groupId>
- <artifactId>jbpm-jbpm4jsf</artifactId>
- <version>${version}</version>
- <exclusions>
- <exclusion>
- <artifactId>jackrabbit-core</artifactId>
- <groupId>org.apache.jackrabbit</groupId>
- </exclusion>
- <exclusion>
- <artifactId>hibernate</artifactId>
- <groupId>org.hibernate</groupId>
- </exclusion>
- <exclusion>
- <artifactId>bsh</artifactId>
- <groupId>bsh</groupId>
- </exclusion>
- <exclusion>
- <artifactId>dom4j</artifactId>
- <groupId>dom4j</groupId>
- </exclusion>
- <exclusion>
- <artifactId>junit</artifactId>
- <groupId>junit</groupId>
- </exclusion>
- <exclusion>
- <artifactId>ant</artifactId>
- <groupId>org.apache.ant</groupId>
- </exclusion>
- <exclusion>
- <artifactId>jsf-impl</artifactId>
- <groupId>javax.faces</groupId>
- </exclusion>
- <exclusion>
- <artifactId>jcr</artifactId>
- <groupId>javax.jcr</groupId>
- </exclusion>
- <exclusion>
- <artifactId>mail</artifactId>
- <groupId>javax.mail</groupId>
- </exclusion>
- <exclusion>
- <artifactId>el-api</artifactId>
- <groupId>javax.el</groupId>
- </exclusion>
- <exclusion>
- <artifactId>jsf-api</artifactId>
- <groupId>javax.faces</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>commons-fileupload</groupId>
- <artifactId>commons-fileupload</artifactId>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- </dependency>
- </dependencies>
+ <dependencies>
+ <!-- jBPM Dependencies -->
+ <dependency>
+ <groupId>org.jboss.jbpm</groupId>
+ <artifactId>jbpm-jpdl-core</artifactId>
+ <version>${version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbpm</groupId>
+ <artifactId>jbpm-jpdl-identity</artifactId>
+ <version>${version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbpm</groupId>
+ <artifactId>jbpm-jbpm4jsf</artifactId>
+ <version>${version}</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>jackrabbit-core</artifactId>
+ <groupId>org.apache.jackrabbit</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>hibernate</artifactId>
+ <groupId>org.hibernate</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>bsh</artifactId>
+ <groupId>bsh</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>dom4j</artifactId>
+ <groupId>dom4j</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>junit</artifactId>
+ <groupId>junit</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>ant</artifactId>
+ <groupId>org.apache.ant</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>jsf-impl</artifactId>
+ <groupId>javax.faces</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>jcr</artifactId>
+ <groupId>javax.jcr</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>mail</artifactId>
+ <groupId>javax.mail</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>el-api</artifactId>
+ <groupId>javax.el</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>jsf-api</artifactId>
+ <groupId>javax.faces</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>commons-fileupload</groupId>
+ <artifactId>commons-fileupload</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ </dependency>
+ </dependencies>
<!-- Plugins -->
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <finalName>${project.build.finalName}</finalName>
- <appendAssemblyId>true</appendAssemblyId>
- <descriptors>
- <descriptor>scripts/assembly-service.xml</descriptor>
- </descriptors>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <showDeprecation>false</showDeprecation>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <finalName>${project.build.finalName}</finalName>
+ <appendAssemblyId>true</appendAssemblyId>
+ <descriptors>
+ <descriptor>scripts/assembly-service.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
\ No newline at end of file
Modified: jbpm3/trunk/modules/distribution/pom.xml
===================================================================
--- jbpm3/trunk/modules/distribution/pom.xml 2008-08-29 12:45:15 UTC (rev 2048)
+++ jbpm3/trunk/modules/distribution/pom.xml 2008-08-29 14:27:59 UTC (rev 2049)
@@ -41,6 +41,11 @@
</dependency>
<dependency>
<groupId>org.jboss.jbpm</groupId>
+ <artifactId>jbpm-enterprise</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbpm</groupId>
<artifactId>jbpm-jpdl-core</artifactId>
<version>${version}</version>
</dependency>
Modified: jbpm3/trunk/modules/distribution/scripts/install-definition.xml
===================================================================
--- jbpm3/trunk/modules/distribution/scripts/install-definition.xml 2008-08-29 12:45:15 UTC (rev 2048)
+++ jbpm3/trunk/modules/distribution/scripts/install-definition.xml 2008-08-29 14:27:59 UTC (rev 2049)
@@ -51,11 +51,17 @@
<!-- jBPM Main Components -->
<pack name="jBPM3" required="yes" installGroups="Main">
<description>The jBPM Main Components</description>
- <fileset dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/server/@{jboss.server.instance}/deploy/jbpm"
+ <fileset dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/server/@{jboss.server.instance}/deploy/jbpm/jbpm-service.sar"
override="true">
<include name="jboss-bpm-api.jar"/>
+ <include name="jbpm-jpdl-core.jar"/>
+ <include name="jbpm-jpdl-identity.jar"/>
<include name="jbpm-jpdl-integration.jar"/>
</fileset>
+ <fileset dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/server/@{jboss.server.instance}/deploy/jbpm"
+ override="true">
+ <include name="jbpm-enterprise.jar"/>
+ </fileset>
<file src="@{deploy.artifacts.dir}/lib/jbpm-console.zip" targetdir="$INSTALL_PATH/server/@{jboss.server.instance}/deploy/jbpm/jbpm-console.war"
unpack="true" override="true"/>
<file src="@{deploy.artifacts.dir}/lib/jbpm-console-service.zip" targetdir="$INSTALL_PATH/server/@{jboss.server.instance}/deploy/jbpm/jbpm-service.sar"
Modified: jbpm3/trunk/modules/enterprise/src/main/java/org/jbpm/ejb/impl/CommandListenerBean.java
===================================================================
--- jbpm3/trunk/modules/enterprise/src/main/java/org/jbpm/ejb/impl/CommandListenerBean.java 2008-08-29 12:45:15 UTC (rev 2048)
+++ jbpm3/trunk/modules/enterprise/src/main/java/org/jbpm/ejb/impl/CommandListenerBean.java 2008-08-29 14:27:59 UTC (rev 2049)
@@ -190,7 +190,7 @@
/*
* if the connection supports xa, the session will be transacted, else the
* session will auto acknowledge; in either case no explicit transaction
- * control must be performed - see ejb 2.1 §17.3.5
+ * control must be performed - see ejb 2.1 - 17.3.5
*/
return jmsConnection.createSession(false, Session.AUTO_ACKNOWLEDGE);
}
Modified: jbpm3/trunk/modules/enterprise/src/main/resources/META-INF/jboss.xml
===================================================================
--- jbpm3/trunk/modules/enterprise/src/main/resources/META-INF/jboss.xml 2008-08-29 12:45:15 UTC (rev 2048)
+++ jbpm3/trunk/modules/enterprise/src/main/resources/META-INF/jboss.xml 2008-08-29 14:27:59 UTC (rev 2049)
@@ -13,7 +13,7 @@
<local-jndi-name>java:ejb/CommandServiceBean</local-jndi-name>
<resource-ref>
<res-ref-name>jdbc/JbpmDataSource</res-ref-name>
- <jndi-name>java:JbpmDS</jndi-name>
+ <jndi-name>java:/JbpmDS</jndi-name>
</resource-ref>
<resource-ref>
<res-ref-name>jms/JbpmConnectionFactory</res-ref-name>
Modified: jbpm3/trunk/modules/enterprise/src/main/resources/META-INF/jbosscmp-jdbc.xml
===================================================================
--- jbpm3/trunk/modules/enterprise/src/main/resources/META-INF/jbosscmp-jdbc.xml 2008-08-29 12:45:15 UTC (rev 2048)
+++ jbpm3/trunk/modules/enterprise/src/main/resources/META-INF/jbosscmp-jdbc.xml 2008-08-29 14:27:59 UTC (rev 2049)
@@ -5,7 +5,7 @@
<jbosscmp-jdbc>
<defaults>
- <datasource>java:JbpmDS</datasource>
+ <datasource>java:/JbpmDS</datasource>
<create-table>false</create-table>
<remove-table>false</remove-table>
<pk-constraint>false</pk-constraint>
Modified: jbpm3/trunk/modules/enterprise/src/test/webapp/WEB-INF/jboss-web.xml
===================================================================
--- jbpm3/trunk/modules/enterprise/src/test/webapp/WEB-INF/jboss-web.xml 2008-08-29 12:45:15 UTC (rev 2048)
+++ jbpm3/trunk/modules/enterprise/src/test/webapp/WEB-INF/jboss-web.xml 2008-08-29 14:27:59 UTC (rev 2049)
@@ -2,17 +2,13 @@
<!DOCTYPE jboss-web PUBLIC
"-//JBoss//DTD Web Application 2.4//EN"
"http://www.jboss.org/j2ee/dtd/jboss-web_4_0.dtd" >
-
<jboss-web>
-
<resource-ref>
<res-ref-name>jdbc/JbpmDataSource</res-ref-name>
- <jndi-name>java:JbpmDS</jndi-name>
+ <jndi-name>java:/JbpmDS</jndi-name>
</resource-ref>
-
<resource-ref>
<res-ref-name>jms/JbpmConnectionFactory</res-ref-name>
<jndi-name>java:JmsXA</jndi-name>
</resource-ref>
-
-</jboss-web>
+</jboss-web>
\ No newline at end of file
More information about the jbpm-commits
mailing list