JBoss JBPM SVN: r6565 - projects/jsf-console/branches/jsf-console-3.2-soa.
by do-not-reply@jboss.org
Author: ryanzhang
Date: 2010-08-10 20:10:54 -0400 (Tue, 10 Aug 2010)
New Revision: 6565
Added:
projects/jsf-console/branches/jsf-console-3.2-soa/soa-distribution/
Removed:
projects/jsf-console/branches/jsf-console-3.2-soa/soa/
Log:
update SOA profile
Copied: projects/jsf-console/branches/jsf-console-3.2-soa/soa-distribution (from rev 6564, projects/jsf-console/branches/jsf-console-3.2-soa/soa)
13 years, 10 months
JBoss JBPM SVN: r6563 - projects/exception_framework/trunk/src/main/config.
by do-not-reply@jboss.org
Author: MohReece
Date: 2010-08-10 17:15:03 -0400 (Tue, 10 Aug 2010)
New Revision: 6563
Modified:
projects/exception_framework/trunk/src/main/config/hibernate.cfg.xml
Log:
Added hibernate.show_sql property (for testing).
Modified: projects/exception_framework/trunk/src/main/config/hibernate.cfg.xml
===================================================================
--- projects/exception_framework/trunk/src/main/config/hibernate.cfg.xml 2010-08-10 20:18:38 UTC (rev 6562)
+++ projects/exception_framework/trunk/src/main/config/hibernate.cfg.xml 2010-08-10 21:15:03 UTC (rev 6563)
@@ -44,6 +44,7 @@
<property name="hibernate.cache.provider_class">org.hibernate.cache.HashtableCacheProvider</property>
<!-- SQL rendering properties -->
+ <property name="hibernate.show_sql">true</property>
<property name="hibernate.format_sql">true</property>
<property name="hibernate.use_sql_comments">true</property>
13 years, 10 months
JBoss JBPM SVN: r6562 - jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home.
by do-not-reply@jboss.org
Author: alex.guizar(a)jboss.com
Date: 2010-08-10 16:18:38 -0400 (Tue, 10 Aug 2010)
New Revision: 6562
Added:
jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/container.sh
jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/standalone.sh
Removed:
jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/command.sh
Log:
JBPM-2916 split standalone and container test suites
Deleted: jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/command.sh
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/command.sh 2010-08-10 18:50:38 UTC (rev 6561)
+++ jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/command.sh 2010-08-10 20:18:38 UTC (rev 6562)
@@ -1,171 +0,0 @@
-#!/bin/sh
-#
-# Script that builds the project via Maven and
-# executes the test suite against a given target container
-#
-# Exported shell variables required:
-# WORKSPACE work directory
-# JAVA_HOME location of java development kit
-# JAVA_15_HOME required if testing against java 1.4 only
-# DATABASE db2, hsqldb, mssql, mysql, oracle, postgresql
-# CONTAINER jboss405, jboss423, jboss501, jboss510
-# MYTESTIP_1 bind address
-# MCASTIP multicast address
-# JOB_NAME used as unique jgroups partition name
-# SOURCE_REPO location of jboss distributions
-#
-
-#
-# Extract JBoss distro
-#
-case $CONTAINER in
- jboss405)
- JBOSS_VERSION=jboss-4.0.5.GA
- ;;
- jboss423)
- JBOSS_VERSION=jboss-4.2.3.GA
- ;;
- jboss501)
- JBOSS_VERSION=jboss-5.0.1.GA
- ;;
- jboss510)
- JBOSS_VERSION=jboss-5.1.0.GA
- ;;
- *)
- echo "ERROR: invalid container: $CONTAINER"
- exit 1
- ;;
-esac
-JBOSS_HOME=$WORKSPACE/$JBOSS_VERSION
-JBOSS_SERVER=all
-
-rm -rf $JBOSS_HOME
-unzip -q -d $WORKSPACE $SOURCE_REPO/jboss/$JBOSS_VERSION.zip
-
-#
-# Determine Java platform version
-#
-JAVA=$JAVA_HOME/bin/java
-JAVA_VERSION=`$JAVA -version 2>&1 | grep version | awk '{ print substr($3, 2, 3); }'`
-
-if [ $JAVA_VERSION = 1.4 ]; then
- ORIG_JAVA_HOME=$JAVA_HOME
- JAVA=$JAVA_15_HOME/bin/java
- export JAVA_HOME=$JAVA_15_HOME
-else
- ORIG_JAVA_HOME=$JAVA_HOME
-fi
-
-#
-# Set up Maven
-#
-export MAVEN_OPTS="-Ddatabase=$DATABASE -Xms16m -Xmx256m"
-cp -u hudson/profiles.redhat.qa.xml profiles.xml
-
-# Determine jBPM version
-mvn -Dexpression=project.version help:evaluate > $WORKSPACE/project-version.txt
-JBPM_VERSION=`grep '^3\.' $WORKSPACE/project-version.txt`
-
-#
-# Build distro
-#
-mvn -Pdistro -Djbpm.home=$WORKSPACE/jbpm-$JBPM_VERSION -Dcontainer=$CONTAINER \
- -Djboss.home=$JBOSS_HOME -Djboss.server=$JBOSS_SERVER clean install
-if [ $? -ne 0 ]; then
- echo "ERROR: failed to build distro"
- exit 1
-fi
-
-#
-# Install distro
-#
-$JAVA -jar modules/distribution/target/jbpm-distribution-$JBPM_VERSION-installer.jar \
- modules/distribution/target/classes/auto-install-template.xml
-if [ $? -ne 0 ]; then
- echo "ERROR: failed to install distro"
- exit 1
-fi
-
-#
-# Install proprietary JDBC drivers
-#
-mvn -N -DoutputFile=$WORKSPACE/dependencies.txt dependency:resolve
-
-# Install DB2 driver
-if [ "$DATABASE" = "db2" ]; then
- DB2JCC_VERSION=`grep com.ibm:db2jcc:jar $WORKSPACE/dependencies.txt | awk -F : '{ print $4 }'`
- DB2JCC_JAR=~/.m2/repository/com/ibm/db2jcc/$DB2JCC_VERSION/db2jcc-$DB2JCC_VERSION.jar
- if [ -f $DB2JCC_JAR ]; then
- ln -s $DB2JCC_JAR $JBOSS_HOME/server/$JBOSS_SERVER/lib
- else
- echo "WARNING: DB2 driver not found: $DB2JCC_JAR"
- fi
- DB2JCC_LICENSE=~/.m2/repository/com/ibm/db2jcc_license_cu/$DB2JCC_VERSION/db2jcc_license_cu-$DB2JCC_VERSION.jar
- if [ -f $DB2JCC_LICENSE ]; then
- ln -s $DB2JCC_LICENSE $JBOSS_HOME/server/$JBOSS_SERVER/lib
- else
- echo "WARNING: DB2 license not found: $DB2JCC_LICENSE"
- fi
-fi
-
-# Install MSSQL driver
-if [ "$DATABASE" = "mssql" ]; then
- MSJDBC_VERSION=`grep com.microsoft.sqlserver:msjdbc $WORKSPACE/dependencies.txt | awk -F : '{ print $4 }'`
- MSJDBC_JAR=~/.m2/repository/com/microsoft/sqlserver/msjdbc/$MSJDBC_VERSION/msjdbc-$MSJDBC_VERSION.jar
- if [ -f $MSJDBC_JAR ]; then
- ln -s $MSJDBC_JAR $JBOSS_HOME/server/$JBOSS_SERVER/lib
- else
- echo "WARNING: SQL Server driver not found: $MSJDBC_JAR"
- fi
-fi
-
-# Install Oracle driver
-if [ "$DATABASE" = "oracle" ]; then
- OJDBC_VERSION=`grep com.oracle:ojdbc14 $WORKSPACE/dependencies.txt | awk -F : '{ print $4 }'`
- OJDBC_JAR=~/.m2/repository/com/oracle/ojdbc14/$OJDBC_VERSION/ojdbc14-$OJDBC_VERSION.jar
- if [ -f $OJDBC_JAR ]; then
- ln -s $OJDBC_JAR $JBOSS_HOME/server/$JBOSS_SERVER/lib
- else
- echo "WARNING: Oracle driver not found: $OJDBC_JAR"
- fi
-fi
-
-# Install Sybase driver
-if [ "$DATABASE" = "sybase" ]; then
- JCONNECT_VERSION=`grep com.sybase:jconnect $WORKSPACE/dependencies.txt | awk -F : '{ print $4 }'`
- JCONNECT_JAR=~/.m2/repository/com/sybase/jconnect/$JCONNECT_VERSION/jconnect-$JCONNECT_VERSION.jar
- if [ -f $JCONNECT_JAR ]; then
- ln -s $JCONNECT_JAR $JBOSS_HOME/server/$JBOSS_SERVER/lib
- else
- echo "WARNING: Sybase driver not found: $JCONNECT_JAR"
- fi
-fi
-
-#
-# Start JBoss AS
-#
-export JAVA_HOME=$ORIG_JAVA_HOME
-$JBOSS_HOME/bin/run.sh -b $MYTESTIP_1 -c $JBOSS_SERVER -g $JOB_NAME -u $MCASTIP &> /dev/null &
-
-# Was it successfully started?
-wget --spider --retry-connrefused --waitretry=24 --no-verbose $MYTESTIP_1:8080
-if [ $? -ne 0 ]; then
- tail -n 100 $JBOSS_HOME/server/$JBOSS_SERVER/log/server.log
- $JBOSS_HOME/bin/shutdown.sh -s jnp://$MYTESTIP_1:1099 -S
- exit 1
-fi
-
-#
-# Execute tests
-#
-mvn --fail-at-end -Djboss.bind.address=$MYTESTIP_1 -Dsurefire.jvm.args="-Xms64m -Xmx256m" \
- test | tee $WORKSPACE/tests.log
-grep -E 'FIXME\|FAILED' $WORKSPACE/tests.log | sort -u > $WORKSPACE/fixme.txt
-grep -E '\[\S*]' $WORKSPACE/fixme.txt > $WORKSPACE/errata-$CONTAINER.txt
-
-#
-# Stop JBoss AS
-#
-$JBOSS_HOME/bin/shutdown.sh -s jnp://$MYTESTIP_1:1099 -S
-ln -sf $JBOSS_HOME/server/$JBOSS_SERVER/log/boot.log $WORKSPACE
-ln -sf $JBOSS_HOME/server/$JBOSS_SERVER/log/server.log $WORKSPACE
Copied: jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/container.sh (from rev 6560, jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/command.sh)
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/container.sh (rev 0)
+++ jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/container.sh 2010-08-10 20:18:38 UTC (rev 6562)
@@ -0,0 +1,155 @@
+#!/bin/sh
+#
+# Build the project with Maven and
+# run the enterprise test suite inside a container
+#
+# Exported shell variables required:
+# WORKSPACE work directory
+# JAVA_HOME location of java development kit
+# JAVA_15_HOME required if testing against java 1.4 only
+# DATABASE db2, hsqldb, mssql, mysql, oracle, postgresql
+# CONTAINER jboss405, jboss423, jboss501, jboss510
+# MYTESTIP_1 bind address
+# MCASTIP multicast address
+# SOURCE_REPO location of jboss distributions
+
+# Determine JBoss AS version
+case $CONTAINER in
+ jboss405)
+ JBOSS_VERSION=jboss-4.0.5.GA
+ ;;
+ jboss423)
+ JBOSS_VERSION=jboss-4.2.3.GA
+ ;;
+ jboss501)
+ JBOSS_VERSION=jboss-5.0.1.GA
+ ;;
+ jboss510)
+ JBOSS_VERSION=jboss-5.1.0.GA
+ ;;
+ *)
+ echo "ERROR: invalid container: $CONTAINER"
+ exit 1
+ ;;
+esac
+JBOSS_HOME=$WORKSPACE/$JBOSS_VERSION
+JBOSS_SERVER=all
+
+# Determine Java platform version
+JAVA=$JAVA_HOME/bin/java
+JAVA_VERSION=`$JAVA -version 2>&1 | grep version | awk '{ print substr($3, 2, 3); }'`
+
+if [ $JAVA_VERSION = 1.4 ]; then
+ # Switch to JDK 1.5 for building and installing jBPM
+ ORIG_JAVA_HOME=$JAVA_HOME
+ JAVA=$JAVA_15_HOME/bin/java
+ export JAVA_HOME=$JAVA_15_HOME
+else
+ ORIG_JAVA_HOME=$JAVA_HOME
+fi
+
+# Set up Maven
+export MAVEN_OPTS="-Ddatabase=$DATABASE -Xms16m -Xmx256m"
+cp -u hudson/profiles.redhat.qa.xml profiles.xml
+
+# Determine jBPM version
+mvn -Dexpression=project.version help:evaluate > $WORKSPACE/project-version.txt
+JBPM_VERSION=`grep '^3\.' $WORKSPACE/project-version.txt`
+
+# Build jBPM
+mvn -Pdistro -Djbpm.home=$WORKSPACE/jbpm-$JBPM_VERSION -Dcontainer=$CONTAINER \
+ -Djboss.home=$JBOSS_HOME -Djboss.server=$JBOSS_SERVER clean install
+if [ $? -ne 0 ]; then
+ echo "ERROR: failed to build distro"
+ exit 1
+fi
+
+# Install JBoss AS
+rm -rf $JBOSS_HOME
+unzip -q -d $WORKSPACE $SOURCE_REPO/jboss/$JBOSS_VERSION.zip
+
+# Install jBPM
+$JAVA -jar modules/distribution/target/jbpm-distribution-$JBPM_VERSION-installer.jar \
+ modules/distribution/target/classes/auto-install-template.xml
+if [ $? -ne 0 ]; then
+ echo "ERROR: failed to install distro"
+ exit 1
+fi
+
+# Install proprietary JDBC drivers
+mvn -N -DoutputFile=$WORKSPACE/dependencies.txt dependency:resolve
+
+# DB2 driver
+if [ "$DATABASE" = "db2" ]; then
+ DB2JCC_VERSION=`grep com.ibm:db2jcc:jar $WORKSPACE/dependencies.txt | awk -F : '{ print $4 }'`
+ DB2JCC_JAR=~/.m2/repository/com/ibm/db2jcc/$DB2JCC_VERSION/db2jcc-$DB2JCC_VERSION.jar
+ if [ -f $DB2JCC_JAR ]; then
+ ln -s $DB2JCC_JAR $JBOSS_HOME/server/$JBOSS_SERVER/lib
+ else
+ echo "WARNING: DB2 driver not found: $DB2JCC_JAR"
+ fi
+ DB2JCC_LICENSE=~/.m2/repository/com/ibm/db2jcc_license_cu/$DB2JCC_VERSION/db2jcc_license_cu-$DB2JCC_VERSION.jar
+ if [ -f $DB2JCC_LICENSE ]; then
+ ln -s $DB2JCC_LICENSE $JBOSS_HOME/server/$JBOSS_SERVER/lib
+ else
+ echo "WARNING: DB2 license not found: $DB2JCC_LICENSE"
+ fi
+fi
+
+# MSSQL driver
+if [ "$DATABASE" = "mssql" ]; then
+ MSJDBC_VERSION=`grep com.microsoft.sqlserver:msjdbc $WORKSPACE/dependencies.txt | awk -F : '{ print $4 }'`
+ MSJDBC_JAR=~/.m2/repository/com/microsoft/sqlserver/msjdbc/$MSJDBC_VERSION/msjdbc-$MSJDBC_VERSION.jar
+ if [ -f $MSJDBC_JAR ]; then
+ ln -s $MSJDBC_JAR $JBOSS_HOME/server/$JBOSS_SERVER/lib
+ else
+ echo "WARNING: SQL Server driver not found: $MSJDBC_JAR"
+ fi
+fi
+
+# Oracle driver
+if [ "$DATABASE" = "oracle" ]; then
+ OJDBC_VERSION=`grep com.oracle:ojdbc14 $WORKSPACE/dependencies.txt | awk -F : '{ print $4 }'`
+ OJDBC_JAR=~/.m2/repository/com/oracle/ojdbc14/$OJDBC_VERSION/ojdbc14-$OJDBC_VERSION.jar
+ if [ -f $OJDBC_JAR ]; then
+ ln -s $OJDBC_JAR $JBOSS_HOME/server/$JBOSS_SERVER/lib
+ else
+ echo "WARNING: Oracle driver not found: $OJDBC_JAR"
+ fi
+fi
+
+# Sybase driver
+if [ "$DATABASE" = "sybase" ]; then
+ JCONNECT_VERSION=`grep com.sybase:jconnect $WORKSPACE/dependencies.txt | awk -F : '{ print $4 }'`
+ JCONNECT_JAR=~/.m2/repository/com/sybase/jconnect/$JCONNECT_VERSION/jconnect-$JCONNECT_VERSION.jar
+ if [ -f $JCONNECT_JAR ]; then
+ ln -s $JCONNECT_JAR $JBOSS_HOME/server/$JBOSS_SERVER/lib
+ else
+ echo "WARNING: Sybase driver not found: $JCONNECT_JAR"
+ fi
+fi
+
+# Switch back to JDK 1.4 for running test suite
+export JAVA_HOME=$ORIG_JAVA_HOME
+
+# Start JBoss AS
+$JBOSS_HOME/bin/run.sh -b $MYTESTIP_1 -c $JBOSS_SERVER -g jbpm3-$CONTAINER-$DATABASE \
+ -u $MCASTIP &> /dev/null &
+
+# Was it successfully started?
+wget --spider --retry-connrefused --waitretry=24 --no-verbose $MYTESTIP_1:8080
+if [ $? -ne 0 ]; then
+ tail -n 100 $JBOSS_HOME/server/$JBOSS_SERVER/log/server.log
+ $JBOSS_HOME/bin/shutdown.sh -s jnp://$MYTESTIP_1:1099 -S
+ exit 1
+fi
+
+# Run enterprise test suite
+mvn -f modules/enterprise/pom.xml --fail-at-end -Djboss.bind.address=$MYTESTIP_1 \
+ -Dsurefire.jvm.args="-Xms64m -Xmx256m" test | tee $WORKSPACE/tests.log
+grep -E 'FIXME\|FAILED' $WORKSPACE/tests.log | sort -u > $WORKSPACE/fixme.txt
+
+# Stop JBoss AS
+$JBOSS_HOME/bin/shutdown.sh -s jnp://$MYTESTIP_1:1099 -S
+ln -sf $JBOSS_HOME/server/$JBOSS_SERVER/log/boot.log $WORKSPACE
+ln -sf $JBOSS_HOME/server/$JBOSS_SERVER/log/server.log $WORKSPACE
Added: jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/standalone.sh
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/standalone.sh (rev 0)
+++ jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/standalone.sh 2010-08-10 20:18:38 UTC (rev 6562)
@@ -0,0 +1,36 @@
+#!/bin/sh
+#
+# Build the project with Maven and
+# run the standalone test suite
+#
+# Exported shell variables required:
+# JAVA_HOME location of java development kit
+# JAVA_15_HOME required if testing against java 1.4 only
+# DATABASE db2, hsqldb, mssql, mysql, oracle, postgresql
+
+# Determine Java platform version
+JAVA=$JAVA_HOME/bin/java
+JAVA_VERSION=`$JAVA -version 2>&1 | grep version | awk '{ print substr($3, 2, 3); }'`
+
+if [ $JAVA_VERSION = 1.4 ]; then
+ ORIG_JAVA_HOME=$JAVA_HOME
+ JAVA=$JAVA_15_HOME/bin/java
+ export JAVA_HOME=$JAVA_15_HOME
+else
+ ORIG_JAVA_HOME=$JAVA_HOME
+fi
+
+# Set up Maven
+export MAVEN_OPTS="-Ddatabase=$DATABASE -Xms16m -Xmx256m"
+cp -u hudson/profiles.redhat.qa.xml profiles.xml
+
+# Build jBPM
+mvn -Pdistro clean install
+if [ $? -ne 0 ]; then
+ echo "ERROR: failed to build distro"
+ exit 1
+fi
+
+# Run standalone test suite
+export JAVA_HOME=$ORIG_JAVA_HOME
+mvn --fail-at-end -Dsurefire.jvm.args="-Xms64m -Xmx256m" test
Property changes on: jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/standalone.sh
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:eol-style
+ LF
13 years, 10 months
JBoss JBPM SVN: r6560 - in jbpm3/branches/jbpm-3.2-soa: modules/enterprise/src/main/etc and 1 other directory.
by do-not-reply@jboss.org
Author: alex.guizar(a)jboss.com
Date: 2010-08-10 06:11:34 -0400 (Tue, 10 Aug 2010)
New Revision: 6560
Modified:
jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/command.sh
jbpm3/branches/jbpm-3.2-soa/modules/enterprise/src/main/etc/jbpm.jndi.properties
Log:
JBPM-2916 provide udp multicast address;
separate naming provider urls with comma instead of space
Modified: jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/command.sh
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/command.sh 2010-08-10 09:42:10 UTC (rev 6559)
+++ jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/command.sh 2010-08-10 10:11:34 UTC (rev 6560)
@@ -9,7 +9,8 @@
# JAVA_15_HOME required if testing against java 1.4 only
# DATABASE db2, hsqldb, mssql, mysql, oracle, postgresql
# CONTAINER jboss405, jboss423, jboss501, jboss510
-# JBOSS_BINDADDR jboss bind address
+# MYTESTIP_1 bind address
+# MCASTIP multicast address
# JOB_NAME used as unique jgroups partition name
# SOURCE_REPO location of jboss distributions
#
@@ -68,7 +69,7 @@
#
# Build distro
#
-mvn -Pdistro,soa -Djbpm.home=$WORKSPACE/jbpm-$JBPM_VERSION -Dcontainer=$CONTAINER \
+mvn -Pdistro -Djbpm.home=$WORKSPACE/jbpm-$JBPM_VERSION -Dcontainer=$CONTAINER \
-Djboss.home=$JBOSS_HOME -Djboss.server=$JBOSS_SERVER clean install
if [ $? -ne 0 ]; then
echo "ERROR: failed to build distro"
@@ -79,7 +80,11 @@
# Install distro
#
$JAVA -jar modules/distribution/target/jbpm-distribution-$JBPM_VERSION-installer.jar \
- modules/distribution/target/resources/auto-install-template.xml
+ modules/distribution/target/classes/auto-install-template.xml
+if [ $? -ne 0 ]; then
+ echo "ERROR: failed to install distro"
+ exit 1
+fi
#
# Install proprietary JDBC drivers
@@ -140,27 +145,27 @@
# Start JBoss AS
#
export JAVA_HOME=$ORIG_JAVA_HOME
-$JBOSS_HOME/bin/run.sh -b $JBOSS_BINDADDR -c $JBOSS_SERVER -g $JOB_NAME &> /dev/null &
+$JBOSS_HOME/bin/run.sh -b $MYTESTIP_1 -c $JBOSS_SERVER -g $JOB_NAME -u $MCASTIP &> /dev/null &
# Was it successfully started?
-wget --spider --retry-connrefused --waitretry=24 --no-verbose $JBOSS_BINDADDR:8080
+wget --spider --retry-connrefused --waitretry=24 --no-verbose $MYTESTIP_1:8080
if [ $? -ne 0 ]; then
tail -n 100 $JBOSS_HOME/server/$JBOSS_SERVER/log/server.log
- $JBOSS_HOME/bin/shutdown.sh -s jnp://$JBOSS_BINDADDR:1099 -S
+ $JBOSS_HOME/bin/shutdown.sh -s jnp://$MYTESTIP_1:1099 -S
exit 1
fi
#
# Execute tests
#
-mvn --fail-at-end -Djboss.bind.address=$JBOSS_BINDADDR -Dsurefire.jvm.args="-Xms64m -Xmx256m" \
+mvn --fail-at-end -Djboss.bind.address=$MYTESTIP_1 -Dsurefire.jvm.args="-Xms64m -Xmx256m" \
test | tee $WORKSPACE/tests.log
-grep -E 'FIXME\|FAILED' $WORKSPACE/tests.log | sort -u | tee $WORKSPACE/fixme.txt
+grep -E 'FIXME\|FAILED' $WORKSPACE/tests.log | sort -u > $WORKSPACE/fixme.txt
grep -E '\[\S*]' $WORKSPACE/fixme.txt > $WORKSPACE/errata-$CONTAINER.txt
#
# Stop JBoss AS
#
-$JBOSS_HOME/bin/shutdown.sh -s jnp://$JBOSS_BINDADDR:1099 -S
+$JBOSS_HOME/bin/shutdown.sh -s jnp://$MYTESTIP_1:1099 -S
ln -sf $JBOSS_HOME/server/$JBOSS_SERVER/log/boot.log $WORKSPACE
ln -sf $JBOSS_HOME/server/$JBOSS_SERVER/log/server.log $WORKSPACE
Modified: jbpm3/branches/jbpm-3.2-soa/modules/enterprise/src/main/etc/jbpm.jndi.properties
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/enterprise/src/main/etc/jbpm.jndi.properties 2010-08-10 09:42:10 UTC (rev 6559)
+++ jbpm3/branches/jbpm-3.2-soa/modules/enterprise/src/main/etc/jbpm.jndi.properties 2010-08-10 10:11:34 UTC (rev 6560)
@@ -1,2 +1,2 @@
-java.naming.provider.url=jnp://${jboss.bind.address}:1100 jnp://${jboss.bind.address}
+java.naming.provider.url=jnp://${jboss.bind.address}:1100,jnp://${jboss.bind.address}
jnp.partitionName=${jboss.partition.name}
13 years, 10 months
JBoss JBPM SVN: r6559 - jbpm3/branches/jbpm-3.2-soa/modules/core.
by do-not-reply@jboss.org
Author: alex.guizar(a)jboss.com
Date: 2010-08-10 05:42:10 -0400 (Tue, 10 Aug 2010)
New Revision: 6559
Modified:
jbpm3/branches/jbpm-3.2-soa/modules/core/pom.xml
Log:
remove extraneous artifacts in distribution src/ and docs/
correct dangling target name in core pom
Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/pom.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/core/pom.xml 2010-08-10 08:03:43 UTC (rev 6558)
+++ jbpm3/branches/jbpm-3.2-soa/modules/core/pom.xml 2010-08-10 09:42:10 UTC (rev 6559)
@@ -203,7 +203,7 @@
<configuration>
<tasks>
<property name="database" value="${database}" />
- <ant antfile="scripts/antrun-jbpm-config.xml" target="concat" />
+ <ant antfile="scripts/antrun-jbpm-config.xml" target="cat-hibernate-cfg" />
<ant antfile="scripts/antrun-jbpm-config.xml" target="jbpm-cfg-xml-soa" />
</tasks>
</configuration>
13 years, 10 months
JBoss JBPM SVN: r6558 - jbpm3/branches/jbpm-3.2-soa/modules/core and 20 other directories.
by do-not-reply@jboss.org
Author: alex.guizar(a)jboss.com
Date: 2010-08-10 04:03:43 -0400 (Tue, 10 Aug 2010)
New Revision: 6558
Removed:
jbpm3/branches/jbpm-3.2-soa/modules/distribution/jbpm3-distribution.iml
Modified:
jbpm3/branches/jbpm-3.2-soa/modules/core/pom.xml
jbpm3/branches/jbpm-3.2-soa/modules/core/scripts/antrun-jbpm-config.xml
jbpm3/branches/jbpm-3.2-soa/modules/db/pom.xml
jbpm3/branches/jbpm-3.2-soa/modules/db/scripts/antrun-jbpmschema.xml
jbpm3/branches/jbpm-3.2-soa/modules/distribution/pom.xml
jbpm3/branches/jbpm-3.2-soa/modules/distribution/scripts/antrun-installer.xml
jbpm3/branches/jbpm-3.2-soa/modules/distribution/scripts/assembly-modules.xml
jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/examples/module/pom.xml
jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/examples/pom.xml
jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/installer/download-helper.xml
jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/installer/install-definition.xml
jbpm3/branches/jbpm-3.2-soa/modules/enterprise/pom.xml
jbpm3/branches/jbpm-3.2-soa/modules/enterprise/scripts/antrun-test-jars.xml
jbpm3/branches/jbpm-3.2-soa/modules/examples/pom.xml
jbpm3/branches/jbpm-3.2-soa/modules/examples/scripts/assembly-examples.xml
jbpm3/branches/jbpm-3.2-soa/modules/identity/pom.xml
jbpm3/branches/jbpm-3.2-soa/modules/simulation/pom.xml
jbpm3/branches/jbpm-3.2-soa/modules/userguide/pom.xml
jbpm3/branches/jbpm-3.2-soa/pom.xml
projects/jsf-console/branches/jsf-console-3.2-soa/console/pom.xml
projects/jsf-console/branches/jsf-console-3.2-soa/gpd-deployer/pom.xml
projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/pom.xml
projects/jsf-console/branches/jsf-console-3.2-soa/pom.xml
projects/jsf-console/branches/jsf-console-3.2-soa/soa/pom.xml
Log:
remove extraneous artifacts in distribution src/ and docs/
shorten project names
Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/pom.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/core/pom.xml 2010-08-09 19:44:08 UTC (rev 6557)
+++ jbpm3/branches/jbpm-3.2-soa/modules/core/pom.xml 2010-08-10 08:03:43 UTC (rev 6558)
@@ -7,12 +7,10 @@
<!-- See terms of license at http://www.gnu.org. -->
<!-- ====================================================================== -->
-<!-- $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 - Core</name>
+ <name>jBPM3 - Core</name>
<groupId>org.jbpm.jbpm3</groupId>
<artifactId>jbpm-jpdl</artifactId>
<packaging>jar</packaging>
@@ -174,7 +172,7 @@
<configuration>
<tasks>
<property name="database" value="${database}" />
- <ant antfile="scripts/antrun-jbpm-config.xml" target="concat" />
+ <ant antfile="scripts/antrun-jbpm-config.xml" target="cat-hibernate-cfg" />
</tasks>
</configuration>
</execution>
@@ -237,9 +235,6 @@
<scope>test</scope>
</dependency>
</dependencies>
- <properties>
- <surefire.jvm.args>-Xmx128m</surefire.jvm.args>
- </properties>
</profile>
<!--
Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/scripts/antrun-jbpm-config.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/core/scripts/antrun-jbpm-config.xml 2010-08-09 19:44:08 UTC (rev 6557)
+++ jbpm3/branches/jbpm-3.2-soa/modules/core/scripts/antrun-jbpm-config.xml 2010-08-10 08:03:43 UTC (rev 6558)
@@ -1,18 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- ====================================================================== -->
+<!-- jBPM: Workflow in Java -->
<!-- -->
-<!-- JBoss, the OpenSource J2EE webOS -->
-<!-- -->
<!-- Distributable under LGPL license. -->
<!-- See terms of license at http://www.gnu.org. -->
-<!-- -->
<!-- ====================================================================== -->
-<!-- $Id$ -->
+<project name="hibernate-config" default="cat-hibernate-cfg">
-<project default="concat">
-
<property name="project.build.directory" value="${basedir}/target"/>
<property name="build.resources.directory" value="${basedir}/target/classes"/>
@@ -80,7 +76,7 @@
</macrodef>
<!-- Concatenates the hibernate config scripts -->
- <target name="concat" >
+ <target name="cat-hibernate-cfg" >
<macro-database-cfg database="db2" />
<macro-database-cfg database="derby" />
<macro-database-cfg database="firebird" />
Modified: jbpm3/branches/jbpm-3.2-soa/modules/db/pom.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/db/pom.xml 2010-08-09 19:44:08 UTC (rev 6557)
+++ jbpm3/branches/jbpm-3.2-soa/modules/db/pom.xml 2010-08-10 08:03:43 UTC (rev 6558)
@@ -1,18 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
- <!-- ====================================================================== -->
- <!-- jBPM: Workflow in Java -->
- <!-- -->
- <!-- Distributable under LGPL license. -->
- <!-- See terms of license at http://www.gnu.org. -->
- <!-- ====================================================================== -->
+<!-- ====================================================================== -->
+<!-- jBPM: Workflow in Java -->
+<!-- -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at http://www.gnu.org. -->
+<!-- ====================================================================== -->
- <!-- $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 - Database</name>
+ <name>jBPM3 - Database</name>
<groupId>org.jbpm.jbpm3</groupId>
<artifactId>jbpm-db</artifactId>
<packaging>jar</packaging>
Modified: jbpm3/branches/jbpm-3.2-soa/modules/db/scripts/antrun-jbpmschema.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/db/scripts/antrun-jbpmschema.xml 2010-08-09 19:44:08 UTC (rev 6557)
+++ jbpm3/branches/jbpm-3.2-soa/modules/db/scripts/antrun-jbpmschema.xml 2010-08-10 08:03:43 UTC (rev 6558)
@@ -1,12 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- ================================================================== -->
-<!-- jBPM Database schema -->
-<!-- ================================================================== -->
+<!-- ====================================================================== -->
+<!-- jBPM: Workflow in Java -->
+<!-- -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at http://www.gnu.org. -->
+<!-- ====================================================================== -->
-<!-- $Id$ -->
-
-<project>
+<project name="db-schema">
<target name="init">
<taskdef name="jbpmschema"
classname="org.jbpm.ant.JbpmSchemaTask"
Deleted: jbpm3/branches/jbpm-3.2-soa/modules/distribution/jbpm3-distribution.iml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/distribution/jbpm3-distribution.iml 2010-08-09 19:44:08 UTC (rev 6557)
+++ jbpm3/branches/jbpm-3.2-soa/modules/distribution/jbpm3-distribution.iml 2010-08-10 08:03:43 UTC (rev 6558)
@@ -1,864 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module version="4" relativePaths="true" type="JAVA_MODULE">
- <component name="ModuleRootManager" />
- <component name="NewModuleRootManager" inherit-compiler-output="true">
- <exclude-output />
- <content url="file://$MODULE_DIR$">
- <sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
- </content>
- <orderEntry type="inheritedJdk" />
- <orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="module" module-name="jbpm3-toplevel" />
- <orderEntry type="module" module-name="report-server" />
- <orderEntry type="module" module-name="gwt-parent" />
- <orderEntry type="module" module-name="jbpm3-enterprise" />
- <orderEntry type="module" module-name="jbpm3-identity" />
- <orderEntry type="module" module-name="jbpm3-core" />
- <orderEntry type="module" module-name="gwt-war" />
- <orderEntry type="module-library">
- <library name="M2 Dep: org.slf4j:slf4j-simple:jar:1.5.2:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/slf4j/slf4j-simple/1.5.2/slf4j-simple-1.5.2.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library name="M2 Dep: com.sun.facelets:jsf-facelets:jar:1.1.14:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/sun/facelets/jsf-facelets/1.1.14/jsf-facelets-1.1.14.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library name="M2 Dep: org.jboss.bpm:bpm-spec-api:jar:1.0.0-SNAPSHOT:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/bpm/bpm-spec-api/1.0.0-SNAPSHOT/bpm-spec-api-1.0.0-SNAPSHOT.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library name="M2 Dep: nekohtml:nekohtml:jar:0.9.4:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/nekohtml/nekohtml/0.9.4/nekohtml-0.9.4.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library name="M2 Dep: org.apache.derby:derby:jar:10.2.1.6:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/apache/derby/derby/10.2.1.6/derby-10.2.1.6.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library name="M2 Dep: javax.xml.stream:stax-api:jar:1.0-2:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/xml/stream/stax-api/1.0-2/stax-api-1.0-2.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library name="M2 Dep: org.jboss.gravel:gravel:jar:1.0.0.GA:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/gravel/gravel/1.0.0.GA/gravel-1.0.0.GA.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library name="M2 Dep: asm:asm:jar:1.5.3:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/asm/asm/1.5.3/asm-1.5.3.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library name="M2 Dep: commons-httpclient:commons-httpclient:jar:3.1:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library name="M2 Dep: jboss:jboss:jar:4.2.2.GA:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/jboss/jboss/4.2.2.GA/jboss-4.2.2.GA.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library name="M2 Dep: sun-jaxb:jaxb-api:jar:2.1.4:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/sun-jaxb/jaxb-api/2.1.4/jaxb-api-2.1.4.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library name="M2 Dep: com.google.gwt:gwt-servlet:jar:1.5.2:runtime">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/google/gwt/gwt-servlet/1.5.2/gwt-servlet-1.5.2.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library name="M2 Dep: org.apache.poi:poi:jar:3.0.2-FINAL:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/apache/poi/poi/3.0.2-FINAL/poi-3.0.2-FINAL.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library name="M2 Dep: jboss.common:jboss-common:jar:1.2.1.GA:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/jboss/common/jboss-common/1.2.1.GA/jboss-common-1.2.1.GA.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library name="M2 Dep: xml-apis:xml-apis:jar:1.3.03:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/xml-apis/xml-apis/1.3.03/xml-apis-1.3.03.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library name="M2 Dep: hsqldb:hsqldb:jar:1.8.0.7:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/hsqldb/hsqldb/1.8.0.7/hsqldb-1.8.0.7.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library name="M2 Dep: jboss:jbosssx:jar:4.2.2.GA:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/jboss/jbosssx/4.2.2.GA/jbosssx-4.2.2.GA.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library name="M2 Dep: net.sf.ehcache:ehcache:jar:1.2.3:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/net/sf/ehcache/ehcache/1.2.3/ehcache-1.2.3.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library name="M2 Dep: org.jboss:jboss-common-core:jar:2.2.8.GA:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/jboss-common-core/2.2.8.GA/jboss-common-core-2.2.8.GA.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library name="M2 Dep: org.jboss:jboss-reflect:jar:2.0.0.CR1:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/jboss-reflect/2.0.0.CR1/jboss-reflect-2.0.0.CR1.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library name="M2 Dep: apache-xerces:xml-apis:jar:2.9.1:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/apache-xerces/xml-apis/2.9.1/xml-apis-2.9.1.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library name="M2 Dep: com.sun.xml.stream:sjsxp:jar:1.0.1:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/sun/xml/stream/sjsxp/1.0.1/sjsxp-1.0.1.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library name="M2 Dep: org.slf4j:slf4j-log4j12:jar:1.5.5:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/slf4j/slf4j-log4j12/1.5.5/slf4j-log4j12-1.5.5.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library name="M2 Dep: org.apache.jackrabbit:jackrabbit-text-extractors:jar:1.4:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/apache/jackrabbit/jackrabbit-text-extractors/1.4/jackrabbit-text-extractors-1.4.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library name="M2 Dep: cglib:cglib:jar:2.1_3:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/cglib/cglib/2.1_3/cglib-2.1_3.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library name="M2 Dep: asm:asm-attrs:jar:1.5.3:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/asm/asm-attrs/1.5.3/asm-attrs-1.5.3.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library name="M2 Dep: javax.mail:mail:jar:1.4:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/mail/mail/1.4/mail-1.4.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library name="M2 Dep: javassist:javassist:jar:3.6.0.GA:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javassist/javassist/3.6.0.GA/javassist-3.6.0.GA.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library name="M2 Dep: org.apache.jackrabbit:jackrabbit-api:jar:1.4:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/apache/jackrabbit/jackrabbit-api/1.4/jackrabbit-api-1.4.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library name="M2 Dep: org.jyaml:jyaml:jar:1.3:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jyaml/jyaml/1.3/jyaml-1.3.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library name="M2 Dep: tjws:webserver:jar:1.3.3:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/tjws/webserver/1.3.3/webserver-1.3.3.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library name="M2 Dep: commons-collections:commons-collections:jar:2.1.1:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-collections/commons-collections/2.1.1/commons-collections-2.1.1.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library name="M2 Dep: net.sourceforge.jtds:jtds:jar:1.2.2:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/net/sourceforge/jtds/jtds/1.2.2/jtds-1.2.2.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library name="M2 Dep: org.jboss.bpm:bpm-spec-dialect-api10:jar:1.0.0-SNAPSHOT:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/bpm/bpm-spec-dialect-api10/1.0.0-SNAPSHOT/bpm-spec-dialect-api10-1.0.0-SNAPSHOT.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library name="M2 Dep: org.jboss.resteasy:jaxrs-api:jar:1.0-beta-8:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/resteasy/jaxrs-api/1.0-beta-8/jaxrs-api-1.0-beta-8.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library name="M2 Dep: postgresql:postgresql:jar:8.3-603.jdbc3:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/postgresql/postgresql/8.3-603.jdbc3/postgresql-8.3-603.jdbc3.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library name="M2 Dep: org.apache.jackrabbit:jackrabbit-spi-commons:jar:1.4:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/apache/jackrabbit/jackrabbit-spi-commons/1.4/jackrabbit-spi-commons-1.4.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library name="M2 Dep: org.jboss:jboss-mdr:jar:2.0.0.CR1:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/jboss-mdr/2.0.0.CR1/jboss-mdr-2.0.0.CR1.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library name="M2 Dep: jboss:jboss-ejb3:jar:4.2.2.GA:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/jboss/jboss-ejb3/4.2.2.GA/jboss-ejb3-4.2.2.GA.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library name="M2 Dep: org.jboss.logging:jboss-logging-spi:jar:2.0.5.GA:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/logging/jboss-logging-spi/2.0.5.GA/jboss-logging-spi-2.0.5.GA.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library name="M2 Dep: log4j:log4j:jar:1.2.14:test">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/log4j/log4j/1.2.14/log4j-1.2.14.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library name="M2 Dep: org.apache.ant:ant-launcher:jar:1.7.0:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/apache/ant/ant-launcher/1.7.0/ant-launcher-1.7.0.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library name="M2 Dep: org.apache.jackrabbit:jackrabbit-spi:jar:1.4:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/apache/jackrabbit/jackrabbit-spi/1.4/jackrabbit-spi-1.4.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library name="M2 Dep: org.apache.jackrabbit:jackrabbit-core:jar:1.4.5:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/apache/jackrabbit/jackrabbit-core/1.4.5/jackrabbit-core-1.4.5.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library name="M2 Dep: javax.xml.bind:jaxb-api:jar:2.1:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library name="M2 Dep: izpack:standalone-compiler:jar:4.1.0:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/izpack/standalone-compiler/4.1.0/standalone-compiler-4.1.0.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library name="M2 Dep: concurrent:concurrent:jar:1.3.4:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/concurrent/concurrent/1.3.4/concurrent-1.3.4.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library name="M2 Dep: javax.transaction:jta:jar:1.0.1B:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/transaction/jta/1.0.1B/jta-1.0.1B.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library name="M2 Dep: commons-logging:commons-logging:jar:1.1.1:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library name="M2 Dep: org.apache.ant:ant:jar:1.7.0:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/apache/ant/ant/1.7.0/ant-1.7.0.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library name="M2 Dep: junit:junit:jar:3.8.1:test">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/junit/junit/3.8.1/junit-3.8.1.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library name="M2 Dep: org.hibernate:hibernate:jar:3.2.6.ga:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/hibernate/hibernate/3.2.6.ga/hibernate-3.2.6.ga.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library name="M2 Dep: org.jboss:jbossxb:jar:2.0.0.CR13:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/jbossxb/2.0.0.CR13/jbossxb-2.0.0.CR13.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library name="M2 Dep: bsh:bsh:jar:1.3.0:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/bsh/bsh/1.3.0/bsh-1.3.0.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library name="M2 Dep: org.jboss.microcontainer:jboss-dependency:jar:2.0.0.CR1:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/microcontainer/jboss-dependency/2.0.0.CR1/jboss-dependency-2.0.0.CR1.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library name="M2 Dep: org.mvel:mvel:jar:1.3.7-java1.5:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/mvel/mvel/1.3.7-java1.5/mvel-1.3.7-java1.5.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library name="M2 Dep: antlr:antlr:jar:2.7.6:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/antlr/antlr/2.7.6/antlr-2.7.6.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library name="M2 Dep: wutka-dtdparser:dtdparser121:jar:1.2.1:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/wutka-dtdparser/dtdparser121/1.2.1/dtdparser121-1.2.1.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library name="M2 Dep: commons-fileupload:commons-fileupload:jar:1.2.1:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-fileupload/commons-fileupload/1.2.1/commons-fileupload-1.2.1.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library name="M2 Dep: javax.servlet:servlet-api:jar:2.5:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/servlet/servlet-api/2.5/servlet-api-2.5.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library name="M2 Dep: javax.annotation:jsr250-api:jar:1.0:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/annotation/jsr250-api/1.0/jsr250-api-1.0.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library name="M2 Dep: pdfbox:pdfbox:jar:0.6.4:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/pdfbox/pdfbox/0.6.4/pdfbox-0.6.4.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library name="M2 Dep: commons-codec:commons-codec:jar:1.2:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-codec/commons-codec/1.2/commons-codec-1.2.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library name="M2 Dep: org.jboss.microcontainer:jboss-kernel:jar:2.0.0.CR1:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/microcontainer/jboss-kernel/2.0.0.CR1/jboss-kernel-2.0.0.CR1.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library name="M2 Dep: com.sun.xml.bind:jaxb-xjc:jar:2.1.7:runtime">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/sun/xml/bind/jaxb-xjc/2.1.7/jaxb-xjc-2.1.7.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library name="M2 Dep: org.slf4j:slf4j-api:jar:1.5.5:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/slf4j/slf4j-api/1.5.5/slf4j-api-1.5.5.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library name="M2 Dep: jboss:jboss-jmx:jar:4.2.2.GA:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/jboss/jboss-jmx/4.2.2.GA/jboss-jmx-4.2.2.GA.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library name="M2 Dep: javax.activation:activation:jar:1.1:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/activation/activation/1.1/activation-1.1.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library name="M2 Dep: com.sun.xml.fastinfoset:FastInfoset:jar:1.2.2:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/sun/xml/fastinfoset/FastInfoset/1.2.2/FastInfoset-1.2.2.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library name="M2 Dep: apache-xerces:xercesImpl:jar:2.9.1:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/apache-xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library name="M2 Dep: xerces:xercesImpl:jar:2.8.1:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/xerces/xercesImpl/2.8.1/xercesImpl-2.8.1.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library name="M2 Dep: com.sun.xml.bind:jaxb-impl:jar:2.1.7:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/sun/xml/bind/jaxb-impl/2.1.7/jaxb-impl-2.1.7.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library name="M2 Dep: dom4j:dom4j:jar:1.6.1:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library name="M2 Dep: org.codehaus.jettison:jettison:jar:1.0.1:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/codehaus/jettison/jettison/1.0.1/jettison-1.0.1.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library name="M2 Dep: mysql:mysql-connector-java:jar:5.0.8:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/mysql/mysql-connector-java/5.0.8/mysql-connector-java-5.0.8.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library name="M2 Dep: org.apache.jackrabbit:jackrabbit-jcr-commons:jar:1.4:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/apache/jackrabbit/jackrabbit-jcr-commons/1.4/jackrabbit-jcr-commons-1.4.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library name="M2 Dep: commons-io:commons-io:jar:1.4:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-io/commons-io/1.4/commons-io-1.4.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library name="M2 Dep: jboss:jboss-ejb3x:jar:4.2.2.GA:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/jboss/jboss-ejb3x/4.2.2.GA/jboss-ejb3x-4.2.2.GA.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library name="M2 Dep: org.jboss.resteasy:resteasy-jaxrs:jar:1.0-beta-8:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/resteasy/resteasy-jaxrs/1.0-beta-8/resteasy-jaxrs-1.0-beta-8.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library name="M2 Dep: org.apache.lucene:lucene-core:jar:2.2.0:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/apache/lucene/lucene-core/2.2.0/lucene-core-2.2.0.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library name="M2 Dep: com.google.code.gson:gson:jar:1.2.2:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/google/code/gson/gson/1.2.2/gson-1.2.2.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library name="M2 Dep: org.textmining:tm-extractors:jar:0.4:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/textmining/tm-extractors/0.4/tm-extractors-0.4.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library name="M2 Dep: org.jbpm.jbpm3:jsf-console-jbpm4jsf:jar:3.3.0.GA:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jbpm/jbpm3/jsf-console-jbpm4jsf/3.3.0.GA/jsf-console-jbpm4jsf-3.3.0.GA.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jbpm/jbpm3/jsf-console-jbpm4jsf/3.3.0.GA/jsf-console-jbpm4jsf-3.3.0.GA-sources.jar!/" />
- </SOURCES>
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library name="M2 Dep: jboss:jboss-system:jar:4.2.2.GA:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/jboss/jboss-system/4.2.2.GA/jboss-system-4.2.2.GA.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library name="M2 Dep: org.scannotation:scannotation:jar:1.0.2:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/scannotation/scannotation/1.0.2/scannotation-1.0.2.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library name="M2 Dep: org.jbpm.jbpm3:bpm-spec-integration-jboss42:jar:config:3.3.1-SNAPSHOT:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jbpm/jbpm3/bpm-spec-integration-jboss42/3.3.1-SNAPSHOT/bpm-spec-integration-jboss42-3.3.1-SNAPSHOT-config.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library name="M2 Dep: org.jbpm.jbpm3:bpm-spec-integration-jbpm3:jar:config:3.3.1-SNAPSHOT:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jbpm/jbpm3/bpm-spec-integration-jbpm3/3.3.1-SNAPSHOT/bpm-spec-integration-jbpm3-3.3.1-SNAPSHOT-config.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library name="M2 Dep: org.jbpm.jbpm3:bpm-spec-integration-jboss42:jar:3.3.1-SNAPSHOT:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jbpm/jbpm3/bpm-spec-integration-jboss42/3.3.1-SNAPSHOT/bpm-spec-integration-jboss42-3.3.1-SNAPSHOT.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jbpm/jbpm3/bpm-spec-integration-jboss42/3.3.1-SNAPSHOT/bpm-spec-integration-jboss42-3.3.1-SNAPSHOT-sources.jar!/" />
- </SOURCES>
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library name="M2 Dep: org.jbpm.jbpm3:bpm-spec-integration-jbpm3:jar:3.3.1-SNAPSHOT:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jbpm/jbpm3/bpm-spec-integration-jbpm3/3.3.1-SNAPSHOT/bpm-spec-integration-jbpm3-3.3.1-SNAPSHOT.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jbpm/jbpm3/bpm-spec-integration-jbpm3/3.3.1-SNAPSHOT/bpm-spec-integration-jbpm3-3.3.1-SNAPSHOT-sources.jar!/" />
- </SOURCES>
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library name="M2 Dep: net.sf.ezmorph:ezmorph:jar:1.0.6:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/net/sf/ezmorph/ezmorph/1.0.6/ezmorph-1.0.6.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library name="M2 Dep: net.sf.json-lib:json-lib:jar:2.2.3:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/net/sf/json-lib/json-lib/2.2.3/json-lib-2.2.3.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library name="M2 Dep: commons-beanutils:commons-beanutils:jar:1.7.0:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library name="M2 Dep: commons-lang:commons-lang:jar:2.4:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-lang/commons-lang/2.4/commons-lang-2.4.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntryProperties />
- </component>
-</module>
-
Modified: jbpm3/branches/jbpm-3.2-soa/modules/distribution/pom.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/distribution/pom.xml 2010-08-09 19:44:08 UTC (rev 6557)
+++ jbpm3/branches/jbpm-3.2-soa/modules/distribution/pom.xml 2010-08-10 08:03:43 UTC (rev 6558)
@@ -7,12 +7,10 @@
<!-- See terms of license at http://www.gnu.org. -->
<!-- ====================================================================== -->
-<!-- $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>
+ <name>jBPM3 - Distribution</name>
<groupId>org.jbpm.jbpm3</groupId>
<artifactId>jbpm-distribution</artifactId>
<packaging>pom</packaging>
@@ -27,10 +25,9 @@
<!-- Properties -->
<properties>
- <assembly.id>assembly-modules</assembly.id>
- <project.build.assemblyDirectory>${project.build.directory}/${assembly.id}</project.build.assemblyDirectory>
- <resources.outputDirectory>${project.build.directory}/resources</resources.outputDirectory>
- <resources.directory>${basedir}/src/main/resources</resources.directory>
+ <assemblyFinalName>assembly-modules</assemblyFinalName>
+ <assemblyDirectory>${project.build.directory}/${assemblyFinalName}</assemblyDirectory>
+ <resourcesDirectory>${basedir}/src/main/resources</resourcesDirectory>
</properties>
<!-- Dependencies -->
@@ -175,17 +172,15 @@
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
- <id>${assembly.id}</id>
<phase>process-resources</phase>
<goals>
<goal>directory-single</goal>
</goals>
<configuration>
- <finalName>${assembly.id}</finalName>
- <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions>
+ <finalName>${assemblyFinalName}</finalName>
<appendAssemblyId>false</appendAssemblyId>
<descriptors>
- <descriptor>scripts/${assembly.id}.xml</descriptor>
+ <descriptor>scripts/assembly-modules.xml</descriptor>
</descriptors>
</configuration>
</execution>
@@ -196,7 +191,6 @@
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
- <id>installer-resources</id>
<phase>process-resources</phase>
<goals>
<goal>run</goal>
@@ -205,10 +199,9 @@
<tasks>
<property name="project.version" value="${project.version}" />
<property name="project.build.dir" value="${project.build.directory}" />
- <property name="project.build.assembly.resources"
- value="${project.build.assemblyDirectory}/resources" />
- <property name="resources.dir" value="${resources.directory}" />
- <property name="resources.output.dir" value="${resources.outputDirectory}" />
+ <property name="project.build.assembly.dir" value="${assemblyDirectory}" />
+ <property name="resources.dir" value="${resourcesDirectory}" />
+ <property name="resources.output.dir" value="${project.build.outputDirectory}" />
<property name="jbpm.home" value="${jbpm.home}" />
<property name="container" value="${container}" />
<property name="jboss.home" value="${jboss.home}" />
@@ -231,7 +224,8 @@
<goal>izpack</goal>
</goals>
<configuration>
- <descriptor>${resources.directory}/installer/install-definition.xml</descriptor>
+ <descriptor>${project.build.outputDirectory}/install-definition.xml</descriptor>
+ <descriptorEncoding>${project.build.sourceEncoding}</descriptorEncoding>
<kind>installer</kind>
</configuration>
</execution>
@@ -265,11 +259,9 @@
<configuration>
<tasks>
<!-- replace jsf-console.war with the SOA platform build -->
- <property name="project.build.assembly.lib"
- value="${project.build.assemblyDirectory}/lib" />
+ <property name="project.build.assembly.lib" value="${assemblyDirectory}/lib" />
<copy file="${project.build.assembly.lib}/jsf-console-soa.war"
- tofile="${project.build.assembly.lib}/jsf-console.war"
- overwrite="yes" />
+ tofile="${project.build.assembly.lib}/jsf-console.war" overwrite="yes" />
</tasks>
</configuration>
</execution>
Modified: jbpm3/branches/jbpm-3.2-soa/modules/distribution/scripts/antrun-installer.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/distribution/scripts/antrun-installer.xml 2010-08-09 19:44:08 UTC (rev 6557)
+++ jbpm3/branches/jbpm-3.2-soa/modules/distribution/scripts/antrun-installer.xml 2010-08-10 08:03:43 UTC (rev 6558)
@@ -1,8 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- $Id$ -->
+<!-- ====================================================================== -->
+<!-- jBPM: Workflow in Java -->
+<!-- -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at http://www.gnu.org. -->
+<!-- ====================================================================== -->
-<project name="installer">
+<project name="distro-resources">
<macrodef name="macro-disable">
<attribute name="file" />
<attribute name="section" />
@@ -33,6 +38,20 @@
</sequential>
</macrodef>
+ <macrodef name="macro-hibernate-cfg">
+ <attribute name="file" />
+ <sequential>
+ <macro-disable file="@{file}" section="JDBC connection properties" />
+ <macro-enable file="@{file}" section="DataSource properties" />
+ <macro-enable file="@{file}" section="JTA transaction properties" />
+ <macro-disable file="@{file}" section="Memory cache" />
+ <macro-enable file="@{file}" section="Clustered cache" />
+ <replace file="@{file}"
+ token="usage="nonstrict-read-write""
+ value="usage="transactional"" />
+ </sequential>
+ </macrodef>
+
<!-- ================================================================== -->
<!-- Configuration -->
<!-- ================================================================== -->
@@ -40,25 +59,25 @@
<basename file="${basedir}" property="example.name" />
<echo message="${example.name}" />
<!-- jpdl resources -->
- <mkdir dir="${project.build.assembly.resources}/jbpm-examples-dist/${example.name}/src/main/jpdl" />
- <copy todir="${project.build.assembly.resources}/jbpm-examples-dist/${example.name}/src/main/jpdl">
- <fileset dir="${project.build.assembly.resources}/jbpm-examples-dev/src/test/resources/${example.name}" />
+ <mkdir dir="${project.build.assembly.dir}/examples/${example.name}/src/main/jpdl" />
+ <copy todir="${project.build.assembly.dir}/examples/${example.name}/src/main/jpdl">
+ <fileset dir="${project.build.assembly.dir}/jbpm-examples/src/test/resources/${example.name}" />
</copy>
<!-- main sources -->
- <mkdir dir="${project.build.assembly.resources}/jbpm-examples-dist/${example.name}/src/main/java" />
- <copy todir="${project.build.assembly.resources}/jbpm-examples-dist/${example.name}/src/main">
- <fileset dir="${project.build.assembly.resources}/jbpm-examples-dev/src/test"
+ <mkdir dir="${project.build.assembly.dir}/examples/${example.name}/src/main/java" />
+ <copy todir="${project.build.assembly.dir}/examples/${example.name}/src/main">
+ <fileset dir="${project.build.assembly.dir}/jbpm-examples/src/test"
includes="java/org/jbpm/examples/${example.name}/**"
excludes="**/*Test.java" />
</copy>
<!-- test sources -->
- <mkdir dir="${project.build.assembly.resources}/jbpm-examples-dist/${example.name}/src/test/java" />
- <copy todir="${project.build.assembly.resources}/jbpm-examples-dist/${example.name}">
- <fileset dir="${project.build.assembly.resources}/jbpm-examples-dev"
+ <mkdir dir="${project.build.assembly.dir}/examples/${example.name}/src/test/java" />
+ <copy todir="${project.build.assembly.dir}/examples/${example.name}">
+ <fileset dir="${project.build.assembly.dir}/jbpm-examples"
includes="src/test/java/org/jbpm/examples/${example.name}/*Test.java" />
</copy>
<!-- project model -->
- <copy todir="${project.build.assembly.resources}/jbpm-examples-dist/${example.name}"
+ <copy todir="${project.build.assembly.dir}/examples/${example.name}"
file="${resources.dir}/examples/module/pom.xml">
<filterset>
<filter token="example.name" value="${example.name}" />
@@ -68,94 +87,35 @@
<target name="reorganize-examples">
<subant genericantfile="${ant.file}" target="reorganize-example" inheritall="yes">
- <dirset dir="${project.build.assembly.resources}/jbpm-examples-dev/src/test/resources"
+ <dirset dir="${project.build.assembly.dir}/jbpm-examples/src/test/resources"
includes="*" />
</subant>
- <copy todir="${project.build.assembly.resources}/jbpm-examples-dist">
+ <copy todir="${project.build.assembly.dir}/examples">
<fileset dir="${resources.dir}/examples" excludes="module/**" />
</copy>
</target>
- <target name="configure-hibernate">
- <property name="db2.cfg.xml"
- value="${project.build.assembly.resources}/jbpm-jpdl-config/hibernate.cfg.db2.xml" />
- <macro-disable file="${db2.cfg.xml}" section="JDBC connection properties" />
- <macro-enable file="${db2.cfg.xml}" section="DataSource properties" />
- <macro-enable file="${db2.cfg.xml}" section="JTA transaction properties" />
- <macro-disable file="${db2.cfg.xml}" section="Memory cache" />
- <macro-enable file="${db2.cfg.xml}" section="Clustered cache" />
- <replace file="${db2.cfg.xml}"
- token="usage="nonstrict-read-write""
- value="usage="transactional"" />
-
+ <target name="process-hibernate-cfg">
<property name="hsqldb.cfg.xml"
- value="${project.build.assembly.resources}/jbpm-jpdl-config/hibernate.cfg.hsqldb.xml" />
+ value="${project.build.assembly.dir}/config/hibernate.cfg.hsqldb.xml" />
<macro-disable file="${hsqldb.cfg.xml}" section="JDBC connection properties" />
<macro-disable file="${hsqldb.cfg.xml}" section="Automatic schema creation" />
<macro-enable file="${hsqldb.cfg.xml}" section="DataSource properties" />
<macro-enable file="${hsqldb.cfg.xml}" section="JTA transaction properties" />
- <property name="mssql.cfg.xml"
- value="${project.build.assembly.resources}/jbpm-jpdl-config/hibernate.cfg.mssql.xml" />
- <macro-disable file="${mssql.cfg.xml}" section="JDBC connection properties" />
- <macro-enable file="${mssql.cfg.xml}" section="DataSource properties" />
- <macro-enable file="${mssql.cfg.xml}" section="JTA transaction properties" />
- <macro-disable file="${mssql.cfg.xml}" section="Memory cache" />
- <macro-enable file="${mssql.cfg.xml}" section="Clustered cache" />
- <replace file="${mssql.cfg.xml}"
- token="usage="nonstrict-read-write""
- value="usage="transactional"" />
-
- <property name="mysql.cfg.xml"
- value="${project.build.assembly.resources}/jbpm-jpdl-config/hibernate.cfg.mysql.xml" />
- <macro-disable file="${mysql.cfg.xml}" section="JDBC connection properties" />
- <macro-enable file="${mysql.cfg.xml}" section="DataSource properties" />
- <macro-enable file="${mysql.cfg.xml}" section="JTA transaction properties" />
- <macro-disable file="${mysql.cfg.xml}" section="Memory cache" />
- <macro-enable file="${mysql.cfg.xml}" section="Clustered cache" />
- <replace file="${mysql.cfg.xml}"
- token="usage="nonstrict-read-write""
- value="usage="transactional"" />
-
- <property name="oracle.cfg.xml"
- value="${project.build.assembly.resources}/jbpm-jpdl-config/hibernate.cfg.oracle.xml" />
- <macro-disable file="${oracle.cfg.xml}" section="JDBC connection properties" />
- <macro-enable file="${oracle.cfg.xml}" section="DataSource properties" />
- <macro-enable file="${oracle.cfg.xml}" section="JTA transaction properties" />
- <macro-disable file="${oracle.cfg.xml}" section="Memory cache" />
- <macro-enable file="${oracle.cfg.xml}" section="Clustered cache" />
- <replace file="${oracle.cfg.xml}"
- token="usage="nonstrict-read-write""
- value="usage="transactional"" />
-
- <property name="postgresql.cfg.xml"
- value="${project.build.assembly.resources}/jbpm-jpdl-config/hibernate.cfg.postgresql.xml" />
- <macro-disable file="${postgresql.cfg.xml}" section="JDBC connection properties" />
- <macro-enable file="${postgresql.cfg.xml}" section="DataSource properties" />
- <macro-enable file="${postgresql.cfg.xml}" section="JTA transaction properties" />
- <macro-disable file="${postgresql.cfg.xml}" section="Memory cache" />
- <macro-enable file="${postgresql.cfg.xml}" section="Clustered cache" />
- <replace file="${postgresql.cfg.xml}"
- token="usage="nonstrict-read-write""
- value="usage="transactional"" />
-
- <property name="sybase.cfg.xml"
- value="${project.build.assembly.resources}/jbpm-jpdl-config/hibernate.cfg.sybase.xml" />
- <macro-disable file="${sybase.cfg.xml}" section="JDBC connection properties" />
- <macro-enable file="${sybase.cfg.xml}" section="DataSource properties" />
- <macro-enable file="${sybase.cfg.xml}" section="JTA transaction properties" />
- <macro-disable file="${sybase.cfg.xml}" section="Memory cache" />
- <macro-enable file="${sybase.cfg.xml}" section="Clustered cache" />
- <replace file="${sybase.cfg.xml}"
- token="usage="nonstrict-read-write""
- value="usage="transactional"" />
+ <macro-hibernate-cfg file="${project.build.assembly.dir}/config/hibernate.cfg.db2.xml"/>
+ <macro-hibernate-cfg file="${project.build.assembly.dir}/config/hibernate.cfg.mssql.xml"/>
+ <macro-hibernate-cfg file="${project.build.assembly.dir}/config/hibernate.cfg.mysql.xml"/>
+ <macro-hibernate-cfg file="${project.build.assembly.dir}/config/hibernate.cfg.oracle.xml"/>
+ <macro-hibernate-cfg file="${project.build.assembly.dir}/config/hibernate.cfg.postgresql.xml"/>
+ <macro-hibernate-cfg file="${project.build.assembly.dir}/config/hibernate.cfg.sybase.xml"/>
</target>
<!-- ================================================================== -->
<!-- Distribution -->
<!-- ================================================================== -->
<target name="process-resources"
- depends="configure-hibernate, reorganize-examples"
+ depends="process-hibernate-cfg, reorganize-examples"
description="prepares installer resources">
<copy todir="${resources.output.dir}" overwrite="true">
<fileset dir="${resources.dir}/installer" />
Modified: jbpm3/branches/jbpm-3.2-soa/modules/distribution/scripts/assembly-modules.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/distribution/scripts/assembly-modules.xml 2010-08-09 19:44:08 UTC (rev 6557)
+++ jbpm3/branches/jbpm-3.2-soa/modules/distribution/scripts/assembly-modules.xml 2010-08-10 08:03:43 UTC (rev 6558)
@@ -1,7 +1,15 @@
-<assembly 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/assembly-1.1.0-SNAPSHOT.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
- <id>deploy-artifacts</id>
+<!-- ====================================================================== -->
+<!-- jBPM: Workflow in Java -->
+<!-- -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at http://www.gnu.org. -->
+<!-- ====================================================================== -->
+
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+ <id>modules</id>
<formats>
<format>dir</format>
</formats>
@@ -9,90 +17,53 @@
<!-- Dependency Sets -->
<dependencySets>
-
<!-- lib -->
<dependencySet>
<outputDirectory>lib</outputDirectory>
<outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
- <useStrictFiltering>true</useStrictFiltering>
- <scope>compile</scope>
- <unpack>false</unpack>
- </dependencySet>
- <dependencySet>
- <outputDirectory>lib</outputDirectory>
- <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
- <useStrictFiltering>true</useStrictFiltering>
- <scope>provided</scope>
- <unpack>false</unpack>
- </dependencySet>
- <dependencySet>
- <outputDirectory>lib</outputDirectory>
- <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
- <useStrictFiltering>true</useStrictFiltering>
+ <useProjectArtifact>false</useProjectArtifact>
<scope>test</scope>
- <unpack>false</unpack>
</dependencySet>
-
- <!-- resources -->
+
+ <!-- config -->
<dependencySet>
- <outputDirectory>resources/jbpm-jpdl-config</outputDirectory>
- <useStrictFiltering>true</useStrictFiltering>
+ <outputDirectory>config</outputDirectory>
+ <useProjectArtifact>false</useProjectArtifact>
<includes>
<include>org.jbpm.jbpm3:jbpm-jpdl:jar:config</include>
</includes>
<unpack>true</unpack>
</dependencySet>
+
+ <!-- examples -->
<dependencySet>
- <outputDirectory>resources/jbpm-enterprise-config</outputDirectory>
- <useStrictFiltering>true</useStrictFiltering>
+ <outputDirectory>jbpm-examples</outputDirectory>
+ <useProjectArtifact>false</useProjectArtifact>
<includes>
- <include>org.jbpm.jbpm3:jbpm-enterprise:jar:config</include>
- </includes>
- <unpack>true</unpack>
- </dependencySet>
- <dependencySet>
- <outputDirectory>resources/jbpm-examples-dev</outputDirectory>
- <useStrictFiltering>true</useStrictFiltering>
- <includes>
<include>org.jbpm.jbpm3:jbpm-examples:jar:examples</include>
</includes>
<unpack>true</unpack>
</dependencySet>
-
+
<!-- sources -->
<dependencySet>
<!-- Must be called 'src' because the GPD has a dependency on it -->
<outputDirectory>src</outputDirectory>
<outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
- <useStrictFiltering>true</useStrictFiltering>
+ <useProjectArtifact>false</useProjectArtifact>
<includes>
- <include>org.jbpm.jbpm3:*:jar:sources</include>
+ <include>*:sources</include>
</includes>
- <unpack>false</unpack>
</dependencySet>
-
+
<!-- javadoc -->
<dependencySet>
<outputDirectory>javadoc</outputDirectory>
<outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
- <useStrictFiltering>true</useStrictFiltering>
+ <useProjectArtifact>false</useProjectArtifact>
<includes>
- <include>org.jbpm.jbpm3:*:jar:javadoc</include>
+ <include>*:javadoc</include>
</includes>
- <unpack>false</unpack>
</dependencySet>
</dependencySets>
-
- <fileSets>
- <!-- etc -->
- <fileSet>
- <directory>src/main/etc</directory>
- <outputDirectory>etc</outputDirectory>
- <includes>
- <include>JBossORG-EULA.txt</include>
- <include>release.notes.html</include>
- <include>version.info.xml</include>
- </includes>
- </fileSet>
- </fileSets>
</assembly>
Modified: jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/examples/module/pom.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/examples/module/pom.xml 2010-08-09 19:44:08 UTC (rev 6557)
+++ jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/examples/module/pom.xml 2010-08-10 08:03:43 UTC (rev 6558)
@@ -7,12 +7,10 @@
<!-- See terms of license at http://www.gnu.org. -->
<!-- ====================================================================== -->
-<!-- $Id$ -->
-
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
- <name>JBoss jBPM3 - Example: @example.name@</name>
+ <name>jBPM3 - Example: @example.name@</name>
<groupId>org.jbpm.jbpm3</groupId>
<artifactId>jbpm-example-(a)example.name@</artifactId>
<packaging>jar</packaging>
Modified: jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/examples/pom.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/examples/pom.xml 2010-08-09 19:44:08 UTC (rev 6557)
+++ jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/examples/pom.xml 2010-08-10 08:03:43 UTC (rev 6558)
@@ -7,12 +7,10 @@
<!-- See terms of license at http://www.gnu.org. -->
<!-- ====================================================================== -->
-<!-- $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 Examples</name>
+ <name>jBPM3 - Distribution Examples</name>
<groupId>org.jbpm.jbpm3</groupId>
<artifactId>jbpm-examples-dist</artifactId>
<packaging>pom</packaging>
Modified: jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/installer/download-helper.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/installer/download-helper.xml 2010-08-09 19:44:08 UTC (rev 6557)
+++ jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/installer/download-helper.xml 2010-08-10 08:03:43 UTC (rev 6558)
@@ -1,8 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- $Id$ -->
+<!-- ====================================================================== -->
+<!-- jBPM: Workflow in Java -->
+<!-- -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at http://www.gnu.org. -->
+<!-- ====================================================================== -->
+
<project name="download-helper">
-
<property name="jboss.version" value="4.2.3.GA" />
<property name="eclipse.release" value="galileo" />
<property name="eclipse.version" value="SR2" />
Modified: jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/installer/install-definition.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/installer/install-definition.xml 2010-08-09 19:44:08 UTC (rev 6557)
+++ jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/installer/install-definition.xml 2010-08-10 08:03:43 UTC (rev 6558)
@@ -17,8 +17,8 @@
</locale>
<!-- It is necessary to include everything needed, in this case ant itself -->
- <jar src="@{project.build.assemblyDirectory}/lib/ant.jar" stage="both" />
- <jar src="@{project.build.assemblyDirectory}/lib/ant-launcher.jar" stage="both" />
+ <jar src="@{assemblyDirectory}/lib/ant.jar" stage="both" />
+ <jar src="@{assemblyDirectory}/lib/ant-launcher.jar" stage="both" />
<!-- Setup the Ant Action Listener -->
<listeners>
@@ -27,11 +27,11 @@
<!-- Resources -->
<resources>
- <res id="TargetPanel.dir" src="@{resources.outputDirectory}/target-panel-dir.txt" />
- <res id="AntActionsSpec.xml" src="@{resources.outputDirectory}/ant-actions-spec.xml" />
- <res id="userInputSpec.xml" src="@{resources.outputDirectory}/user-input-spec.xml" />
- <res id="userInputLang.xml_eng" src="@{resources.outputDirectory}/user-input-lang_eng.xml" />
- <res id="userInputLang.xml_spa" src="@{resources.outputDirectory}/user-input-lang_spa.xml" />
+ <res id="TargetPanel.dir" src="@{project.build.outputDirectory}/target-panel-dir.txt" />
+ <res id="AntActionsSpec.xml" src="@{project.build.outputDirectory}/ant-actions-spec.xml" />
+ <res id="userInputSpec.xml" src="@{project.build.outputDirectory}/user-input-spec.xml" />
+ <res id="userInputLang.xml_eng" src="@{project.build.outputDirectory}/user-input-lang_eng.xml" />
+ <res id="userInputLang.xml_spa" src="@{project.build.outputDirectory}/user-input-lang_spa.xml" />
</resources>
<!-- Variables -->
@@ -126,16 +126,14 @@
<description>Standalone process engine and configuration files</description>
<!-- jbpm3/ -->
- <file src="@{project.build.assemblyDirectory}/etc/release.notes.html" targetdir="$INSTALL_PATH" />
- <file src="@{project.build.assemblyDirectory}/etc/JBossORG-EULA.txt" targetdir="$INSTALL_PATH" />
+ <file src="@{basedir}/src/main/etc/release.notes.html" targetdir="$INSTALL_PATH" />
+ <file src="@{basedir}/src/main/etc/JBossORG-EULA.txt" targetdir="$INSTALL_PATH" />
<!-- jbpm3/config -->
- <file src="@{project.build.assemblyDirectory}/lib/jbpm-jpdl-config.jar" targetdir="$INSTALL_PATH/config"
- unpack="true" />
- <file src="@{project.build.assemblyDirectory}/etc/version.info.xml" targetdir="$INSTALL_PATH/config" />
+ <fileset dir="@{assemblyDirectory}/config" targetdir="$INSTALL_PATH/config" />
<!-- jbpm3/database -->
- <file src="@{project.build.assemblyDirectory}/lib/jbpm-db.jar" targetdir="$INSTALL_PATH/database"
+ <file src="@{assemblyDirectory}/lib/jbpm-db.jar" targetdir="$INSTALL_PATH/database"
unpack="true" />
</pack>
@@ -143,12 +141,13 @@
<description>User guide and examples</description>
<!-- jbpm3/docs -->
- <file src="@{project.build.assemblyDirectory}/lib/jbpm-userguide.jdocbook" targetdir="$INSTALL_PATH/docs/userguide"
+ <file src="@{assemblyDirectory}/lib/jbpm-userguide.jdocbook"
+ targetdir="$INSTALL_PATH/docs/userguide"
unpack="true" />
- <fileset dir="@{project.build.assemblyDirectory}/javadoc" targetdir="$INSTALL_PATH/docs" />
+ <fileset dir="@{assemblyDirectory}/javadoc" targetdir="$INSTALL_PATH/docs" />
<!-- jbpm3/examples -->
- <fileset dir="@{project.build.assemblyDirectory}/resources/jbpm-examples-dist"
+ <fileset dir="@{assemblyDirectory}/examples"
targetdir="$INSTALL_PATH/examples" />
</pack>
@@ -157,13 +156,14 @@
useful to develop and test jBPM applications</description>
<!-- jbpm3/designer -->
- <fileset dir="@{project.build.assemblyDirectory}/lib" targetdir="$INSTALL_PATH/designer">
+ <fileset dir="@{assemblyDirectory}/lib" targetdir="$INSTALL_PATH/designer">
<include name="jbpm-jpdl-designer-site.zip" />
</fileset>
- <file src="@{project.build.assemblyDirectory}/etc/version.info.xml" targetdir="$INSTALL_PATH/src/resources/gpd" />
+ <file src="@{basedir}/src/main/etc/version.info.xml"
+ targetdir="$INSTALL_PATH/src/resources/gpd" />
<!-- jbpm3/lib -->
- <fileset dir="@{project.build.assemblyDirectory}/lib" targetdir="$INSTALL_PATH/lib">
+ <fileset dir="@{assemblyDirectory}/lib" targetdir="$INSTALL_PATH/lib">
<include name="antlr.jar" />
<include name="asm.jar" />
<include name="bsh.jar" />
@@ -183,7 +183,7 @@
</fileset>
<!-- jbpm3/src - Must be called 'src' because the GPD depends on it -->
- <fileset dir="@{project.build.assemblyDirectory}/src" targetdir="$INSTALL_PATH/src">
+ <fileset dir="@{assemblyDirectory}/src" targetdir="$INSTALL_PATH/src">
<include name="jsf-console-sources.jar" />
<include name="jbpm-jpdl-sources.jar" />
<include name="jbpm-enterprise-sources.jar" />
@@ -200,59 +200,59 @@
<description>Application server integration modules</description>
<!-- jbpm/jbpm-service.sar -->
- <fileset dir="@{project.build.assemblyDirectory}/resources/jbpm-enterprise-config"
+ <file src="@{assemblyDirectory}/lib/jbpm-enterprise-config.jar"
targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar"
- excludes="META-INF" />
- <fileset dir="@{project.build.assemblyDirectory}/lib"
+ unpack="true" />
+ <fileset dir="@{assemblyDirectory}/lib"
targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar">
<include name="jbpm-jpdl.jar" />
<include name="jbpm-identity.jar" />
</fileset>
- <file src="@{resources.directory}/service/jboss-service.xml"
+ <file src="@{resourcesDirectory}/service/jboss-service.xml"
targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar/META-INF" />
<file condition="isJBoss405"
- src="@{project.build.assemblyDirectory}/lib/hibernate-jbc-cacheprovider.jar"
+ src="@{assemblyDirectory}/lib/hibernate-jbc-cacheprovider.jar"
targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar" />
<file condition="isJBoss423"
- src="@{project.build.assemblyDirectory}/lib/hibernate-jbc-cacheprovider.jar"
+ src="@{assemblyDirectory}/lib/hibernate-jbc-cacheprovider.jar"
targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar" />
<!-- jbpm/jbpm-enterprise.jar -->
- <file src="@{project.build.assemblyDirectory}/lib/jbpm-enterprise.jar"
+ <file src="@{assemblyDirectory}/lib/jbpm-enterprise.jar"
targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-enterprise.jar"
unpack="true" />
<!-- jbpm/jbpm-userguide.war -->
- <file src="@{project.build.assemblyDirectory}/lib/jbpm-userguide.jdocbook"
+ <file src="@{assemblyDirectory}/lib/jbpm-userguide.jdocbook"
targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-userguide.war"
unpack="true" />
<!-- jbpm-mq-service.xml -->
- <file src="@{resources.directory}/destination/jbpm-mq-service.xml"
+ <file src="@{resourcesDirectory}/destination/jbpm-mq-service.xml"
targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy-hasingleton/jbpm"
condition="isJBoss405" />
- <file src="@{resources.directory}/destination/jbpm-mq-service.xml"
+ <file src="@{resourcesDirectory}/destination/jbpm-mq-service.xml"
targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy-hasingleton/jbpm"
condition="isJBoss423" />
<!-- jbpm-jbm-service.xml -->
- <file src="@{resources.directory}/destination/jbpm-jbm-service.xml"
+ <file src="@{resourcesDirectory}/destination/jbpm-jbm-service.xml"
targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm"
condition="isJBoss501" />
- <file src="@{resources.directory}/destination/jbpm-jbm-service.xml"
+ <file src="@{resourcesDirectory}/destination/jbpm-jbm-service.xml"
targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm"
condition="isJBoss510" />
<!-- jbpm-jbc1-service.xml -->
- <file src="@{resources.directory}/cache/jbpm-jbc1-service.xml"
+ <file src="@{resourcesDirectory}/cache/jbpm-jbc1-service.xml"
targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm"
condition="isJBoss405" />
- <file src="@{resources.directory}/cache/jbpm-jbc1-service.xml"
+ <file src="@{resourcesDirectory}/cache/jbpm-jbc1-service.xml"
targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm"
condition="isJBoss423" />
<!-- Database configs to docs/examples/jbpm -->
- <fileset dir="@{project.build.assemblyDirectory}/resources/jbpm-jpdl-config"
+ <fileset dir="@{assemblyDirectory}/config"
targetdir="${jbossInstallPath}/docs/examples/jbpm">
<include name="hibernate.cfg.db2.xml" />
<include name="hibernate.cfg.hsqldb.xml" />
@@ -272,66 +272,66 @@
<!-- Database DB2 -->
<file condition="isDB2"
- src="@{project.build.assemblyDirectory}/resources/jbpm-jpdl-config/jbpm-db2-ds.xml"
+ src="@{assemblyDirectory}/config/jbpm-db2-ds.xml"
targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm" />
<singlefile condition="isDB2"
- src="@{project.build.assemblyDirectory}/resources/jbpm-jpdl-config/hibernate.cfg.db2.xml"
+ src="@{assemblyDirectory}/config/hibernate.cfg.db2.xml"
target="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar/hibernate.cfg.xml" />
<!-- Database Hypersonic -->
<file condition="isHypersonic"
- src="@{project.build.assemblyDirectory}/resources/jbpm-jpdl-config/jbpm-hsqldb-ds.xml"
+ src="@{assemblyDirectory}/config/jbpm-hsqldb-ds.xml"
targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm" />
<singlefile condition="isHypersonic"
- src="@{project.build.assemblyDirectory}/resources/jbpm-jpdl-config/hibernate.cfg.hsqldb.xml"
+ src="@{assemblyDirectory}/config/hibernate.cfg.hsqldb.xml"
target="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar/hibernate.cfg.xml" />
- <fileset condition="isHypersonic" dir="@{resources.directory}/database"
+ <fileset condition="isHypersonic" dir="@{resourcesDirectory}/database"
targetdir="${jbossInstallPath}/server/${jbossTargetServer}/data">
<include name="hypersonic/jbpmDB.*" />
</fileset>
<!-- Database MSSQL -->
<file condition="isMSSQL"
- src="@{project.build.assemblyDirectory}/resources/jbpm-jpdl-config/jbpm-mssql-ds.xml"
+ src="@{assemblyDirectory}/config/jbpm-mssql-ds.xml"
targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm" />
<singlefile condition="isMSSQL"
- src="@{project.build.assemblyDirectory}/resources/jbpm-jpdl-config/hibernate.cfg.mssql.xml"
+ src="@{assemblyDirectory}/config/hibernate.cfg.mssql.xml"
target="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar/hibernate.cfg.xml" />
<!-- Database MySQL -->
<file condition="isMySQL"
- src="@{project.build.assemblyDirectory}/resources/jbpm-jpdl-config/jbpm-mysql-ds.xml"
+ src="@{assemblyDirectory}/config/jbpm-mysql-ds.xml"
targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm" />
<singlefile condition="isMySQL"
- src="@{project.build.assemblyDirectory}/resources/jbpm-jpdl-config/hibernate.cfg.mysql.xml"
+ src="@{assemblyDirectory}/config/hibernate.cfg.mysql.xml"
target="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar/hibernate.cfg.xml" />
- <file condition="isMySQL" src="@{project.build.assemblyDirectory}/lib/mysql-connector-java.jar"
+ <file condition="isMySQL" src="@{assemblyDirectory}/lib/mysql-connector-java.jar"
targetdir="${jbossInstallPath}/server/${jbossTargetServer}/lib" />
<!-- Database Oracle -->
<file condition="isOracle"
- src="@{project.build.assemblyDirectory}/resources/jbpm-jpdl-config/jbpm-oracle-ds.xml"
+ src="@{assemblyDirectory}/config/jbpm-oracle-ds.xml"
targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm" />
<singlefile condition="isOracle"
- src="@{project.build.assemblyDirectory}/resources/jbpm-jpdl-config/hibernate.cfg.oracle.xml"
+ src="@{assemblyDirectory}/config/hibernate.cfg.oracle.xml"
target="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar/hibernate.cfg.xml" />
<!-- Database PostgreSQL -->
<file condition="isPostgreSQL"
- src="@{project.build.assemblyDirectory}/resources/jbpm-jpdl-config/jbpm-postgresql-ds.xml"
+ src="@{assemblyDirectory}/config/jbpm-postgresql-ds.xml"
targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm" />
<singlefile condition="isPostgreSQL"
- src="@{project.build.assemblyDirectory}/resources/jbpm-jpdl-config/hibernate.cfg.postgresql.xml"
+ src="@{assemblyDirectory}/config/hibernate.cfg.postgresql.xml"
target="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar/hibernate.cfg.xml" />
- <file condition="isPostgreSQL" src="@{project.build.assemblyDirectory}/lib/postgresql.jar"
+ <file condition="isPostgreSQL" src="@{assemblyDirectory}/lib/postgresql.jar"
targetdir="${jbossInstallPath}/server/${jbossTargetServer}/lib" />
<!-- Database Sybase -->
<file condition="isSybase"
- src="@{project.build.assemblyDirectory}/resources/jbpm-jpdl-config/jbpm-sybase-ds.xml"
+ src="@{assemblyDirectory}/config/jbpm-sybase-ds.xml"
targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm" />
<singlefile condition="isSybase"
- src="@{project.build.assemblyDirectory}/resources/jbpm-jpdl-config/hibernate.cfg.sybase.xml"
+ src="@{assemblyDirectory}/config/hibernate.cfg.sybase.xml"
target="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar/hibernate.cfg.xml" />
</pack>
@@ -344,10 +344,10 @@
<description>Web console based on the Java Server Faces technology</description>
<!-- jbpm/jsf-console.war -->
- <file src="@{project.build.assemblyDirectory}/lib/jsf-console.war"
+ <file src="@{assemblyDirectory}/lib/jsf-console.war"
targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jsf-console.war"
unpack="true" />
- <file src="@{project.build.assemblyDirectory}/lib/gpd-deployer.war"
+ <file src="@{assemblyDirectory}/lib/gpd-deployer.war"
targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/gpd-deployer.war"
unpack="true" />
</pack>
@@ -365,14 +365,14 @@
<pack name="JBoss AS" parent="Optional Downloads" required="no" preselected="no">
<description>Download a suitable JBoss AS distribution</description>
<!-- http://jira.codehaus.org/browse/IZPACK-158 -->
- <file src="@{resources.directory}/installer/download-helper.xml"
+ <file src="@{resourcesDirectory}/installer/download-helper.xml"
targetdir="$INSTALL_PATH/uninstall" />
</pack>
<!-- Eclipse -->
<pack name="Eclipse" parent="Optional Downloads" required="no" preselected="no">
<description>Download a suitable Eclipse distribution</description>
- <file src="@{resources.directory}/installer/download-helper.xml"
+ <file src="@{resourcesDirectory}/installer/download-helper.xml"
targetdir="$INSTALL_PATH/uninstall" />
</pack>
</packs>
Modified: jbpm3/branches/jbpm-3.2-soa/modules/enterprise/pom.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/enterprise/pom.xml 2010-08-09 19:44:08 UTC (rev 6557)
+++ jbpm3/branches/jbpm-3.2-soa/modules/enterprise/pom.xml 2010-08-10 08:03:43 UTC (rev 6558)
@@ -10,7 +10,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</name>
+ <name>jBPM3 - Enterprise</name>
<groupId>org.jbpm.jbpm3</groupId>
<artifactId>jbpm-enterprise</artifactId>
<packaging>ejb</packaging>
Modified: jbpm3/branches/jbpm-3.2-soa/modules/enterprise/scripts/antrun-test-jars.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/enterprise/scripts/antrun-test-jars.xml 2010-08-09 19:44:08 UTC (rev 6557)
+++ jbpm3/branches/jbpm-3.2-soa/modules/enterprise/scripts/antrun-test-jars.xml 2010-08-10 08:03:43 UTC (rev 6558)
@@ -1,17 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- $Id$ -->
+<!-- ====================================================================== -->
+<!-- jBPM: Workflow in Java -->
+<!-- -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at http://www.gnu.org. -->
+<!-- ====================================================================== -->
-<project>
-
+<project name="test-jars">
<description>jBPM enterprise test archive builder</description>
- <!-- ================================================================== -->
- <!-- Building -->
- <!-- ================================================================== -->
-
<target name="build-test-jars" description="Build the test deployments">
-
<mkdir dir="${tests.output.dir}/test-libs" />
<!-- enterprise-test -->
@@ -25,9 +24,5 @@
<zip destfile="${tests.output.dir}/test-libs/fork-join-example.par">
<fileset dir="${tests.resources.dir}/deployment/fork-join-example" />
</zip>
-
- <!-- Please add alphabetically -->
-
</target>
-
</project>
Modified: jbpm3/branches/jbpm-3.2-soa/modules/examples/pom.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/examples/pom.xml 2010-08-09 19:44:08 UTC (rev 6557)
+++ jbpm3/branches/jbpm-3.2-soa/modules/examples/pom.xml 2010-08-10 08:03:43 UTC (rev 6558)
@@ -7,12 +7,10 @@
<!-- See terms of license at http://www.gnu.org. -->
<!-- ====================================================================== -->
-<!-- $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 - Examples</name>
+ <name>jBPM3 - Examples</name>
<groupId>org.jbpm.jbpm3</groupId>
<artifactId>jbpm-examples</artifactId>
<packaging>jar</packaging>
@@ -109,8 +107,6 @@
<goal>single</goal>
</goals>
<configuration>
- <finalName>${project.build.finalName}</finalName>
- <appendAssemblyId>true</appendAssemblyId>
<descriptors>
<descriptor>scripts/assembly-examples.xml</descriptor>
</descriptors>
Modified: jbpm3/branches/jbpm-3.2-soa/modules/examples/scripts/assembly-examples.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/examples/scripts/assembly-examples.xml 2010-08-09 19:44:08 UTC (rev 6557)
+++ jbpm3/branches/jbpm-3.2-soa/modules/examples/scripts/assembly-examples.xml 2010-08-10 08:03:43 UTC (rev 6558)
@@ -1,5 +1,15 @@
-<assembly 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/assembly-1.1.0-SNAPSHOT.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+
+ <!-- ====================================================================== -->
+ <!-- jBPM: Workflow in Java -->
+ <!-- -->
+ <!-- Distributable under LGPL license. -->
+ <!-- See terms of license at http://www.gnu.org. -->
+ <!-- ====================================================================== -->
+
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
<id>examples</id>
<formats>
<format>jar</format>
@@ -7,10 +17,7 @@
<includeBaseDirectory>false</includeBaseDirectory>
<fileSets>
<fileSet>
- <directory>.</directory>
- <outputDirectory>/</outputDirectory>
<includes>
- <include>scripts/*.xml</include>
<include>src/**</include>
<include>pom.xml</include>
</includes>
Modified: jbpm3/branches/jbpm-3.2-soa/modules/identity/pom.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/identity/pom.xml 2010-08-09 19:44:08 UTC (rev 6557)
+++ jbpm3/branches/jbpm-3.2-soa/modules/identity/pom.xml 2010-08-10 08:03:43 UTC (rev 6558)
@@ -7,12 +7,10 @@
<!-- See terms of license at http://www.gnu.org. -->
<!-- ====================================================================== -->
-<!-- $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 - Identity</name>
+ <name>jBPM3 - Identity</name>
<groupId>org.jbpm.jbpm3</groupId>
<artifactId>jbpm-identity</artifactId>
<packaging>jar</packaging>
Modified: jbpm3/branches/jbpm-3.2-soa/modules/simulation/pom.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/simulation/pom.xml 2010-08-09 19:44:08 UTC (rev 6557)
+++ jbpm3/branches/jbpm-3.2-soa/modules/simulation/pom.xml 2010-08-10 08:03:43 UTC (rev 6558)
@@ -7,12 +7,10 @@
<!-- See terms of license at http://www.gnu.org. -->
<!-- ====================================================================== -->
-<!-- $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 - Simulation</name>
+ <name>jBPM3 - Simulation</name>
<groupId>org.jbpm.jbpm3</groupId>
<artifactId>jbpm-simulation</artifactId>
<packaging>jar</packaging>
Modified: jbpm3/branches/jbpm-3.2-soa/modules/userguide/pom.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/userguide/pom.xml 2010-08-09 19:44:08 UTC (rev 6557)
+++ jbpm3/branches/jbpm-3.2-soa/modules/userguide/pom.xml 2010-08-10 08:03:43 UTC (rev 6558)
@@ -7,12 +7,10 @@
<!-- See terms of license at http://www.gnu.org. -->
<!-- ====================================================================== -->
-<!-- $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 - Userguide</name>
+ <name>jBPM3 - Reference Guide</name>
<groupId>org.jbpm.jbpm3</groupId>
<artifactId>jbpm-userguide</artifactId>
<packaging>jdocbook</packaging>
Modified: jbpm3/branches/jbpm-3.2-soa/pom.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/pom.xml 2010-08-09 19:44:08 UTC (rev 6557)
+++ jbpm3/branches/jbpm-3.2-soa/pom.xml 2010-08-10 08:03:43 UTC (rev 6558)
@@ -7,13 +7,10 @@
<!-- See terms of license at http://www.gnu.org. -->
<!-- ====================================================================== -->
-<!-- $Id: pom.xml 7412 2008-06-06 13:42:30Z thomas.diesler(a)jboss.com $ -->
-
<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</name>
+ <name>jBPM3</name>
<groupId>org.jbpm.jbpm3</groupId>
<artifactId>jbpm</artifactId>
<packaging>pom</packaging>
@@ -391,13 +388,6 @@
</systemProperties>
</configuration>
</plugin>
-
- <plugin>
- <artifactId>maven-release-plugin</artifactId>
- <configuration>
- <tagBase>https://svn.jboss.org/repos/jbpm/jbpm3/tags</tagBase>
- </configuration>
- </plugin>
</plugins>
<pluginManagement>
@@ -419,6 +409,10 @@
<artifactId>sql-maven-plugin</artifactId>
<version>1.4</version>
</plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2-beta-3</version>
+ </plugin>
</plugins>
</pluginManagement>
</build>
Modified: projects/jsf-console/branches/jsf-console-3.2-soa/console/pom.xml
===================================================================
--- projects/jsf-console/branches/jsf-console-3.2-soa/console/pom.xml 2010-08-09 19:44:08 UTC (rev 6557)
+++ projects/jsf-console/branches/jsf-console-3.2-soa/console/pom.xml 2010-08-10 08:03:43 UTC (rev 6558)
@@ -1,18 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
- <!-- ====================================================================== -->
- <!-- jBPM: Workflow in Java -->
- <!-- -->
- <!-- Distributable under LGPL license. -->
- <!-- See terms of license at http://www.gnu.org. -->
- <!-- ====================================================================== -->
+<!-- ====================================================================== -->
+<!-- jBPM: Workflow in Java -->
+<!-- -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at http://www.gnu.org. -->
+<!-- ====================================================================== -->
- <!-- $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 - Console</name>
+ <name>jBPM3 - Console</name>
<groupId>org.jbpm.jbpm3</groupId>
<artifactId>jsf-console</artifactId>
<packaging>war</packaging>
Modified: projects/jsf-console/branches/jsf-console-3.2-soa/gpd-deployer/pom.xml
===================================================================
--- projects/jsf-console/branches/jsf-console-3.2-soa/gpd-deployer/pom.xml 2010-08-09 19:44:08 UTC (rev 6557)
+++ projects/jsf-console/branches/jsf-console-3.2-soa/gpd-deployer/pom.xml 2010-08-10 08:03:43 UTC (rev 6558)
@@ -7,12 +7,10 @@
<!-- See terms of license at http://www.gnu.org. -->
<!-- ====================================================================== -->
-<!-- $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 - GPD Deployer</name>
+ <name>jBPM3 - GPD Deployer</name>
<groupId>org.jbpm.jbpm3</groupId>
<artifactId>gpd-deployer</artifactId>
<packaging>war</packaging>
Modified: projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/pom.xml
===================================================================
--- projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/pom.xml 2010-08-09 19:44:08 UTC (rev 6557)
+++ projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/pom.xml 2010-08-10 08:03:43 UTC (rev 6558)
@@ -7,12 +7,10 @@
<!-- See terms of license at http://www.gnu.org. -->
<!-- ====================================================================== -->
-<!-- $Id: pom.xml 2644 2008-10-28 13:15:01Z heiko.braun(a)jboss.com $ -->
-
<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 - 4JSF</name>
+ <name>jBPM3 - 4JSF</name>
<groupId>org.jbpm.jbpm3</groupId>
<artifactId>jsf-console-jbpm4jsf</artifactId>
<packaging>jar</packaging>
Modified: projects/jsf-console/branches/jsf-console-3.2-soa/pom.xml
===================================================================
--- projects/jsf-console/branches/jsf-console-3.2-soa/pom.xml 2010-08-09 19:44:08 UTC (rev 6557)
+++ projects/jsf-console/branches/jsf-console-3.2-soa/pom.xml 2010-08-10 08:03:43 UTC (rev 6558)
@@ -7,12 +7,10 @@
<!-- See terms of license at http://www.gnu.org. -->
<!-- ====================================================================== -->
-<!-- $Id: pom.xml 7412 2008-06-06 13:42:30Z thomas.diesler(a)jboss.com $ -->
-
<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</name>
+ <name>jBPM3</name>
<groupId>org.jbpm.jbpm3</groupId>
<artifactId>jsf-console-parent</artifactId>
<packaging>pom</packaging>
Modified: projects/jsf-console/branches/jsf-console-3.2-soa/soa/pom.xml
===================================================================
--- projects/jsf-console/branches/jsf-console-3.2-soa/soa/pom.xml 2010-08-09 19:44:08 UTC (rev 6557)
+++ projects/jsf-console/branches/jsf-console-3.2-soa/soa/pom.xml 2010-08-10 08:03:43 UTC (rev 6558)
@@ -7,12 +7,10 @@
<!-- See terms of license at http://www.gnu.org. -->
<!-- ====================================================================== -->
-<!-- $Id: pom.xml 3298 2008-12-09 21:33:53Z thomas.diesler(a)jboss.com $ -->
-
<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 - SOA Overlay</name>
+ <name>jBPM3 - SOA Overlay</name>
<groupId>org.jbpm.jbpm3</groupId>
<artifactId>soa-webapp</artifactId>
<packaging>war</packaging>
13 years, 10 months
JBoss JBPM SVN: r6557 - in jbpm3/branches/jbpm-3.2-soa/modules/userguide: src/main/docbook/en-US and 1 other directory.
by do-not-reply@jboss.org
Author: alex.guizar(a)jboss.com
Date: 2010-08-09 15:44:08 -0400 (Mon, 09 Aug 2010)
New Revision: 6557
Added:
jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/en-US/jBPM_Reference_Guide.ent
jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/en-US/jBPM_Reference_Guide.xml
Removed:
jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/en-US/JBPM_Reference_Guide.ent
jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/en-US/JBPM_Reference_Guide.xml
Modified:
jbpm3/branches/jbpm-3.2-soa/modules/userguide/pom.xml
jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/en-US/Author_Group.xml
jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/en-US/Book_Info.xml
jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/en-US/LGPL_Appendix.xml
jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/en-US/Preface.xml
jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/en-US/Revision_History.xml
jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/en-US/async.xml
jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/en-US/calendar.xml
jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/en-US/configuration.xml
jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/en-US/context.xml
jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/en-US/database.xml
jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/en-US/deployment.xml
jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/en-US/developers.xml
jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/en-US/enterprise.xml
jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/en-US/gettingstarted.xml
jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/en-US/introduction.xml
jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/en-US/jpdl.xml
jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/en-US/logging.xml
jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/en-US/mail.xml
jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/en-US/modelling.xml
jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/en-US/persistence.xml
jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/en-US/pluggable.xml
jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/en-US/scheduler.xml
jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/en-US/security.xml
jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/en-US/simulation.xml
jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/en-US/taskmgmt.xml
jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/en-US/tdd.xml
jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/en-US/tutorial.xml
Log:
JBPM-2866 fix userguide build broken by filename changes
Modified: jbpm3/branches/jbpm-3.2-soa/modules/userguide/pom.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/userguide/pom.xml 2010-08-09 17:22:14 UTC (rev 6556)
+++ jbpm3/branches/jbpm-3.2-soa/modules/userguide/pom.xml 2010-08-09 19:44:08 UTC (rev 6557)
@@ -29,18 +29,15 @@
<build>
<plugins>
<!--
- Maven JDocbook Plugin
- http://www.jboss.org/maven-jdocbook-plugin
-
- mvn jdocbook:generate
- mvn jdocbook:bundle
+ Maven JDocbook Plugin
+ http://www.jboss.org/maven-jdocbook-plugin
-->
<plugin>
<groupId>org.jboss.maven.plugins</groupId>
<artifactId>maven-jdocbook-plugin</artifactId>
<version>2.2.0</version>
<extensions>true</extensions>
-
+
<dependencies>
<dependency>
<groupId>org.jboss</groupId>
@@ -54,45 +51,39 @@
<type>jdocbook-style</type>
</dependency>
</dependencies>
-
+
<configuration>
- <options>
- <xincludeSupported>true</xincludeSupported>
- <xmlTransformerType>saxon</xmlTransformerType>
- <!-- needed for uri-resolvers; can be ommitted if using 'current' uri scheme -->
- <!-- could also locate the docbook dependency and inspect its version... -->
- <docbookVersion>1.72.0</docbookVersion>
- <transformerParameters>
- <property>
- <name>javax.xml.parsers.DocumentBuilderFactory</name>
- <value>org.apache.xerces.jaxp.DocumentBuilderFactoryImpl</value>
- </property>
- <property>
- <name>javax.xml.parsers.SAXParserFactory</name>
- <value>org.apache.xerces.jaxp.SAXParserFactoryImpl</value>
- </property>
- </transformerParameters>
-
- </options>
- <sourceDocumentName>jBPM_jPDL_User_Guide.xml</sourceDocumentName>
+ <options>
+ <xincludeSupported>true</xincludeSupported>
+ <xmlTransformerType>saxon</xmlTransformerType>
+ <!-- needed for uri-resolvers; can be ommitted if using 'current' uri scheme -->
+ <!-- could also locate the docbook dependency and inspect its version... -->
+ <docbookVersion>1.72.0</docbookVersion>
+ <transformerParameters>
+ <property>
+ <name>javax.xml.parsers.DocumentBuilderFactory</name>
+ <value>org.apache.xerces.jaxp.DocumentBuilderFactoryImpl</value>
+ </property>
+ <property>
+ <name>javax.xml.parsers.SAXParserFactory</name>
+ <value>org.apache.xerces.jaxp.SAXParserFactoryImpl</value>
+ </property>
+ </transformerParameters>
+ </options>
+
+ <sourceDocumentName>jBPM_Reference_Guide.xml</sourceDocumentName>
<imageResource>
<directory>${basedir}/src/main/docbook/en-US/</directory>
- <includes>
+ <includes>
<include>images/*</include>
-<!-- <include>**/*.jpg</include> -->
</includes>
- </imageResource>
+ </imageResource>
<formats>
- <format>
- <formatName>html_single</formatName>
- <stylesheetResource>classpath:/xslt/org/jboss/xhtml-single.xsl</stylesheetResource>
- <finalName>index.html</finalName>
- </format>
- <!-- <format>
- <formatName>html</formatName>
- <stylesheetResource>classpath:/xslt/org/jboss/xhtml.xsl</stylesheetResource>
- <finalName>index.html</finalName>
- </format> -->
+ <format>
+ <formatName>html_single</formatName>
+ <stylesheetResource>classpath:/xslt/org/jboss/xhtml-single.xsl</stylesheetResource>
+ <finalName>index.html</finalName>
+ </format>
</formats>
</configuration>
</plugin>
Modified: jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/en-US/Author_Group.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/en-US/Author_Group.xml 2010-08-09 17:22:14 UTC (rev 6556)
+++ jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/en-US/Author_Group.xml 2010-08-09 19:44:08 UTC (rev 6557)
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='utf-8' ?>
<!DOCTYPE authorgroup PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "jBPM_jPDL_User_Guide.ent">
+<!ENTITY % BOOK_ENTITIES SYSTEM "jBPM_Reference_Guide.ent">
%BOOK_ENTITIES;
]>
<authorgroup>
Modified: jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/en-US/Book_Info.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/en-US/Book_Info.xml 2010-08-09 17:22:14 UTC (rev 6556)
+++ jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/en-US/Book_Info.xml 2010-08-09 19:44:08 UTC (rev 6557)
@@ -3,7 +3,7 @@
<!ENTITY % BOOK_ENTITIES SYSTEM "jBPM_Reference_Guide.ent">
%BOOK_ENTITIES;
]>
-<bookinfo id="book-jBPM_jPDL_User_Guide-jBPM_jPDL_User_Guide">
+<bookinfo id="book-jBPM_Reference_Guide-jBPM_Reference_Guide">
<title>jBPM Reference Guide</title>
<subtitle>Guide to using and developing with jBPM 3</subtitle>
<productname>jBPM</productname>
Deleted: jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/en-US/JBPM_Reference_Guide.ent
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/en-US/JBPM_Reference_Guide.ent 2010-08-09 17:22:14 UTC (rev 6556)
+++ jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/en-US/JBPM_Reference_Guide.ent 2010-08-09 19:44:08 UTC (rev 6557)
@@ -1,4 +0,0 @@
-<!ENTITY PRODUCT "jBPM3">
-<!ENTITY BOOKID "jBPM_jPDL_User_Guide">
-<!ENTITY YEAR "2010">
-<!ENTITY HOLDER "The jBPM Project">
Deleted: jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/en-US/JBPM_Reference_Guide.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/en-US/JBPM_Reference_Guide.xml 2010-08-09 17:22:14 UTC (rev 6556)
+++ jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/en-US/JBPM_Reference_Guide.xml 2010-08-09 19:44:08 UTC (rev 6557)
@@ -1,35 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "jBPM_jPDL_User_Guide.ent">
-%BOOK_ENTITIES;
-]>
-<book>
- <xi:include href="Book_Info.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-<!-- <xi:include href="Preface.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> -->
-
- <xi:include href= "introduction.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="gettingstarted.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="tutorial.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="deployment.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="configuration.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="persistence.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="database.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="enterprise.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="modelling.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="context.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="taskmgmt.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="scheduler.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="async.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="calendar.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="mail.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="logging.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="jpdl.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="security.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="tdd.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="pluggable.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-
- <xi:include href="LGPL_Appendix.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="Revision_History.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-
-</book>
-
Modified: jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/en-US/LGPL_Appendix.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/en-US/LGPL_Appendix.xml 2010-08-09 17:22:14 UTC (rev 6556)
+++ jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/en-US/LGPL_Appendix.xml 2010-08-09 19:44:08 UTC (rev 6557)
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='utf-8' ?>
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "jBPM_jPDL_User_Guide.ent">
+<!ENTITY % BOOK_ENTITIES SYSTEM "jBPM_Reference_Guide.ent">
%BOOK_ENTITIES;
]>
<!-- this file stolen from http://www.gnu.org/copyleft/lesser.html -->
Modified: jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/en-US/Preface.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/en-US/Preface.xml 2010-08-09 17:22:14 UTC (rev 6556)
+++ jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/en-US/Preface.xml 2010-08-09 19:44:08 UTC (rev 6557)
@@ -1,9 +1,9 @@
<?xml version='1.0' encoding='utf-8' ?>
<!DOCTYPE preface PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "jBPM_jPDL_User_Guide.ent">
+<!ENTITY % BOOK_ENTITIES SYSTEM "jBPM_Reference_Guide.ent">
%BOOK_ENTITIES;
]>
-<preface id="pref-jBPM_jPDL_User_Guide-Preface">
+<preface id="pref-jBPM_Reference_Guide-Preface">
<title>Preface</title>
<xi:include href="Common_Content/Conventions.xml" xmlns:xi="http://www.w3.org/2001/XInclude">
<xi:fallback xmlns:xi="http://www.w3.org/2001/XInclude" />
Modified: jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/en-US/Revision_History.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/en-US/Revision_History.xml 2010-08-09 17:22:14 UTC (rev 6556)
+++ jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/en-US/Revision_History.xml 2010-08-09 19:44:08 UTC (rev 6557)
@@ -1,9 +1,9 @@
<?xml version='1.0' encoding='utf-8' ?>
<!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "jBPM_jPDL_User_Guide.ent">
+<!ENTITY % BOOK_ENTITIES SYSTEM "jBPM_Reference_Guide.ent">
%BOOK_ENTITIES;
]>
-<appendix id="appe-jBPM_jPDL_User_Guide-Revision_History">
+<appendix id="appe-jBPM_Reference_Guide-Revision_History">
<title>Revision History</title>
<simpara>
<revhistory>
Modified: jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/en-US/async.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/en-US/async.xml 2010-08-09 17:22:14 UTC (rev 6556)
+++ jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/en-US/async.xml 2010-08-09 19:44:08 UTC (rev 6557)
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='utf-8' ?>
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "jBPM_jPDL_User_Guide.ent">
+<!ENTITY % BOOK_ENTITIES SYSTEM "jBPM_Reference_Guide.ent">
%BOOK_ENTITIES;
]>
Modified: jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/en-US/calendar.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/en-US/calendar.xml 2010-08-09 17:22:14 UTC (rev 6556)
+++ jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/en-US/calendar.xml 2010-08-09 19:44:08 UTC (rev 6557)
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='utf-8' ?>
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "jBPM_jPDL_User_Guide.ent">
+<!ENTITY % BOOK_ENTITIES SYSTEM "jBPM_Reference_Guide.ent">
%BOOK_ENTITIES;
]>
Modified: jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/en-US/configuration.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/en-US/configuration.xml 2010-08-09 17:22:14 UTC (rev 6556)
+++ jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/en-US/configuration.xml 2010-08-09 19:44:08 UTC (rev 6557)
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='utf-8' ?>
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "jBPM_jPDL_User_Guide.ent">
+<!ENTITY % BOOK_ENTITIES SYSTEM "jBPM_Reference_Guide.ent">
%BOOK_ENTITIES;
]>
Modified: jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/en-US/context.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/en-US/context.xml 2010-08-09 17:22:14 UTC (rev 6556)
+++ jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/en-US/context.xml 2010-08-09 19:44:08 UTC (rev 6557)
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='utf-8' ?>
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "jBPM_jPDL_User_Guide.ent">
+<!ENTITY % BOOK_ENTITIES SYSTEM "jBPM_Reference_Guide.ent">
%BOOK_ENTITIES;
]>
Modified: jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/en-US/database.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/en-US/database.xml 2010-08-09 17:22:14 UTC (rev 6556)
+++ jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/en-US/database.xml 2010-08-09 19:44:08 UTC (rev 6557)
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='utf-8' ?>
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "jBPM_jPDL_User_Guide.ent">
+<!ENTITY % BOOK_ENTITIES SYSTEM "jBPM_Reference_Guide.ent">
%BOOK_ENTITIES;
]>
<chapter id="thejbpmdatabase">
Modified: jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/en-US/deployment.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/en-US/deployment.xml 2010-08-09 17:22:14 UTC (rev 6556)
+++ jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/en-US/deployment.xml 2010-08-09 19:44:08 UTC (rev 6557)
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='utf-8' ?>
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "jBPM_jPDL_User_Guide.ent">
+<!ENTITY % BOOK_ENTITIES SYSTEM "jBPM_Reference_Guide.ent">
%BOOK_ENTITIES;
]>
<chapter id="deployment">
Modified: jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/en-US/developers.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/en-US/developers.xml 2010-08-09 17:22:14 UTC (rev 6556)
+++ jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/en-US/developers.xml 2010-08-09 19:44:08 UTC (rev 6557)
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='utf-8' ?>
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "jBPM_jPDL_User_Guide.ent">
+<!ENTITY % BOOK_ENTITIES SYSTEM "jBPM_Reference_Guide.ent">
%BOOK_ENTITIES;
]>
<chapter id="developers">
Modified: jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/en-US/enterprise.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/en-US/enterprise.xml 2010-08-09 17:22:14 UTC (rev 6556)
+++ jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/en-US/enterprise.xml 2010-08-09 19:44:08 UTC (rev 6557)
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='utf-8' ?>
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "jBPM_jPDL_User_Guide.ent">
+<!ENTITY % BOOK_ENTITIES SYSTEM "jBPM_Reference_Guide.ent">
%BOOK_ENTITIES;
]>
<chapter id="enterprise">
Modified: jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/en-US/gettingstarted.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/en-US/gettingstarted.xml 2010-08-09 17:22:14 UTC (rev 6556)
+++ jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/en-US/gettingstarted.xml 2010-08-09 19:44:08 UTC (rev 6557)
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='utf-8' ?>
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "jBPM_jPDL_User_Guide.ent">
+<!ENTITY % BOOK_ENTITIES SYSTEM "jBPM_Reference_Guide.ent">
%BOOK_ENTITIES;
]>
<chapter id="gettingstarted">
Modified: jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/en-US/introduction.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/en-US/introduction.xml 2010-08-09 17:22:14 UTC (rev 6556)
+++ jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/en-US/introduction.xml 2010-08-09 19:44:08 UTC (rev 6557)
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='utf-8' ?>
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "jBPM_jPDL_User_Guide.ent">
+<!ENTITY % BOOK_ENTITIES SYSTEM "jBPM_Reference_Guide.ent">
%BOOK_ENTITIES;
]>
Copied: jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/en-US/jBPM_Reference_Guide.ent (from rev 6556, jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/en-US/JBPM_Reference_Guide.ent)
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/en-US/jBPM_Reference_Guide.ent (rev 0)
+++ jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/en-US/jBPM_Reference_Guide.ent 2010-08-09 19:44:08 UTC (rev 6557)
@@ -0,0 +1,4 @@
+<!ENTITY PRODUCT "jBPM3">
+<!ENTITY BOOKID "jBPM Reference Guide">
+<!ENTITY YEAR "2010">
+<!ENTITY HOLDER "The jBPM Project">
Copied: jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/en-US/jBPM_Reference_Guide.xml (from rev 6556, jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/en-US/JBPM_Reference_Guide.xml)
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/en-US/jBPM_Reference_Guide.xml (rev 0)
+++ jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/en-US/jBPM_Reference_Guide.xml 2010-08-09 19:44:08 UTC (rev 6557)
@@ -0,0 +1,36 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "jBPM_Reference_Guide.ent">
+%BOOK_ENTITIES;
+]>
+<book>
+ <xi:include href="Book_Info.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <!--
+ <xi:include href="Preface.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ -->
+
+ <xi:include href= "introduction.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="gettingstarted.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="tutorial.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="deployment.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="configuration.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="persistence.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="database.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="enterprise.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="modelling.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="context.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="taskmgmt.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="scheduler.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="async.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="calendar.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="mail.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="logging.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="jpdl.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="security.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="tdd.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="pluggable.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+
+ <xi:include href="LGPL_Appendix.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="Revision_History.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+</book>
Modified: jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/en-US/jpdl.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/en-US/jpdl.xml 2010-08-09 17:22:14 UTC (rev 6556)
+++ jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/en-US/jpdl.xml 2010-08-09 19:44:08 UTC (rev 6557)
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='utf-8' ?>
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "jBPM_jPDL_User_Guide.ent">
+<!ENTITY % BOOK_ENTITIES SYSTEM "jBPM_Reference_Guide.ent">
%BOOK_ENTITIES;
]>
Modified: jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/en-US/logging.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/en-US/logging.xml 2010-08-09 17:22:14 UTC (rev 6556)
+++ jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/en-US/logging.xml 2010-08-09 19:44:08 UTC (rev 6557)
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='utf-8' ?>
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "jBPM_jPDL_User_Guide.ent">
+<!ENTITY % BOOK_ENTITIES SYSTEM "jBPM_Reference_Guide.ent">
%BOOK_ENTITIES;
]>
Modified: jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/en-US/mail.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/en-US/mail.xml 2010-08-09 17:22:14 UTC (rev 6556)
+++ jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/en-US/mail.xml 2010-08-09 19:44:08 UTC (rev 6557)
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='utf-8' ?>
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "jBPM_jPDL_User_Guide.ent">
+<!ENTITY % BOOK_ENTITIES SYSTEM "jBPM_Reference_Guide.ent">
%BOOK_ENTITIES;
]>
Modified: jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/en-US/modelling.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/en-US/modelling.xml 2010-08-09 17:22:14 UTC (rev 6556)
+++ jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/en-US/modelling.xml 2010-08-09 19:44:08 UTC (rev 6557)
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='utf-8' ?>
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "jBPM_jPDL_User_Guide.ent">
+<!ENTITY % BOOK_ENTITIES SYSTEM "jBPM_Reference_Guide.ent">
%BOOK_ENTITIES;
]>
<chapter id="processmodelling">
Modified: jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/en-US/persistence.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/en-US/persistence.xml 2010-08-09 17:22:14 UTC (rev 6556)
+++ jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/en-US/persistence.xml 2010-08-09 19:44:08 UTC (rev 6557)
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='utf-8' ?>
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "jBPM_jPDL_User_Guide.ent">
+<!ENTITY % BOOK_ENTITIES SYSTEM "jBPM_Reference_Guide.ent">
%BOOK_ENTITIES;
]>
Modified: jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/en-US/pluggable.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/en-US/pluggable.xml 2010-08-09 17:22:14 UTC (rev 6556)
+++ jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/en-US/pluggable.xml 2010-08-09 19:44:08 UTC (rev 6557)
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='utf-8' ?>
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "jBPM_jPDL_User_Guide.ent">
+<!ENTITY % BOOK_ENTITIES SYSTEM "jBPM_Reference_Guide.ent">
%BOOK_ENTITIES;
]>
<chapter id="pluggable">
Modified: jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/en-US/scheduler.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/en-US/scheduler.xml 2010-08-09 17:22:14 UTC (rev 6556)
+++ jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/en-US/scheduler.xml 2010-08-09 19:44:08 UTC (rev 6557)
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='utf-8' ?>
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "jBPM_jPDL_User_Guide.ent">
+<!ENTITY % BOOK_ENTITIES SYSTEM "jBPM_Reference_Guide.ent">
%BOOK_ENTITIES;
]>
<chapter id="scheduler">
Modified: jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/en-US/security.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/en-US/security.xml 2010-08-09 17:22:14 UTC (rev 6556)
+++ jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/en-US/security.xml 2010-08-09 19:44:08 UTC (rev 6557)
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='utf-8' ?>
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "jBPM_jPDL_User_Guide.ent">
+<!ENTITY % BOOK_ENTITIES SYSTEM "jBPM_Reference_Guide.ent">
%BOOK_ENTITIES;
]>
<chapter id="security">
Modified: jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/en-US/simulation.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/en-US/simulation.xml 2010-08-09 17:22:14 UTC (rev 6556)
+++ jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/en-US/simulation.xml 2010-08-09 19:44:08 UTC (rev 6557)
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='utf-8' ?>
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "jBPM_jPDL_User_Guide.ent">
+<!ENTITY % BOOK_ENTITIES SYSTEM "jBPM_Reference_Guide.ent">
%BOOK_ENTITIES;
]>
<chapter id="simulation">
Modified: jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/en-US/taskmgmt.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/en-US/taskmgmt.xml 2010-08-09 17:22:14 UTC (rev 6556)
+++ jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/en-US/taskmgmt.xml 2010-08-09 19:44:08 UTC (rev 6557)
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='utf-8' ?>
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "jBPM_jPDL_User_Guide.ent">
+<!ENTITY % BOOK_ENTITIES SYSTEM "jBPM_Reference_Guide.ent">
%BOOK_ENTITIES;
]>
<chapter id="taskmanagement">
Modified: jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/en-US/tdd.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/en-US/tdd.xml 2010-08-09 17:22:14 UTC (rev 6556)
+++ jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/en-US/tdd.xml 2010-08-09 19:44:08 UTC (rev 6557)
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='utf-8' ?>
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "jBPM_jPDL_User_Guide.ent">
+<!ENTITY % BOOK_ENTITIES SYSTEM "jBPM_Reference_Guide.ent">
%BOOK_ENTITIES;
]>
Modified: jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/en-US/tutorial.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/en-US/tutorial.xml 2010-08-09 17:22:14 UTC (rev 6556)
+++ jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/en-US/tutorial.xml 2010-08-09 19:44:08 UTC (rev 6557)
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='utf-8' ?>
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "jBPM_jPDL_User_Guide.ent">
+<!ENTITY % BOOK_ENTITIES SYSTEM "jBPM_Reference_Guide.ent">
%BOOK_ENTITIES;
]>
<chapter id="tutorial">
13 years, 10 months
JBoss JBPM SVN: r6556 - in jbpm4/trunk/modules: pvm/src/main/java/org/jbpm/pvm/internal/job and 1 other directories.
by do-not-reply@jboss.org
Author: swiderski.maciej
Date: 2010-08-09 13:22:14 -0400 (Mon, 09 Aug 2010)
New Revision: 6556
Added:
jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/timer/StartProcessTimerTest.java
Modified:
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cal/Duration.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/job/TimerImpl.java
Log:
JBPM-2913: support for timer expressions on process level - event attached to process not an activity
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cal/Duration.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cal/Duration.java 2010-08-09 03:04:06 UTC (rev 6555)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cal/Duration.java 2010-08-09 17:22:14 UTC (rev 6556)
@@ -34,6 +34,7 @@
import org.jbpm.api.JbpmException;
import org.jbpm.pvm.internal.el.Expression;
import org.jbpm.pvm.internal.env.EnvironmentImpl;
+import org.jbpm.pvm.internal.model.ExecutionImpl;
import org.jbpm.pvm.internal.util.Clock;
/**
@@ -110,6 +111,10 @@
}
public static Date calculateDueDate(String durationExpression) {
+ return calculateDueDate(durationExpression, null);
+ }
+
+ public static Date calculateDueDate(String durationExpression, ExecutionImpl executionImpl) {
Date duedate = null;
if (durationExpression != null) {
@@ -120,7 +125,7 @@
if (durationExpression.startsWith("#")) {
String baseDateEL = durationExpression.substring(0, durationExpression.indexOf("}") + 1);
- Object result = Expression.create(baseDateEL).evaluate();
+ Object result = Expression.create(baseDateEL).evaluate(executionImpl);
if (result instanceof Date) {
baseDate = (Date) result;
@@ -132,7 +137,7 @@
if (endOfELIndex < (durationExpression.length() - 1)) {
throw new JbpmException("Invalid duedate, didnot support + or - in String type EL.");
}
- durationString = (String) Expression.create(durationExpression, null).evaluate((Execution) null);
+ durationString = (String) Expression.create(durationExpression, null).evaluate(executionImpl);
} else {
throw new JbpmException("Invalid basedate type: " + baseDateEL + " is of type "
+ result.getClass().getName()
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/job/TimerImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/job/TimerImpl.java 2010-08-09 03:04:06 UTC (rev 6555)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/job/TimerImpl.java 2010-08-09 17:22:14 UTC (rev 6556)
@@ -40,7 +40,7 @@
/**
* a runtime timer instance.
- *
+ *
* @author Tom Baeyens
* @author Pascal Verdage
* @author Alejandro Guizar
@@ -71,7 +71,7 @@
public void setDueDateDescription(String dueDateDescription) {
if (dueDateDescription != null) {
- dueDate = Duration.calculateDueDate(dueDateDescription);
+ dueDate = Duration.calculateDueDate(dueDateDescription, this.execution);
}
}
Added: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/timer/StartProcessTimerTest.java
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/timer/StartProcessTimerTest.java (rev 0)
+++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/timer/StartProcessTimerTest.java 2010-08-09 17:22:14 UTC (rev 6556)
@@ -0,0 +1,99 @@
+/*
+ * 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.test.timer;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.jbpm.api.ProcessInstance;
+import org.jbpm.api.job.Job;
+import org.jbpm.api.listener.EventListener;
+import org.jbpm.api.listener.EventListenerExecution;
+import org.jbpm.test.JbpmTestCase;
+
+/**
+ *
+ * @author Maciej Swiderski
+ *
+ */
+public class StartProcessTimerTest extends JbpmTestCase {
+
+
+
+ public void testTimerTimeout() {
+ deployJpdlXmlString(
+ "<process name='Insurance claim' key='ICL'>" +
+ " <on event='timeout'>" +
+ " <timer duedate='#{duedate}' />" +
+ " <event-listener class='" + MyCustomEvent.class.getName() + "' />" +
+ " </on>" +
+ " <start>" +
+ " <transition to='a' />" +
+ " </start>" +
+ " <state name='a'>" +
+ " <transition to='b' />" +
+ " <on event='timeout'>" +
+ " <timer duedate='#{du!
edate}' />" +
+ " <event-listener class='" + MyCustom!
Event.cl
ass.getName() + "' />" +
+ " </on>" +
+ " </state>" +
+ " <state name='b' >" +
+ " <transition to='escalate' />" +
+ " </state>" +
+ " <end name='escalate' />" +
+ "</process>"
+ );
+ Map<String, String> variables = new HashMap<String, String>();
+ variables.put("duedate", "24 business minutes");
+ ProcessInstance processInstance = executionService.startProcessInstanceByKey("ICL", variables, "82436");
+
+ List<Job> job = managementService.createJobQuery()
+ .processInstanceId(processInstance.getId())
+ .list();
+
+ assertEquals(2, job.size());
+
+ managementService.executeJob(job.get(0).getId());
+
+ managementService.executeJob(job.get(1).getId());
+
+ String executionId = processInstance.findActiveExecutionIn("a").getId();
+
+ processInstance = executionService.signalExecutionById(executionId);
+ executionService.signalExecutionById(processInstance.getId());
+
+ assertProcessInstanceE!
nded(processInstance);
+ }
+
+ public static class MyCustomEvent implements EventListener {
+
+ private static final long serialVersionUID = 1L;
+
+ static int nrOfTimesCalled;
+
+ public void notify(EventListenerExecution execution) throws Exception {
+ nrOfTimesCalled++;
+ }
+ }
+
+}
\ No newline at end of file
13 years, 10 months
JBoss JBPM SVN: r6555 - jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/en-US.
by do-not-reply@jboss.org
Author: dlesage
Date: 2010-08-08 23:04:06 -0400 (Sun, 08 Aug 2010)
New Revision: 6555
Modified:
jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/en-US/Book_Info.xml
Log:
Minor Fixes
Modified: jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/en-US/Book_Info.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/en-US/Book_Info.xml 2010-08-09 01:30:03 UTC (rev 6554)
+++ jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/en-US/Book_Info.xml 2010-08-09 03:04:06 UTC (rev 6555)
@@ -1,10 +1,10 @@
<?xml version='1.0' encoding='utf-8' ?>
<!DOCTYPE bookinfo PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "jBPM_jPDL_User_Guide.ent">
+<!ENTITY % BOOK_ENTITIES SYSTEM "jBPM_Reference_Guide.ent">
%BOOK_ENTITIES;
]>
<bookinfo id="book-jBPM_jPDL_User_Guide-jBPM_jPDL_User_Guide">
- <title>jBPM User Guide</title>
+ <title>jBPM Reference Guide</title>
<subtitle>Guide to using and developing with jBPM 3</subtitle>
<productname>jBPM</productname>
<productnumber>3.2.10</productnumber>
13 years, 10 months