JBoss JBPM SVN: r3435 - in jbpm3/trunk: modules/distribution and 1 other directory.
by do-not-reply＠jboss.org
Author: heiko.braun(a)jboss.com
Date: 2008-12-18 16:17:44 -0500 (Thu, 18 Dec 2008)
New Revision: 3435
Modified:
jbpm3/trunk/modules/distribution/pom.xml
jbpm3/trunk/pom.xml
Log:
Added -Psoa switch to distribution that includes the SOA-P console overlays
Modified: jbpm3/trunk/modules/distribution/pom.xml
===================================================================
--- jbpm3/trunk/modules/distribution/pom.xml 2008-12-18 18:52:16 UTC (rev 3434)
+++ jbpm3/trunk/modules/distribution/pom.xml 2008-12-18 21:17:44 UTC (rev 3435)
@@ -1,15 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
- <!-- ====================================================================== -->
- <!-- -->
- <!-- JBoss, the OpenSource J2EE webOS -->
- <!-- -->
- <!-- Distributable under LGPL license. -->
- <!-- See terms of license at http://www.gnu.org. -->
- <!-- -->
- <!-- ====================================================================== -->
+<!-- ====================================================================== -->
+<!-- -->
+<!-- JBoss, the OpenSource J2EE webOS -->
+<!-- -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at http://www.gnu.org. -->
+<!-- -->
+<!-- ====================================================================== -->
- <!-- $Id$ -->
+<!-- $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>
<name>JBoss jBPM3 - Distribution</name>
@@ -127,6 +127,12 @@
</dependency>
<dependency>
<groupId>org.jbpm.jbpm3</groupId>
+ <artifactId>jsf-console</artifactId>
+ <classifier>soa</classifier>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <groupId>org.jbpm.jbpm3</groupId>
<artifactId>gwt-console</artifactId>
<type>war</type>
</dependency>
@@ -242,7 +248,7 @@
<executions>
<execution>
<id>make-assembly</id>
- <phase>package</phase>
+ <phase>process-resources</phase>
<goals>
<goal>directory-single</goal>
</goals>
@@ -287,4 +293,34 @@
</plugin>
</plugins>
</build>
+
+ <profiles>
+ <profile>
+ <id>soa</id>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <!-- replace jsf-console.war with the SOA platform build -->
+ <property name="targetDir" value="${project.build.directory}/deploy-artifacts/lib/"/>
+ <echo>**** Replacing jsf-console with SOA-P build ****</echo>
+ <delete file="${targetDir}/jsf-console.war"/>
+ <copy file="${targetDir}/jsf-console-soa.war" tofile="${targetDir}/jsf-console.war"/>
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
\ No newline at end of file
Modified: jbpm3/trunk/pom.xml
===================================================================
--- jbpm3/trunk/pom.xml 2008-12-18 18:52:16 UTC (rev 3434)
+++ jbpm3/trunk/pom.xml 2008-12-18 21:17:44 UTC (rev 3435)
@@ -103,6 +103,13 @@
<type>war</type>
</dependency>
<dependency>
+ <groupId>org.jbpm.jbpm3</groupId>
+ <artifactId>jsf-console</artifactId>
+ <version>${jbpm.jsf-console.version}</version>
+ <classifier>soa</classifier>
+ <type>war</type>
+ </dependency>
+ <dependency>
<groupId>org.jbpm.jbpm3</groupId>
<artifactId>gwt-console</artifactId>
<version>${jbpm.gwt-console.version}</version>
17 years, 4 months
JBoss JBPM SVN: r3434 - in jbpm3/tags/jbpm-3.2.4.GA/hudson: hudson-home and 1 other directory.
by do-not-reply＠jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-12-18 13:52:16 -0500 (Thu, 18 Dec 2008)
New Revision: 3434
Added:
jbpm3/tags/jbpm-3.2.4.GA/hudson/profiles.xml.local.qa
Modified:
jbpm3/tags/jbpm-3.2.4.GA/hudson/hudson-home/command.sh
Log:
Add profiles.xml.local.qa
Modified: jbpm3/tags/jbpm-3.2.4.GA/hudson/hudson-home/command.sh
===================================================================
--- jbpm3/tags/jbpm-3.2.4.GA/hudson/hudson-home/command.sh 2008-12-18 15:26:21 UTC (rev 3433)
+++ jbpm3/tags/jbpm-3.2.4.GA/hudson/hudson-home/command.sh 2008-12-18 18:52:16 UTC (rev 3434)
@@ -36,7 +36,6 @@
# Build distro
#
cd $JBPMDIR
-cp profiles.xml.example profiles.xml
MVN_CMD="mvn -U $ENVIRONMENT -Pdistro clean install"
echo $MVN_CMD; $MVN_CMD; MVN_STATUS=$?
if [ $MVN_STATUS -ne 0 ]; then
Copied: jbpm3/tags/jbpm-3.2.4.GA/hudson/profiles.xml.local.qa (from rev 3433, jbpm3/trunk/hudson/profiles.xml.local.qa)
===================================================================
--- jbpm3/tags/jbpm-3.2.4.GA/hudson/profiles.xml.local.qa (rev 0)
+++ jbpm3/tags/jbpm-3.2.4.GA/hudson/profiles.xml.local.qa 2008-12-18 18:52:16 UTC (rev 3434)
@@ -0,0 +1,42 @@
+<profilesXml 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/xsd/profiles-1.0.0.xsd">
+ <profiles>
+
+ <!-- This profile can also be defined in ~/.m2/settings.xml -->
+ <profile>
+ <id>jboss-home-profile</id>
+ <activation>
+ <property>
+ <name>user.name</name>
+ </property>
+ </activation>
+ <properties>
+
+ <jdbc.mysql.url>jdbc:mysql://localhost:3306/jbpmtest</jdbc.mysql.url>
+ <jdbc.mysql.server>localhost</jdbc.mysql.server>
+ <jdbc.mysql.port>3306</jdbc.mysql.port>
+ <jdbc.mysql.database>jbpmtest</jdbc.mysql.database>
+ <jdbc.mysql.username>jbpmtest</jdbc.mysql.username>
+ <jdbc.mysql.password></jdbc.mysql.password>
+
+ <jdbc.sybase.url>jdbc:jtds:sybase://192.168.0.101:5000/jbpmtest</jdbc.sybase.url>
+ <jdbc.sybase.server>192.168.0.101</jdbc.sybase.server>
+ <jdbc.sybase.port>5000</jdbc.sybase.port>
+ <jdbc.sybase.database>jbpmtest</jdbc.sybase.database>
+ <jdbc.sybase.username>jbpmtest</jdbc.sybase.username>
+ <jdbc.sybase.password>jbpmtest</jdbc.sybase.password>
+
+ <!-- PostgreSQL is currently not supported
+ <jdbc.postgresql.url>jdbc:postgresql://localhost:5432/jbpmtest</jdbc.postgresql.url>
+ <jdbc.postgresql.server>localhost</jdbc.postgresql.server>
+ <jdbc.postgresql.port>5432</jdbc.postgresql.port>
+ <jdbc.postgresql.database>jbpmtest</jdbc.postgresql.database>
+ <jdbc.postgresql.username>jbpmtest</jdbc.postgresql.username>
+ <jdbc.postgresql.password></jdbc.postgresql.password>
+ -->
+
+ </properties>
+ </profile>
+
+ </profiles>
+</profilesXml>
17 years, 4 months
JBoss JBPM SVN: r3433 - in projects/spec/trunk: modules/api and 13 other directories.
by do-not-reply＠jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-12-18 10:26:21 -0500 (Thu, 18 Dec 2008)
New Revision: 3433
Modified:
projects/spec/trunk/modules/api/pom.xml
projects/spec/trunk/modules/cts/pom.xml
projects/spec/trunk/modules/dialects/api10/pom.xml
projects/spec/trunk/modules/dialects/jpdl32/pom.xml
projects/spec/trunk/modules/dialects/pom.xml
projects/spec/trunk/modules/dialects/stp/pom.xml
projects/spec/trunk/modules/dialects/xpdl21/pom.xml
projects/spec/trunk/modules/integration/jboss42/pom.xml
projects/spec/trunk/modules/integration/jboss50/pom.xml
projects/spec/trunk/modules/integration/pom.xml
projects/spec/trunk/modules/ri/pom.xml
projects/spec/trunk/modules/samples/airticket/client/pom.xml
projects/spec/trunk/modules/samples/airticket/pom.xml
projects/spec/trunk/modules/samples/airticket/server/pom.xml
projects/spec/trunk/pom.xml
Log:
Switch to jboss-bpm
Modified: projects/spec/trunk/modules/api/pom.xml
===================================================================
--- projects/spec/trunk/modules/api/pom.xml 2008-12-18 15:07:23 UTC (rev 3432)
+++ projects/spec/trunk/modules/api/pom.xml 2008-12-18 15:26:21 UTC (rev 3433)
@@ -14,13 +14,13 @@
<modelVersion>4.0.0</modelVersion>
<name>JBoss BPM Spec - API</name>
<groupId>org.jboss.bpm</groupId>
- <artifactId>bpm-spec-api</artifactId>
+ <artifactId>jboss-bpm-api</artifactId>
<packaging>jar</packaging>
<!-- Parent -->
<parent>
<groupId>org.jboss.bpm</groupId>
- <artifactId>bpm-spec</artifactId>
+ <artifactId>jboss-bpm</artifactId>
<version>1.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: projects/spec/trunk/modules/cts/pom.xml
===================================================================
--- projects/spec/trunk/modules/cts/pom.xml 2008-12-18 15:07:23 UTC (rev 3432)
+++ projects/spec/trunk/modules/cts/pom.xml 2008-12-18 15:26:21 UTC (rev 3433)
@@ -15,13 +15,13 @@
<modelVersion>4.0.0</modelVersion>
<name>JBoss BPM Spec - CTS</name>
<groupId>org.jboss.bpm</groupId>
- <artifactId>bpm-spec-cts</artifactId>
+ <artifactId>jboss-bpm-cts</artifactId>
<packaging>jar</packaging>
<!-- Parent -->
<parent>
<groupId>org.jboss.bpm</groupId>
- <artifactId>bpm-spec</artifactId>
+ <artifactId>jboss-bpm</artifactId>
<version>1.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
@@ -34,26 +34,26 @@
<dependencies>
<dependency>
<groupId>org.jboss.bpm</groupId>
- <artifactId>bpm-spec-api</artifactId>
+ <artifactId>jboss-bpm-api</artifactId>
<version>${version}</version>
</dependency>
<!-- Test Dependencies -->
<dependency>
<groupId>org.jboss.bpm</groupId>
- <artifactId>bpm-spec-dialect-api10</artifactId>
+ <artifactId>jboss-bpm-dialect-api10</artifactId>
<version>${version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.bpm</groupId>
- <artifactId>bpm-spec-dialect-stp</artifactId>
+ <artifactId>jboss-bpm-dialect-stp</artifactId>
<version>${version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.bpm</groupId>
- <artifactId>bpm-spec-ri</artifactId>
+ <artifactId>jboss-bpm-ri</artifactId>
<version>${version}</version>
<scope>test</scope>
</dependency>
Modified: projects/spec/trunk/modules/dialects/api10/pom.xml
===================================================================
--- projects/spec/trunk/modules/dialects/api10/pom.xml 2008-12-18 15:07:23 UTC (rev 3432)
+++ projects/spec/trunk/modules/dialects/api10/pom.xml 2008-12-18 15:26:21 UTC (rev 3433)
@@ -15,13 +15,13 @@
<modelVersion>4.0.0</modelVersion>
<name>JBoss BPM Spec - Dialect API-1.0</name>
<groupId>org.jboss.bpm</groupId>
- <artifactId>bpm-spec-dialect-api10</artifactId>
+ <artifactId>jboss-bpm-dialect-api10</artifactId>
<packaging>jar</packaging>
<!-- Parent -->
<parent>
<groupId>org.jboss.bpm</groupId>
- <artifactId>bpm-spec-dialects</artifactId>
+ <artifactId>jboss-bpm-dialects</artifactId>
<version>1.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: projects/spec/trunk/modules/dialects/jpdl32/pom.xml
===================================================================
--- projects/spec/trunk/modules/dialects/jpdl32/pom.xml 2008-12-18 15:07:23 UTC (rev 3432)
+++ projects/spec/trunk/modules/dialects/jpdl32/pom.xml 2008-12-18 15:26:21 UTC (rev 3433)
@@ -15,13 +15,13 @@
<modelVersion>4.0.0</modelVersion>
<name>JBoss BPM Spec - Dialect jPDL-3.2</name>
<groupId>org.jboss.bpm</groupId>
- <artifactId>bpm-spec-dialect-jpdl32</artifactId>
+ <artifactId>jboss-bpm-dialect-jpdl32</artifactId>
<packaging>jar</packaging>
<!-- Parent -->
<parent>
<groupId>org.jboss.bpm</groupId>
- <artifactId>bpm-spec-dialects</artifactId>
+ <artifactId>jboss-bpm-dialects</artifactId>
<version>1.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: projects/spec/trunk/modules/dialects/pom.xml
===================================================================
--- projects/spec/trunk/modules/dialects/pom.xml 2008-12-18 15:07:23 UTC (rev 3432)
+++ projects/spec/trunk/modules/dialects/pom.xml 2008-12-18 15:26:21 UTC (rev 3433)
@@ -14,13 +14,13 @@
<modelVersion>4.0.0</modelVersion>
<name>JBoss BPM Spec - Dialects</name>
<groupId>org.jboss.bpm</groupId>
- <artifactId>bpm-spec-dialects</artifactId>
+ <artifactId>jboss-bpm-dialects</artifactId>
<packaging>pom</packaging>
<!-- Parent -->
<parent>
<groupId>org.jboss.bpm</groupId>
- <artifactId>bpm-spec</artifactId>
+ <artifactId>jboss-bpm</artifactId>
<version>1.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
@@ -37,7 +37,7 @@
<dependencies>
<dependency>
<groupId>org.jboss.bpm</groupId>
- <artifactId>bpm-spec-api</artifactId>
+ <artifactId>jboss-bpm-api</artifactId>
<version>${version}</version>
</dependency>
<dependency>
Modified: projects/spec/trunk/modules/dialects/stp/pom.xml
===================================================================
--- projects/spec/trunk/modules/dialects/stp/pom.xml 2008-12-18 15:07:23 UTC (rev 3432)
+++ projects/spec/trunk/modules/dialects/stp/pom.xml 2008-12-18 15:26:21 UTC (rev 3433)
@@ -14,13 +14,13 @@
<modelVersion>4.0.0</modelVersion>
<name>JBoss BPM Spec - Dialect STP-0.7.1</name>
<groupId>org.jboss.bpm</groupId>
- <artifactId>bpm-spec-dialect-stp</artifactId>
+ <artifactId>jboss-bpm-dialect-stp</artifactId>
<packaging>jar</packaging>
<!-- Parent -->
<parent>
<groupId>org.jboss.bpm</groupId>
- <artifactId>bpm-spec-dialects</artifactId>
+ <artifactId>jboss-bpm-dialects</artifactId>
<version>1.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: projects/spec/trunk/modules/dialects/xpdl21/pom.xml
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/pom.xml 2008-12-18 15:07:23 UTC (rev 3432)
+++ projects/spec/trunk/modules/dialects/xpdl21/pom.xml 2008-12-18 15:26:21 UTC (rev 3433)
@@ -15,13 +15,13 @@
<modelVersion>4.0.0</modelVersion>
<name>JBoss BPM Spec - Dialect XPDL-2.1</name>
<groupId>org.jboss.bpm</groupId>
- <artifactId>bpm-spec-dialect-xpdl21</artifactId>
+ <artifactId>jboss-bpm-dialect-xpdl21</artifactId>
<packaging>jar</packaging>
<!-- Parent -->
<parent>
<groupId>org.jboss.bpm</groupId>
- <artifactId>bpm-spec-dialects</artifactId>
+ <artifactId>jboss-bpm-dialects</artifactId>
<version>1.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: projects/spec/trunk/modules/integration/jboss42/pom.xml
===================================================================
--- projects/spec/trunk/modules/integration/jboss42/pom.xml 2008-12-18 15:07:23 UTC (rev 3432)
+++ projects/spec/trunk/modules/integration/jboss42/pom.xml 2008-12-18 15:26:21 UTC (rev 3433)
@@ -17,13 +17,13 @@
<name>JBoss BPM Spec - Integration JBoss42</name>
<groupId>org.jboss.bpm</groupId>
- <artifactId>bpm-spec-integration-jboss42</artifactId>
+ <artifactId>jboss-bpm-integration-jboss42</artifactId>
<packaging>jar</packaging>
<!-- Parent -->
<parent>
<groupId>org.jboss.bpm</groupId>
- <artifactId>bpm-spec-integration</artifactId>
+ <artifactId>jboss-bpm-integration</artifactId>
<version>1.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -40,7 +40,7 @@
<!-- BPM Dependencies -->
<dependency>
<groupId>org.jboss.bpm</groupId>
- <artifactId>bpm-spec-api</artifactId>
+ <artifactId>jboss-bpm-api</artifactId>
<version>${version}</version>
</dependency>
Modified: projects/spec/trunk/modules/integration/jboss50/pom.xml
===================================================================
--- projects/spec/trunk/modules/integration/jboss50/pom.xml 2008-12-18 15:07:23 UTC (rev 3432)
+++ projects/spec/trunk/modules/integration/jboss50/pom.xml 2008-12-18 15:26:21 UTC (rev 3433)
@@ -17,13 +17,13 @@
<name>JBoss BPM Spec - Integration JBoss50</name>
<groupId>org.jboss.bpm</groupId>
- <artifactId>bpm-spec-integration-jboss50</artifactId>
+ <artifactId>jboss-bpm-integration-jboss50</artifactId>
<packaging>jar</packaging>
<!-- Parent -->
<parent>
<groupId>org.jboss.bpm</groupId>
- <artifactId>bpm-spec-integration</artifactId>
+ <artifactId>jboss-bpm-integration</artifactId>
<version>1.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: projects/spec/trunk/modules/integration/pom.xml
===================================================================
--- projects/spec/trunk/modules/integration/pom.xml 2008-12-18 15:07:23 UTC (rev 3432)
+++ projects/spec/trunk/modules/integration/pom.xml 2008-12-18 15:26:21 UTC (rev 3433)
@@ -17,13 +17,13 @@
<name>JBoss BPM Spec - Integration</name>
<groupId>org.jboss.bpm</groupId>
- <artifactId>bpm-spec-integration</artifactId>
+ <artifactId>jboss-bpm-integration</artifactId>
<packaging>pom</packaging>
<!-- Parent -->
<parent>
<groupId>org.jboss.bpm</groupId>
- <artifactId>bpm-spec</artifactId>
+ <artifactId>jboss-bpm</artifactId>
<version>1.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: projects/spec/trunk/modules/ri/pom.xml
===================================================================
--- projects/spec/trunk/modules/ri/pom.xml 2008-12-18 15:07:23 UTC (rev 3432)
+++ projects/spec/trunk/modules/ri/pom.xml 2008-12-18 15:26:21 UTC (rev 3433)
@@ -16,14 +16,14 @@
<modelVersion>4.0.0</modelVersion>
<name>JBoss BPM Spec - RI</name>
<groupId>org.jboss.bpm</groupId>
- <artifactId>bpm-spec-ri</artifactId>
+ <artifactId>jboss-bpm-ri</artifactId>
<packaging>jar</packaging>
<!-- Parent -->
<parent>
<groupId>org.jboss.bpm</groupId>
- <artifactId>bpm-spec</artifactId>
+ <artifactId>jboss-bpm</artifactId>
<version>1.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
@@ -66,7 +66,7 @@
<dependencies>
<dependency>
<groupId>org.jboss.bpm</groupId>
- <artifactId>bpm-spec-api</artifactId>
+ <artifactId>jboss-bpm-api</artifactId>
<version>${version}</version>
</dependency>
@@ -90,13 +90,13 @@
<!-- Test Dependencies -->
<dependency>
<groupId>org.jboss.bpm</groupId>
- <artifactId>bpm-spec-dialect-api10</artifactId>
+ <artifactId>jboss-bpm-dialect-api10</artifactId>
<version>${version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.bpm</groupId>
- <artifactId>bpm-spec-dialect-stp</artifactId>
+ <artifactId>jboss-bpm-dialect-stp</artifactId>
<version>${version}</version>
<scope>test</scope>
</dependency>
Modified: projects/spec/trunk/modules/samples/airticket/client/pom.xml
===================================================================
--- projects/spec/trunk/modules/samples/airticket/client/pom.xml 2008-12-18 15:07:23 UTC (rev 3432)
+++ projects/spec/trunk/modules/samples/airticket/client/pom.xml 2008-12-18 15:26:21 UTC (rev 3433)
@@ -16,13 +16,13 @@
<modelVersion>4.0.0</modelVersion>
<name>JBoss BPM Spec - Samples Airticket (Client)</name>
<groupId>org.jboss.bpm</groupId>
- <artifactId>bpm-spec-sample-airticket-client</artifactId>
+ <artifactId>jboss-bpm-sample-airticket-client</artifactId>
<packaging>war</packaging>
<!-- Parent -->
<parent>
<groupId>org.jboss.bpm</groupId>
- <artifactId>bpm-spec-sample-airticket</artifactId>
+ <artifactId>jboss-bpm-sample-airticket</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
@@ -30,7 +30,7 @@
<dependencies>
<dependency>
<groupId>org.jboss.bpm</groupId>
- <artifactId>bpm-spec-sample-airticket-server</artifactId>
+ <artifactId>jboss-bpm-sample-airticket-server</artifactId>
<version>${version}</version>
</dependency>
<dependency>
Modified: projects/spec/trunk/modules/samples/airticket/pom.xml
===================================================================
--- projects/spec/trunk/modules/samples/airticket/pom.xml 2008-12-18 15:07:23 UTC (rev 3432)
+++ projects/spec/trunk/modules/samples/airticket/pom.xml 2008-12-18 15:26:21 UTC (rev 3433)
@@ -3,13 +3,13 @@
<modelVersion>4.0.0</modelVersion>
<name>JBoss BPM Spec - Samples Airticket</name>
<groupId>org.jboss.bpm</groupId>
- <artifactId>bpm-spec-sample-airticket</artifactId>
+ <artifactId>jboss-bpm-sample-airticket</artifactId>
<packaging>pom</packaging>
<!-- Parent -->
<parent>
<groupId>org.jboss.bpm</groupId>
- <artifactId>bpm-spec</artifactId>
+ <artifactId>jboss-bpm</artifactId>
<version>1.0.0-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
@@ -51,12 +51,12 @@
<dependencies>
<dependency>
<groupId>org.jboss.bpm</groupId>
- <artifactId>bpm-spec-api</artifactId>
+ <artifactId>jboss-bpm-api</artifactId>
<version>${version}</version>
</dependency>
<dependency>
<groupId>org.jboss.bpm</groupId>
- <artifactId>bpm-spec-ri</artifactId>
+ <artifactId>jboss-bpm-ri</artifactId>
<version>${version}</version>
<scope>runtime</scope>
</dependency>
Modified: projects/spec/trunk/modules/samples/airticket/server/pom.xml
===================================================================
--- projects/spec/trunk/modules/samples/airticket/server/pom.xml 2008-12-18 15:07:23 UTC (rev 3432)
+++ projects/spec/trunk/modules/samples/airticket/server/pom.xml 2008-12-18 15:26:21 UTC (rev 3433)
@@ -16,12 +16,12 @@
<modelVersion>4.0.0</modelVersion>
<name>JBoss BPM Spec - Samples Airticket (Server)</name>
<groupId>org.jboss.bpm</groupId>
- <artifactId>bpm-spec-sample-airticket-server</artifactId>
+ <artifactId>jboss-bpm-sample-airticket-server</artifactId>
<!-- Parent -->
<parent>
<groupId>org.jboss.bpm</groupId>
- <artifactId>bpm-spec-sample-airticket</artifactId>
+ <artifactId>jboss-bpm-sample-airticket</artifactId>
<version>1.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -30,13 +30,13 @@
<dependencies>
<dependency>
<groupId>org.jboss.bpm</groupId>
- <artifactId>bpm-spec-dialect-api10</artifactId>
+ <artifactId>jboss-bpm-dialect-api10</artifactId>
<version>${version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.jboss.bpm</groupId>
- <artifactId>bpm-spec-dialect-stp</artifactId>
+ <artifactId>jboss-bpm-dialect-stp</artifactId>
<version>${version}</version>
<scope>runtime</scope>
</dependency>
Modified: projects/spec/trunk/pom.xml
===================================================================
--- projects/spec/trunk/pom.xml 2008-12-18 15:07:23 UTC (rev 3432)
+++ projects/spec/trunk/pom.xml 2008-12-18 15:26:21 UTC (rev 3433)
@@ -19,7 +19,7 @@
<name>JBoss BPM Spec</name>
<groupId>org.jboss.bpm</groupId>
- <artifactId>bpm-spec</artifactId>
+ <artifactId>jboss-bpm</artifactId>
<packaging>pom</packaging>
<version>1.0.0-SNAPSHOT</version>
17 years, 4 months
JBoss JBPM SVN: r3432 - in jbpm4/trunk/modules: examples/src/test/java/org/jbpm/examples and 8 other directories.
by do-not-reply＠jboss.org
Author: tom.baeyens(a)jboss.com
Date: 2008-12-18 10:07:23 -0500 (Thu, 18 Dec 2008)
New Revision: 3432
Added:
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/script/
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/script/text/
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/script/text/Person.java
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/script/text/ScriptTextTest.java
jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/script/
jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/script/expression/
jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/script/text/
jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/script/text/process.jpdl.xml
jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/ScriptActivity.java
jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/ScriptBinding.java
Modified:
jbpm4/trunk/modules/api/src/main/resources/jpdl.xsd
jbpm4/trunk/modules/jpdl/src/main/resources/jbpm.jpdl.activities.xml
jbpm4/trunk/modules/jpdl/src/main/resources/jbpm.jpdl.hbm.xml
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/script/ScriptManager.java
Log:
added script
Modified: jbpm4/trunk/modules/api/src/main/resources/jpdl.xsd
===================================================================
--- jbpm4/trunk/modules/api/src/main/resources/jpdl.xsd 2008-12-18 14:37:05 UTC (rev 3431)
+++ jbpm4/trunk/modules/api/src/main/resources/jpdl.xsd 2008-12-18 15:07:23 UTC (rev 3432)
@@ -343,7 +343,7 @@
<complexType name="scriptType">
<sequence>
- <element name="script" type="string">
+ <element name="text" type="string">
<annotation><documentation>The content of this expression element
is the script text that will be evaluated. This is mutually
exclusive with the expression attribute.</documentation></annotation>
@@ -358,6 +358,10 @@
<annotation><documentation>Identification of the scripting language
to use.</documentation></annotation>
</attribute>
+ <attribute name="var" type="string">
+ <annotation><documentation>Name of the variable in which the result
+ of the script evaluation will be stored</documentation></annotation>
+ </attribute>
</complexType>
<attributeGroup name="nodeAttributes">
Added: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/script/text/Person.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/script/text/Person.java (rev 0)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/script/text/Person.java 2008-12-18 15:07:23 UTC (rev 3432)
@@ -0,0 +1,44 @@
+/*
+ * 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.examples.script.text;
+
+import java.io.Serializable;
+
+/**
+ * @author Tom Baeyens
+ */
+public class Person implements Serializable {
+
+ String address;
+
+ public Person(String address) {
+ this.address = address;
+ }
+
+ public String getAddress() {
+ return address;
+ }
+
+ public void setAddress(String address) {
+ this.address = address;
+ }
+}
Property changes on: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/script/text/Person.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/script/text/ScriptTextTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/script/text/ScriptTextTest.java (rev 0)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/script/text/ScriptTextTest.java 2008-12-18 15:07:23 UTC (rev 3432)
@@ -0,0 +1,49 @@
+/*
+ * 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.examples.script.text;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.jbpm.Execution;
+import org.jbpm.test.DbTestCase;
+
+
+/**
+ * @author Tom Baeyens
+ */
+public class ScriptTextTest extends DbTestCase {
+
+ public void testScriptText() {
+ deployJpdlResource("org/jbpm/examples/script/text/process.jpdl.xml");
+
+ Map<String, Object> variables = new HashMap<String, Object>();
+ variables.put("person", new Person("Honolulu"));
+
+ Execution execution = executionService.startExecutionByKey("ScriptText", variables);
+ String executionId = execution.getId();
+
+ String text = (String) executionService.getVariable(executionId, "text");
+ assertTextPresent("Send packet to Honolulu", text);
+ }
+
+}
Property changes on: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/script/text/ScriptTextTest.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/script/text/process.jpdl.xml
===================================================================
--- jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/script/text/process.jpdl.xml (rev 0)
+++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/script/text/process.jpdl.xml 2008-12-18 15:07:23 UTC (rev 3432)
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<process name="ScriptText" xmlns="http://jbpm.org/4/jpdl">
+
+ <start>
+ <flow to="invoke script" />
+ </start>
+
+ <script name="invoke script"
+ var="text">
+ <text>
+ Send packet to #{person.address}
+ </text>
+
+ <flow to="wait" />
+ </script>
+
+ <state name="wait" />
+
+</process>
Property changes on: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/script/text/process.jpdl.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/ScriptActivity.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/ScriptActivity.java (rev 0)
+++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/ScriptActivity.java 2008-12-18 15:07:23 UTC (rev 3432)
@@ -0,0 +1,58 @@
+/*
+ * 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.jpdl.activity;
+
+import org.jbpm.activity.ActivityExecution;
+import org.jbpm.env.Environment;
+import org.jbpm.pvm.internal.script.ScriptManager;
+
+
+/**
+ * @author Tom Baeyens
+ */
+public class ScriptActivity extends JpdlActivity {
+
+ private static final long serialVersionUID = 1L;
+
+ protected String script;
+ protected String language;
+ protected String variableName;
+
+ public void execute(ActivityExecution execution) {
+ ScriptManager scriptManager = Environment.getFromCurrent(ScriptManager.class);
+ Object returnValue = scriptManager.evaluateScript(script, execution, language);
+
+ if (variableName!=null) {
+ execution.setVariable(variableName, returnValue);
+ }
+ }
+
+ public void setScript(String script) {
+ this.script = script;
+ }
+ public void setLanguage(String language) {
+ this.language = language;
+ }
+ public void setVariableName(String variableName) {
+ this.variableName = variableName;
+ }
+}
Property changes on: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/ScriptActivity.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/ScriptBinding.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/ScriptBinding.java (rev 0)
+++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/ScriptBinding.java 2008-12-18 15:07:23 UTC (rev 3432)
@@ -0,0 +1,70 @@
+/*
+ * 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.jpdl.activity;
+
+import org.jbpm.env.Environment;
+import org.jbpm.pvm.internal.script.ScriptManager;
+import org.jbpm.pvm.internal.util.XmlUtil;
+import org.jbpm.pvm.internal.xml.Parse;
+import org.jbpm.pvm.internal.xml.Parser;
+import org.w3c.dom.Element;
+
+
+/**
+ * @author Tom Baeyens
+ */
+public class ScriptBinding extends JpdlActivityBinding {
+
+ private static final String TAG = "script";
+
+ public ScriptBinding() {
+ super(TAG);
+ }
+
+ public Object parse(Element element, Parse parse, Parser parser) {
+ String script = null;
+ String language = null;
+
+ String expr = XmlUtil.attribute(element, "expr");
+ Element textElement = XmlUtil.element(element, "text");
+ if(expr!=null) {
+ ScriptManager scriptManager = Environment.getFromCurrent(ScriptManager.class);
+ language = scriptManager.getDefaultExpressionLanguage();
+ if (textElement!=null) {
+ parse.addProblem("in <script ...> attribute expr can't be combined with a nexted text element");
+ }
+ } else {
+ language = XmlUtil.attribute(element, "lang");
+ script = XmlUtil.getContentText(textElement);
+ }
+
+ String variableName = XmlUtil.attribute(element, "var");
+
+ ScriptActivity scriptActivity = new ScriptActivity();
+ scriptActivity.setScript(script);
+ scriptActivity.setLanguage(language);
+ scriptActivity.setVariableName(variableName);
+
+ return scriptActivity;
+ }
+
+}
Property changes on: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/ScriptBinding.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: jbpm4/trunk/modules/jpdl/src/main/resources/jbpm.jpdl.activities.xml
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/resources/jbpm.jpdl.activities.xml 2008-12-18 14:37:05 UTC (rev 3431)
+++ jbpm4/trunk/modules/jpdl/src/main/resources/jbpm.jpdl.activities.xml 2008-12-18 15:07:23 UTC (rev 3432)
@@ -9,4 +9,5 @@
<activity binding="org.jbpm.jpdl.activity.HqlBinding" />
<activity binding="org.jbpm.jpdl.activity.SqlBinding" />
<activity binding="org.jbpm.jpdl.activity.JavaBinding" />
+ <activity binding="org.jbpm.jpdl.activity.ScriptBinding" />
</activities>
Modified: jbpm4/trunk/modules/jpdl/src/main/resources/jbpm.jpdl.hbm.xml
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/resources/jbpm.jpdl.hbm.xml 2008-12-18 14:37:05 UTC (rev 3431)
+++ jbpm4/trunk/modules/jpdl/src/main/resources/jbpm.jpdl.hbm.xml 2008-12-18 15:07:23 UTC (rev 3432)
@@ -67,6 +67,11 @@
foreign-key="FK_ACT_INVKOPER"
index="IDX_ACT_INVKOPER" />
</subclass>
+ <subclass name="org.jbpm.jpdl.activity.ScriptActivity" discriminator-value="script">
+ <property name="script" column="TEXT_" />
+ <property name="language" column="TEXT2_" />
+ <property name="variableName" column="TEXT3_" />
+ </subclass>
</class>
</hibernate-mapping>
\ No newline at end of file
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/script/ScriptManager.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/script/ScriptManager.java 2008-12-18 14:37:05 UTC (rev 3431)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/script/ScriptManager.java 2008-12-18 15:07:23 UTC (rev 3432)
@@ -148,4 +148,11 @@
throw new JbpmException("script evaluation error: "+e.getMessage(), e);
}
}
+
+ public String getDefaultExpressionLanguage() {
+ return defaultExpressionLanguage;
+ }
+ public String getDefaultScriptLanguage() {
+ return defaultScriptLanguage;
+ }
}
17 years, 4 months
JBoss JBPM SVN: r3431 - jbpm3/trunk/modules/core/src/main/java/org/jbpm/command.
by do-not-reply＠jboss.org
Author: camunda
Date: 2008-12-18 09:37:05 -0500 (Thu, 18 Dec 2008)
New Revision: 3431
Modified:
jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/GetProcessInstanceLogCommand.java
Log:
JBPM-1905: fixed fluent method
Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/GetProcessInstanceLogCommand.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/GetProcessInstanceLogCommand.java 2008-12-18 13:04:16 UTC (rev 3430)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/GetProcessInstanceLogCommand.java 2008-12-18 14:37:05 UTC (rev 3431)
@@ -9,7 +9,8 @@
import org.jbpm.logging.log.ProcessLog;
/**
- * Retrieve the <code>org.jbpm.logging.log.ProcessLog</code> for the process with the given process-id
+ * Retrieve the <code>org.jbpm.logging.log.ProcessLog</code> for
+ * the process with the given process-id
*
* returns a map that maps {@link Token}s to {@link List}s.
*
@@ -85,10 +86,9 @@
return processInstanceId;
}
- public GetProcessInstanceLogCommand setProcessInstanceId(long processInstanceId)
+ public void setProcessInstanceId(long processInstanceId)
{
this.processInstanceId = processInstanceId;
- return this;
}
@Override
@@ -96,5 +96,12 @@
{
return "processInstanceId=" + processInstanceId;
}
-
+
+ // methods for fluent programming
+
+ public GetProcessInstanceLogCommand processInstanceId(long processInstanceId)
+ {
+ setProcessInstanceId(processInstanceId);
+ return this;
+ }
}
17 years, 4 months
JBoss JBPM SVN: r3430 - in jbpm3: tags and 1 other directory.
by do-not-reply＠jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-12-18 08:04:16 -0500 (Thu, 18 Dec 2008)
New Revision: 3430
Added:
jbpm3/tags/jbpm-3.2.4.GA/
Removed:
jbpm3/branches/jbpm-3.2.4/
Log:
Release jbpm-3.2.4.GA
Copied: jbpm3/tags/jbpm-3.2.4.GA (from rev 3429, jbpm3/branches/jbpm-3.2.4)
17 years, 4 months
JBoss JBPM SVN: r3429 - in jbpm3/branches/jbpm-3.2.4: modules/core and 10 other directories.
by do-not-reply＠jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-12-18 08:03:30 -0500 (Thu, 18 Dec 2008)
New Revision: 3429
Modified:
jbpm3/branches/jbpm-3.2.4/.project
jbpm3/branches/jbpm-3.2.4/modules/core/pom.xml
jbpm3/branches/jbpm-3.2.4/modules/db/pom.xml
jbpm3/branches/jbpm-3.2.4/modules/distribution/pom.xml
jbpm3/branches/jbpm-3.2.4/modules/distribution/src/main/resources/installer/install-definition.xml
jbpm3/branches/jbpm-3.2.4/modules/enterprise/ear/pom.xml
jbpm3/branches/jbpm-3.2.4/modules/enterprise/jar/pom.xml
jbpm3/branches/jbpm-3.2.4/modules/enterprise/pom.xml
jbpm3/branches/jbpm-3.2.4/modules/examples/pom.xml
jbpm3/branches/jbpm-3.2.4/modules/identity/pom.xml
jbpm3/branches/jbpm-3.2.4/modules/simulation/pom.xml
jbpm3/branches/jbpm-3.2.4/modules/userguide/pom.xml
jbpm3/branches/jbpm-3.2.4/pom.xml
Log:
Remove GWT console
Modified: jbpm3/branches/jbpm-3.2.4/.project
===================================================================
--- jbpm3/branches/jbpm-3.2.4/.project 2008-12-18 12:52:50 UTC (rev 3428)
+++ jbpm3/branches/jbpm-3.2.4/.project 2008-12-18 13:03:30 UTC (rev 3429)
@@ -1,17 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>jbpm3</name>
+ <name>jbpm</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
<name>org.maven.ide.eclipse.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.maven.ide.eclipse.maven2Nature</nature>
</natures>
</projectDescription>
Modified: jbpm3/branches/jbpm-3.2.4/modules/core/pom.xml
===================================================================
--- jbpm3/branches/jbpm-3.2.4/modules/core/pom.xml 2008-12-18 12:52:50 UTC (rev 3428)
+++ jbpm3/branches/jbpm-3.2.4/modules/core/pom.xml 2008-12-18 13:03:30 UTC (rev 3429)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.jbpm.jbpm3</groupId>
<artifactId>jbpm</artifactId>
- <version>3.3.0.GA</version>
+ <version>3.2.4.GA</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: jbpm3/branches/jbpm-3.2.4/modules/db/pom.xml
===================================================================
--- jbpm3/branches/jbpm-3.2.4/modules/db/pom.xml 2008-12-18 12:52:50 UTC (rev 3428)
+++ jbpm3/branches/jbpm-3.2.4/modules/db/pom.xml 2008-12-18 13:03:30 UTC (rev 3429)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.jbpm.jbpm3</groupId>
<artifactId>jbpm</artifactId>
- <version>3.3.0.GA</version>
+ <version>3.2.4.GA</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: jbpm3/branches/jbpm-3.2.4/modules/distribution/pom.xml
===================================================================
--- jbpm3/branches/jbpm-3.2.4/modules/distribution/pom.xml 2008-12-18 12:52:50 UTC (rev 3428)
+++ jbpm3/branches/jbpm-3.2.4/modules/distribution/pom.xml 2008-12-18 13:03:30 UTC (rev 3429)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.jbpm.jbpm3</groupId>
<artifactId>jbpm</artifactId>
- <version>3.3.0.GA</version>
+ <version>3.2.4.GA</version>
<relativePath>../../pom.xml</relativePath>
</parent>
@@ -101,16 +101,6 @@
</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.jbpm3</groupId>
<artifactId>jbpm-jpdl-designer-site</artifactId>
<type>zip</type>
</dependency>
Modified: jbpm3/branches/jbpm-3.2.4/modules/distribution/src/main/resources/installer/install-definition.xml
===================================================================
--- jbpm3/branches/jbpm-3.2.4/modules/distribution/src/main/resources/installer/install-definition.xml 2008-12-18 12:52:50 UTC (rev 3428)
+++ jbpm3/branches/jbpm-3.2.4/modules/distribution/src/main/resources/installer/install-definition.xml 2008-12-18 13:03:30 UTC (rev 3429)
@@ -254,12 +254,5 @@
<file src="@{resources.dir}/installer/download-helper.xml" targetdir="$INSTALL_PATH/Uninstaller"/>
</pack>
- <!-- GWT Console -->
- <pack name="GWT-Console" required="no" parent="Optional Components" preselected="no">
- <description>GWT-Console (Preview, use at your own risk)</description>
- <file src="@{deploy.artifacts.dir}/lib/gwt-console.war" targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm" unpack="false" override="true" />
- <file src="@{deploy.artifacts.dir}/lib/gwt-console-server.war" targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm" unpack="false" override="true" />
- </pack>
-
</packs>
</installation>
\ No newline at end of file
Modified: jbpm3/branches/jbpm-3.2.4/modules/enterprise/ear/pom.xml
===================================================================
--- jbpm3/branches/jbpm-3.2.4/modules/enterprise/ear/pom.xml 2008-12-18 12:52:50 UTC (rev 3428)
+++ jbpm3/branches/jbpm-3.2.4/modules/enterprise/ear/pom.xml 2008-12-18 13:03:30 UTC (rev 3429)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.jbpm.jbpm3</groupId>
<artifactId>jbpm-enterprise</artifactId>
- <version>3.3.0.GA</version>
+ <version>3.2.4.GA</version>
</parent>
<!-- Dependencies -->
Modified: jbpm3/branches/jbpm-3.2.4/modules/enterprise/jar/pom.xml
===================================================================
--- jbpm3/branches/jbpm-3.2.4/modules/enterprise/jar/pom.xml 2008-12-18 12:52:50 UTC (rev 3428)
+++ jbpm3/branches/jbpm-3.2.4/modules/enterprise/jar/pom.xml 2008-12-18 13:03:30 UTC (rev 3429)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.jbpm.jbpm3</groupId>
<artifactId>jbpm-enterprise</artifactId>
- <version>3.3.0.GA</version>
+ <version>3.2.4.GA</version>
</parent>
<!-- Dependencies -->
Modified: jbpm3/branches/jbpm-3.2.4/modules/enterprise/pom.xml
===================================================================
--- jbpm3/branches/jbpm-3.2.4/modules/enterprise/pom.xml 2008-12-18 12:52:50 UTC (rev 3428)
+++ jbpm3/branches/jbpm-3.2.4/modules/enterprise/pom.xml 2008-12-18 13:03:30 UTC (rev 3429)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.jbpm.jbpm3</groupId>
<artifactId>jbpm</artifactId>
- <version>3.3.0.GA</version>
+ <version>3.2.4.GA</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: jbpm3/branches/jbpm-3.2.4/modules/examples/pom.xml
===================================================================
--- jbpm3/branches/jbpm-3.2.4/modules/examples/pom.xml 2008-12-18 12:52:50 UTC (rev 3428)
+++ jbpm3/branches/jbpm-3.2.4/modules/examples/pom.xml 2008-12-18 13:03:30 UTC (rev 3429)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.jbpm.jbpm3</groupId>
<artifactId>jbpm</artifactId>
- <version>3.3.0.GA</version>
+ <version>3.2.4.GA</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: jbpm3/branches/jbpm-3.2.4/modules/identity/pom.xml
===================================================================
--- jbpm3/branches/jbpm-3.2.4/modules/identity/pom.xml 2008-12-18 12:52:50 UTC (rev 3428)
+++ jbpm3/branches/jbpm-3.2.4/modules/identity/pom.xml 2008-12-18 13:03:30 UTC (rev 3429)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.jbpm.jbpm3</groupId>
<artifactId>jbpm</artifactId>
- <version>3.3.0.GA</version>
+ <version>3.2.4.GA</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: jbpm3/branches/jbpm-3.2.4/modules/simulation/pom.xml
===================================================================
--- jbpm3/branches/jbpm-3.2.4/modules/simulation/pom.xml 2008-12-18 12:52:50 UTC (rev 3428)
+++ jbpm3/branches/jbpm-3.2.4/modules/simulation/pom.xml 2008-12-18 13:03:30 UTC (rev 3429)
@@ -21,7 +21,7 @@
<parent>
<groupId>org.jbpm.jbpm3</groupId>
<artifactId>jbpm</artifactId>
- <version>3.3.0.GA</version>
+ <version>3.2.4.GA</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: jbpm3/branches/jbpm-3.2.4/modules/userguide/pom.xml
===================================================================
--- jbpm3/branches/jbpm-3.2.4/modules/userguide/pom.xml 2008-12-18 12:52:50 UTC (rev 3428)
+++ jbpm3/branches/jbpm-3.2.4/modules/userguide/pom.xml 2008-12-18 13:03:30 UTC (rev 3429)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.jbpm.jbpm3</groupId>
<artifactId>jbpm</artifactId>
- <version>3.3.0.GA</version>
+ <version>3.2.4.GA</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: jbpm3/branches/jbpm-3.2.4/pom.xml
===================================================================
--- jbpm3/branches/jbpm-3.2.4/pom.xml 2008-12-18 12:52:50 UTC (rev 3428)
+++ jbpm3/branches/jbpm-3.2.4/pom.xml 2008-12-18 13:03:30 UTC (rev 3429)
@@ -17,7 +17,7 @@
<groupId>org.jbpm.jbpm3</groupId>
<artifactId>jbpm</artifactId>
<packaging>pom</packaging>
- <version>3.3.0.GA</version>
+ <version>3.2.4.GA</version>
<!-- Parent -->
<parent>
@@ -66,7 +66,6 @@
<jaxen.version>1.1.1</jaxen.version>
<jbpm.api.version>1.0.0-Alpha2</jbpm.api.version>
<jbpm.designer.version>3.1.5</jbpm.designer.version>
- <jbpm.gwt-console.version>1.0.0-Beta1</jbpm.gwt-console.version>
<jbpm.jsf-console.version>3.3.0.GA</jbpm.jsf-console.version>
<jboss.gravel.version>1.0.0.GA</jboss.gravel.version>
<jboss.seam.version>2.0.2.GA</jboss.seam.version>
@@ -101,18 +100,6 @@
</dependency>
<dependency>
<groupId>org.jbpm.jbpm3</groupId>
- <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.jbpm3</groupId>
<artifactId>jbpm-jpdl-designer-site</artifactId>
<version>${jbpm.designer.version}</version>
<type>zip</type>
17 years, 4 months
JBoss JBPM SVN: r3428 - jbpm3/branches.
by do-not-reply＠jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-12-18 07:52:50 -0500 (Thu, 18 Dec 2008)
New Revision: 3428
Added:
jbpm3/branches/jbpm-3.2.4/
Log:
Create branch jbpm-3.2.4 from jbpm-3.3.0
Copied: jbpm3/branches/jbpm-3.2.4 (from rev 3427, jbpm3/tags/jbpm-3.3.0.GA)
17 years, 4 months
JBoss JBPM SVN: r3427 - jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/config.
by do-not-reply＠jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-12-18 07:43:05 -0500 (Thu, 18 Dec 2008)
New Revision: 3427
Modified:
jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/config/ContainerProvidedJarsTest.java
Log:
Exclude jbpm-* and jboss-bpm-* jars
Modified: jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/config/ContainerProvidedJarsTest.java
===================================================================
--- jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/config/ContainerProvidedJarsTest.java 2008-12-18 12:20:41 UTC (rev 3426)
+++ jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/config/ContainerProvidedJarsTest.java 2008-12-18 12:43:05 UTC (rev 3427)
@@ -91,7 +91,7 @@
for (String deployedJar : deployedJars)
{
if (deployedJar.startsWith(jbossJar))
- matchingJars.add(jbossJar);
+ matchingJars.add(deployedJar);
}
jbossJar = br.readLine();
}
@@ -111,7 +111,7 @@
}
String fileName = file.getName();
- if (fileName.endsWith(".jar"))
+ if (fileName.endsWith(".jar") && !fileName.startsWith("jbpm") && !fileName.startsWith("jboss-bpm"))
{
deployedJars.add(fileName);
}
17 years, 4 months
JBoss JBPM SVN: r3426 - jbpm3/trunk/modules/core.
by do-not-reply＠jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-12-18 07:20:41 -0500 (Thu, 18 Dec 2008)
New Revision: 3426
Modified:
jbpm3/trunk/modules/core/pom.xml
Log:
Won't Fix [JBPM-1811] JmsMessageTest fails intermitently on HSQLDB
Modified: jbpm3/trunk/modules/core/pom.xml
===================================================================
--- jbpm3/trunk/modules/core/pom.xml 2008-12-18 12:13:19 UTC (rev 3425)
+++ jbpm3/trunk/modules/core/pom.xml 2008-12-18 12:20:41 UTC (rev 3426)
@@ -223,14 +223,14 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<excludes>
+ <!-- Won't Fix [JBPM-1811] JmsMessageTest fails intermitently on HSQLDB -->
+ <exclude>org/jbpm/msg/jms/JmsMessageTest.java</exclude>
<!-- [JBPM-983] concurrent process execution fails -->
<exclude>org/jbpm/jbpm983/JBPM983Test.java</exclude>
<!-- [JBPM-1072] Concurrent JobExecutors can process the same job in parallel -->
<exclude>org/jbpm/jbpm1072/JBPM1072Test.java</exclude>
<!-- [JBPM-1810] Fix clean, drop, create schema with JbpmSchema -->
<exclude>org/jbpm/db/JbpmSchemaDbTest.java</exclude>
- <!-- [JBPM-1811] JmsMessageTest fails intermitently on HSQLDB -->
- <exclude>org/jbpm/msg/jms/JmsMessageTest.java</exclude>
</excludes>
</configuration>
</plugin>
@@ -260,10 +260,10 @@
<exclude>org/jbpm/jbpm983/JBPM983Test.java</exclude>
<!-- Won't Fix [JBPM-1072] Concurrent JobExecutors can process the same job in parallel -->
<exclude>org/jbpm/jbpm1072/JBPM1072Test.java</exclude>
+ <!-- Won't Fix [JBPM-1811] JmsMessageTest fails intermitently on HSQLDB -->
+ <exclude>org/jbpm/msg/jms/JmsMessageTest.java</exclude>
<!-- [JBPM-1810] Fix clean, drop, create schema with JbpmSchema -->
<exclude>org/jbpm/db/JbpmSchemaDbTest.java</exclude>
- <!-- [JBPM-1811] JmsMessageTest fails intermitently on HSQLDB -->
- <exclude>org/jbpm/msg/jms/JmsMessageTest.java</exclude>
</excludes>
</configuration>
</plugin>
17 years, 4 months