Author: thomas.diesler(a)jboss.com
Date: 2008-10-30 07:08:13 -0400 (Thu, 30 Oct 2008)
New Revision: 2672
Modified:
jbpm3/trunk/modules/distribution/pom.xml
jbpm3/trunk/modules/distribution/src/main/resources/installer/install-definition.xml
jbpm3/trunk/modules/enterprise/ear/pom.xml
jbpm3/trunk/pom.xml
Log:
Update to jsf-console-3.3.0-SNAPSHOT
Modified: jbpm3/trunk/modules/distribution/pom.xml
===================================================================
--- jbpm3/trunk/modules/distribution/pom.xml 2008-10-30 11:06:59 UTC (rev 2671)
+++ jbpm3/trunk/modules/distribution/pom.xml 2008-10-30 11:08:13 UTC (rev 2672)
@@ -26,10 +26,6 @@
<relativePath>../../pom.xml</relativePath>
</parent>
- <properties>
- <gwt.console.version>1.0.0-SNAPSHOT</gwt.console.version>
- </properties>
-
<!-- Dependencies -->
<dependencies>
<dependency>
@@ -63,18 +59,6 @@
</dependency>
<dependency>
<groupId>org.jbpm.jbpm3</groupId>
- <artifactId>gwt-console</artifactId>
- <version>${gwt.console.version}</version>
- <type>war</type>
- </dependency>
- <dependency>
- <groupId>org.jbpm.jbpm3</groupId>
- <artifactId>gwt-console-server</artifactId>
- <version>${gwt.console.version}</version>
- <type>war</type>
- </dependency>
- <dependency>
- <groupId>org.jbpm.jbpm3</groupId>
<artifactId>jbpm-identity</artifactId>
<version>${version}</version>
</dependency>
@@ -103,7 +87,24 @@
<version>${version}</version>
<type>jdocbook</type>
</dependency>
+
+ <!-- jBPM Projects -->
<dependency>
+ <groupId>org.jbpm.jbpm3</groupId>
+ <artifactId>jsf-console</artifactId>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <groupId>org.jbpm.jbpm3</groupId>
+ <artifactId>gwt-console</artifactId>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <groupId>org.jbpm.jbpm3</groupId>
+ <artifactId>gwt-console-server</artifactId>
+ <type>war</type>
+ </dependency>
+ <dependency>
<groupId>org.jbpm</groupId>
<artifactId>jbpm-jpdl-designer</artifactId>
<type>zip</type>
@@ -112,15 +113,15 @@
<!-- Sources -->
<dependency>
<groupId>org.jbpm.jbpm3</groupId>
- <artifactId>jbpm-console</artifactId>
+ <artifactId>jbpm-core</artifactId>
<classifier>sources</classifier>
<version>${version}</version>
</dependency>
<dependency>
<groupId>org.jbpm.jbpm3</groupId>
- <artifactId>jbpm-core</artifactId>
+ <artifactId>jsf-console</artifactId>
<classifier>sources</classifier>
- <version>${version}</version>
+ <version>${jbpm.jsf-console.version}</version>
</dependency>
<dependency>
<groupId>org.jbpm.jbpm3</groupId>
Modified:
jbpm3/trunk/modules/distribution/src/main/resources/installer/install-definition.xml
===================================================================
---
jbpm3/trunk/modules/distribution/src/main/resources/installer/install-definition.xml 2008-10-30
11:06:59 UTC (rev 2671)
+++
jbpm3/trunk/modules/distribution/src/main/resources/installer/install-definition.xml 2008-10-30
11:08:13 UTC (rev 2672)
@@ -115,6 +115,7 @@
<include name="jbpm-enterprise-bundle.ear" />
<include name="jbpm-core.jar" />
<include name="jbpm-identity.jar" />
+ <include name="jsf-console.war" />
<include name="activation.jar" />
<include name="antlr.jar" />
<include name="asm.jar" />
@@ -131,7 +132,7 @@
<!-- jbpm3/src -->
<fileset dir="(a){deploy.artifacts.dir}/src"
targetdir="$INSTALL_PATH/jbpm3/src" override="true">
- <include name="jbpm-console-sources.jar" />
+ <include name="jsf-console-sources.jar" />
<include name="jbpm-core-sources.jar" />
<include name="jbpm-enterprise-beans-sources.jar" />
<include name="jbpm-identity-sources.jar" />
@@ -187,7 +188,9 @@
<!-- jbpm/jbpm-userguide.war -->
<file src="(a){deploy.artifacts.dir}/lib/jbpm-userguide.zip"
targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-userguide.war"
unpack="true" override="true" />
-
+
+ <!-- jbpm-destinations-service -->
+ <file src="(a){resources.dir}/destination/jbpm-destinations-service.xml"
targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm" />
</pack>
<!-- jBPM Databases -->
@@ -238,10 +241,5 @@
<singlefile
src="(a){deploy.artifacts.dir}/resources/jbpm-core-config/hibernate.cfg.sybase.xml"
target="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar/hibernate.cfg.xml"
/>
</pack>
- <!-- jBPM JMS Destinations -->
- <pack name="jBPM3 JMS Destinations" required="no"
preselected="yes">
- <description>The JMS Destinations</description>
- <file src="(a){resources.dir}/destination/jbpm-destinations-service.xml"
targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm" />
- </pack>
</packs>
</installation>
\ No newline at end of file
Modified: jbpm3/trunk/modules/enterprise/ear/pom.xml
===================================================================
--- jbpm3/trunk/modules/enterprise/ear/pom.xml 2008-10-30 11:06:59 UTC (rev 2671)
+++ jbpm3/trunk/modules/enterprise/ear/pom.xml 2008-10-30 11:08:13 UTC (rev 2672)
@@ -41,7 +41,7 @@
</dependency>
<dependency>
<groupId>org.jbpm.jbpm3</groupId>
- <artifactId>jsf-console-war</artifactId>
+ <artifactId>jsf-console</artifactId>
<type>war</type>
</dependency>
<dependency>
@@ -116,7 +116,7 @@
</jarModule>
<webModule>
<groupId>org.jbpm.jbpm3</groupId>
- <artifactId>jsf-console-war</artifactId>
+ <artifactId>jsf-console</artifactId>
<bundleFileName>jsf-console.war</bundleFileName>
<contextRoot>/jbpm-console</contextRoot>
<unpack>true</unpack>
Modified: jbpm3/trunk/pom.xml
===================================================================
--- jbpm3/trunk/pom.xml 2008-10-30 11:06:59 UTC (rev 2671)
+++ jbpm3/trunk/pom.xml 2008-10-30 11:08:13 UTC (rev 2672)
@@ -29,9 +29,9 @@
<!-- Modules -->
<modules>
<module>modules/core</module>
+ <module>modules/identity</module>
<module>modules/enterprise</module>
<module>modules/examples</module>
- <module>modules/identity</module>
<module>modules/simulation</module>
</modules>
@@ -64,9 +64,10 @@
<javax.persistence.version>1.0</javax.persistence.version>
<javax.jaxb.version>2.1</javax.jaxb.version>
<jaxen.version>1.1.1</jaxen.version>
- <jsf-console.version>3.2.2-SNAPSHOT</jsf-console.version>
<jbpm.api.version>1.0.0-SNAPSHOT</jbpm.api.version>
- <jboss.jbpm.designer.version>3.1.4</jboss.jbpm.designer.version>
+ <jbpm.designer.version>3.1.4</jbpm.designer.version>
+ <jbpm.gwt-console.version>1.0.0-SNAPSHOT</jbpm.gwt-console.version>
+ <jbpm.jsf-console.version>3.3.0-SNAPSHOT</jbpm.jsf-console.version>
<jboss.gravel.version>1.0.0.GA</jboss.gravel.version>
<jboss.seam.version>2.0.2.GA</jboss.seam.version>
<junit.version>3.8.1</junit.version>
@@ -93,17 +94,29 @@
<version>${jbpm.api.version}</version>
</dependency>
<dependency>
- <groupId>org.jbpm</groupId>
- <artifactId>jbpm-jpdl-designer</artifactId>
- <version>${jboss.jbpm.designer.version}</version>
- <type>zip</type>
+ <groupId>org.jbpm.jbpm3</groupId>
+ <artifactId>jsf-console</artifactId>
+ <version>${jbpm.jsf-console.version}</version>
+ <type>war</type>
</dependency>
<dependency>
<groupId>org.jbpm.jbpm3</groupId>
- <artifactId>jsf-console-war</artifactId>
- <version>${jsf-console.version}</version>
+ <artifactId>gwt-console</artifactId>
+ <version>${jbpm.gwt-console.version}</version>
<type>war</type>
</dependency>
+ <dependency>
+ <groupId>org.jbpm.jbpm3</groupId>
+ <artifactId>gwt-console-server</artifactId>
+ <version>${jbpm.gwt-console.version}</version>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <groupId>org.jbpm</groupId>
+ <artifactId>jbpm-jpdl-designer</artifactId>
+ <version>${jbpm.designer.version}</version>
+ <type>zip</type>
+ </dependency>
<!-- Thirdparty Dependencies -->
<dependency>
Show replies by date