February 2009 - jbpm-commits - Jboss List Archives

JBoss JBPM SVN: r3748 - in jbpm3/branches/jbpm-3.2.5.SP/hudson/hudson-home/jobs: jBPM3-Container-Matrix and 1 other directories.

by do-not-reply＠jboss.org

Author: thomas.diesler(a)jboss.com Date: 2009-02-03 05:25:17 -0500 (Tue, 03 Feb 2009) New Revision: 3748 Added: jbpm3/branches/jbpm-3.2.5.SP/hudson/hudson-home/jobs/jBPM3-Container-Matrix/ jbpm3/branches/jbpm-3.2.5.SP/hudson/hudson-home/jobs/jBPM3-Container-Matrix/config.xml jbpm3/branches/jbpm-3.2.5.SP/hudson/hudson-home/jobs/jBPM3-Database-Matrix/ jbpm3/branches/jbpm-3.2.5.SP/hudson/hudson-home/jobs/jBPM3-Database-Matrix/config.xml Removed: jbpm3/branches/jbpm-3.2.5.SP/hudson/hudson-home/jobs/jBPM3-Container-Matrix/config.xml jbpm3/branches/jbpm-3.2.5.SP/hudson/hudson-home/jobs/jBPM3-Database-Matrix/config.xml jbpm3/branches/jbpm-3.2.5.SP/hudson/hudson-home/jobs/jBPM3-Matrix/ jbpm3/branches/jbpm-3.2.5.SP/hudson/hudson-home/jobs/jBPM3-ShortMatrix/ Log: Move to two dimensional test matricies Copied: jbpm3/branches/jbpm-3.2.5.SP/hudson/hudson-home/jobs/jBPM3-Container-Matrix (from rev 3728, jbpm3/trunk/hudson/hudson-home/jobs/jBPM3-Container-Matrix) Property changes on: jbpm3/branches/jbpm-3.2.5.SP/hudson/hudson-home/jobs/jBPM3-Container-Matrix ___________________________________________________________________ Name: svn:mergeinfo + Deleted: jbpm3/branches/jbpm-3.2.5.SP/hudson/hudson-home/jobs/jBPM3-Container-Matrix/config.xml =================================================================== --- jbpm3/trunk/hudson/hudson-home/jobs/jBPM3-Container-Matrix/config.xml 2009-01-29 04:23:29 UTC (rev 3728) +++ jbpm3/branches/jbpm-3.2.5.SP/hudson/hudson-home/jobs/jBPM3-Container-Matrix/config.xml 2009-02-03 10:25:17 UTC (rev 3748) @@ -1,92 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<matrix-project> - <actions class="java.util.concurrent.CopyOnWriteArrayList"/> - <description>Build and test the @version.id@ Container Matrix</description> - <logRotator> - <daysToKeep>60</daysToKeep> - <numToKeep>-1</numToKeep> - </logRotator> - <keepDependencies>false</keepDependencies> - <properties> - <hudson.security.AuthorizationMatrixProperty/> - </properties> - <scm class="hudson.scm.SubversionSCM"> - <locations> - <hudson.scm.SubversionSCM_-ModuleLocation> - <remote>@hudson.jbpm.url@</remote> - <local>jbpm</local> - </hudson.scm.SubversionSCM_-ModuleLocation> - </locations> - <useUpdate>true</useUpdate> - <browser class="hudson.scm.browsers.FishEyeSVN"> - <url>http://fisheye.jboss.com/browse/JbpmSvn/</url> - <rootModule></rootModule> - </browser> - </scm> - <canRoam>true</canRoam> - <disabled>false</disabled> - <triggers class="vector"> - <hudson.triggers.TimerTrigger> - <spec>0 0 * * *</spec> - </hudson.triggers.TimerTrigger> - </triggers> - <axes> - <axis> - <name>container</name> - <values> - <string>jboss422</string> - <string>jboss423</string> - <string>jboss500</string> - </values> - </axis> - <axis> - <name>database</name> - <values> - <string>hsqldb</string> - <string>mysql</string> - </values> - </axis> - <axis> - <name>jdk</name> - <values> - <string>jdk1.5</string> - <string>jdk1.6</string> - </values> - </axis> - </axes> - <builders> - <hudson.tasks.Shell> - <command> -WORKSPACE=`pwd` -JBPMDIR=$WORKSPACE/jbpm - -export CONTAINER=$container -export DATABASE=$database - -export HUDSON_BASE=(a)hudson.base@ -export JBPM_VERSION=(a)version.id@ -export JBOSS_SERVER=(a)jboss.server.instance@ -export JBOSS_BINDADDR=(a)jboss.bind.address@ - -# copy the maven profile -cp @hudson.maven.profile@ $JBPMDIR/profiles.xml - -# -# call command.sh -# -/bin/sh $JBPMDIR/hudson/hudson-home/command.sh - </command> - </hudson.tasks.Shell> - </builders> - <publishers class="vector"> - <hudson.tasks.junit.JUnitResultArchiver> - <testResults>jbpm/modules/**/target/surefire-reports/TEST-*.xml</testResults> - </hudson.tasks.junit.JUnitResultArchiver> - <hudson.tasks.Mailer> - <recipients>@hudson.mail.recipients@</recipients> - <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild> - <sendToIndividuals>true</sendToIndividuals> - </hudson.tasks.Mailer> - </publishers> - <buildWrappers/> -</matrix-project> Copied: jbpm3/branches/jbpm-3.2.5.SP/hudson/hudson-home/jobs/jBPM3-Container-Matrix/config.xml (from rev 3728, jbpm3/trunk/hudson/hudson-home/jobs/jBPM3-Container-Matrix/config.xml) =================================================================== --- jbpm3/branches/jbpm-3.2.5.SP/hudson/hudson-home/jobs/jBPM3-Container-Matrix/config.xml (rev 0) +++ jbpm3/branches/jbpm-3.2.5.SP/hudson/hudson-home/jobs/jBPM3-Container-Matrix/config.xml 2009-02-03 10:25:17 UTC (rev 3748) @@ -0,0 +1,92 @@ +<?xml version='1.0' encoding='UTF-8'?> +<matrix-project> + <actions class="java.util.concurrent.CopyOnWriteArrayList"/> + <description>Build and test the @version.id@ Container Matrix</description> + <logRotator> + <daysToKeep>60</daysToKeep> + <numToKeep>-1</numToKeep> + </logRotator> + <keepDependencies>false</keepDependencies> + <properties> + <hudson.security.AuthorizationMatrixProperty/> + </properties> + <scm class="hudson.scm.SubversionSCM"> + <locations> + <hudson.scm.SubversionSCM_-ModuleLocation> + <remote>@hudson.jbpm.url@</remote> + <local>jbpm</local> + </hudson.scm.SubversionSCM_-ModuleLocation> + </locations> + <useUpdate>true</useUpdate> + <browser class="hudson.scm.browsers.FishEyeSVN"> + <url>http://fisheye.jboss.com/browse/JbpmSvn/</url> + <rootModule></rootModule> + </browser> + </scm> + <canRoam>true</canRoam> + <disabled>false</disabled> + <triggers class="vector"> + <hudson.triggers.TimerTrigger> + <spec>0 0 * * *</spec> + </hudson.triggers.TimerTrigger> + </triggers> + <axes> + <axis> + <name>container</name> + <values> + <string>jboss422</string> + <string>jboss423</string> + <string>jboss500</string> + </values> + </axis> + <axis> + <name>database</name> + <values> + <string>hsqldb</string> + <string>mysql</string> + </values> + </axis> + <axis> + <name>jdk</name> + <values> + <string>jdk1.5</string> + <string>jdk1.6</string> + </values> + </axis> + </axes> + <builders> + <hudson.tasks.Shell> + <command> +WORKSPACE=`pwd` +JBPMDIR=$WORKSPACE/jbpm + +export CONTAINER=$container +export DATABASE=$database + +export HUDSON_BASE=(a)hudson.base@ +export JBPM_VERSION=(a)version.id@ +export JBOSS_SERVER=(a)jboss.server.instance@ +export JBOSS_BINDADDR=(a)jboss.bind.address@ + +# copy the maven profile +cp @hudson.maven.profile@ $JBPMDIR/profiles.xml + +# +# call command.sh +# +/bin/sh $JBPMDIR/hudson/hudson-home/command.sh + </command> + </hudson.tasks.Shell> + </builders> + <publishers class="vector"> + <hudson.tasks.junit.JUnitResultArchiver> + <testResults>jbpm/modules/**/target/surefire-reports/TEST-*.xml</testResults> + </hudson.tasks.junit.JUnitResultArchiver> + <hudson.tasks.Mailer> + <recipients>@hudson.mail.recipients@</recipients> + <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild> + <sendToIndividuals>true</sendToIndividuals> + </hudson.tasks.Mailer> + </publishers> + <buildWrappers/> +</matrix-project> Copied: jbpm3/branches/jbpm-3.2.5.SP/hudson/hudson-home/jobs/jBPM3-Database-Matrix (from rev 3728, jbpm3/trunk/hudson/hudson-home/jobs/jBPM3-Database-Matrix) Property changes on: jbpm3/branches/jbpm-3.2.5.SP/hudson/hudson-home/jobs/jBPM3-Database-Matrix ___________________________________________________________________ Name: svn:mergeinfo + Deleted: jbpm3/branches/jbpm-3.2.5.SP/hudson/hudson-home/jobs/jBPM3-Database-Matrix/config.xml =================================================================== --- jbpm3/trunk/hudson/hudson-home/jobs/jBPM3-Database-Matrix/config.xml 2009-01-29 04:23:29 UTC (rev 3728) +++ jbpm3/branches/jbpm-3.2.5.SP/hudson/hudson-home/jobs/jBPM3-Database-Matrix/config.xml 2009-02-03 10:25:17 UTC (rev 3748) @@ -1,92 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<matrix-project> - <actions class="java.util.concurrent.CopyOnWriteArrayList"/> - <description>Build and test the @version.id@ Database Matrix on JBoss-4.2.2.GA</description> - <logRotator> - <daysToKeep>60</daysToKeep> - <numToKeep>-1</numToKeep> - </logRotator> - <keepDependencies>false</keepDependencies> - <properties> - <hudson.security.AuthorizationMatrixProperty/> - </properties> - <scm class="hudson.scm.SubversionSCM"> - <locations> - <hudson.scm.SubversionSCM_-ModuleLocation> - <remote>@hudson.jbpm.url@</remote> - <local>jbpm</local> - </hudson.scm.SubversionSCM_-ModuleLocation> - </locations> - <useUpdate>true</useUpdate> - <browser class="hudson.scm.browsers.FishEyeSVN"> - <url>http://fisheye.jboss.com/browse/JbpmSvn/</url> - <rootModule></rootModule> - </browser> - </scm> - <canRoam>true</canRoam> - <disabled>false</disabled> - <triggers class="vector"> - <hudson.triggers.TimerTrigger> - <spec>0 4 * * *</spec> - </hudson.triggers.TimerTrigger> - </triggers> - <axes> - <axis> - <name>container</name> - <values> - <string>jboss422</string> - </values> - </axis> - <axis> - <name>database</name> - <values> - <string>hsqldb</string> - <string>mysql</string> - <string>postgresql</string> - <string>sybase</string> - </values> - </axis> - <axis> - <name>jdk</name> - <values> - <string>jdk1.5</string> - <string>jdk1.6</string> - </values> - </axis> - </axes> - <builders> - <hudson.tasks.Shell> - <command> -WORKSPACE=`pwd` -JBPMDIR=$WORKSPACE/jbpm - -export CONTAINER=$container -export DATABASE=$database - -export HUDSON_BASE=(a)hudson.base@ -export JBPM_VERSION=(a)version.id@ -export JBOSS_SERVER=(a)jboss.server.instance@ -export JBOSS_BINDADDR=(a)jboss.bind.address@ - -# copy the maven profile -cp @hudson.maven.profile@ $JBPMDIR/profiles.xml - -# -# call command.sh -# -/bin/sh $JBPMDIR/hudson/hudson-home/command.sh - </command> - </hudson.tasks.Shell> - </builders> - <publishers class="vector"> - <hudson.tasks.junit.JUnitResultArchiver> - <testResults>jbpm/modules/**/target/surefire-reports/TEST-*.xml</testResults> - </hudson.tasks.junit.JUnitResultArchiver> - <hudson.tasks.Mailer> - <recipients>@hudson.mail.recipients@</recipients> - <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild> - <sendToIndividuals>true</sendToIndividuals> - </hudson.tasks.Mailer> - </publishers> - <buildWrappers/> -</matrix-project> Copied: jbpm3/branches/jbpm-3.2.5.SP/hudson/hudson-home/jobs/jBPM3-Database-Matrix/config.xml (from rev 3728, jbpm3/trunk/hudson/hudson-home/jobs/jBPM3-Database-Matrix/config.xml) =================================================================== --- jbpm3/branches/jbpm-3.2.5.SP/hudson/hudson-home/jobs/jBPM3-Database-Matrix/config.xml (rev 0) +++ jbpm3/branches/jbpm-3.2.5.SP/hudson/hudson-home/jobs/jBPM3-Database-Matrix/config.xml 2009-02-03 10:25:17 UTC (rev 3748) @@ -0,0 +1,92 @@ +<?xml version='1.0' encoding='UTF-8'?> +<matrix-project> + <actions class="java.util.concurrent.CopyOnWriteArrayList"/> + <description>Build and test the @version.id@ Database Matrix on JBoss-4.2.2.GA</description> + <logRotator> + <daysToKeep>60</daysToKeep> + <numToKeep>-1</numToKeep> + </logRotator> + <keepDependencies>false</keepDependencies> + <properties> + <hudson.security.AuthorizationMatrixProperty/> + </properties> + <scm class="hudson.scm.SubversionSCM"> + <locations> + <hudson.scm.SubversionSCM_-ModuleLocation> + <remote>@hudson.jbpm.url@</remote> + <local>jbpm</local> + </hudson.scm.SubversionSCM_-ModuleLocation> + </locations> + <useUpdate>true</useUpdate> + <browser class="hudson.scm.browsers.FishEyeSVN"> + <url>http://fisheye.jboss.com/browse/JbpmSvn/</url> + <rootModule></rootModule> + </browser> + </scm> + <canRoam>true</canRoam> + <disabled>false</disabled> + <triggers class="vector"> + <hudson.triggers.TimerTrigger> + <spec>0 4 * * *</spec> + </hudson.triggers.TimerTrigger> + </triggers> + <axes> + <axis> + <name>container</name> + <values> + <string>jboss422</string> + </values> + </axis> + <axis> + <name>database</name> + <values> + <string>hsqldb</string> + <string>mysql</string> + <string>postgresql</string> + <string>sybase</string> + </values> + </axis> + <axis> + <name>jdk</name> + <values> + <string>jdk1.5</string> + <string>jdk1.6</string> + </values> + </axis> + </axes> + <builders> + <hudson.tasks.Shell> + <command> +WORKSPACE=`pwd` +JBPMDIR=$WORKSPACE/jbpm + +export CONTAINER=$container +export DATABASE=$database + +export HUDSON_BASE=(a)hudson.base@ +export JBPM_VERSION=(a)version.id@ +export JBOSS_SERVER=(a)jboss.server.instance@ +export JBOSS_BINDADDR=(a)jboss.bind.address@ + +# copy the maven profile +cp @hudson.maven.profile@ $JBPMDIR/profiles.xml + +# +# call command.sh +# +/bin/sh $JBPMDIR/hudson/hudson-home/command.sh + </command> + </hudson.tasks.Shell> + </builders> + <publishers class="vector"> + <hudson.tasks.junit.JUnitResultArchiver> + <testResults>jbpm/modules/**/target/surefire-reports/TEST-*.xml</testResults> + </hudson.tasks.junit.JUnitResultArchiver> + <hudson.tasks.Mailer> + <recipients>@hudson.mail.recipients@</recipients> + <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild> + <sendToIndividuals>true</sendToIndividuals> + </hudson.tasks.Mailer> + </publishers> + <buildWrappers/> +</matrix-project>

15 years, 4 months

1
0
0 / 0

JBoss JBPM SVN: r3747 - jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/java/org/jbpm/persistence/jta.

by do-not-reply＠jboss.org

Author: thomas.diesler(a)jboss.com Date: 2009-02-03 05:22:21 -0500 (Tue, 03 Feb 2009) New Revision: 3747 Modified: jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/java/org/jbpm/persistence/jta/JtaDbPersistenceService.java Log: [JBPM-1988] throw JbpmPersistenceException from JtaDbPersistenceService Modified: jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/java/org/jbpm/persistence/jta/JtaDbPersistenceService.java =================================================================== --- jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/java/org/jbpm/persistence/jta/JtaDbPersistenceService.java 2009-02-03 10:17:31 UTC (rev 3746) +++ jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/java/org/jbpm/persistence/jta/JtaDbPersistenceService.java 2009-02-03 10:22:21 UTC (rev 3747) @@ -29,6 +29,7 @@ import org.hibernate.engine.SessionFactoryImplementor; import org.hibernate.util.JTAHelper; import org.jbpm.JbpmException; +import org.jbpm.persistence.JbpmPersistenceException; import org.jbpm.persistence.db.DbPersistenceService; public class JtaDbPersistenceService extends DbPersistenceService { @@ -85,14 +86,14 @@ try { userTransaction.rollback(); } catch (Exception e) { - throw new JbpmException("couldn't rollback user transaction", e); + throw new JbpmPersistenceException("couldn't rollback user transaction", e); } } else { log.debug("committing user transaction"); try { userTransaction.commit(); } catch (Exception e) { - throw new JbpmException("couldn't commit user transaction", e); + throw new JbpmPersistenceException("couldn't commit user transaction", e); } } } @@ -101,7 +102,7 @@ try { return userTransaction.getStatus(); } catch (SystemException e) { - throw new JbpmException("couldn't get status for user transaction", e); + throw new JbpmPersistenceException("couldn't get status for user transaction", e); } }

15 years, 4 months

1
0
0 / 0

JBoss JBPM SVN: r3746 - in jbpm3/branches/jbpm-3.2.5.SP/modules/core: src/main/java/org/jbpm/graph/node and 1 other directory.

by do-not-reply＠jboss.org

Author: thomas.diesler(a)jboss.com Date: 2009-02-03 05:17:31 -0500 (Tue, 03 Feb 2009) New Revision: 3746 Modified: jbpm3/branches/jbpm-3.2.5.SP/modules/core/pom.xml jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/java/org/jbpm/graph/node/Join.java Log: [JBPM-1991] change default parentLockMode from FORCE to UPGRADE Modified: jbpm3/branches/jbpm-3.2.5.SP/modules/core/pom.xml =================================================================== --- jbpm3/branches/jbpm-3.2.5.SP/modules/core/pom.xml 2009-02-03 10:12:31 UTC (rev 3745) +++ jbpm3/branches/jbpm-3.2.5.SP/modules/core/pom.xml 2009-02-03 10:17:31 UTC (rev 3746) @@ -306,8 +306,6 @@ <artifactId>maven-surefire-plugin</artifactId> <configuration> <excludes> -  - <exclude>org/jbpm/jpdl/exe/JoinExecutionDbTest.java</exclude>  <exclude>org/jbpm/db/JbpmSchemaDbTest.java</exclude> </excludes> Modified: jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/java/org/jbpm/graph/node/Join.java =================================================================== --- jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/java/org/jbpm/graph/node/Join.java 2009-02-03 10:12:31 UTC (rev 3745) +++ jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/java/org/jbpm/graph/node/Join.java 2009-02-03 10:17:31 UTC (rev 3746) @@ -43,7 +43,7 @@ /** * specifies wether what type of hibernate lock should be acquired. - * null value defaults to LockMode.FORCE + * null value defaults to LockMode.UPGRADE */ String parentLockMode; @@ -120,8 +120,9 @@ JbpmContext jbpmContext = executionContext.getJbpmContext(); Session session = (jbpmContext!=null ? jbpmContext.getSession() : null); if (session!=null) { - // force version increment by default (LockMode.FORCE) - LockMode lockMode = parentLockMode != null ? LockMode.parse(parentLockMode) : LockMode.FORCE; + // obtain update lock by default (LockMode.UPGRADE) + LockMode lockMode = parentLockMode != null ? LockMode.parse(parentLockMode) + : LockMode.UPGRADE; log.debug("acquiring " + lockMode + " lock on " + parentToken); // lock updates as appropriate, no need to flush here session.lock(parentToken, lockMode);

15 years, 4 months

1
0
0 / 0

JBoss JBPM SVN: r3745 - jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/java/org/jbpm/job/executor.

by do-not-reply＠jboss.org

Author: thomas.diesler(a)jboss.com Date: 2009-02-03 05:12:31 -0500 (Tue, 03 Feb 2009) New Revision: 3745 Modified: jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/java/org/jbpm/job/executor/JobExecutor.java Log: [JBPM-1989] Null Pointer Exception in jBPM JobExecutor on server shutdown Modified: jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/java/org/jbpm/job/executor/JobExecutor.java =================================================================== --- jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/java/org/jbpm/job/executor/JobExecutor.java 2009-02-03 09:57:00 UTC (rev 3744) +++ jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/java/org/jbpm/job/executor/JobExecutor.java 2009-02-03 10:12:31 UTC (rev 3745) @@ -16,7 +16,8 @@ import org.apache.commons.logging.LogFactory; import org.jbpm.JbpmConfiguration; -public class JobExecutor implements Serializable { +public class JobExecutor implements Serializable +{ private static final long serialVersionUID = 1L; @@ -39,204 +40,255 @@ protected static String hostName; - public synchronized void start() { - if (! isStarted) { - log.debug("starting thread group '"+name+"'..."); - for (int i=0; i<nbrOfThreads; i++) { + public synchronized void start() + { + if (!isStarted) + { + log.debug("starting thread group '" + name + "'..."); + for (int i = 0; i < nbrOfThreads; i++) + { startThread(); } lockMonitorThread = new LockMonitorThread(jbpmConfiguration, lockMonitorInterval, maxLockTime, lockBufferTime); isStarted = true; - } else { - log.debug("ignoring start: thread group '"+name+"' is already started'"); } + else + { + log.debug("ignoring start: thread group '" + name + "' is already started'"); + } } - - /** - * signals to all threads in this job executor to stop. It may be that - * threads are in the middle of something and they will finish that firts. - * Use {@link #stopAndJoin()} in case you want a method that blocks until - * all the threads are actually finished. - * @return a list of all the stopped threads. In case no threads were stopped - * an empty list will be returned. + + /* + * signals to all threads in this job executor to stop. It may be that threads are in the middle of something and they will finish that firts. Use {@link + * #stopAndJoin()} in case you want a method that blocks until all the threads are actually finished. + * @return a list of all the stopped threads. In case no threads were stopped an empty list will be returned. */ - public synchronized List stop() { + public synchronized List stop() + { List stoppedThreads = new ArrayList(threads.size()); - if (isStarted) { - log.debug("stopping thread group '"+name+"'..."); - for (int i=0; i<nbrOfThreads; i++) { + if (isStarted) + { + log.debug("stopping thread group '" + name + "'..."); + for (int i = 0; i < nbrOfThreads; i++) + { stoppedThreads.add(stopThread()); } - lockMonitorThread.deactivate(); + if (lockMonitorThread != null) + lockMonitorThread.deactivate(); isStarted = false; - } else { - log.debug("ignoring stop: thread group '"+name+"' not started"); } + else + { + log.debug("ignoring stop: thread group '" + name + "' not started"); + } return stoppedThreads; } - public void stopAndJoin() throws InterruptedException { + public void stopAndJoin() throws InterruptedException + { Iterator iter = stop().iterator(); - while (iter.hasNext()) { - Thread thread = (Thread) iter.next(); + while (iter.hasNext()) + { + Thread thread = (Thread)iter.next(); thread.join(); } - lockMonitorThread.join(); + if (lockMonitorThread != null) + lockMonitorThread.join(); } - protected synchronized void startThread() { + protected synchronized void startThread() + { String threadName = getNextThreadName(); Thread thread = createThread(threadName); threads.put(threadName, thread); - log.debug("starting new job executor thread '"+threadName+"'"); + log.debug("starting new job executor thread '" + threadName + "'"); thread.start(); } - protected Thread createThread(String threadName) { + protected Thread createThread(String threadName) + { return new JobExecutorThread(threadName, this, jbpmConfiguration, idleInterval, maxIdleInterval, maxLockTime, historyMaxSize); } - protected String getNextThreadName() { - return getThreadName(threads.size()+1); + protected String getNextThreadName() + { + return getThreadName(threads.size() + 1); } - protected String getLastThreadName() { + + protected String getLastThreadName() + { return getThreadName(threads.size()); } - - private String getThreadName(int index) { + + private String getThreadName(int index) + { return name + ":" + getHostName() + ":" + index; } - private static String getHostName() { - if (hostName == null) { - try { + private static String getHostName() + { + if (hostName == null) + { + try + { hostName = InetAddress.getLocalHost().getHostAddress(); - } catch (UnknownHostException e) { + } + catch (UnknownHostException e) + { hostName = "127.0.0.1"; - } + } } return hostName; } - protected synchronized Thread stopThread() { + protected synchronized Thread stopThread() + { String threadName = getLastThreadName(); - JobExecutorThread thread = (JobExecutorThread) threads.remove(threadName); - log.debug("removing job executor thread '"+threadName+"'"); + JobExecutorThread thread = (JobExecutorThread)threads.remove(threadName); + log.debug("removing job executor thread '" + threadName + "'"); thread.deactivate(); return thread; } - public void setMonitoredJobIds(Map monitoredJobIds) { - this.monitoredJobIds = monitoredJobIds; - } - - public Set getMonitoredJobIds() { + public void setMonitoredJobIds(Map monitoredJobIds) + { + this.monitoredJobIds = monitoredJobIds; + } + + public Set getMonitoredJobIds() + { return new HashSet(monitoredJobIds.values()); } - - public void addMonitoredJobId(String threadName, long jobId) { + + public void addMonitoredJobId(String threadName, long jobId) + { monitoredJobIds.put(threadName, new Long(jobId)); } - - public void removeMonitoredJobId(String threadName) { + + public void removeMonitoredJobId(String threadName) + { monitoredJobIds.remove(threadName); } - public void setHistoryMaxSize(int historyMaxSize) { - this.historyMaxSize = historyMaxSize; - } - - public int getHistoryMaxSize() { + public void setHistoryMaxSize(int historyMaxSize) + { + this.historyMaxSize = historyMaxSize; + } + + public int getHistoryMaxSize() + { return historyMaxSize; } - - public void setIdleInterval(int idleInterval) { - this.idleInterval = idleInterval; + + public void setIdleInterval(int idleInterval) + { + this.idleInterval = idleInterval; } - - public int getIdleInterval() { + + public int getIdleInterval() + { return idleInterval; } - - public void setStarted(boolean isStarted) { - this.isStarted = isStarted; + + public void setStarted(boolean isStarted) + { + this.isStarted = isStarted; } - - public boolean isStarted() { + + public boolean isStarted() + { return isStarted; } - - public void setJbpmConfiguration(JbpmConfiguration jbpmConfiguration) { - this.jbpmConfiguration = jbpmConfiguration; - } - - public JbpmConfiguration getJbpmConfiguration() { + + public void setJbpmConfiguration(JbpmConfiguration jbpmConfiguration) + { + this.jbpmConfiguration = jbpmConfiguration; + } + + public JbpmConfiguration getJbpmConfiguration() + { return jbpmConfiguration; } - - public void setMaxIdleInterval(int maxIdleInterval) { - this.maxIdleInterval = maxIdleInterval; - } - - public int getMaxIdleInterval() { + + public void setMaxIdleInterval(int maxIdleInterval) + { + this.maxIdleInterval = maxIdleInterval; + } + + public int getMaxIdleInterval() + { return maxIdleInterval; } - - public void setName(String name) { - this.name = name; + + public void setName(String name) + { + this.name = name; } - - public String getName() { + + public String getName() + { return name; } - - public void setSize(int nbrOfThreads) { - this.nbrOfThreads = nbrOfThreads; + + public void setSize(int nbrOfThreads) + { + this.nbrOfThreads = nbrOfThreads; } - - public int getSize() { + + public int getSize() + { return nbrOfThreads; } - - public void setThreads(Map threads) { - this.threads = threads; + + public void setThreads(Map threads) + { + this.threads = threads; } - - public Map getThreads() { + + public Map getThreads() + { return threads; } - - public void setMaxLockTime(int maxLockTime) { - this.maxLockTime = maxLockTime; + + public void setMaxLockTime(int maxLockTime) + { + this.maxLockTime = maxLockTime; } - - public int getMaxLockTime() { + + public int getMaxLockTime() + { return maxLockTime; } - - public void setLockBufferTime(int lockBufferTime) { - this.lockBufferTime = lockBufferTime; + + public void setLockBufferTime(int lockBufferTime) + { + this.lockBufferTime = lockBufferTime; } - - public int getLockBufferTime() { + + public int getLockBufferTime() + { return lockBufferTime; } - - public void setLockMonitorInterval(int lockMonitorInterval) { - this.lockMonitorInterval = lockMonitorInterval; + + public void setLockMonitorInterval(int lockMonitorInterval) + { + this.lockMonitorInterval = lockMonitorInterval; } - - public int getLockMonitorInterval() { + + public int getLockMonitorInterval() + { return lockMonitorInterval; } - - public void setNbrOfThreads(int nbrOfThreads) { - this.nbrOfThreads = nbrOfThreads; + + public void setNbrOfThreads(int nbrOfThreads) + { + this.nbrOfThreads = nbrOfThreads; } - - public int getNbrOfThreads() { + + public int getNbrOfThreads() + { return nbrOfThreads; } - + private static Log log = LogFactory.getLog(JobExecutor.class); }

15 years, 4 months

1
0
0 / 0

JBoss JBPM SVN: r3744 - in jbpm3/branches/jbpm-3.2.5.SP: modules/core and 8 other directories.

by do-not-reply＠jboss.org

Author: thomas.diesler(a)jboss.com Date: 2009-02-03 04:57:00 -0500 (Tue, 03 Feb 2009) New Revision: 3744 Modified: jbpm3/branches/jbpm-3.2.5.SP/modules/core/pom.xml jbpm3/branches/jbpm-3.2.5.SP/modules/db/pom.xml jbpm3/branches/jbpm-3.2.5.SP/modules/distribution/pom.xml jbpm3/branches/jbpm-3.2.5.SP/modules/enterprise/pom.xml jbpm3/branches/jbpm-3.2.5.SP/modules/examples/pom.xml jbpm3/branches/jbpm-3.2.5.SP/modules/identity/pom.xml jbpm3/branches/jbpm-3.2.5.SP/modules/integration/pom.xml jbpm3/branches/jbpm-3.2.5.SP/modules/simulation/pom.xml jbpm3/branches/jbpm-3.2.5.SP/modules/userguide/pom.xml jbpm3/branches/jbpm-3.2.5.SP/pom.xml Log: version=3.2.5.SP1 Modified: jbpm3/branches/jbpm-3.2.5.SP/modules/core/pom.xml =================================================================== --- jbpm3/branches/jbpm-3.2.5.SP/modules/core/pom.xml 2009-02-03 09:37:36 UTC (rev 3743) +++ jbpm3/branches/jbpm-3.2.5.SP/modules/core/pom.xml 2009-02-03 09:57:00 UTC (rev 3744) @@ -23,7 +23,7 @@ <parent> <groupId>org.jbpm.jbpm3</groupId> <artifactId>jbpm</artifactId> - <version>3.2.5.GA</version> + <version>3.2.5.SP1</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: jbpm3/branches/jbpm-3.2.5.SP/modules/db/pom.xml =================================================================== --- jbpm3/branches/jbpm-3.2.5.SP/modules/db/pom.xml 2009-02-03 09:37:36 UTC (rev 3743) +++ jbpm3/branches/jbpm-3.2.5.SP/modules/db/pom.xml 2009-02-03 09:57:00 UTC (rev 3744) @@ -24,7 +24,7 @@ <parent> <groupId>org.jbpm.jbpm3</groupId> <artifactId>jbpm</artifactId> - <version>3.2.5.GA</version> + <version>3.2.5.SP1</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: jbpm3/branches/jbpm-3.2.5.SP/modules/distribution/pom.xml =================================================================== --- jbpm3/branches/jbpm-3.2.5.SP/modules/distribution/pom.xml 2009-02-03 09:37:36 UTC (rev 3743) +++ jbpm3/branches/jbpm-3.2.5.SP/modules/distribution/pom.xml 2009-02-03 09:57:00 UTC (rev 3744) @@ -21,7 +21,7 @@ <parent> <groupId>org.jbpm.jbpm3</groupId> <artifactId>jbpm</artifactId> - <version>3.2.5.GA</version> + <version>3.2.5.SP1</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: jbpm3/branches/jbpm-3.2.5.SP/modules/enterprise/pom.xml =================================================================== --- jbpm3/branches/jbpm-3.2.5.SP/modules/enterprise/pom.xml 2009-02-03 09:37:36 UTC (rev 3743) +++ jbpm3/branches/jbpm-3.2.5.SP/modules/enterprise/pom.xml 2009-02-03 09:57:00 UTC (rev 3744) @@ -22,7 +22,7 @@ <parent> <groupId>org.jbpm.jbpm3</groupId> <artifactId>jbpm</artifactId> - <version>3.2.5.GA</version> + <version>3.2.5.SP1</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: jbpm3/branches/jbpm-3.2.5.SP/modules/examples/pom.xml =================================================================== --- jbpm3/branches/jbpm-3.2.5.SP/modules/examples/pom.xml 2009-02-03 09:37:36 UTC (rev 3743) +++ jbpm3/branches/jbpm-3.2.5.SP/modules/examples/pom.xml 2009-02-03 09:57:00 UTC (rev 3744) @@ -24,7 +24,7 @@ <parent> <groupId>org.jbpm.jbpm3</groupId> <artifactId>jbpm</artifactId> - <version>3.2.5.GA</version> + <version>3.2.5.SP1</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: jbpm3/branches/jbpm-3.2.5.SP/modules/identity/pom.xml =================================================================== --- jbpm3/branches/jbpm-3.2.5.SP/modules/identity/pom.xml 2009-02-03 09:37:36 UTC (rev 3743) +++ jbpm3/branches/jbpm-3.2.5.SP/modules/identity/pom.xml 2009-02-03 09:57:00 UTC (rev 3744) @@ -22,7 +22,7 @@ <parent> <groupId>org.jbpm.jbpm3</groupId> <artifactId>jbpm</artifactId> - <version>3.2.5.GA</version> + <version>3.2.5.SP1</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: jbpm3/branches/jbpm-3.2.5.SP/modules/integration/pom.xml =================================================================== --- jbpm3/branches/jbpm-3.2.5.SP/modules/integration/pom.xml 2009-02-03 09:37:36 UTC (rev 3743) +++ jbpm3/branches/jbpm-3.2.5.SP/modules/integration/pom.xml 2009-02-03 09:57:00 UTC (rev 3744) @@ -24,7 +24,7 @@ <parent> <groupId>org.jbpm.jbpm3</groupId> <artifactId>jbpm</artifactId> - <version>3.2.5.GA</version> + <version>3.2.5.SP1</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: jbpm3/branches/jbpm-3.2.5.SP/modules/simulation/pom.xml =================================================================== --- jbpm3/branches/jbpm-3.2.5.SP/modules/simulation/pom.xml 2009-02-03 09:37:36 UTC (rev 3743) +++ jbpm3/branches/jbpm-3.2.5.SP/modules/simulation/pom.xml 2009-02-03 09:57:00 UTC (rev 3744) @@ -21,7 +21,7 @@ <parent> <groupId>org.jbpm.jbpm3</groupId> <artifactId>jbpm</artifactId> - <version>3.2.5.GA</version> + <version>3.2.5.SP1</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: jbpm3/branches/jbpm-3.2.5.SP/modules/userguide/pom.xml =================================================================== --- jbpm3/branches/jbpm-3.2.5.SP/modules/userguide/pom.xml 2009-02-03 09:37:36 UTC (rev 3743) +++ jbpm3/branches/jbpm-3.2.5.SP/modules/userguide/pom.xml 2009-02-03 09:57:00 UTC (rev 3744) @@ -24,7 +24,7 @@ <parent> <groupId>org.jbpm.jbpm3</groupId> <artifactId>jbpm</artifactId> - <version>3.2.5.GA</version> + <version>3.2.5.SP1</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: jbpm3/branches/jbpm-3.2.5.SP/pom.xml =================================================================== --- jbpm3/branches/jbpm-3.2.5.SP/pom.xml 2009-02-03 09:37:36 UTC (rev 3743) +++ jbpm3/branches/jbpm-3.2.5.SP/pom.xml 2009-02-03 09:57:00 UTC (rev 3744) @@ -16,7 +16,7 @@ <groupId>org.jbpm.jbpm3</groupId> <artifactId>jbpm</artifactId> <packaging>pom</packaging> - <version>3.2.5.GA</version> + <version>3.2.5.SP1</version>  <parent> @@ -56,7 +56,6 @@ <drools.version>4.0.7</drools.version> <dumbster.version>1.6</dumbster.version> <hibernate.version>3.2.6.ga</hibernate.version> - <hibernate.annotations.version>3.2.5.GA</hibernate.annotations.version> <hibernate.validator.version>3.0.0.ga</hibernate.validator.version> <izpack.version>4.1.0</izpack.version> <jasper.reports.version>3.0.0</jasper.reports.version> @@ -309,11 +308,6 @@ </dependency> <dependency> <groupId>org.hibernate</groupId> - <artifactId>hibernate-annotations</artifactId> - <version>${hibernate.annotations.version}</version> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> <artifactId>hibernate-validator</artifactId> <version>${hibernate.validator.version}</version> </dependency>

15 years, 4 months

1
0
0 / 0

JBoss JBPM SVN: r3743 - jbpm3/branches.

by do-not-reply＠jboss.org

Author: thomas.diesler(a)jboss.com Date: 2009-02-03 04:37:36 -0500 (Tue, 03 Feb 2009) New Revision: 3743 Added: jbpm3/branches/jbpm-3.2.5.SP/ Log: Create service branch jbpm-3.2.5.SP Copied: jbpm3/branches/jbpm-3.2.5.SP (from rev 3742, jbpm3/tags/jbpm-3.2.5.GA)

15 years, 4 months

1
0
0 / 0

JBoss JBPM SVN: r3742 - jbpm3/trunk/modules/core/src/main/java/org/jbpm/jpdl/xml.

by do-not-reply＠jboss.org

Author: camunda Date: 2009-02-03 02:52:46 -0500 (Tue, 03 Feb 2009) New Revision: 3742 Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/jpdl/xml/JpdlXmlReader.java Log: JBPM-2008: used configured "create-timer" actions for "timer" Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/jpdl/xml/JpdlXmlReader.java =================================================================== --- jbpm3/trunk/modules/core/src/main/java/org/jbpm/jpdl/xml/JpdlXmlReader.java 2009-02-02 16:14:21 UTC (rev 3741) +++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/jpdl/xml/JpdlXmlReader.java 2009-02-03 07:52:46 UTC (rev 3742) @@ -542,17 +542,55 @@ String name = timerElement.attributeValue("name", node.getName()); if (name == null) name = generateTimerName(); - CreateTimerAction createTimerAction = new CreateTimerAction(); + CreateTimerAction createTimerAction = instantiateCreateTimerAction(); createTimerAction.read(timerElement, this); createTimerAction.setTimerName(name); createTimerAction.setTimerAction(readSingleAction(timerElement)); addAction(node, Event.EVENTTYPE_NODE_ENTER, createTimerAction); - CancelTimerAction cancelTimerAction = new CancelTimerAction(); + CancelTimerAction cancelTimerAction = instantiateCancelTimerAction(); cancelTimerAction.setTimerName(name); addAction(node, Event.EVENTTYPE_NODE_LEAVE, cancelTimerAction); } + /** + * instantiate {@link CreateTimerAction} object from configured + * class in action.types.xml (if configured). If not the default + * jbpm class is used. + */ + private CreateTimerAction instantiateCreateTimerAction() + { + if (ActionTypes.hasActionName("create-timer")) { + Class actionType = ActionTypes.getActionType("create-timer"); + try { + return (CreateTimerAction)actionType.newInstance(); + } catch (Exception e) { + log.error("couldn't instantiate 'create-timer' action of type '"+actionType.getName()+"'. Using default CreateTimerAction.", e); + } + } + // default + return new CreateTimerAction(); + } + + /** + * instantiate {@link CancelTimerAction} object from configured + * class in action.types.xml (if configured). If not the default + * jbpm class is used. + */ + private CancelTimerAction instantiateCancelTimerAction() + { + if (ActionTypes.hasActionName("cancel-timer")) { + Class actionType = ActionTypes.getActionType("cancel-timer"); + try { + return (CancelTimerAction)actionType.newInstance(); + } catch (Exception e) { + log.error("couldn't instantiate 'cancel-timer' action of type '"+actionType.getName()+"'. Using default CancelTimerAction.", e); + } + } + // default + return new CancelTimerAction(); + } + private String generateTimerName() { return "timer-" + (timerNumber++); } @@ -573,7 +611,7 @@ String name = timerElement.attributeValue("name", task.getName()); if (name==null) name = generateTimerName(); - CreateTimerAction createTimerAction = new CreateTimerAction(); + CreateTimerAction createTimerAction = instantiateCreateTimerAction(); createTimerAction.read(timerElement, this); createTimerAction.setTimerName(name); Action action = null; @@ -602,7 +640,7 @@ } for (String cancelEventType : cancelEventTypes) { - CancelTimerAction cancelTimerAction = new CancelTimerAction(); + CancelTimerAction cancelTimerAction = instantiateCancelTimerAction(); cancelTimerAction.setTimerName(name); addAction(task, cancelEventType, cancelTimerAction); }

15 years, 4 months

1
0
0 / 0

JBoss JBPM SVN: r3741 - in jbpm4/trunk/modules/db: src/main/ant and 1 other directories.

by do-not-reply＠jboss.org

Author: heiko.braun(a)jboss.com Date: 2009-02-02 11:14:21 -0500 (Mon, 02 Feb 2009) New Revision: 3741 Removed: jbpm4/trunk/modules/db/src/main/resources/db.properties/ jbpm4/trunk/modules/db/src/main/resources/hibernate.cfg.xml Modified: jbpm4/trunk/modules/db/pom.xml jbpm4/trunk/modules/db/src/main/ant/build.schema.xml Log: Restore DB schema generation scripts and module Modified: jbpm4/trunk/modules/db/pom.xml =================================================================== --- jbpm4/trunk/modules/db/pom.xml 2009-02-02 14:27:18 UTC (rev 3740) +++ jbpm4/trunk/modules/db/pom.xml 2009-02-02 16:14:21 UTC (rev 3741) @@ -24,12 +24,12 @@ <version>4.0.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> - +  <dependencies> <dependency> <groupId>org.jbpm.jbpm4</groupId> - <artifactId>jbpm-api</artifactId> + <artifactId>jbpm-jpdl</artifactId> <version>${version}</version> </dependency> <dependency> @@ -37,28 +37,42 @@ <artifactId>jbpm-test-base</artifactId> <version>${version}</version> </dependency> - <dependency> - <groupId>org.jbpm.jbpm4</groupId> - <artifactId>jbpm-jpdl</artifactId> - <version>${version}</version> - </dependency> - <dependency> - <groupId>org.jbpm.jbpm4</groupId> - <artifactId>jbpm-pvm</artifactId> - <version>${version}</version> - </dependency> </dependencies> - +  <build> <resources> <resource> - <directory>src/main/resources</directory> + <directory>src/main/resources</directory> <filtering>true</filtering> </resource> </resources> <plugins> <plugin> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <id>unpack.jbpm.db</id> + <phase>generate-resources</phase> + <goals> + <goal>unpack</goal> + </goals> + <configuration> + <artifactItems> + <artifactItem> + <groupId>org.jbpm.jbpm4</groupId> + <artifactId>jbpm-jpdl</artifactId> + <classifier>config</classifier> + <overWrite>true</overWrite> + </artifactItem> + </artifactItems> + <excludeTransitive>true</excludeTransitive> + <outputDirectory>target/jpdl-config</outputDirectory> + </configuration> + </execution> + </executions> + </plugin> + <plugin> <artifactId>maven-antrun-plugin</artifactId> <executions> <execution> @@ -78,5 +92,5 @@ </plugin> </plugins> </build> - + </project> \ No newline at end of file Modified: jbpm4/trunk/modules/db/src/main/ant/build.schema.xml =================================================================== --- jbpm4/trunk/modules/db/src/main/ant/build.schema.xml 2009-02-02 14:27:18 UTC (rev 3740) +++ jbpm4/trunk/modules/db/src/main/ant/build.schema.xml 2009-02-02 16:14:21 UTC (rev 3741) @@ -16,56 +16,56 @@ <target name="create-schema"> <echo message="${maven.runtime.classpath}"/> - + <taskdef name="schemaexport" - classname="org.hibernate.tool.hbm2ddl.SchemaExportTask"> + classname="org.hibernate.tool.hbm2ddl.SchemaExportTask"> <classpath path="${maven.runtime.classpath}"/> </taskdef> - - <property name="cfg" value="src/main/resources/hibernate.cfg.xml" /> <mkdir dir="target/classes/create"/> <mkdir dir="target/classes/drop"/> - <schemaexport properties="src/main/resources/db.properties/hsqldb.properties" - output="target/classes/create/jbpm.hsqldb.create.sql" - create="yes" drop="no" config="${cfg}" text="yes" /> - <schemaexport properties="src/main/resources/db.properties/hsqldb.properties" - output="target/classes/drop/jbpm.hsqldb.drop.sql" - create="no" drop="yes" config="${cfg}" text="yes" /> +  + <schemaexport output="target/classes/create/jbpm.hsqldb.create.sql" + create="yes" drop="no" + config="target/jpdl-config/hibernate.cfg.hsqldb.xml" text="yes" /> + <schemaexport output="target/classes/drop/jbpm.hsqldb.drop.sql" + create="no" drop="yes" + config="target/jpdl-config/hibernate.cfg.hsqldb.xml" text="yes" /> - <schemaexport properties="src/main/resources/db.properties/mysql.properties" - output="target/classes/create/jbpm.mysql.create.sql" - delimiter=";" - create="yes" drop="no" config="${cfg}" text="yes" /> - <schemaexport properties="src/main/resources/db.properties/mysql.properties" - output="target/classes/drop/jbpm.mysql.drop.sql" - delimiter=";" - create="no" drop="yes" config="${cfg}" text="yes" /> +  + <schemaexport output="target/classes/create/jbpm.mysql.create.sql" + create="yes" drop="no" + config="target/jpdl-config/hibernate.cfg.mysql.xml" text="yes" /> + <schemaexport output="target/classes/drop/jbpm.mysql.drop.sql" + create="no" drop="yes" + config="target/jpdl-config/hibernate.cfg.mysql.xml" text="yes" /> - <schemaexport properties="src/main/resources/db.properties/oracle.properties" - output="target/classes/create/jbpm.oracle.create.sql" - create="yes" drop="no" config="${cfg}" text="yes" - delimiter=";" /> - <schemaexport properties="src/main/resources/db.properties/oracle.properties" - output="target/classes/drop/jbpm.oracle.drop.sql" - create="no" drop="yes" config="${cfg}" text="yes" - delimiter=";" /> +  + <schemaexport output="target/classes/create/jbpm.oracle.create.sql" + create="yes" drop="no" + config="target/jpdl-config/hibernate.cfg.oracle.xml" text="yes" /> + <schemaexport output="target/classes/drop/jbpm.oracle.drop.sql" + create="no" drop="yes" + config="target/jpdl-config/hibernate.cfg.oracle.xml" text="yes" /> - <schemaexport properties="src/main/resources/db.properties/postgresql.properties" - output="target/classes/create/jbpm.postgresql.create.sql" - create="yes" drop="no" config="${cfg}" text="yes" /> - <schemaexport properties="src/main/resources/db.properties/postgresql.properties" - output="target/classes/drop/jbpm.postgresql.drop.sql" - create="no" drop="yes" config="${cfg}" text="yes" /> +  + <schemaexport output="target/classes/create/jbpm.postgresql.create.sql" + create="yes" drop="no" + config="target/jpdl-config/hibernate.cfg.postgresql.xml" text="yes" /> + <schemaexport output="target/classes/drop/jbpm.postgresql.drop.sql" + create="no" drop="yes" + config="target/jpdl-config/hibernate.cfg.postgresql.xml" text="yes" /> - <schemaexport properties="src/main/resources/db.properties/sybase.properties" - output="target/classes/create/jbpm.sybase.create.sql" - create="yes" drop="no" config="${cfg}" text="yes" /> - <schemaexport properties="src/main/resources/db.properties/sybase.properties" - output="target/classes/drop/jbpm.sybase.drop.sql" - create="no" drop="yes" config="${cfg}" text="yes" /> +  + <schemaexport output="target/classes/create/jbpm.sybase.create.sql" + create="yes" drop="no" + config="target/jpdl-config/hibernate.cfg.sybase.xml" text="yes" /> + <schemaexport output="target/classes/drop/jbpm.sybase.drop.sql" + create="no" drop="yes" + config="target/jpdl-config/hibernate.cfg.sybase.xml" text="yes" /> + </target> - + </project> Deleted: jbpm4/trunk/modules/db/src/main/resources/hibernate.cfg.xml =================================================================== --- jbpm4/trunk/modules/db/src/main/resources/hibernate.cfg.xml 2009-02-02 14:27:18 UTC (rev 3740) +++ jbpm4/trunk/modules/db/src/main/resources/hibernate.cfg.xml 2009-02-02 16:14:21 UTC (rev 3741) @@ -1,20 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> - -<!DOCTYPE hibernate-configuration PUBLIC - "-//Hibernate/Hibernate Configuration DTD 2.0//EN" - "http://hibernate.sourceforge.net/hibernate-configuration-2.0.dtd"> - -<hibernate-configuration> - - <session-factory> - <mapping resource="jbpm.pvm.typedefs.hbm.xml" /> - <mapping resource="jbpm.pvm.wire.hbm.xml" /> - <mapping resource="jbpm.pvm.definition.hbm.xml" /> - <mapping resource="jbpm.pvm.execution.hbm.xml" /> - <mapping resource="jbpm.pvm.variable.hbm.xml" /> - <mapping resource="jbpm.pvm.job.hbm.xml" /> - <mapping resource="jbpm.task.hbm.xml" /> - <mapping resource="jbpm.jpdl.hbm.xml" /> - </session-factory> - -</hibernate-configuration>

15 years, 4 months

1
0
0 / 0

JBoss JBPM SVN: r3740 - in jbpm4/trunk: eclipse and 329 other directories.

by do-not-reply＠jboss.org

Author: heiko.braun(a)jboss.com Date: 2009-02-02 09:27:18 -0500 (Mon, 02 Feb 2009) New Revision: 3740 Added: jbpm4/trunk/modules/db/jbpm4-db.iml jbpm4/trunk/modules/distro/scripts/ jbpm4/trunk/modules/distro/scripts/antrun-installer.xml jbpm4/trunk/modules/distro/scripts/assembly-deploy-artifacts.xml jbpm4/trunk/modules/distro/src/main/resources/installer/ jbpm4/trunk/modules/distro/src/main/resources/installer/ant-actions-spec.xml jbpm4/trunk/modules/distro/src/main/resources/installer/auto-install-template.xml jbpm4/trunk/modules/distro/src/main/resources/installer/download-helper.xml jbpm4/trunk/modules/distro/src/main/resources/installer/install-definition.xml jbpm4/trunk/modules/distro/src/main/resources/installer/target-panel-dir.txt jbpm4/trunk/modules/distro/src/main/resources/installer/user-input-spec.xml jbpm4/trunk/modules/distro/src/main/resources/release.notes.html jbpm4/trunk/modules/enterprise/jbpm4-enterprise.iml jbpm4/trunk/modules/enterprise/scripts/assembly-config.xml jbpm4/trunk/modules/examples/jbpm4-examples.iml jbpm4/trunk/modules/jpdl/scripts/antrun-jbpm-config.xml jbpm4/trunk/modules/jpdl/scripts/assembly-config.xml jbpm4/trunk/modules/jpdl/scripts/build.schema.xml jbpm4/trunk/modules/jpdl/src/main/resources/hibernate.cfg.xml jbpm4/trunk/modules/jpdl/src/main/resources/hibernate.common.xml jbpm4/trunk/modules/jpdl/src/main/resources/hibernate.properties.db2.xml jbpm4/trunk/modules/jpdl/src/main/resources/hibernate.properties.derby.xml jbpm4/trunk/modules/jpdl/src/main/resources/hibernate.properties.firebird.xml jbpm4/trunk/modules/jpdl/src/main/resources/hibernate.properties.hsqldb.xml jbpm4/trunk/modules/jpdl/src/main/resources/hibernate.properties.ingres.xml jbpm4/trunk/modules/jpdl/src/main/resources/hibernate.properties.interbase.xml jbpm4/trunk/modules/jpdl/src/main/resources/hibernate.properties.mckoi.xml jbpm4/trunk/modules/jpdl/src/main/resources/hibernate.properties.mssql.xml jbpm4/trunk/modules/jpdl/src/main/resources/hibernate.properties.mysql.xml jbpm4/trunk/modules/jpdl/src/main/resources/hibernate.properties.oracle.xml jbpm4/trunk/modules/jpdl/src/main/resources/hibernate.properties.postgresql.xml jbpm4/trunk/modules/jpdl/src/main/resources/hibernate.properties.sapdb.xml jbpm4/trunk/modules/jpdl/src/main/resources/hibernate.properties.sybase.xml jbpm4/trunk/modules/jpdl/src/main/resources/jbpm-hsqldb-ds.xml jbpm4/trunk/modules/jpdl/src/main/resources/jbpm-mysql-ds.xml jbpm4/trunk/modules/jpdl/src/main/resources/jbpm-postgresql-ds.xml jbpm4/trunk/modules/jpdl/src/main/resources/jbpm-sybase-ds.xml jbpm4/trunk/modules/jpdl/src/main/resources/jbpm.cfg.xml jbpm4/trunk/modules/jpdl/src/main/resources/logging.properties jbpm4/trunk/modules/pvm/src/test/resources/hibernate.properties jbpm4/trunk/modules/test-db/jpm4-test-db.iml Removed: jbpm4/trunk/modules/config/src/main/resources/hibernate.properties jbpm4/trunk/modules/distro/scripts/antrun-installer.xml jbpm4/trunk/modules/distro/scripts/assembly-deploy-artifacts.xml jbpm4/trunk/modules/distro/src/main/resources/installer/ant-actions-spec.xml jbpm4/trunk/modules/distro/src/main/resources/installer/auto-install-template.xml jbpm4/trunk/modules/distro/src/main/resources/installer/download-helper.xml jbpm4/trunk/modules/distro/src/main/resources/installer/install-definition.xml jbpm4/trunk/modules/distro/src/main/resources/installer/target-panel-dir.txt jbpm4/trunk/modules/distro/src/main/resources/installer/user-input-spec.xml jbpm4/trunk/modules/enterprise/src/test/resources/hibernate.properties jbpm4/trunk/modules/examples/src/test/resources/hibernate.properties jbpm4/trunk/modules/jpdl/src/test/resources/hibernate.properties jbpm4/trunk/modules/pvm/src/test/resources/hibernate.properties jbpm4/trunk/modules/task/src/test/resources/hibernate.properties jbpm4/trunk/modules/test-db/src/main/resources/hibernate.properties jbpm4/trunk/modules/test-load/src/test/resources/hibernate.properties Modified: jbpm4/trunk/ jbpm4/trunk/eclipse/ jbpm4/trunk/hudson/ jbpm4/trunk/hudson/jbpm4-base.sh jbpm4/trunk/hudson/jbpm4-db.sh jbpm4/trunk/hudson/jbpm4-load.sh jbpm4/trunk/modules/ jbpm4/trunk/modules/api/ jbpm4/trunk/modules/api/src/ jbpm4/trunk/modules/api/src/main/ jbpm4/trunk/modules/api/src/main/java/ jbpm4/trunk/modules/api/src/main/java/org/ jbpm4/trunk/modules/api/src/main/java/org/jbpm/ jbpm4/trunk/modules/api/src/main/java/org/jbpm/activity/ jbpm4/trunk/modules/api/src/main/java/org/jbpm/client/ jbpm4/trunk/modules/api/src/main/java/org/jbpm/cmd/ jbpm4/trunk/modules/api/src/main/java/org/jbpm/env/ jbpm4/trunk/modules/api/src/main/java/org/jbpm/job/ jbpm4/trunk/modules/api/src/main/java/org/jbpm/listener/ jbpm4/trunk/modules/api/src/main/java/org/jbpm/model/ jbpm4/trunk/modules/api/src/main/java/org/jbpm/processlog/ jbpm4/trunk/modules/api/src/main/java/org/jbpm/session/ jbpm4/trunk/modules/api/src/main/java/org/jbpm/task/ jbpm4/trunk/modules/api/src/main/resources/ jbpm4/trunk/modules/config/ jbpm4/trunk/modules/config/src/ jbpm4/trunk/modules/config/src/main/ jbpm4/trunk/modules/config/src/main/resources/ jbpm4/trunk/modules/db/ jbpm4/trunk/modules/db/pom.xml jbpm4/trunk/modules/db/src/ jbpm4/trunk/modules/db/src/main/ jbpm4/trunk/modules/db/src/main/ant/ jbpm4/trunk/modules/db/src/main/resources/ jbpm4/trunk/modules/db/src/main/resources/db.properties/ jbpm4/trunk/modules/db/src/main/resources/db.properties/hsqldb.properties jbpm4/trunk/modules/db/src/main/resources/db.properties/mysql.properties jbpm4/trunk/modules/db/src/main/resources/db.properties/postgresql.properties jbpm4/trunk/modules/db/src/main/resources/db.properties/sybase.properties jbpm4/trunk/modules/devguide/ jbpm4/trunk/modules/devguide/src/ jbpm4/trunk/modules/devguide/src/main/ jbpm4/trunk/modules/devguide/src/main/diagrams/ jbpm4/trunk/modules/devguide/src/main/docbook/ jbpm4/trunk/modules/devguide/src/main/docbook/en/ jbpm4/trunk/modules/devguide/src/main/docbook/en/images/ jbpm4/trunk/modules/devguide/src/main/docbook/en/modules/ jbpm4/trunk/modules/distro/ jbpm4/trunk/modules/distro/pom.xml jbpm4/trunk/modules/distro/src/ jbpm4/trunk/modules/distro/src/main/ jbpm4/trunk/modules/distro/src/main/resources/ jbpm4/trunk/modules/enterprise/ jbpm4/trunk/modules/enterprise/pom.xml jbpm4/trunk/modules/enterprise/scripts/ jbpm4/trunk/modules/enterprise/scripts/assembly-test-dependencies.xml jbpm4/trunk/modules/enterprise/src/ jbpm4/trunk/modules/enterprise/src/main/ jbpm4/trunk/modules/enterprise/src/main/java/ jbpm4/trunk/modules/enterprise/src/main/java/org/ jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/ jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/ jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/ jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/wire/ jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/wire/binding/ jbpm4/trunk/modules/enterprise/src/main/resources/ jbpm4/trunk/modules/enterprise/src/main/resources/META-INF/ jbpm4/trunk/modules/enterprise/src/test/ jbpm4/trunk/modules/enterprise/src/test/java/ jbpm4/trunk/modules/enterprise/src/test/java/org/ jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/ jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/ jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/custom/ jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/ jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/test/ jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/test/enterprise/ jbpm4/trunk/modules/enterprise/src/test/resources/ jbpm4/trunk/modules/enterprise/src/test/resources/META-INF/ jbpm4/trunk/modules/enterprise/src/test/resources/WEB-INF/ jbpm4/trunk/modules/examples/ jbpm4/trunk/modules/examples/pom.xml jbpm4/trunk/modules/examples/src/ jbpm4/trunk/modules/examples/src/eclipse/ jbpm4/trunk/modules/examples/src/test/ jbpm4/trunk/modules/examples/src/test/java/ jbpm4/trunk/modules/examples/src/test/java/org/ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/concurrency/ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/concurrency/graphbased/ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/end/ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/end/multiple/ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/end/processinstance/ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/end/state/ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/esb/ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/exclusive/ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/exclusive/conditions/ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/exclusive/expression/ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/exclusive/handler/ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/hql/ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/java/ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/script/ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/script/expression/ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/script/text/ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/sql/ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/state/ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/state/choice/ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/state/sequence/ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/states/ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/ jbpm4/trunk/modules/examples/src/test/resources/ jbpm4/trunk/modules/examples/src/test/resources/jbpm.cfg.xml jbpm4/trunk/modules/examples/src/test/resources/org/ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/concurrency/ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/concurrency/graphbased/ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/end/ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/end/multiple/ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/end/processinstance/ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/end/state/ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/esb/ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/exclusive/ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/exclusive/conditions/ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/exclusive/expression/ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/exclusive/handler/ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/hql/ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/java/ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/script/ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/script/expression/ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/script/text/ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/sql/ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/state/ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/state/choice/ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/state/sequence/ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/states/ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/task/ jbpm4/trunk/modules/jpdl/ jbpm4/trunk/modules/jpdl/pom.xml jbpm4/trunk/modules/jpdl/scripts/ jbpm4/trunk/modules/jpdl/src/ jbpm4/trunk/modules/jpdl/src/main/ jbpm4/trunk/modules/jpdl/src/main/java/ jbpm4/trunk/modules/jpdl/src/main/java/org/ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/el/ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/deploy/ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/impl/ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/xml/ jbpm4/trunk/modules/jpdl/src/main/resources/ jbpm4/trunk/modules/jpdl/src/test/ jbpm4/trunk/modules/jpdl/src/test/java/ jbpm4/trunk/modules/jpdl/src/test/java/org/ jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/ jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/ jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/controlflow/ jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/ jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/test/ jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/test/xml/ jbpm4/trunk/modules/jpdl/src/test/resources/ jbpm4/trunk/modules/jpdl/src/test/resources/org/ jbpm4/trunk/modules/jpdl/src/test/resources/org/jbpm/ jbpm4/trunk/modules/jpdl/src/test/resources/org/jbpm/test/ jbpm4/trunk/modules/jpdl/src/test/resources/org/jbpm/test/xml/ jbpm4/trunk/modules/log/ jbpm4/trunk/modules/log/src/ jbpm4/trunk/modules/log/src/main/ jbpm4/trunk/modules/log/src/main/java/ jbpm4/trunk/modules/log/src/main/java/org/ jbpm4/trunk/modules/log/src/main/java/org/jbpm/ jbpm4/trunk/modules/log/src/main/java/org/jbpm/log/ jbpm4/trunk/modules/pvm/ jbpm4/trunk/modules/pvm/pom.xml jbpm4/trunk/modules/pvm/src/ jbpm4/trunk/modules/pvm/src/main/ jbpm4/trunk/modules/pvm/src/main/java/ jbpm4/trunk/modules/pvm/src/main/java/org/ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cal/ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cfg/ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/deploy/ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jms/ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/job/ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/lob/ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/script/ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/spring/ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/stream/ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/test/ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/type/ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/type/converter/ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/type/matcher/ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/type/variable/ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/HibernateConfigurationBinding.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/HibernateConfigurationDescriptor.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/HibernateSessionFactoryDescriptor.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/operation/ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/xml/ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/xml/ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/model/ jbpm4/trunk/modules/pvm/src/main/resources/ jbpm4/trunk/modules/pvm/src/test/ jbpm4/trunk/modules/pvm/src/test/java/ jbpm4/trunk/modules/pvm/src/test/java/org/ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/activities/ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/builder/ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/eventlistener/ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/executionmode/ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/executionmode/embedded/ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/executionmode/object/ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model/ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr/ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/cron/ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/type/ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/util/ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/println/ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/spring/ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/tx/ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/variables/ jbpm4/trunk/modules/pvm/src/test/resources/ jbpm4/trunk/modules/pvm/src/test/resources/org/ jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/ jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/ jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/api/ jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/api/db/ jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/api/db/continuation/ jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/api/db/svc/ jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/api/timer/ jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/enterprise/ jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/enterprise/custom/ jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/executionmode/ jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/executionmode/embedded/ jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/internal/ jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/internal/db/ jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/internal/db/model/ jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/internal/jobexecutor/ jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/internal/type/ jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/internal/wire/ jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/internal/xml/ jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/spring/ jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/variables/ jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/wire/ jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/xml/ jbpm4/trunk/modules/task/ jbpm4/trunk/modules/task/pom.xml jbpm4/trunk/modules/task/src/ jbpm4/trunk/modules/task/src/main/ jbpm4/trunk/modules/task/src/main/docs/ jbpm4/trunk/modules/task/src/main/java/ jbpm4/trunk/modules/task/src/main/java/org/ jbpm4/trunk/modules/task/src/main/java/org/jbpm/ jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/ jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/ jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/cmd/ jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/hibernate/ jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/model/ jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/wire/ jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/wire/binding/ jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/wire/descriptor/ jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/session/ jbpm4/trunk/modules/task/src/main/resources/ jbpm4/trunk/modules/task/src/test/ jbpm4/trunk/modules/task/src/test/java/ jbpm4/trunk/modules/task/src/test/java/org/ jbpm4/trunk/modules/task/src/test/java/org/jbpm/ jbpm4/trunk/modules/task/src/test/java/org/jbpm/task/ jbpm4/trunk/modules/task/src/test/java/org/jbpm/task/internal/ jbpm4/trunk/modules/task/src/test/java/org/jbpm/task/internal/model/ jbpm4/trunk/modules/task/src/test/resources/ jbpm4/trunk/modules/test-base/ jbpm4/trunk/modules/test-base/src/ jbpm4/trunk/modules/test-base/src/main/ jbpm4/trunk/modules/test-base/src/main/java/ jbpm4/trunk/modules/test-base/src/main/java/org/ jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/ jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/ jbpm4/trunk/modules/test-db/ jbpm4/trunk/modules/test-db/pom.xml jbpm4/trunk/modules/test-db/src/ jbpm4/trunk/modules/test-db/src/main/ jbpm4/trunk/modules/test-db/src/main/java/ jbpm4/trunk/modules/test-db/src/main/java/org/ jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/ jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/ jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/activities/ jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/cfg/ jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/task/ jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/variables/ jbpm4/trunk/modules/test-db/src/main/resources/ jbpm4/trunk/modules/test-db/src/main/resources/jbpm.cfg.xml jbpm4/trunk/modules/test-load/ jbpm4/trunk/modules/test-load/src/ jbpm4/trunk/modules/test-load/src/main/ jbpm4/trunk/modules/test-load/src/main/parked/ jbpm4/trunk/modules/test-load/src/main/scripts/ jbpm4/trunk/modules/test-load/src/test/ jbpm4/trunk/modules/test-load/src/test/java/ jbpm4/trunk/modules/test-load/src/test/java/org/ jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/ jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/ jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/ jbpm4/trunk/modules/test-load/src/test/resources/ jbpm4/trunk/modules/test-load/src/test/resources/org/ jbpm4/trunk/modules/test-load/src/test/resources/org/jbpm/ jbpm4/trunk/modules/test-load/src/test/resources/org/jbpm/test/ jbpm4/trunk/modules/test-load/src/test/resources/org/jbpm/test/load/ jbpm4/trunk/modules/test-pojo/ jbpm4/trunk/modules/test-pojo/src/ jbpm4/trunk/modules/test-pojo/src/main/ jbpm4/trunk/modules/test-pojo/src/main/java/ jbpm4/trunk/modules/test-pojo/src/main/java/org/ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ jbpm4/trunk/modules/test-pojo/src/main/resources/ jbpm4/trunk/modules/userguide/ jbpm4/trunk/modules/userguide/src/ jbpm4/trunk/modules/userguide/src/main/ jbpm4/trunk/modules/userguide/src/main/diagrams/ jbpm4/trunk/modules/userguide/src/main/diagrams/bpmn/ jbpm4/trunk/modules/userguide/src/main/docbook/ jbpm4/trunk/modules/userguide/src/main/docbook/en/ jbpm4/trunk/modules/userguide/src/main/docbook/en/images/ jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ jbpm4/trunk/pom.xml jbpm4/trunk/profiles.xml.example Log: svn merge -r3711:HEAD https://svn.jboss.org/repos/jbpm/jbpm4/branches/hbraun Property changes on: jbpm4/trunk ___________________________________________________________________ Name: svn:ignore - .settings profiles.xml target + *.iml Property changes on: jbpm4/trunk/eclipse ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/hudson ___________________________________________________________________ Name: svn:ignore - target ant.properties + *.iml Modified: jbpm4/trunk/hudson/jbpm4-base.sh =================================================================== --- jbpm4/trunk/hudson/jbpm4-base.sh 2009-02-02 13:49:27 UTC (rev 3739) +++ jbpm4/trunk/hudson/jbpm4-base.sh 2009-02-02 14:27:18 UTC (rev 3740) @@ -10,6 +10,11 @@ DISTRODIR=$JBPMDIR/modules/distribution/target # +# default environment settings +# +cp $JBPMDIR/profiles.xml.example $JBPMDIR/profiles.xml + +# # build the tests # cd $JBPMDIR Modified: jbpm4/trunk/hudson/jbpm4-db.sh =================================================================== --- jbpm4/trunk/hudson/jbpm4-db.sh 2009-02-02 13:49:27 UTC (rev 3739) +++ jbpm4/trunk/hudson/jbpm4-db.sh 2009-02-02 14:27:18 UTC (rev 3740) @@ -11,10 +11,9 @@ JBPMDIR=$WORKSPACE/jbpm4 # -# copy the profiles.xml +# default environment settings # -echo copying profiles.xml from resources -cp -f $WORKSPACE/resources/profiles-db.xml $JBPMDIR/profiles.xml +cp $JBPMDIR/profiles.xml.example $JBPMDIR/profiles.xml # # build the tests Modified: jbpm4/trunk/hudson/jbpm4-load.sh =================================================================== --- jbpm4/trunk/hudson/jbpm4-load.sh 2009-02-02 13:49:27 UTC (rev 3739) +++ jbpm4/trunk/hudson/jbpm4-load.sh 2009-02-02 14:27:18 UTC (rev 3740) @@ -10,11 +10,11 @@ DISTRODIR=$JBPMDIR/modules/distribution/target # -# copy the profiles.xml +# default environment settings # -echo copying profiles.xml from resources -cp -f $WORKSPACE/resources/profiles-load.xml $JBPMDIR/profiles.xml +cp $JBPMDIR/profiles.xml.example $JBPMDIR/profiles.xml + # # build the tests # Property changes on: jbpm4/trunk/modules ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/api ___________________________________________________________________ Name: svn:ignore - .settings target + *.iml Property changes on: jbpm4/trunk/modules/api/src ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/api/src/main ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/api/src/main/java ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/api/src/main/java/org ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/api/src/main/java/org/jbpm ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/api/src/main/java/org/jbpm/activity ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/api/src/main/java/org/jbpm/client ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/api/src/main/java/org/jbpm/cmd ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/api/src/main/java/org/jbpm/env ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/api/src/main/java/org/jbpm/job ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/api/src/main/java/org/jbpm/listener ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/api/src/main/java/org/jbpm/model ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/api/src/main/java/org/jbpm/processlog ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/api/src/main/java/org/jbpm/session ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/api/src/main/java/org/jbpm/task ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/api/src/main/resources ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/config ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/config/src ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/config/src/main ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/config/src/main/resources ___________________________________________________________________ Name: svn:ignore + *.iml Deleted: jbpm4/trunk/modules/config/src/main/resources/hibernate.properties =================================================================== --- jbpm4/trunk/modules/config/src/main/resources/hibernate.properties 2009-02-02 13:49:27 UTC (rev 3739) +++ jbpm4/trunk/modules/config/src/main/resources/hibernate.properties 2009-02-02 14:27:18 UTC (rev 3740) @@ -1,12 +0,0 @@ -hibernate.dialect=org.hibernate.dialect.HSQLDialect -hibernate.connection.driver_class=org.hsqldb.jdbcDriver -hibernate.connection.url=jdbc:hsqldb:mem:. -hibernate.connection.username=sa -hibernate.connection.password= -hibernate.hbm2ddl.auto=create-drop -hibernate.cache.use_second_level_cache=true -hibernate.cache.provider_class=org.hibernate.cache.HashtableCacheProvider - -# hibernate.show_sql=true -# hibernate.format_sql=true -# hibernate.use_sql_comments=true Property changes on: jbpm4/trunk/modules/db ___________________________________________________________________ Name: svn:ignore - .settings target + *.iml Copied: jbpm4/trunk/modules/db/jbpm4-db.iml (from rev 3739, jbpm4/branches/hbraun/modules/db/jbpm4-db.iml) =================================================================== --- jbpm4/trunk/modules/db/jbpm4-db.iml (rev 0) +++ jbpm4/trunk/modules/db/jbpm4-db.iml 2009-02-02 14:27:18 UTC (rev 3740) @@ -0,0 +1,253 @@ +<?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="jbpm4-toplevel" /> + <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: junit:junit:jar:3.8.1:compile"> + <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.jbpm.jbpm4.dependencies.esb:jbossesb-rosetta:jar:4.4.0.GA:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jbpm/jbpm4/dependencies/esb/jbossesb-rosetta/4.4.0.GA/jbossesb-rosetta-4.4.0.GA.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: commons-logging:commons-logging:jar:1.0.4:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: stax:stax-api:jar:1.0.1:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/stax/stax-api/1.0.1/stax-api-1.0.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.jboss.client:jbossall-client:jar:4.2.2.GA:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/client/jbossall-client/4.2.2.GA/jbossall-client-4.2.2.GA.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: 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: stax:stax:jar:1.2.0:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/stax/stax/1.2.0/stax-1.2.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: jboss:jboss-j2ee:jar:4.2.2.GA:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/jboss/jboss-j2ee/4.2.2.GA/jboss-j2ee-4.2.2.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: hsqldb:hsqldb:jar:1.8.0.7:test"> + <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: 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: 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> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/dom4j/dom4j/1.6.1/dom4j-1.6.1-sources.jar!/" /> + </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: org.jbpm.jbpm4.dependencies.esb:test-util:jar:4.4.0.GA:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jbpm/jbpm4/dependencies/esb/test-util/4.4.0.GA/test-util-4.4.0.GA.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: jboss.jbossts:jbossts-common:jar:4.4.0.GA:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/jboss/jbossts/jbossts-common/4.4.0.GA/jbossts-common-4.4.0.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: log4j:log4j:jar:1.2.14:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/log4j/log4j/1.2.14/log4j-1.2.14.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/log4j/log4j/1.2.14/log4j-1.2.14-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: juel:juel-engine:jar:2.1.0:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/juel/juel-engine/2.1.0/juel-engine-2.1.0.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: org.springframework:spring:jar:2.5.4:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/springframework/spring/2.5.4/spring-2.5.4.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: juel:juel:jar:2.1.0:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/juel/juel/2.1.0/juel-2.1.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: juel:juel-impl:jar:2.1.0:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/juel/juel-impl/2.1.0/juel-impl-2.1.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.livetribe:livetribe-jsr223:jar:2.0.5:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/livetribe/livetribe-jsr223/2.0.5/livetribe-jsr223-2.0.5.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntryProperties /> + </component> +</module> + Modified: jbpm4/trunk/modules/db/pom.xml =================================================================== --- jbpm4/trunk/modules/db/pom.xml 2009-02-02 13:49:27 UTC (rev 3739) +++ jbpm4/trunk/modules/db/pom.xml 2009-02-02 14:27:18 UTC (rev 3740) @@ -24,7 +24,7 @@ <version>4.0.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> - +  <dependencies> <dependency> @@ -51,6 +51,12 @@  <build> + <resources> + <resource> + <directory>src/main/resources</directory> + <filtering>true</filtering> + </resource> + </resources> <plugins> <plugin> <artifactId>maven-antrun-plugin</artifactId> Property changes on: jbpm4/trunk/modules/db/src ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/db/src/main ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/db/src/main/ant ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/db/src/main/resources ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/db/src/main/resources/db.properties ___________________________________________________________________ Name: svn:ignore + *.iml Modified: jbpm4/trunk/modules/db/src/main/resources/db.properties/hsqldb.properties =================================================================== --- jbpm4/trunk/modules/db/src/main/resources/db.properties/hsqldb.properties 2009-02-02 13:49:27 UTC (rev 3739) +++ jbpm4/trunk/modules/db/src/main/resources/db.properties/hsqldb.properties 2009-02-02 14:27:18 UTC (rev 3740) @@ -1,8 +1,11 @@ +## +## jbpm-db hsqldb config +## hibernate.dialect=org.hibernate.dialect.HSQLDialect hibernate.connection.driver_class=org.hsqldb.jdbcDriver -hibernate.connection.url=jdbc:hsqldb:hsql://${jdbc.server}/${jdbc.dbname} -hibernate.connection.username=${jdbc.username} -hibernate.connection.password=${jdbc.password} +hibernate.connection.url=${jdbc.hsql.url} +hibernate.connection.username=${jdbc.hsql.username} +hibernate.connection.password=${jdbc.hsql.password} hibernate.cache.use_second_level_cache=true hibernate.cache.provider_class=org.hibernate.cache.HashtableCacheProvider Modified: jbpm4/trunk/modules/db/src/main/resources/db.properties/mysql.properties =================================================================== --- jbpm4/trunk/modules/db/src/main/resources/db.properties/mysql.properties 2009-02-02 13:49:27 UTC (rev 3739) +++ jbpm4/trunk/modules/db/src/main/resources/db.properties/mysql.properties 2009-02-02 14:27:18 UTC (rev 3740) @@ -1,8 +1,11 @@ +## +## jbpm-db mysql config +## hibernate.dialect=org.hibernate.dialect.MySQLInnoDBDialect hibernate.connection.driver_class=com.mysql.jdbc.Driver -hibernate.connection.url=jdbc:mysql://${jdbc.server}/${jdbc.dbname} -hibernate.connection.username=${jdbc.username} -hibernate.connection.password=${jdbc.password} +hibernate.connection.url=${jdbc.mysql.url} +hibernate.connection.username=${jdbc.mysql.username} +hibernate.connection.password=${jdbc.mysql.password} hibernate.cache.use_second_level_cache=true Modified: jbpm4/trunk/modules/db/src/main/resources/db.properties/postgresql.properties =================================================================== --- jbpm4/trunk/modules/db/src/main/resources/db.properties/postgresql.properties 2009-02-02 13:49:27 UTC (rev 3739) +++ jbpm4/trunk/modules/db/src/main/resources/db.properties/postgresql.properties 2009-02-02 14:27:18 UTC (rev 3740) @@ -1,9 +1,9 @@ hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect # fetch driver from http://jdbc.postgresql.org/ hibernate.connection.driver_class=org.postgresql.Driver -hibernate.connection.url=jdbc:postgresql://${jdbc.server}/${jdbc.dbname} -hibernate.connection.username=${jdbc.username} -hibernate.connection.password=${jdbc.password} +hibernate.connection.url=${jdbc.postgresql.url} +hibernate.connection.username=${jdbc.postgresql.username} +hibernate.connection.password=${jdbc.postgresql.password} hibernate.cache.use_second_level_cache=true hibernate.cache.provider_class=org.hibernate.cache.HashtableCacheProvider Modified: jbpm4/trunk/modules/db/src/main/resources/db.properties/sybase.properties =================================================================== --- jbpm4/trunk/modules/db/src/main/resources/db.properties/sybase.properties 2009-02-02 13:49:27 UTC (rev 3739) +++ jbpm4/trunk/modules/db/src/main/resources/db.properties/sybase.properties 2009-02-02 14:27:18 UTC (rev 3740) @@ -1,8 +1,8 @@ hibernate.dialect=org.hibernate.dialect.SybaseDialect hibernate.connection.driver_class=net.sourceforge.jtds.jdbc.Driver -hibernate.connection.url=jdbc:jtds:sybase://${jdbc.server}/${jdbc.dbname} -hibernate.connection.username=${jdbc.username} -hibernate.connection.password=${jdbc.password} +hibernate.connection.url=${jdbc.ybase.url} +hibernate.connection.username=${jdbc.sybase.username} +hibernate.connection.password=${jdbc.sybase.password} hibernate.cache.use_second_level_cache=true hibernate.cache.provider_class=org.hibernate.cache.HashtableCacheProvider Property changes on: jbpm4/trunk/modules/devguide ___________________________________________________________________ Name: svn:ignore - target + *.iml Property changes on: jbpm4/trunk/modules/devguide/src ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/devguide/src/main ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/devguide/src/main/diagrams ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/devguide/src/main/docbook ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/devguide/src/main/docbook/en ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/devguide/src/main/docbook/en/images ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/devguide/src/main/docbook/en/modules ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/distro ___________________________________________________________________ Name: svn:ignore - target .settings + *.iml Modified: jbpm4/trunk/modules/distro/pom.xml =================================================================== --- jbpm4/trunk/modules/distro/pom.xml 2009-02-02 13:49:27 UTC (rev 3739) +++ jbpm4/trunk/modules/distro/pom.xml 2009-02-02 14:27:18 UTC (rev 3740) @@ -11,7 +11,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>jBPM 4 - Distro</name> <groupId>org.jbpm.jbpm4</groupId> @@ -25,21 +25,12 @@ <relativePath>../../pom.xml</relativePath> </parent> -  - <properties> - </properties> - -  - <dependencyManagement> - </dependencyManagement> -  <dependencies> <dependency> <groupId>org.jbpm.jbpm4</groupId> <artifactId>jbpm-gpd</artifactId> <type>zip</type> - <version>4.0.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.jbpm.jbpm4</groupId> @@ -63,7 +54,8 @@ </dependency> <dependency> <groupId>org.jbpm.jbpm4</groupId> - <artifactId>jbpm-db</artifactId> + <artifactId>jbpm-jpdl</artifactId> + <classifier>config</classifier> <version>${version}</version> </dependency> <dependency> @@ -76,8 +68,19 @@ <artifactId>jbpm-test-db</artifactId> <version>${version}</version> </dependency> -  <dependency> + <groupId>org.apache.ant</groupId> + <artifactId>ant</artifactId> + </dependency> + <dependency> + <groupId>izpack</groupId> + <artifactId>standalone-compiler</artifactId> + </dependency> + +  </dependencies> - +  <build> <plugins> @@ -93,7 +96,7 @@ <artifactId>maven-assembly-plugin</artifactId> <version>2.2-beta-2</version> <executions> - <execution> +  + +  + + <execution> + <id>create-installer</id> + <phase>process-resources</phase> + <goals> + <goal>directory-single</goal> + </goals> + <configuration> + <finalName>deploy-artifacts</finalName> + <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions> + <appendAssemblyId>false</appendAssemblyId> + <descriptors> + <descriptor>scripts/assembly-deploy-artifacts.xml</descriptor> + </descriptors> + </configuration> </execution> + </executions> </plugin> + + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <id>izpack</id> + <phase>package</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <tasks> + <property name="maven.runtime.classpath" refid="maven.runtime.classpath" /> + <property name="database" value="${database}" /> + <property name="jboss.home" value="${jboss.home}" /> + <property name="jboss422.home" value="${jboss422.home}" /> + <property name="jboss423.home" value="${jboss423.home}" /> + <property name="jboss500.home" value="${jboss500.home}" /> + <property name="jbpm.target.container" value="${jbpm.target.container}" /> + <property name="product.name" value="${project.name}" /> + <property name="product.short.name" value="${artifactId}" /> + <property name="product.version" value="${project.version}" /> + <property name="user.home" value="${user.home}" /> + <ant antfile="scripts/antrun-installer.xml" target="build-installer" /> + </tasks> + </configuration> + </execution> + </executions> + </plugin> + </plugins> </build> Copied: jbpm4/trunk/modules/distro/scripts (from rev 3739, jbpm4/branches/hbraun/modules/distro/scripts) Property changes on: jbpm4/trunk/modules/distro/scripts ___________________________________________________________________ Name: svn:ignore + *.iml Deleted: jbpm4/trunk/modules/distro/scripts/antrun-installer.xml =================================================================== --- jbpm4/branches/hbraun/modules/distro/scripts/antrun-installer.xml 2009-02-02 13:49:27 UTC (rev 3739) +++ jbpm4/trunk/modules/distro/scripts/antrun-installer.xml 2009-02-02 14:27:18 UTC (rev 3740) @@ -1,143 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - - - - - - - - - - -<project> - - <macrodef name="macro-disable"> - <attribute name="file" /> - <attribute name="section" /> - <sequential> - <replace file="@{file}" summary="true"> - <replacetoken><![CDATA[]]></replacetoken> - <replacevalue><![CDATA[]]></replacetoken> - <replacevalue><![CDATA[==== ]]>@{section}<![CDATA[ (end) -->]]></replacevalue> - </replace> - </sequential> - </macrodef> - - <macrodef name="macro-enable"> - <attribute name="file" /> - <attribute name="section" /> - <sequential> - <replace file="@{file}" summary="true"> - <replacetoken><![CDATA[]]></replacevalue> - </replace> - <replace file="@{file}" summary="true"> - <replacetoken><![CDATA[==== ]]>@{section}<![CDATA[ (end) -->]]></replacetoken> - <replacevalue><![CDATA[]]></replacevalue> - </replace> - </sequential> - </macrodef> - -  -  -  - <property name="output.dir" value="${basedir}/target" /> - <property name="resources.dir" value="${basedir}/src/main/resources" /> - <property name="filtered.resources.dir" value="${output.dir}/resources" /> - <property name="deploy.artifacts.dir" value="${output.dir}/deploy-artifacts" /> - <property name="deploy.artifacts.lib" value="${deploy.artifacts.dir}/lib" /> - <property name="deploy.artifacts.resources" value="${deploy.artifacts.dir}/resources" /> - -  -  -  - <target name="init"> - - </target> - -  -  -  - <target name="configure" depends="init"> - - <property name="hsqldb.cfg.xml" value="${deploy.artifacts.resources}/jbpm-jpdl-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="mysql.cfg.xml" value="${deploy.artifacts.resources}/jbpm-jpdl-config/hibernate.cfg.mysql.xml"/> - <macro-disable file="${mysql.cfg.xml}" section="JDBC connection properties"/> - <macro-disable file="${mysql.cfg.xml}" section="Automatic schema creation"/> - <macro-enable file="${mysql.cfg.xml}" section="DataSource properties"/> - <macro-enable file="${mysql.cfg.xml}" section="JTA transaction properties"/> - - <property name="postgresql.cfg.xml" value="${deploy.artifacts.resources}/jbpm-jpdl-config/hibernate.cfg.postgresql.xml"/> - <macro-disable file="${postgresql.cfg.xml}" section="JDBC connection properties"/> - <macro-disable file="${postgresql.cfg.xml}" section="Automatic schema creation"/> - <macro-enable file="${postgresql.cfg.xml}" section="DataSource properties"/> - <macro-enable file="${postgresql.cfg.xml}" section="JTA transaction properties"/> - - <property name="sybase.cfg.xml" value="${deploy.artifacts.resources}/jbpm-jpdl-config/hibernate.cfg.sybase.xml"/> - <macro-disable file="${sybase.cfg.xml}" section="JDBC connection properties"/> - <macro-disable file="${sybase.cfg.xml}" section="Automatic schema creation"/> - <macro-enable file="${sybase.cfg.xml}" section="DataSource properties"/> - <macro-enable file="${sybase.cfg.xml}" section="JTA transaction properties"/> - - <condition property="database.is.hsqldb" value="true" else="false"> - <equals arg1="${database}" arg2="hsqldb"/> - </condition> - <condition property="database.is.mysql" value="true" else="false"> - <equals arg1="${database}" arg2="mysql"/> - </condition> - <condition property="database.is.postgresql" value="true" else="false"> - <equals arg1="${database}" arg2="postgresql"/> - </condition> - <condition property="database.is.sybase" value="true" else="false"> - <equals arg1="${database}" arg2="sybase"/> - </condition> - - </target> - -  -  -  - <target name="build-installer" depends="configure"> - - <copy todir="${filtered.resources.dir}" filtering="true" overwrite="true"> - <fileset dir="${resources.dir}/installer" /> - <filterset> - <filter token="database" value="${database}" /> - <filter token="database.is.hsqldb" value="${database.is.hsqldb}" /> - <filter token="database.is.mysql" value="${database.is.mysql}" /> - <filter token="database.is.postgresql" value="${database.is.postgresql}" /> - <filter token="database.is.sybase" value="${database.is.sybase}" /> - <filter token="jbpm.target.container" value="${jbpm.target.container}" /> - <filter token="jboss.home" value="${jboss.home}" /> - <filter token="product.version" value="${product.version}" /> - <filter token="user.home" value="${user.home}" /> - </filterset> - </copy> - -  - <taskdef name="izpack" classname="com.izforge.izpack.ant.IzPackTask"> - <classpath> - <pathelement path="${maven.runtime.classpath}" /> - </classpath> - </taskdef> - <property name="izpack.temp.dir" value="${output.dir}/izpack-temp" /> - <mkdir dir="${izpack.temp.dir}" /> - -  - <echo message="Running IzPack to build the installer..." /> - <izpack input="${resources.dir}/installer/install-definition.xml" output="${output.dir}/jbpm-installer-${product.version}.jar" - installerType="standard" inheritAll="true" basedir="${izpack.temp.dir}" /> - -  - <delete dir="${izpack.temp.dir}" quiet="true" includeemptydirs="true" /> - </target> -</project> \ No newline at end of file Copied: jbpm4/trunk/modules/distro/scripts/antrun-installer.xml (from rev 3739, jbpm4/branches/hbraun/modules/distro/scripts/antrun-installer.xml) =================================================================== --- jbpm4/trunk/modules/distro/scripts/antrun-installer.xml (rev 0) +++ jbpm4/trunk/modules/distro/scripts/antrun-installer.xml 2009-02-02 14:27:18 UTC (rev 3740) @@ -0,0 +1,143 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + + + + + + + + + +<project> + + <macrodef name="macro-disable"> + <attribute name="file" /> + <attribute name="section" /> + <sequential> + <replace file="@{file}" summary="true"> + <replacetoken><![CDATA[]]></replacetoken> + <replacevalue><![CDATA[]]></replacetoken> + <replacevalue><![CDATA[==== ]]>@{section}<![CDATA[ (end) -->]]></replacevalue> + </replace> + </sequential> + </macrodef> + + <macrodef name="macro-enable"> + <attribute name="file" /> + <attribute name="section" /> + <sequential> + <replace file="@{file}" summary="true"> + <replacetoken><![CDATA[]]></replacevalue> + </replace> + <replace file="@{file}" summary="true"> + <replacetoken><![CDATA[==== ]]>@{section}<![CDATA[ (end) -->]]></replacetoken> + <replacevalue><![CDATA[]]></replacevalue> + </replace> + </sequential> + </macrodef> + +  +  +  + <property name="output.dir" value="${basedir}/target" /> + <property name="resources.dir" value="${basedir}/src/main/resources" /> + <property name="filtered.resources.dir" value="${output.dir}/resources" /> + <property name="deploy.artifacts.dir" value="${output.dir}/deploy-artifacts" /> + <property name="deploy.artifacts.lib" value="${deploy.artifacts.dir}/lib" /> + <property name="deploy.artifacts.resources" value="${deploy.artifacts.dir}/resources" /> + +  +  +  + <target name="init"> + + </target> + +  +  +  + <target name="configure" depends="init"> + + <property name="hsqldb.cfg.xml" value="${deploy.artifacts.resources}/jbpm-jpdl-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="mysql.cfg.xml" value="${deploy.artifacts.resources}/jbpm-jpdl-config/hibernate.cfg.mysql.xml"/> + <macro-disable file="${mysql.cfg.xml}" section="JDBC connection properties"/> + <macro-disable file="${mysql.cfg.xml}" section="Automatic schema creation"/> + <macro-enable file="${mysql.cfg.xml}" section="DataSource properties"/> + <macro-enable file="${mysql.cfg.xml}" section="JTA transaction properties"/> + + <property name="postgresql.cfg.xml" value="${deploy.artifacts.resources}/jbpm-jpdl-config/hibernate.cfg.postgresql.xml"/> + <macro-disable file="${postgresql.cfg.xml}" section="JDBC connection properties"/> + <macro-disable file="${postgresql.cfg.xml}" section="Automatic schema creation"/> + <macro-enable file="${postgresql.cfg.xml}" section="DataSource properties"/> + <macro-enable file="${postgresql.cfg.xml}" section="JTA transaction properties"/> + + <property name="sybase.cfg.xml" value="${deploy.artifacts.resources}/jbpm-jpdl-config/hibernate.cfg.sybase.xml"/> + <macro-disable file="${sybase.cfg.xml}" section="JDBC connection properties"/> + <macro-disable file="${sybase.cfg.xml}" section="Automatic schema creation"/> + <macro-enable file="${sybase.cfg.xml}" section="DataSource properties"/> + <macro-enable file="${sybase.cfg.xml}" section="JTA transaction properties"/> + + <condition property="database.is.hsqldb" value="true" else="false"> + <equals arg1="${database}" arg2="hsqldb"/> + </condition> + <condition property="database.is.mysql" value="true" else="false"> + <equals arg1="${database}" arg2="mysql"/> + </condition> + <condition property="database.is.postgresql" value="true" else="false"> + <equals arg1="${database}" arg2="postgresql"/> + </condition> + <condition property="database.is.sybase" value="true" else="false"> + <equals arg1="${database}" arg2="sybase"/> + </condition> + + </target> + +  +  +  + <target name="build-installer" depends="configure"> + + <copy todir="${filtered.resources.dir}" filtering="true" overwrite="true"> + <fileset dir="${resources.dir}/installer" /> + <filterset> + <filter token="database" value="${database}" /> + <filter token="database.is.hsqldb" value="${database.is.hsqldb}" /> + <filter token="database.is.mysql" value="${database.is.mysql}" /> + <filter token="database.is.postgresql" value="${database.is.postgresql}" /> + <filter token="database.is.sybase" value="${database.is.sybase}" /> + <filter token="jbpm.target.container" value="${jbpm.target.container}" /> + <filter token="jboss.home" value="${jboss.home}" /> + <filter token="product.version" value="${product.version}" /> + <filter token="user.home" value="${user.home}" /> + </filterset> + </copy> + +  + <taskdef name="izpack" classname="com.izforge.izpack.ant.IzPackTask"> + <classpath> + <pathelement path="${maven.runtime.classpath}" /> + </classpath> + </taskdef> + <property name="izpack.temp.dir" value="${output.dir}/izpack-temp" /> + <mkdir dir="${izpack.temp.dir}" /> + +  + <echo message="Running IzPack to build the installer..." /> + <izpack input="${resources.dir}/installer/install-definition.xml" output="${output.dir}/jbpm-installer-${product.version}.jar" + installerType="standard" inheritAll="true" basedir="${izpack.temp.dir}" /> + +  + <delete dir="${izpack.temp.dir}" quiet="true" includeemptydirs="true" /> + </target> +</project> \ No newline at end of file Deleted: jbpm4/trunk/modules/distro/scripts/assembly-deploy-artifacts.xml =================================================================== --- jbpm4/branches/hbraun/modules/distro/scripts/assembly-deploy-artifacts.xml 2009-02-02 13:49:27 UTC (rev 3739) +++ jbpm4/trunk/modules/distro/scripts/assembly-deploy-artifacts.xml 2009-02-02 14:27:18 UTC (rev 3740) @@ -1,165 +0,0 @@ -<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"> - - <id>deploy-artifacts</id> - <formats> - <format>dir</format> - </formats> - <includeBaseDirectory>false</includeBaseDirectory> - -  - <dependencySets> - -  - <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> - <scope>test</scope> - <unpack>false</unpack> - </dependencySet> -  - - -  - <dependencySet> - <outputDirectory>resources/jbpm-jpdl-config</outputDirectory> - <useStrictFiltering>true</useStrictFiltering> - <includes> - <include>*:jbpm-jpdl:jar:config</include> - </includes> - <unpack>true</unpack> - </dependencySet> -  - - </dependencySets> - - <fileSets> - <fileSet> - <directory>src/main/resources</directory> - <includes> - <include>jboss.eula.txt</include> - <include>license.txt</include> - <include>readme.html</include> - <include>release.notes.html</include> - </includes> - <outputDirectory></outputDirectory> - </fileSet> - <fileSet> - <directory>../api/target/site/apidocs</directory> - <outputDirectory>doc/javadocs</outputDirectory> - </fileSet> - <fileSet> - <directory>../api/target/schemadoc</directory> - <outputDirectory>doc/schemadoc</outputDirectory> - </fileSet> - <fileSet> - <directory>../db/target/create</directory> - <outputDirectory>db/create</outputDirectory> - </fileSet> - <fileSet> - <directory>../db/target/drop</directory> - <outputDirectory>db/drop</outputDirectory> - </fileSet> - <fileSet> - <directory>../devguide/target/docbook/publish/en</directory> - <outputDirectory>doc/devguide</outputDirectory> - <excludes> - <exclude>**/*.fo</exclude> - </excludes> - </fileSet> - <fileSet> - <directory>../userguide/target/docbook/publish/en</directory> - <outputDirectory>doc/userguide</outputDirectory> - <excludes> - <exclude>**/*.fo</exclude> - </excludes> - </fileSet> - <fileSet> - <directory>../api/target/schemadocs</directory> - <outputDirectory>doc/schemadocs</outputDirectory> - <excludes> - <exclude>**/*.fo</exclude> - </excludes> - </fileSet> - <fileSet> - <directory>../api/src/main/java</directory> - <outputDirectory>src</outputDirectory> - </fileSet> - <fileSet> - <directory>../api/src/main/resources</directory> - <outputDirectory>src</outputDirectory> - </fileSet> - <fileSet> - <directory>../log/src/main/java</directory> - <outputDirectory>src</outputDirectory> - </fileSet> - <fileSet> - <directory>../pvm/src/main/java</directory> - <outputDirectory>src</outputDirectory> - </fileSet> - <fileSet> - <directory>../pvm/src/main/resources</directory> - <outputDirectory>src</outputDirectory> - </fileSet> - <fileSet> - <directory>../jpdl/src/main/java</directory> - <outputDirectory>src</outputDirectory> - </fileSet> - <fileSet> - <directory>../jpdl/src/main/resources</directory> - <outputDirectory>src</outputDirectory> - </fileSet> - <fileSet> - <directory>../task/src/main/java</directory> - <outputDirectory>src</outputDirectory> - </fileSet> - <fileSet> - <directory>../task/src/main/resources</directory> - <outputDirectory>src</outputDirectory> - </fileSet> - <fileSet> - <directory>../test-base/src/main/java</directory> - <outputDirectory>src</outputDirectory> - </fileSet> - <fileSet> - <directory>../examples/src/test/java</directory> - <outputDirectory>examples/src</outputDirectory> - </fileSet> - <fileSet> - <directory>../examples/src/test/resources</directory> - <outputDirectory>examples/src</outputDirectory> - </fileSet> - <fileSet> - <directory>../examples/src/eclipse</directory> - <outputDirectory>examples</outputDirectory> - </fileSet> - </fileSets> -</assembly> Copied: jbpm4/trunk/modules/distro/scripts/assembly-deploy-artifacts.xml (from rev 3739, jbpm4/branches/hbraun/modules/distro/scripts/assembly-deploy-artifacts.xml) =================================================================== --- jbpm4/trunk/modules/distro/scripts/assembly-deploy-artifacts.xml (rev 0) +++ jbpm4/trunk/modules/distro/scripts/assembly-deploy-artifacts.xml 2009-02-02 14:27:18 UTC (rev 3740) @@ -0,0 +1,165 @@ +<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"> + + <id>deploy-artifacts</id> + <formats> + <format>dir</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> + +  + <dependencySets> + +  + <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> + <scope>test</scope> + <unpack>false</unpack> + </dependencySet> +  + + +  + <dependencySet> + <outputDirectory>resources/jbpm-jpdl-config</outputDirectory> + <useStrictFiltering>true</useStrictFiltering> + <includes> + <include>*:jbpm-jpdl:jar:config</include> + </includes> + <unpack>true</unpack> + </dependencySet> +  + + </dependencySets> + + <fileSets> + <fileSet> + <directory>src/main/resources</directory> + <includes> + <include>jboss.eula.txt</include> + <include>license.txt</include> + <include>readme.html</include> + <include>release.notes.html</include> + </includes> + <outputDirectory></outputDirectory> + </fileSet> + <fileSet> + <directory>../api/target/site/apidocs</directory> + <outputDirectory>doc/javadocs</outputDirectory> + </fileSet> + <fileSet> + <directory>../api/target/schemadoc</directory> + <outputDirectory>doc/schemadoc</outputDirectory> + </fileSet> + <fileSet> + <directory>../db/target/create</directory> + <outputDirectory>db/create</outputDirectory> + </fileSet> + <fileSet> + <directory>../db/target/drop</directory> + <outputDirectory>db/drop</outputDirectory> + </fileSet> + <fileSet> + <directory>../devguide/target/docbook/publish/en</directory> + <outputDirectory>doc/devguide</outputDirectory> + <excludes> + <exclude>**/*.fo</exclude> + </excludes> + </fileSet> + <fileSet> + <directory>../userguide/target/docbook/publish/en</directory> + <outputDirectory>doc/userguide</outputDirectory> + <excludes> + <exclude>**/*.fo</exclude> + </excludes> + </fileSet> + <fileSet> + <directory>../api/target/schemadocs</directory> + <outputDirectory>doc/schemadocs</outputDirectory> + <excludes> + <exclude>**/*.fo</exclude> + </excludes> + </fileSet> + <fileSet> + <directory>../api/src/main/java</directory> + <outputDirectory>src</outputDirectory> + </fileSet> + <fileSet> + <directory>../api/src/main/resources</directory> + <outputDirectory>src</outputDirectory> + </fileSet> + <fileSet> + <directory>../log/src/main/java</directory> + <outputDirectory>src</outputDirectory> + </fileSet> + <fileSet> + <directory>../pvm/src/main/java</directory> + <outputDirectory>src</outputDirectory> + </fileSet> + <fileSet> + <directory>../pvm/src/main/resources</directory> + <outputDirectory>src</outputDirectory> + </fileSet> + <fileSet> + <directory>../jpdl/src/main/java</directory> + <outputDirectory>src</outputDirectory> + </fileSet> + <fileSet> + <directory>../jpdl/src/main/resources</directory> + <outputDirectory>src</outputDirectory> + </fileSet> + <fileSet> + <directory>../task/src/main/java</directory> + <outputDirectory>src</outputDirectory> + </fileSet> + <fileSet> + <directory>../task/src/main/resources</directory> + <outputDirectory>src</outputDirectory> + </fileSet> + <fileSet> + <directory>../test-base/src/main/java</directory> + <outputDirectory>src</outputDirectory> + </fileSet> + <fileSet> + <directory>../examples/src/test/java</directory> + <outputDirectory>examples/src</outputDirectory> + </fileSet> + <fileSet> + <directory>../examples/src/test/resources</directory> + <outputDirectory>examples/src</outputDirectory> + </fileSet> + <fileSet> + <directory>../examples/src/eclipse</directory> + <outputDirectory>examples</outputDirectory> + </fileSet> + </fileSets> +</assembly> Property changes on: jbpm4/trunk/modules/distro/src ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/distro/src/main ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/distro/src/main/resources ___________________________________________________________________ Name: svn:ignore + *.iml Copied: jbpm4/trunk/modules/distro/src/main/resources/installer (from rev 3739, jbpm4/branches/hbraun/modules/distro/src/main/resources/installer) Property changes on: jbpm4/trunk/modules/distro/src/main/resources/installer ___________________________________________________________________ Name: svn:ignore + *.iml Deleted: jbpm4/trunk/modules/distro/src/main/resources/installer/ant-actions-spec.xml =================================================================== --- jbpm4/branches/hbraun/modules/distro/src/main/resources/installer/ant-actions-spec.xml 2009-02-02 13:49:27 UTC (rev 3739) +++ jbpm4/trunk/modules/distro/src/main/resources/installer/ant-actions-spec.xml 2009-02-02 14:27:18 UTC (rev 3740) @@ -1,14 +0,0 @@ -<antactions> - <pack name="Download JBoss-5.0.0"> - <antcall order="afterpack" buildfile="$INSTALL_PATH/Uninstaller/download-helper.xml"> - <property name="install.path" value="$INSTALL_PATH"/> - <target name="download-jboss"/> - </antcall> - </pack> - <pack name="Download Eclipse-3.4.0"> - <antcall order="afterpack" buildfile="$INSTALL_PATH/Uninstaller/download-helper.xml"> - <property name="install.path" value="$INSTALL_PATH"/> - <target name="download-eclipse"/> - </antcall> - </pack> -</antactions> \ No newline at end of file Copied: jbpm4/trunk/modules/distro/src/main/resources/installer/ant-actions-spec.xml (from rev 3739, jbpm4/branches/hbraun/modules/distro/src/main/resources/installer/ant-actions-spec.xml) =================================================================== --- jbpm4/trunk/modules/distro/src/main/resources/installer/ant-actions-spec.xml (rev 0) +++ jbpm4/trunk/modules/distro/src/main/resources/installer/ant-actions-spec.xml 2009-02-02 14:27:18 UTC (rev 3740) @@ -0,0 +1,14 @@ +<antactions> + <pack name="Download JBoss-5.0.0"> + <antcall order="afterpack" buildfile="$INSTALL_PATH/Uninstaller/download-helper.xml"> + <property name="install.path" value="$INSTALL_PATH"/> + <target name="download-jboss"/> + </antcall> + </pack> + <pack name="Download Eclipse-3.4.0"> + <antcall order="afterpack" buildfile="$INSTALL_PATH/Uninstaller/download-helper.xml"> + <property name="install.path" value="$INSTALL_PATH"/> + <target name="download-eclipse"/> + </antcall> + </pack> +</antactions> \ No newline at end of file Deleted: jbpm4/trunk/modules/distro/src/main/resources/installer/auto-install-template.xml =================================================================== --- jbpm4/branches/hbraun/modules/distro/src/main/resources/installer/auto-install-template.xml 2009-02-02 13:49:27 UTC (rev 3739) +++ jbpm4/trunk/modules/distro/src/main/resources/installer/auto-install-template.xml 2009-02-02 14:27:18 UTC (rev 3740) @@ -1,34 +0,0 @@ -<AutomatedInstallation langpack="eng"> - <com.izforge.izpack.panels.HelloPanel /> - <com.izforge.izpack.panels.TargetPanel> - <installpath>@user.home@/jbpm-jpdl-(a)product.version@</installpath> - </com.izforge.izpack.panels.TargetPanel> - <com.izforge.izpack.panels.TreePacksPanel> - <pack name="jBPM4 Standalone" index="0" selected="true"/> - <pack name="jBPM4 JBoss Integration" index="1" selected="true"/> -  - <pack name="Optional Components" index="4" selected="false"/> - <pack name="Download JBoss-5.0.0" index="5" selected="false"/> - <pack name="Download Eclipse-3.4.0" index="6" selected="false"/> - </com.izforge.izpack.panels.TreePacksPanel> - <com.izforge.izpack.panels.UserInputPanel> - <userInput> - <entry key="jbossTargetServer" value="default" /> - <entry key="jbossSelection" value="@jbpm.target.container@" /> - </userInput> - </com.izforge.izpack.panels.UserInputPanel> - <com.izforge.izpack.panels.UserInputPanel> - <userInput> - <entry key="dbSelection" value="@database@"/> - </userInput> - </com.izforge.izpack.panels.UserInputPanel> - <com.izforge.izpack.panels.UserInputPanel> - <userInput> - <entry key="jbossInstallPath" value="@jboss.home@" /> - </userInput> - </com.izforge.izpack.panels.UserInputPanel> - <com.izforge.izpack.panels.SummaryPanel /> - <com.izforge.izpack.panels.InstallPanel /> - <com.izforge.izpack.panels.FinishPanel /> -</AutomatedInstallation> Copied: jbpm4/trunk/modules/distro/src/main/resources/installer/auto-install-template.xml (from rev 3739, jbpm4/branches/hbraun/modules/distro/src/main/resources/installer/auto-install-template.xml) =================================================================== --- jbpm4/trunk/modules/distro/src/main/resources/installer/auto-install-template.xml (rev 0) +++ jbpm4/trunk/modules/distro/src/main/resources/installer/auto-install-template.xml 2009-02-02 14:27:18 UTC (rev 3740) @@ -0,0 +1,34 @@ +<AutomatedInstallation langpack="eng"> + <com.izforge.izpack.panels.HelloPanel /> + <com.izforge.izpack.panels.TargetPanel> + <installpath>@user.home@/jbpm-jpdl-(a)product.version@</installpath> + </com.izforge.izpack.panels.TargetPanel> + <com.izforge.izpack.panels.TreePacksPanel> + <pack name="jBPM4 Standalone" index="0" selected="true"/> + <pack name="jBPM4 JBoss Integration" index="1" selected="true"/> +  + <pack name="Optional Components" index="4" selected="false"/> + <pack name="Download JBoss-5.0.0" index="5" selected="false"/> + <pack name="Download Eclipse-3.4.0" index="6" selected="false"/> + </com.izforge.izpack.panels.TreePacksPanel> + <com.izforge.izpack.panels.UserInputPanel> + <userInput> + <entry key="jbossTargetServer" value="default" /> + <entry key="jbossSelection" value="@jbpm.target.container@" /> + </userInput> + </com.izforge.izpack.panels.UserInputPanel> + <com.izforge.izpack.panels.UserInputPanel> + <userInput> + <entry key="dbSelection" value="@database@"/> + </userInput> + </com.izforge.izpack.panels.UserInputPanel> + <com.izforge.izpack.panels.UserInputPanel> + <userInput> + <entry key="jbossInstallPath" value="@jboss.home@" /> + </userInput> + </com.izforge.izpack.panels.UserInputPanel> + <com.izforge.izpack.panels.SummaryPanel /> + <com.izforge.izpack.panels.InstallPanel /> + <com.izforge.izpack.panels.FinishPanel /> +</AutomatedInstallation> Deleted: jbpm4/trunk/modules/distro/src/main/resources/installer/download-helper.xml =================================================================== --- jbpm4/branches/hbraun/modules/distro/src/main/resources/installer/download-helper.xml 2009-02-02 13:49:27 UTC (rev 3739) +++ jbpm4/trunk/modules/distro/src/main/resources/installer/download-helper.xml 2009-02-02 14:27:18 UTC (rev 3740) @@ -1,25 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - - - - - - - - - - -<project> - - <target name="download-jboss"> - <get src="http://downloads.sourceforge.net/jboss/jboss-5.0.0.GA.zip?modtime=1228452..." dest="${install.path}/Uninstaller/jboss-5.0.0.GA.zip" usetimestamp="true"/> - <unzip src="${install.path}/Uninstaller/jboss-5.0.0.GA.zip" dest="${install.path}"/> - </target> - <target name="download-eclipse"> - <get src="http://download.eclipse.org/technology/epp/downloads/release/ganymede/R/e..." - dest="${install.path}/Uninstaller/eclipse-java-ganymede-linux-gtk.tar.gz" usetimestamp="true"/> - <untar src="${install.path}/Uninstaller/eclipse-java-ganymede-linux-gtk.tar.gz" dest="${install.path}" compression="gzip"/> - </target> - -</project> \ No newline at end of file Copied: jbpm4/trunk/modules/distro/src/main/resources/installer/download-helper.xml (from rev 3739, jbpm4/branches/hbraun/modules/distro/src/main/resources/installer/download-helper.xml) =================================================================== --- jbpm4/trunk/modules/distro/src/main/resources/installer/download-helper.xml (rev 0) +++ jbpm4/trunk/modules/distro/src/main/resources/installer/download-helper.xml 2009-02-02 14:27:18 UTC (rev 3740) @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + + + + + + + + + +<project> + + <target name="download-jboss"> + <get src="http://downloads.sourceforge.net/jboss/jboss-5.0.0.GA.zip?modtime=1228452..." dest="${install.path}/Uninstaller/jboss-5.0.0.GA.zip" usetimestamp="true"/> + <unzip src="${install.path}/Uninstaller/jboss-5.0.0.GA.zip" dest="${install.path}"/> + </target> + <target name="download-eclipse"> + <get src="http://download.eclipse.org/technology/epp/downloads/release/ganymede/R/e..." + dest="${install.path}/Uninstaller/eclipse-java-ganymede-linux-gtk.tar.gz" usetimestamp="true"/> + <untar src="${install.path}/Uninstaller/eclipse-java-ganymede-linux-gtk.tar.gz" dest="${install.path}" compression="gzip"/> + </target> + +</project> \ No newline at end of file Deleted: jbpm4/trunk/modules/distro/src/main/resources/installer/install-definition.xml =================================================================== --- jbpm4/branches/hbraun/modules/distro/src/main/resources/installer/install-definition.xml 2009-02-02 13:49:27 UTC (rev 3739) +++ jbpm4/trunk/modules/distro/src/main/resources/installer/install-definition.xml 2009-02-02 14:27:18 UTC (rev 3740) @@ -1,253 +0,0 @@ -<?xml version="1.0" encoding="iso-8859-1" standalone="yes" ?> -<installation version="1.0"> -  - <info> - <appname>@{product.name}</appname> - <appversion>@{product.version}</appversion> - <uninstaller name="remove.task" write="yes" /> - </info> - <guiprefs width="600" height="440" resizable="yes"> -  - </guiprefs> - <locale> - <langpack iso3="eng" /> - </locale> - -  - <jar src="@{deploy.artifacts.dir}/lib/ant.jar" stage="both" /> - <jar src="@{deploy.artifacts.dir}/lib/ant-launcher.jar" stage="both" /> - -  - <listeners> - <listener installer="AntActionInstallerListener" /> - </listeners> - -  - <resources> - <res id="AntActionsSpec.xml" src="@{filtered.resources.dir}/ant-actions-spec.xml" /> - <res id="userInputSpec.xml" src="@{filtered.resources.dir}/user-input-spec.xml" /> - <res id="TargetPanel.dir" src="@{filtered.resources.dir}/target-panel-dir.txt" /> - </resources> - -  - <variables> - <variable name="jboss422.home" value="@{jboss422.home}" /> - <variable name="jboss423.home" value="@{jboss423.home}" /> - <variable name="jboss500.home" value="@{jboss500.home}" /> - </variables> - -  - <dynamicvariables> - <variable name="jboss.home" value="${jboss422.home}" condition="isJBoss422" /> - <variable name="jboss.home" value="${jboss423.home}" condition="isJBoss423" /> - <variable name="jboss.home" value="${jboss500.home}" condition="isJBoss500" /> - </dynamicvariables> - -  - <conditions> -  - <condition type="variable" id="isJBoss422"> - <name>jbossSelection</name> - <value>jboss422</value> - </condition> - <condition type="variable" id="isJBoss423"> - <name>jbossSelection</name> - <value>jboss423</value> - </condition> - <condition type="variable" id="isJBoss500"> - <name>jbossSelection</name> - <value>jboss500</value> - </condition> - -  - <condition type="variable" id="isHypersonic"> - <name>dbSelection</name> - <value>hsqldb</value> - </condition> - <condition type="variable" id="isMySQL"> - <name>dbSelection</name> - <value>mysql</value> - </condition> - <condition type="variable" id="isPostgreSQL"> - <name>dbSelection</name> - <value>postgresql</value> - </condition> - <condition type="variable" id="isSybase"> - <name>dbSelection</name> - <value>sybase</value> - </condition> - </conditions> - -  - <panels> - <panel classname="HelloPanel" /> - <panel classname="TargetPanel" /> - <panel classname="TreePacksPanel" /> - <panel classname="UserInputPanel" /> - <panel classname="UserInputPanel" /> - <panel classname="UserInputPanel" /> - <panel classname="SummaryPanel" /> - <panel classname="InstallPanel" /> - <panel classname="FinishPanel" /> - </panels> - -  - <packs> - -  - - <pack name="jBPM4 Standalone" required="yes" preselected="yes"> - <description>The jBPM4 Standalone Components</description> - -  - <file src="@{deploy.artifacts.dir}/release.notes.html" targetdir="$INSTALL_PATH" override="true" /> - <file src="@{deploy.artifacts.dir}/jboss.eula.txt" targetdir="$INSTALL_PATH" override="true" /> - -  - <file src="@{deploy.artifacts.dir}/lib/jbpm-jpdl-config.jar" targetdir="$INSTALL_PATH/config" - unpack="true" override="true" /> - -  -  - -  - <fileset dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/lib" override="true"> - <include name="*.jar" /> - </fileset> - </pack> - -  - - <pack name="jBPM4 JBoss Integration" required="no" preselected="yes"> - - <description>The jBPM4 JBoss Integration</description> - -  - <fileset dir="@{deploy.artifacts.dir}/resources/jbpm-jpdl-config" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar" override="true"> - <include name="hibernate.properties"/> - <include name="jbpm.cfg.xml"/> - <include name="logging.properties"/> - </fileset> -  - <fileset dir="@{deploy.artifacts.dir}/lib" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar" override="true"> - <include name="jbpm-jpdl.jar" /> - <include name="jbpm-log.jar" /> - <include name="jbpm-pvm.jar" /> - <include name="jbpm-task.jar" /> - </fileset> - -  -  - - -  -  - -  -  - -  - <fileset dir="@{deploy.artifacts.dir}/resources/jbpm-jpdl-config" targetdir="${jbossInstallPath}/docs/examples/jbpm" override="true"> - <include name="hibernate.cfg.hsqldb.xml"/> - <include name="hibernate.cfg.mysql.xml"/> - <include name="hibernate.cfg.postgresql.xml"/> - <include name="hibernate.cfg.sybase.xml"/> - <include name="jbpm-hsqldb-ds.xml"/> - <include name="jbpm-mysql-ds.xml"/> - <include name="jbpm-postgresql-ds.xml"/> - <include name="jbpm-sybase-ds.xml"/> - </fileset> - -  - <file src="@{deploy.artifacts.dir}/resources/jbpm-jpdl-config/jbpm-hsqldb-ds.xml" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm" condition="isHypersonic"/> - <singlefile src="@{deploy.artifacts.dir}/resources/jbpm-jpdl-config/hibernate.cfg.hsqldb.xml" condition="isHypersonic" - target="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar/hibernate.cfg.xml" /> -  - -  - <file src="@{deploy.artifacts.dir}/resources/jbpm-jpdl-config/jbpm-mysql-ds.xml" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm" condition="isMySQL"/> - <singlefile src="@{deploy.artifacts.dir}/resources/jbpm-jpdl-config/hibernate.cfg.mysql.xml" condition="isMySQL" - target="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar/hibernate.cfg.xml" /> - <fileset dir="@{deploy.artifacts.dir}/lib" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar" override="true" condition="isMySQL"> - <include name="mysql-connector-java.jar" /> - </fileset> - - </pack> - -  - -  - -  - - <pack name="Optional Components" required="no" preselected="no"> - <description>Optional jBPM4 Components</description> - </pack> - -  - <pack name="Download JBoss-5.0.0" required="no" parent="Optional Components" preselected="no"> - <description>Download and Install JBoss-5.0.0</description> -  - <file src="@{resources.dir}/installer/download-helper.xml" targetdir="$INSTALL_PATH/Uninstaller"/> - </pack> - -  -  - - </packs> -</installation> \ No newline at end of file Copied: jbpm4/trunk/modules/distro/src/main/resources/installer/install-definition.xml (from rev 3739, jbpm4/branches/hbraun/modules/distro/src/main/resources/installer/install-definition.xml) =================================================================== --- jbpm4/trunk/modules/distro/src/main/resources/installer/install-definition.xml (rev 0) +++ jbpm4/trunk/modules/distro/src/main/resources/installer/install-definition.xml 2009-02-02 14:27:18 UTC (rev 3740) @@ -0,0 +1,253 @@ +<?xml version="1.0" encoding="iso-8859-1" standalone="yes" ?> +<installation version="1.0"> +  + <info> + <appname>@{product.name}</appname> + <appversion>@{product.version}</appversion> + <uninstaller name="remove.task" write="yes" /> + </info> + <guiprefs width="600" height="440" resizable="yes"> +  + </guiprefs> + <locale> + <langpack iso3="eng" /> + </locale> + +  + <jar src="@{deploy.artifacts.dir}/lib/ant.jar" stage="both" /> + <jar src="@{deploy.artifacts.dir}/lib/ant-launcher.jar" stage="both" /> + +  + <listeners> + <listener installer="AntActionInstallerListener" /> + </listeners> + +  + <resources> + <res id="AntActionsSpec.xml" src="@{filtered.resources.dir}/ant-actions-spec.xml" /> + <res id="userInputSpec.xml" src="@{filtered.resources.dir}/user-input-spec.xml" /> + <res id="TargetPanel.dir" src="@{filtered.resources.dir}/target-panel-dir.txt" /> + </resources> + +  + <variables> + <variable name="jboss422.home" value="@{jboss422.home}" /> + <variable name="jboss423.home" value="@{jboss423.home}" /> + <variable name="jboss500.home" value="@{jboss500.home}" /> + </variables> + +  + <dynamicvariables> + <variable name="jboss.home" value="${jboss422.home}" condition="isJBoss422" /> + <variable name="jboss.home" value="${jboss423.home}" condition="isJBoss423" /> + <variable name="jboss.home" value="${jboss500.home}" condition="isJBoss500" /> + </dynamicvariables> + +  + <conditions> +  + <condition type="variable" id="isJBoss422"> + <name>jbossSelection</name> + <value>jboss422</value> + </condition> + <condition type="variable" id="isJBoss423"> + <name>jbossSelection</name> + <value>jboss423</value> + </condition> + <condition type="variable" id="isJBoss500"> + <name>jbossSelection</name> + <value>jboss500</value> + </condition> + +  + <condition type="variable" id="isHypersonic"> + <name>dbSelection</name> + <value>hsqldb</value> + </condition> + <condition type="variable" id="isMySQL"> + <name>dbSelection</name> + <value>mysql</value> + </condition> + <condition type="variable" id="isPostgreSQL"> + <name>dbSelection</name> + <value>postgresql</value> + </condition> + <condition type="variable" id="isSybase"> + <name>dbSelection</name> + <value>sybase</value> + </condition> + </conditions> + +  + <panels> + <panel classname="HelloPanel" /> + <panel classname="TargetPanel" /> + <panel classname="TreePacksPanel" /> + <panel classname="UserInputPanel" /> + <panel classname="UserInputPanel" /> + <panel classname="UserInputPanel" /> + <panel classname="SummaryPanel" /> + <panel classname="InstallPanel" /> + <panel classname="FinishPanel" /> + </panels> + +  + <packs> + +  + + <pack name="jBPM4 Standalone" required="yes" preselected="yes"> + <description>The jBPM4 Standalone Components</description> + +  + <file src="@{deploy.artifacts.dir}/release.notes.html" targetdir="$INSTALL_PATH" override="true" /> + <file src="@{deploy.artifacts.dir}/jboss.eula.txt" targetdir="$INSTALL_PATH" override="true" /> + +  + <file src="@{deploy.artifacts.dir}/lib/jbpm-jpdl-config.jar" targetdir="$INSTALL_PATH/config" + unpack="true" override="true" /> + +  +  + +  + <fileset dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/lib" override="true"> + <include name="*.jar" /> + </fileset> + </pack> + +  + + <pack name="jBPM4 JBoss Integration" required="no" preselected="yes"> + + <description>The jBPM4 JBoss Integration</description> + +  + <fileset dir="@{deploy.artifacts.dir}/resources/jbpm-jpdl-config" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar" override="true"> + <include name="hibernate.properties"/> + <include name="jbpm.cfg.xml"/> + <include name="logging.properties"/> + </fileset> +  + <fileset dir="@{deploy.artifacts.dir}/lib" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar" override="true"> + <include name="jbpm-jpdl.jar" /> + <include name="jbpm-log.jar" /> + <include name="jbpm-pvm.jar" /> + <include name="jbpm-task.jar" /> + </fileset> + +  +  + + +  +  + +  +  + +  + <fileset dir="@{deploy.artifacts.dir}/resources/jbpm-jpdl-config" targetdir="${jbossInstallPath}/docs/examples/jbpm" override="true"> + <include name="hibernate.cfg.hsqldb.xml"/> + <include name="hibernate.cfg.mysql.xml"/> + <include name="hibernate.cfg.postgresql.xml"/> + <include name="hibernate.cfg.sybase.xml"/> + <include name="jbpm-hsqldb-ds.xml"/> + <include name="jbpm-mysql-ds.xml"/> + <include name="jbpm-postgresql-ds.xml"/> + <include name="jbpm-sybase-ds.xml"/> + </fileset> + +  + <file src="@{deploy.artifacts.dir}/resources/jbpm-jpdl-config/jbpm-hsqldb-ds.xml" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm" condition="isHypersonic"/> + <singlefile src="@{deploy.artifacts.dir}/resources/jbpm-jpdl-config/hibernate.cfg.hsqldb.xml" condition="isHypersonic" + target="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar/hibernate.cfg.xml" /> +  + +  + <file src="@{deploy.artifacts.dir}/resources/jbpm-jpdl-config/jbpm-mysql-ds.xml" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm" condition="isMySQL"/> + <singlefile src="@{deploy.artifacts.dir}/resources/jbpm-jpdl-config/hibernate.cfg.mysql.xml" condition="isMySQL" + target="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar/hibernate.cfg.xml" /> + <fileset dir="@{deploy.artifacts.dir}/lib" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar" override="true" condition="isMySQL"> + <include name="mysql-connector-java.jar" /> + </fileset> + + </pack> + +  + +  + +  + + <pack name="Optional Components" required="no" preselected="no"> + <description>Optional jBPM4 Components</description> + </pack> + +  + <pack name="Download JBoss-5.0.0" required="no" parent="Optional Components" preselected="no"> + <description>Download and Install JBoss-5.0.0</description> +  + <file src="@{resources.dir}/installer/download-helper.xml" targetdir="$INSTALL_PATH/Uninstaller"/> + </pack> + +  +  + + </packs> +</installation> \ No newline at end of file Deleted: jbpm4/trunk/modules/distro/src/main/resources/installer/target-panel-dir.txt =================================================================== --- jbpm4/branches/hbraun/modules/distro/src/main/resources/installer/target-panel-dir.txt 2009-02-02 13:49:27 UTC (rev 3739) +++ jbpm4/trunk/modules/distro/src/main/resources/installer/target-panel-dir.txt 2009-02-02 14:27:18 UTC (rev 3740) @@ -1 +0,0 @@ -$USER_HOME/jbpm-(a)product.version@ Copied: jbpm4/trunk/modules/distro/src/main/resources/installer/target-panel-dir.txt (from rev 3739, jbpm4/branches/hbraun/modules/distro/src/main/resources/installer/target-panel-dir.txt) =================================================================== --- jbpm4/trunk/modules/distro/src/main/resources/installer/target-panel-dir.txt (rev 0) +++ jbpm4/trunk/modules/distro/src/main/resources/installer/target-panel-dir.txt 2009-02-02 14:27:18 UTC (rev 3740) @@ -0,0 +1 @@ +$USER_HOME/jbpm-(a)product.version@ Deleted: jbpm4/trunk/modules/distro/src/main/resources/installer/user-input-spec.xml =================================================================== --- jbpm4/branches/hbraun/modules/distro/src/main/resources/installer/user-input-spec.xml 2009-02-02 13:49:27 UTC (rev 3739) +++ jbpm4/trunk/modules/distro/src/main/resources/installer/user-input-spec.xml 2009-02-02 14:27:18 UTC (rev 3740) @@ -1,34 +0,0 @@ -<userInput> - <panel order="0"> - <createForPack name="jBPM4 JBoss Integration" /> - <field type="radio" variable="jbossSelection"> - <description align="left" txt="Please choose your target server" /> - <spec> - <choice txt="JBoss-5.0.0" value="jboss500" set="true"/> - <choice txt="JBoss-4.2.3" value="jboss423"/> - <choice txt="JBoss-4.2.2" value="jboss422"/> - </spec> - </field> - <field type="text" variable="jbossTargetServer"> - <spec txt="Server:" size="15" set="default" /> - </field> - </panel> - <panel order="1"> - <createForPack name="jBPM4 JBoss Integration" /> - <field type="radio" variable="dbSelection"> - <description align="left" txt="Please choose your target database" /> - <spec> - <choice txt="Hypersonic" value="hsqldb"/> - <choice txt="MySQL" value="mysql" set="true"/> -  - <choice txt="Sybase" value="sybase"/> - </spec> - </field> - </panel> - <panel order="2"> - <createForPack name="jBPM4 JBoss Integration" /> - <field type="dir" align="left" variable="jbossInstallPath"> - <spec txt="JBoss Home:" size="25" set="${jboss.home}" /> - </field> - </panel> -</userInput> \ No newline at end of file Copied: jbpm4/trunk/modules/distro/src/main/resources/installer/user-input-spec.xml (from rev 3739, jbpm4/branches/hbraun/modules/distro/src/main/resources/installer/user-input-spec.xml) =================================================================== --- jbpm4/trunk/modules/distro/src/main/resources/installer/user-input-spec.xml (rev 0) +++ jbpm4/trunk/modules/distro/src/main/resources/installer/user-input-spec.xml 2009-02-02 14:27:18 UTC (rev 3740) @@ -0,0 +1,34 @@ +<userInput> + <panel order="0"> + <createForPack name="jBPM4 JBoss Integration" /> + <field type="radio" variable="jbossSelection"> + <description align="left" txt="Please choose your target server" /> + <spec> + <choice txt="JBoss-5.0.0" value="jboss500" set="true"/> + <choice txt="JBoss-4.2.3" value="jboss423"/> + <choice txt="JBoss-4.2.2" value="jboss422"/> + </spec> + </field> + <field type="text" variable="jbossTargetServer"> + <spec txt="Server:" size="15" set="default" /> + </field> + </panel> + <panel order="1"> + <createForPack name="jBPM4 JBoss Integration" /> + <field type="radio" variable="dbSelection"> + <description align="left" txt="Please choose your target database" /> + <spec> + <choice txt="Hypersonic" value="hsqldb"/> + <choice txt="MySQL" value="mysql" set="true"/> +  + <choice txt="Sybase" value="sybase"/> + </spec> + </field> + </panel> + <panel order="2"> + <createForPack name="jBPM4 JBoss Integration" /> + <field type="dir" align="left" variable="jbossInstallPath"> + <spec txt="JBoss Home:" size="25" set="${jboss.home}" /> + </field> + </panel> +</userInput> \ No newline at end of file Copied: jbpm4/trunk/modules/distro/src/main/resources/release.notes.html (from rev 3739, jbpm4/branches/hbraun/modules/distro/src/main/resources/release.notes.html) =================================================================== --- jbpm4/trunk/modules/distro/src/main/resources/release.notes.html (rev 0) +++ jbpm4/trunk/modules/distro/src/main/resources/release.notes.html 2009-02-02 14:27:18 UTC (rev 3740) @@ -0,0 +1,87 @@ +<body><h1>jBPM-4.0.0-SNAPSHOT Release Notes</h1> +</p><p><exclude>org/jbpm/db/JbpmSchemaDbTest.java</exclude></p></pre> +<p> </p> +<p><strong>Core tests - MySQL</strong></p> +<pre class="jive_text_macro jive_macro_code" jivemacro="code" ___default_attr="plain"><p><br /><exclude>org/jbpm/seam/JobExecutorCustomizationTest.java</exclude><br /><br /><exclude>org/jbpm/db/JbpmSchemaDbTest.java</exclude></p></pre> +<p> </p> +<p><strong>Core test, Sybase</strong></p> +<pre class="jive_text_macro jive_macro_code" jivemacro="code" ___default_attr="plain"><p><br /><exclude>org/jbpm/db/JbpmSchemaDbTest.java</exclude></p></pre> +<p> </p> +<p><strong>Enterprise tests - HSQLDB</strong></p> +<p> </p> +<pre class="jive_text_macro jive_macro_code" jivemacro="code" ___default_attr="plain"><p></p><p><exclude>org/jbpm/scheduler/ejbtimer/EjbSchedulerTest.java</exclude></p></pre> +<p> </p> +<p><strong>Enterprise tests, Sybase</strong></p> +<p> </p> +<pre class="jive_text_macro jive_macro_code" jivemacro="code" ___default_attr="plain"><p><br /><exclude>org/jbpm/scheduler/ejbtimer/EjbSchedulerTest.java</exclude><br /><exclude>org/jbpm/persistence/jta/JtaDbPersistenceTest.java</exclude><br /><exclude>org/jbpm/msg/jms/JmsMessageTest.java</exclude></p></pre> +<p> </p> +<p> </p> +<p><strong>Examples tests, Sybase</strong></p> +<p> </p> +<pre class="jive_text_macro jive_macro_code" jivemacro="code" ___default_attr="plain"><p></p><p><exclude>org/jbpm/examples/taskinstance/CustomTaskInstanceTest.java</exclude></p></pre> +<p> </p--> + +</body> \ No newline at end of file Property changes on: jbpm4/trunk/modules/enterprise ___________________________________________________________________ Name: svn:ignore - target .settings + *.iml Copied: jbpm4/trunk/modules/enterprise/jbpm4-enterprise.iml (from rev 3739, jbpm4/branches/hbraun/modules/enterprise/jbpm4-enterprise.iml) =================================================================== --- jbpm4/trunk/modules/enterprise/jbpm4-enterprise.iml (rev 0) +++ jbpm4/trunk/modules/enterprise/jbpm4-enterprise.iml 2009-02-02 14:27:18 UTC (rev 3740) @@ -0,0 +1,327 @@ +<?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/java" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" /> + <sourceFolder url="file://$MODULE_DIR$/src/test/resources" isTestSource="true" /> + </content> + <orderEntry type="inheritedJdk" /> + <orderEntry type="sourceFolder" forTests="false" /> + <orderEntry type="module" module-name="jbpm4-toplevel" /> + <orderEntry type="module-library"> + <library name="M2 Dep: cargo:cargo:jar:0.5:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/cargo/cargo/0.5/cargo-0.5.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: cactus:cactus:jar:13-1.7.1:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/cactus/cactus/13-1.7.1/cactus-13-1.7.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: nekohtml:nekohtml:jar:0.9.1:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/nekohtml/nekohtml/0.9.1/nekohtml-0.9.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/nekohtml/nekohtml/0.9.1/nekohtml-0.9.1-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.jboss.client:jbossall-client:jar:4.2.2.GA:runtime"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/client/jbossall-client/4.2.2.GA/jbossall-client-4.2.2.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: xerces:xercesImpl:jar:2.6.2:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/xerces/xercesImpl/2.6.2/xercesImpl-2.6.2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: aspectj:aspectjrt:jar:1.2.1:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/aspectj/aspectjrt/1.2.1/aspectjrt-1.2.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: jboss:jboss-j2ee:jar:4.2.2.GA:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/jboss/jboss-j2ee/4.2.2.GA/jboss-j2ee-4.2.2.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: commons-httpclient:commons-httpclient:jar:2.0.2:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-httpclient/commons-httpclient/2.0.2/commons-httpclient-2.0.2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: cactus:cactus-ant:jar:13-1.7.1:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/cactus/cactus-ant/13-1.7.1/cactus-ant-13-1.7.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: rhino:js:jar:1.5R4.1:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/rhino/js/1.5R4.1/js-1.5R4.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/rhino/js/1.5R4.1/js-1.5R4.1-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: ant:ant:jar:1.5.4:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/ant/ant/1.5.4/ant-1.5.4.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: jtidy:jtidy:jar:4aug2000r7-dev:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/jtidy/jtidy/4aug2000r7-dev/jtidy-4aug2000r7-dev.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/jtidy/jtidy/4aug2000r7-dev/jtidy-4aug2000r7-dev-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: httpunit:httpunit:jar:1.6:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/httpunit/httpunit/1.6/httpunit-1.6.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/httpunit/httpunit/1.6/httpunit-1.6-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: xerces:xmlParserAPIs:jar:2.2.1:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/xerces/xmlParserAPIs/2.2.1/xmlParserAPIs-2.2.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: hsqldb:hsqldb:jar:1.8.0.7:test"> + <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: 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: junit:junit:jar:3.8.1:compile"> + <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: 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: 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: 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: org.springframework:spring:jar:2.5.4:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/springframework/spring/2.5.4/spring-2.5.4.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.livetribe:livetribe-jsr223:jar:2.0.5:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/livetribe/livetribe-jsr223/2.0.5/livetribe-jsr223-2.0.5.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> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/dom4j/dom4j/1.6.1/dom4j-1.6.1-sources.jar!/" /> + </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: 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: log4j:log4j:jar:1.2.14:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/log4j/log4j/1.2.14/log4j-1.2.14.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/log4j/log4j/1.2.14/log4j-1.2.14-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: commons-logging:commons-logging:jar:1.0.4:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: juel:juel-engine:jar:2.1.0:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/juel/juel-engine/2.1.0/juel-engine-2.1.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: juel:juel:jar:2.1.0:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/juel/juel/2.1.0/juel-2.1.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: juel:juel-impl:jar:2.1.0:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/juel/juel-impl/2.1.0/juel-impl-2.1.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntryProperties /> + </component> +</module> + Modified: jbpm4/trunk/modules/enterprise/pom.xml =================================================================== --- jbpm4/trunk/modules/enterprise/pom.xml 2009-02-02 13:49:27 UTC (rev 3739) +++ jbpm4/trunk/modules/enterprise/pom.xml 2009-02-02 14:27:18 UTC (rev 3740) @@ -1,18 +1,18 @@ <?xml version="1.0" encoding="UTF-8"?> -  -  -  -  -  -  -  -  + + + + + + + + -  + <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"> + 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>jBPM 4 - Enterprise</name> @@ -43,9 +43,9 @@  <dependency> - <groupId>cactus</groupId> - <artifactId>cactus</artifactId> - <scope>test</scope> + <groupId>cactus</groupId> + <artifactId>cactus</artifactId> + <scope>test</scope> </dependency> <dependency> <groupId>org.jboss.client</groupId> @@ -56,12 +56,12 @@  <build> - <testResources> - <testResource> - <filtering>true</filtering> - <directory>src/test/resources</directory> - </testResource> - </testResources> + <testResources> + <testResource> + <filtering>true</filtering> + <directory>src/test/resources</directory> + </testResource> + </testResources> <plugins> <plugin> @@ -89,6 +89,20 @@ </descriptors> </configuration> </execution> + <execution> + <id>assembly-enterprise-config</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + <configuration> + <finalName>${project.build.finalName}</finalName> + <appendAssemblyId>true</appendAssemblyId> + <descriptors> + <descriptor>scripts/assembly-config.xml</descriptor> + </descriptors> + </configuration> + </execution> </executions> </plugin> Property changes on: jbpm4/trunk/modules/enterprise/scripts ___________________________________________________________________ Name: svn:ignore + *.iml Copied: jbpm4/trunk/modules/enterprise/scripts/assembly-config.xml (from rev 3739, jbpm4/branches/hbraun/modules/enterprise/scripts/assembly-config.xml) =================================================================== --- jbpm4/trunk/modules/enterprise/scripts/assembly-config.xml (rev 0) +++ jbpm4/trunk/modules/enterprise/scripts/assembly-config.xml 2009-02-02 14:27:18 UTC (rev 3740) @@ -0,0 +1,17 @@ +<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"> + <id>config</id> + <formats> + <format>jar</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> + <fileSets> + <fileSet> + <directory>${project.build.outputDirectory}</directory> + <outputDirectory>/</outputDirectory> + <includes> + <include>jbpm-*-ds.xml</include> + </includes> + </fileSet> + </fileSets> +</assembly> \ No newline at end of file Modified: jbpm4/trunk/modules/enterprise/scripts/assembly-test-dependencies.xml =================================================================== --- jbpm4/trunk/modules/enterprise/scripts/assembly-test-dependencies.xml 2009-02-02 13:49:27 UTC (rev 3739) +++ jbpm4/trunk/modules/enterprise/scripts/assembly-test-dependencies.xml 2009-02-02 14:27:18 UTC (rev 3740) @@ -16,9 +16,9 @@ <include>aspectj:aspectjrt:jar</include> <include>cactus:cactus</include> <include>junit:junit</include> - <include>org.jbpm.jbpm4:jbpm-api</include> +  </includes> <unpack>false</unpack> <scope>test</scope> Property changes on: jbpm4/trunk/modules/enterprise/src ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/enterprise/src/main ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/enterprise/src/main/java ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/enterprise/src/main/java/org ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/wire ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/wire/binding ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/enterprise/src/main/resources ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/enterprise/src/main/resources/META-INF ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/enterprise/src/test ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/enterprise/src/test/java ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/enterprise/src/test/java/org ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/custom ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/test ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/test/enterprise ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/enterprise/src/test/resources ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/enterprise/src/test/resources/META-INF ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/enterprise/src/test/resources/WEB-INF ___________________________________________________________________ Name: svn:ignore + *.iml Deleted: jbpm4/trunk/modules/enterprise/src/test/resources/hibernate.properties =================================================================== --- jbpm4/trunk/modules/enterprise/src/test/resources/hibernate.properties 2009-02-02 13:49:27 UTC (rev 3739) +++ jbpm4/trunk/modules/enterprise/src/test/resources/hibernate.properties 2009-02-02 14:27:18 UTC (rev 3740) @@ -1,6 +0,0 @@ -hibernate.connection.datasource java\:comp/env/jdbc/JbpmDataSource -hibernate.transaction.factory_class org.hibernate.transaction.JTATransactionFactory -hibernate.transaction.manager_lookup_class org.hibernate.transaction.JBossTransactionManagerLookup -hibernate.cache.provider_class org.hibernate.cache.HashtableCacheProvider -hibernate.format_sql true -hibernate.use_sql_comments true Property changes on: jbpm4/trunk/modules/examples ___________________________________________________________________ Name: svn:ignore - target + *.iml Copied: jbpm4/trunk/modules/examples/jbpm4-examples.iml (from rev 3739, jbpm4/branches/hbraun/modules/examples/jbpm4-examples.iml) =================================================================== --- jbpm4/trunk/modules/examples/jbpm4-examples.iml (rev 0) +++ jbpm4/trunk/modules/examples/jbpm4-examples.iml 2009-02-02 14:27:18 UTC (rev 3740) @@ -0,0 +1,254 @@ +<?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/test/java" isTestSource="true" /> + <sourceFolder url="file://$MODULE_DIR$/src/test/resources" isTestSource="true" /> + </content> + <orderEntry type="inheritedJdk" /> + <orderEntry type="sourceFolder" forTests="false" /> + <orderEntry type="module" module-name="jbpm4-toplevel" /> + <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: junit:junit:jar:3.8.1:compile"> + <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.jbpm.jbpm4.dependencies.esb:jbossesb-rosetta:jar:4.4.0.GA:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jbpm/jbpm4/dependencies/esb/jbossesb-rosetta/4.4.0.GA/jbossesb-rosetta-4.4.0.GA.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: commons-logging:commons-logging:jar:1.0.4:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: stax:stax-api:jar:1.0.1:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/stax/stax-api/1.0.1/stax-api-1.0.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.jboss.client:jbossall-client:jar:4.2.2.GA:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/client/jbossall-client/4.2.2.GA/jbossall-client-4.2.2.GA.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: 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: stax:stax:jar:1.2.0:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/stax/stax/1.2.0/stax-1.2.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: jboss:jboss-j2ee:jar:4.2.2.GA:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/jboss/jboss-j2ee/4.2.2.GA/jboss-j2ee-4.2.2.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: hsqldb:hsqldb:jar:1.8.0.7:test"> + <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: 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: 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> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/dom4j/dom4j/1.6.1/dom4j-1.6.1-sources.jar!/" /> + </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: org.jbpm.jbpm4.dependencies.esb:test-util:jar:4.4.0.GA:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jbpm/jbpm4/dependencies/esb/test-util/4.4.0.GA/test-util-4.4.0.GA.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: jboss.jbossts:jbossts-common:jar:4.4.0.GA:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/jboss/jbossts/jbossts-common/4.4.0.GA/jbossts-common-4.4.0.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: log4j:log4j:jar:1.2.14:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/log4j/log4j/1.2.14/log4j-1.2.14.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/log4j/log4j/1.2.14/log4j-1.2.14-sources.jar!/" /> + </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: org.springframework:spring:jar:2.5.4:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/springframework/spring/2.5.4/spring-2.5.4.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.livetribe:livetribe-jsr223:jar:2.0.5:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/livetribe/livetribe-jsr223/2.0.5/livetribe-jsr223-2.0.5.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: juel:juel-engine:jar:2.1.0:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/juel/juel-engine/2.1.0/juel-engine-2.1.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: juel:juel:jar:2.1.0:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/juel/juel/2.1.0/juel-2.1.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: juel:juel-impl:jar:2.1.0:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/juel/juel-impl/2.1.0/juel-impl-2.1.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntryProperties /> + </component> +</module> + Modified: jbpm4/trunk/modules/examples/pom.xml =================================================================== --- jbpm4/trunk/modules/examples/pom.xml 2009-02-02 13:49:27 UTC (rev 3739) +++ jbpm4/trunk/modules/examples/pom.xml 2009-02-02 14:27:18 UTC (rev 3740) @@ -29,29 +29,62 @@ <dependencies> <dependency> <groupId>org.jbpm.jbpm4</groupId> - <artifactId>jbpm-api</artifactId> + <artifactId>jbpm-jpdl</artifactId> <version>${version}</version> </dependency> - <dependency> <groupId>org.jbpm.jbpm4</groupId> <artifactId>jbpm-test-base</artifactId> <version>${version}</version> </dependency> - - <dependency> - <groupId>org.jbpm.jbpm4</groupId> - <artifactId>jbpm-jpdl</artifactId> - <version>${version}</version> - </dependency> - - <dependency> - <groupId>org.jbpm.jbpm4</groupId> - <artifactId>jbpm-pvm</artifactId> - <version>${version}</version> - <scope>test</scope> - </dependency> - </dependencies> + <build> + <plugins> + <plugin> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <id>unpack.jbpm.db</id> + <phase>generate-test-resources</phase> + <goals> + <goal>unpack</goal> + </goals> + <configuration> + <artifactItems> + <artifactItem> + <groupId>org.jbpm.jbpm4</groupId> + <artifactId>jbpm-jpdl</artifactId> + <classifier>config</classifier> + <overWrite>true</overWrite> + </artifactItem> + </artifactItems> + <excludeTransitive>true</excludeTransitive> + <outputDirectory>target/jpdl-config</outputDirectory> + </configuration> + </execution> + </executions> + </plugin> + + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <id>install.hibernate.database.properties</id> + <phase>generate-test-resources</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <tasks> + <copy file="target/jpdl-config/hibernate.cfg.${database}.xml" + tofile="target/test-classes/examples-hibernate.cfg.xml" + overwrite="true" /> + </tasks> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> </project> \ No newline at end of file Property changes on: jbpm4/trunk/modules/examples/src ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/examples/src/eclipse ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/examples/src/test ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/examples/src/test/java ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/examples/src/test/java/org ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/examples/src/test/java/org/jbpm ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/concurrency ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/concurrency/graphbased ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/end ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/end/multiple ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/end/processinstance ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/end/state ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/esb ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/exclusive ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/exclusive/conditions ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/exclusive/expression ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/exclusive/handler ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/hql ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/java ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/script ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/script/expression ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/script/text ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/sql ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/state ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/state/choice ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/state/sequence ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/states ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/examples/src/test/resources ___________________________________________________________________ Name: svn:ignore + *.iml Deleted: jbpm4/trunk/modules/examples/src/test/resources/hibernate.properties =================================================================== --- jbpm4/trunk/modules/examples/src/test/resources/hibernate.properties 2009-02-02 13:49:27 UTC (rev 3739) +++ jbpm4/trunk/modules/examples/src/test/resources/hibernate.properties 2009-02-02 14:27:18 UTC (rev 3740) @@ -1,11 +0,0 @@ -hibernate.dialect org.hibernate.dialect.HSQLDialect -hibernate.connection.driver_class org.hsqldb.jdbcDriver -hibernate.connection.url jdbc:hsqldb:mem:. -hibernate.connection.username sa -hibernate.connection.password -hibernate.hbm2ddl.auto create-drop -hibernate.cache.use_second_level_cache true -hibernate.cache.provider_class org.hibernate.cache.HashtableCacheProvider -# hibernate.show_sql true -# hibernate.format_sql true -# hibernate.use_sql_comments true Modified: jbpm4/trunk/modules/examples/src/test/resources/jbpm.cfg.xml =================================================================== --- jbpm4/trunk/modules/examples/src/test/resources/jbpm.cfg.xml 2009-02-02 13:49:27 UTC (rev 3739) +++ jbpm4/trunk/modules/examples/src/test/resources/jbpm.cfg.xml 2009-02-02 14:27:18 UTC (rev 3740) @@ -25,19 +25,7 @@ <standard-transaction-interceptor /> </command-service> - <hibernate-configuration> - <properties resource="hibernate.properties" /> - <mapping resource="jbpm.pvm.typedefs.hbm.xml" /> - <mapping resource="jbpm.pvm.wire.hbm.xml" /> - <mapping resource="jbpm.pvm.definition.hbm.xml" /> - <mapping resource="jbpm.pvm.execution.hbm.xml" /> - <mapping resource="jbpm.pvm.variable.hbm.xml" /> - <mapping resource="jbpm.pvm.job.hbm.xml" /> - <mapping resource="jbpm.jpdl.hbm.xml" /> - <mapping resource="jbpm.task.hbm.xml" /> - <cache-configuration resource="jbpm.pvm.cache.xml" - usage="nonstrict-read-write" /> - </hibernate-configuration> + <hibernate-configuration resource="examples-hibernate.cfg.xml"/> <hibernate-session-factory /> Property changes on: jbpm4/trunk/modules/examples/src/test/resources/org ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/concurrency ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/concurrency/graphbased ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/end ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/end/multiple ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/end/processinstance ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/end/state ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/esb ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/exclusive ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/exclusive/conditions ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/exclusive/expression ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/exclusive/handler ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/hql ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/java ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/script ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/script/expression ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/script/text ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/sql ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/state ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/state/choice ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/state/sequence ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/states ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/task ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/jpdl ___________________________________________________________________ Name: svn:ignore - target .settings + *.iml Modified: jbpm4/trunk/modules/jpdl/pom.xml =================================================================== --- jbpm4/trunk/modules/jpdl/pom.xml 2009-02-02 13:49:27 UTC (rev 3739) +++ jbpm4/trunk/modules/jpdl/pom.xml 2009-02-02 14:27:18 UTC (rev 3740) @@ -1,18 +1,18 @@ <?xml version="1.0" encoding="UTF-8"?> -  -  -  -  -  -  -  -  + + + + + + + + -  + <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"> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -35,6 +35,8 @@  <dependencies> + +  <dependency> <groupId>org.jbpm.jbpm4</groupId> <artifactId>jbpm-pvm</artifactId> @@ -45,6 +47,8 @@ <artifactId>jbpm-task</artifactId> <version>${version}</version> </dependency> + +  <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> @@ -61,16 +65,87 @@  <build> + <resources> + <resource> + <directory>src/main/resources</directory> + <filtering>true</filtering> + </resource> + </resources> <plugins> <plugin> + <artifactId>maven-jar-plugin</artifactId> + <configuration> + <excludes> + <exclude>hibernate.*</exclude> + <exclude>jbpm.cfg.xml</exclude> + <exclude>jbpm-*-ds.xml</exclude> + <exclude>db.properties/**</exclude> + <exclude>logging.properties</exclude> + </excludes> + </configuration> + </plugin> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <phase>compile</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <tasks> + <property name="database" value="${database}" /> + <ant antfile="scripts/antrun-jbpm-config.xml" target="concat" /> + </tasks> + </configuration> + </execution> +  + </executions> + </plugin> + + <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> <excludes>  - <exclude>**/*.java</exclude> + <exclude>org/jbpm/jpdl/controlflow/DecisionExpressionTest.java</exclude> + <exclude>org/jbpm/jpdl/controlflow/DecisionHandlerTest.java</exclude> + <exclude>org/jbpm/jpdl/parsing/JpdlSchemaTest.java</exclude> + <exclude>org/jbpm/jpdl/parsing/ProcessParsingTest.java</exclude> + <exclude>org/jbpm/jpdl/parsing/TransitionParsingTest.java</exclude> </excludes> </configuration> </plugin> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + <configuration> + <finalName>${project.build.finalName}</finalName> + <appendAssemblyId>true</appendAssemblyId> + <descriptors> + <descriptor>scripts/assembly-config.xml</descriptor> + </descriptors> + </configuration> + </execution> + </executions> + </plugin> </plugins> </build> Property changes on: jbpm4/trunk/modules/jpdl/scripts ___________________________________________________________________ Name: svn:ignore + *.iml Copied: jbpm4/trunk/modules/jpdl/scripts/antrun-jbpm-config.xml (from rev 3739, jbpm4/branches/hbraun/modules/jpdl/scripts/antrun-jbpm-config.xml) =================================================================== --- jbpm4/trunk/modules/jpdl/scripts/antrun-jbpm-config.xml (rev 0) +++ jbpm4/trunk/modules/jpdl/scripts/antrun-jbpm-config.xml 2009-02-02 14:27:18 UTC (rev 3740) @@ -0,0 +1,104 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + + + + + + + + + + +<project default="concat"> + + <property name="project.build.directory" value="${basedir}/target"/> + <property name="build.resources.directory" value="${basedir}/target/classes"/> + + <macrodef name="macro-disable"> + <attribute name="file" /> + <attribute name="section" /> + <sequential> + <replace file="@{file}" summary="true"> + <replacetoken><![CDATA[]]></replacetoken> + <replacevalue><![CDATA[]]></replacetoken> + <replacevalue><![CDATA[==== ]]>@{section}<![CDATA[ (end) -->]]></replacevalue> + </replace> + </sequential> + </macrodef> + + <macrodef name="macro-enable"> + <attribute name="file" /> + <attribute name="section" /> + <sequential> + <replace file="@{file}" summary="true"> + <replacetoken><![CDATA[]]></replacevalue> + </replace> + <replace file="@{file}" summary="true"> + <replacetoken><![CDATA[==== ]]>@{section}<![CDATA[ (end) -->]]></replacetoken> + <replacevalue><![CDATA[]]></replacevalue> + </replace> + </sequential> + </macrodef> + + <macrodef name="macro-database-cfg"> + <attribute name="database" /> + <sequential> + + <available property="@{database}.properties.available" file="${build.resources.directory}/hibernate.properties.(a){database}.xml"/> + <fail message="hibernate.properties.(a){database}.xml not available" unless="@{database}.properties.available"/> + + <echo message="Concat hibernate.cfg.(a){database}.xml using hibernate.properties.(a){database}.xml, hibernate.mapping.(a){database}.xml" /> + +  + <concat destfile="${project.build.directory}/classes/hibernate.cfg.(a){database}.xml"> + <header><![CDATA[<?xml version='1.0' encoding='utf-8'?> +<!DOCTYPE hibernate-configuration PUBLIC + "-//Hibernate/Hibernate Configuration DTD 3.0//EN" + "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd"> + +<hibernate-configuration> + <session-factory> +]]></header> + <fileset file="${build.resources.directory}/hibernate.properties.(a){database}.xml" /> + <fileset file="${build.resources.directory}/hibernate.common.xml" /> + <fileset file="${build.resources.directory}/hibernate.mapping.(a){database}.xml" /> + <fileset file="${build.resources.directory}/hibernate.mapping.default.xml" /> + <fileset file="${build.resources.directory}/hibernate.cache.xml" /> + <footer><![CDATA[ </session-factory> +</hibernate-configuration>]]></footer> + </concat> + </sequential> + </macrodef> + + <target name="concat" > + <macro-database-cfg database="db2" /> + <macro-database-cfg database="derby" /> + <macro-database-cfg database="firebird" /> + <macro-database-cfg database="hsqldb"/> + <macro-database-cfg database="ingres" /> + <macro-database-cfg database="interbase" /> + <macro-database-cfg database="mckoi" /> + <macro-database-cfg database="mssql" /> + <macro-database-cfg database="mysql"/> + <macro-database-cfg database="postgresql"/> + <macro-database-cfg database="sapdb" /> + <macro-database-cfg database="sybase"/> + <macro-database-cfg database="oracle" /> + <macro-database-cfg database="postgresql" /> + + <echo message="Copy hibernate.cfg.${database}.xml to hibernate.cfg.xml" /> + <copy file="${project.build.directory}/classes/hibernate.cfg.${database}.xml" tofile="${project.build.directory}/classes/hibernate.cfg.xml"/> + + <loadfile property="hibernate.properties.xml" srcFile="${build.resources.directory}/hibernate.properties.${database}.xml"/> + <echo message="${hibernate.properties.xml}"/> + <echo/> + + </target> + +</project> \ No newline at end of file Copied: jbpm4/trunk/modules/jpdl/scripts/assembly-config.xml (from rev 3739, jbpm4/branches/hbraun/modules/jpdl/scripts/assembly-config.xml) =================================================================== --- jbpm4/trunk/modules/jpdl/scripts/assembly-config.xml (rev 0) +++ jbpm4/trunk/modules/jpdl/scripts/assembly-config.xml 2009-02-02 14:27:18 UTC (rev 3740) @@ -0,0 +1,21 @@ +<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"> + <id>config</id> + <formats> + <format>jar</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> + <fileSets> + <fileSet> + <directory>${project.build.outputDirectory}</directory> + <outputDirectory>/</outputDirectory> + <includes> + <include>jbpm.cfg.xml</include> + <include>logging.properties</include> + <include>hibernate.cfg.xml</include> + <include>hibernate.cfg.*.xml</include> + <include>jbpm-*-ds.xml</include> + </includes> + </fileSet> + </fileSets> +</assembly> \ No newline at end of file Copied: jbpm4/trunk/modules/jpdl/scripts/build.schema.xml (from rev 3739, jbpm4/branches/hbraun/modules/jpdl/scripts/build.schema.xml) =================================================================== --- jbpm4/trunk/modules/jpdl/scripts/build.schema.xml (rev 0) +++ jbpm4/trunk/modules/jpdl/scripts/build.schema.xml 2009-02-02 14:27:18 UTC (rev 3740) @@ -0,0 +1,71 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + + + + + + + +<project> + +  +  +  + + <target name="create-schema"> + <echo message="${maven.runtime.classpath}"/> + + <taskdef name="schemaexport" + classname="org.hibernate.tool.hbm2ddl.SchemaExportTask"> + <classpath path="${maven.runtime.classpath}"/> + </taskdef> + + <property name="cfg" value="target/classes/hibernate.cfg.xml" /> + + <mkdir dir="target/classes/create"/> + <mkdir dir="target/classes/drop"/> + + <schemaexport properties="target/classes/db.properties/hsqldb.properties" + output="target/classes/create/jbpm.hsqldb.create.sql" + create="yes" drop="no" config="${cfg}" text="yes" /> + <schemaexport properties="target/classes/db.properties/hsqldb.properties" + output="target/classes/drop/jbpm.hsqldb.drop.sql" + create="no" drop="yes" config="${cfg}" text="yes" /> + + <schemaexport properties="target/classes/db.properties/mysql.properties" + output="target/classes/create/jbpm.mysql.create.sql" + delimiter=";" + create="yes" drop="no" config="${cfg}" text="yes" /> + <schemaexport properties="target/classes/db.properties/mysql.properties" + output="target/classes/drop/jbpm.mysql.drop.sql" + delimiter=";" + create="no" drop="yes" config="${cfg}" text="yes" /> + + <schemaexport properties="target/classes/db.properties/oracle.properties" + output="target/classes/create/jbpm.oracle.create.sql" + create="yes" drop="no" config="${cfg}" text="yes" + delimiter=";" /> + <schemaexport properties="target/classes/db.properties/oracle.properties" + output="target/classes/drop/jbpm.oracle.drop.sql" + create="no" drop="yes" config="${cfg}" text="yes" + delimiter=";" /> + + <schemaexport properties="target/classes/db.properties/postgresql.properties" + output="target/classes/create/jbpm.postgresql.create.sql" + create="yes" drop="no" config="${cfg}" text="yes" /> + <schemaexport properties="target/classes/db.properties/postgresql.properties" + output="target/classes/drop/jbpm.postgresql.drop.sql" + create="no" drop="yes" config="${cfg}" text="yes" /> + + <schemaexport properties="target/classes/db.properties/sybase.properties" + output="target/classes/create/jbpm.sybase.create.sql" + create="yes" drop="no" config="${cfg}" text="yes" /> + <schemaexport properties="target/classes/db.properties/sybase.properties" + output="target/classes/drop/jbpm.sybase.drop.sql" + create="no" drop="yes" config="${cfg}" text="yes" /> + + </target> + +</project> Property changes on: jbpm4/trunk/modules/jpdl/src ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/jpdl/src/main ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/jpdl/src/main/java ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/jpdl/src/main/java/org ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/el ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/deploy ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/impl ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/xml ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/jpdl/src/main/resources ___________________________________________________________________ Name: svn:ignore + *.iml Copied: jbpm4/trunk/modules/jpdl/src/main/resources/hibernate.cfg.xml (from rev 3739, jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.cfg.xml) =================================================================== --- jbpm4/trunk/modules/jpdl/src/main/resources/hibernate.cfg.xml (rev 0) +++ jbpm4/trunk/modules/jpdl/src/main/resources/hibernate.cfg.xml 2009-02-02 14:27:18 UTC (rev 3740) @@ -0,0 +1,20 @@ +<?xml version='1.0' encoding='UTF-8'?> + +<!DOCTYPE hibernate-configuration PUBLIC + "-//Hibernate/Hibernate Configuration DTD 2.0//EN" + "http://hibernate.sourceforge.net/hibernate-configuration-2.0.dtd"> + +<hibernate-configuration> + + <session-factory> + <mapping resource="jbpm.pvm.typedefs.hbm.xml" /> + <mapping resource="jbpm.pvm.wire.hbm.xml" /> + <mapping resource="jbpm.pvm.definition.hbm.xml" /> + <mapping resource="jbpm.pvm.execution.hbm.xml" /> + <mapping resource="jbpm.pvm.variable.hbm.xml" /> + <mapping resource="jbpm.pvm.job.hbm.xml" /> + <mapping resource="jbpm.task.hbm.xml" /> + <mapping resource="jbpm.jpdl.hbm.xml" /> + </session-factory> + +</hibernate-configuration> Copied: jbpm4/trunk/modules/jpdl/src/main/resources/hibernate.common.xml (from rev 3739, jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.common.xml) =================================================================== --- jbpm4/trunk/modules/jpdl/src/main/resources/hibernate.common.xml (rev 0) +++ jbpm4/trunk/modules/jpdl/src/main/resources/hibernate.common.xml 2009-02-02 14:27:18 UTC (rev 3740) @@ -0,0 +1,41 @@ + +  + +  + +  + +  +  +  + +  + <property name="hibernate.hbm2ddl.auto">create</property> +  + +  + <property name="hibernate.cache.provider_class">org.hibernate.cache.HashtableCacheProvider</property> + +  + <property name="hibernate.format_sql">true</property> + <property name="hibernate.use_sql_comments">true</property> + +  + + <mapping resource="jbpm.pvm.typedefs.hbm.xml" /> + <mapping resource="jbpm.pvm.wire.hbm.xml" /> + <mapping resource="jbpm.pvm.definition.hbm.xml" /> + <mapping resource="jbpm.pvm.execution.hbm.xml" /> + <mapping resource="jbpm.pvm.variable.hbm.xml" /> + <mapping resource="jbpm.pvm.job.hbm.xml" /> + <mapping resource="jbpm.task.hbm.xml" /> + <mapping resource="jbpm.jpdl.hbm.xml" /> Copied: jbpm4/trunk/modules/jpdl/src/main/resources/hibernate.properties.db2.xml (from rev 3739, jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.properties.db2.xml) =================================================================== --- jbpm4/trunk/modules/jpdl/src/main/resources/hibernate.properties.db2.xml (rev 0) +++ jbpm4/trunk/modules/jpdl/src/main/resources/hibernate.properties.db2.xml 2009-02-02 14:27:18 UTC (rev 3740) @@ -0,0 +1,12 @@ + +  + <property name="hibernate.dialect">org.hibernate.dialect.DB2Dialect</property> + +  +  + <property name="hibernate.connection.driver_class">com.ibm.db2.jcc.DB2Driver</property> + <property name="hibernate.connection.url">jdbc:db2://localhost:50000/testing</property> + <property name="hibernate.connection.username"></property> + <property name="hibernate.connection.password"></property> +  + Copied: jbpm4/trunk/modules/jpdl/src/main/resources/hibernate.properties.derby.xml (from rev 3739, jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.properties.derby.xml) =================================================================== --- jbpm4/trunk/modules/jpdl/src/main/resources/hibernate.properties.derby.xml (rev 0) +++ jbpm4/trunk/modules/jpdl/src/main/resources/hibernate.properties.derby.xml 2009-02-02 14:27:18 UTC (rev 3740) @@ -0,0 +1,12 @@ + +  + <property name="hibernate.dialect">org.hibernate.dialect.DerbyDialect</property> + +  +  + <property name="hibernate.connection.driver_class">org.apache.derby.jdbc.EmbeddedDriver</property> + <property name="hibernate.connection.url">jdbc:derby:build/derby/jbpmtest;create=true</property> + <property name="hibernate.connection.username"></property> + <property name="hibernate.connection.password"></property> +  + Copied: jbpm4/trunk/modules/jpdl/src/main/resources/hibernate.properties.firebird.xml (from rev 3739, jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.properties.firebird.xml) =================================================================== --- jbpm4/trunk/modules/jpdl/src/main/resources/hibernate.properties.firebird.xml (rev 0) +++ jbpm4/trunk/modules/jpdl/src/main/resources/hibernate.properties.firebird.xml 2009-02-02 14:27:18 UTC (rev 3740) @@ -0,0 +1,12 @@ + +  + <property name="hibernate.dialect">org.hibernate.dialect.FirebirdDialect</property> + +  +  + <property name="hibernate.connection.driver_class">org.firebirdsql.jdbc.FBDriver</property> + <property name="hibernate.connection.url">jdbc:firebirdsql:localhost:jbpmtest</property> + <property name="hibernate.connection.username"></property> + <property name="hibernate.connection.password"></property> +  + Copied: jbpm4/trunk/modules/jpdl/src/main/resources/hibernate.properties.hsqldb.xml (from rev 3739, jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.properties.hsqldb.xml) =================================================================== --- jbpm4/trunk/modules/jpdl/src/main/resources/hibernate.properties.hsqldb.xml (rev 0) +++ jbpm4/trunk/modules/jpdl/src/main/resources/hibernate.properties.hsqldb.xml 2009-02-02 14:27:18 UTC (rev 3740) @@ -0,0 +1,11 @@ + +  + <property name="hibernate.dialect">org.hibernate.dialect.HSQLDialect</property> + +  + <property name="hibernate.connection.driver_class">org.hsqldb.jdbcDriver</property> + <property name="hibernate.connection.url">jdbc:hsqldb:mem:jbpm</property> + <property name="hibernate.connection.username">sa</property> + <property name="hibernate.connection.password"></property> +  + Copied: jbpm4/trunk/modules/jpdl/src/main/resources/hibernate.properties.ingres.xml (from rev 3739, jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.properties.ingres.xml) =================================================================== --- jbpm4/trunk/modules/jpdl/src/main/resources/hibernate.properties.ingres.xml (rev 0) +++ jbpm4/trunk/modules/jpdl/src/main/resources/hibernate.properties.ingres.xml 2009-02-02 14:27:18 UTC (rev 3740) @@ -0,0 +1,12 @@ + +  + <property name="hibernate.dialect">org.hibernate.dialect.IngresDialect</property> + +  +  + <property name="hibernate.connection.driver_class"></property> + <property name="hibernate.connection.url"></property> + <property name="hibernate.connection.username"></property> + <property name="hibernate.connection.password"></property> +  + Copied: jbpm4/trunk/modules/jpdl/src/main/resources/hibernate.properties.interbase.xml (from rev 3739, jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.properties.interbase.xml) =================================================================== --- jbpm4/trunk/modules/jpdl/src/main/resources/hibernate.properties.interbase.xml (rev 0) +++ jbpm4/trunk/modules/jpdl/src/main/resources/hibernate.properties.interbase.xml 2009-02-02 14:27:18 UTC (rev 3740) @@ -0,0 +1,12 @@ + +  + <property name="hibernate.dialect">org.hibernate.dialect.InterbaseDialect</property> + +  +  + <property name="hibernate.connection.driver_class"></property> + <property name="hibernate.connection.url"></property> + <property name="hibernate.connection.username"></property> + <property name="hibernate.connection.password"></property> +  + Copied: jbpm4/trunk/modules/jpdl/src/main/resources/hibernate.properties.mckoi.xml (from rev 3739, jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.properties.mckoi.xml) =================================================================== --- jbpm4/trunk/modules/jpdl/src/main/resources/hibernate.properties.mckoi.xml (rev 0) +++ jbpm4/trunk/modules/jpdl/src/main/resources/hibernate.properties.mckoi.xml 2009-02-02 14:27:18 UTC (rev 3740) @@ -0,0 +1,12 @@ + +  + <property name="hibernate.dialect">org.hibernate.dialect.MckoiDialect</property> + +  +  + <property name="hibernate.connection.driver_class"></property> + <property name="hibernate.connection.url"></property> + <property name="hibernate.connection.username"></property> + <property name="hibernate.connection.password"></property> +  + Copied: jbpm4/trunk/modules/jpdl/src/main/resources/hibernate.properties.mssql.xml (from rev 3739, jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.properties.mssql.xml) =================================================================== --- jbpm4/trunk/modules/jpdl/src/main/resources/hibernate.properties.mssql.xml (rev 0) +++ jbpm4/trunk/modules/jpdl/src/main/resources/hibernate.properties.mssql.xml 2009-02-02 14:27:18 UTC (rev 3740) @@ -0,0 +1,12 @@ + +  + <property name="hibernate.dialect">org.hibernate.dialect.SQLServerDialect</property> + +  +  + <property name="hibernate.connection.driver_class">net.sourceforge.jtds.jdbc.Driver</property> + <property name="hibernate.connection.url">jdbc:jtds:sqlserver://localhost:1433/jbpmtest</property> + <property name="hibernate.connection.username"></property> + <property name="hibernate.connection.password"></property> +  + Copied: jbpm4/trunk/modules/jpdl/src/main/resources/hibernate.properties.mysql.xml (from rev 3739, jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.properties.mysql.xml) =================================================================== --- jbpm4/trunk/modules/jpdl/src/main/resources/hibernate.properties.mysql.xml (rev 0) +++ jbpm4/trunk/modules/jpdl/src/main/resources/hibernate.properties.mysql.xml 2009-02-02 14:27:18 UTC (rev 3740) @@ -0,0 +1,11 @@ + +  + <property name="hibernate.dialect">org.hibernate.dialect.MySQLInnoDBDialect</property> + +  + <property name="hibernate.connection.driver_class">com.mysql.jdbc.Driver</property> + <property name="hibernate.connection.url">${jdbc.mysql.url}</property> + <property name="hibernate.connection.username">${jdbc.mysql.username}</property> + <property name="hibernate.connection.password">${jdbc.mysql.password}</property> + <property name="hibernate.query.substitutions">true 1, false 0</property> +  Copied: jbpm4/trunk/modules/jpdl/src/main/resources/hibernate.properties.oracle.xml (from rev 3739, jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.properties.oracle.xml) =================================================================== --- jbpm4/trunk/modules/jpdl/src/main/resources/hibernate.properties.oracle.xml (rev 0) +++ jbpm4/trunk/modules/jpdl/src/main/resources/hibernate.properties.oracle.xml 2009-02-02 14:27:18 UTC (rev 3740) @@ -0,0 +1,12 @@ + +  + <property name="hibernate.dialect">org.hibernate.dialect.Oracle9Dialect</property> + +  +  + <property name="hibernate.connection.driver_class">oracle.jdbc.driver.OracleDriver</property> + <property name="hibernate.connection.url">${jdbc.oracle.url}</property> + <property name="hibernate.connection.username">${jdbc.oracle.username}</property> + <property name="hibernate.connection.password">${jdbc.oracle.password}</property> +  + Copied: jbpm4/trunk/modules/jpdl/src/main/resources/hibernate.properties.postgresql.xml (from rev 3739, jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.properties.postgresql.xml) =================================================================== --- jbpm4/trunk/modules/jpdl/src/main/resources/hibernate.properties.postgresql.xml (rev 0) +++ jbpm4/trunk/modules/jpdl/src/main/resources/hibernate.properties.postgresql.xml 2009-02-02 14:27:18 UTC (rev 3740) @@ -0,0 +1,11 @@ + +  + <property name="hibernate.dialect">org.hibernate.dialect.PostgreSQLDialect</property> + +  + <property name="hibernate.connection.driver_class">org.postgresql.Driver</property> + <property name="hibernate.connection.url">${jdbc.postgresql.url}</property> + <property name="hibernate.connection.username">${jdbc.postgresql.username}</property> + <property name="hibernate.connection.password">${jdbc.postgresql.password}</property> +  + Copied: jbpm4/trunk/modules/jpdl/src/main/resources/hibernate.properties.sapdb.xml (from rev 3739, jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.properties.sapdb.xml) =================================================================== --- jbpm4/trunk/modules/jpdl/src/main/resources/hibernate.properties.sapdb.xml (rev 0) +++ jbpm4/trunk/modules/jpdl/src/main/resources/hibernate.properties.sapdb.xml 2009-02-02 14:27:18 UTC (rev 3740) @@ -0,0 +1,12 @@ + +  + <property name="hibernate.dialect">org.hibernate.dialect.SAPDBDialect</property> + +  +  + <property name="hibernate.connection.driver_class"></property> + <property name="hibernate.connection.url"></property> + <property name="hibernate.connection.username"></property> + <property name="hibernate.connection.password"></property> +  + Copied: jbpm4/trunk/modules/jpdl/src/main/resources/hibernate.properties.sybase.xml (from rev 3739, jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.properties.sybase.xml) =================================================================== --- jbpm4/trunk/modules/jpdl/src/main/resources/hibernate.properties.sybase.xml (rev 0) +++ jbpm4/trunk/modules/jpdl/src/main/resources/hibernate.properties.sybase.xml 2009-02-02 14:27:18 UTC (rev 3740) @@ -0,0 +1,23 @@ +  + +  + <property name="hibernate.dialect">org.hibernate.dialect.SybaseDialect</property> + +  + <property name="hibernate.connection.driver_class">${jdbc.sybase.driver}</property> + <property name="hibernate.connection.url">${jdbc.sybase.url}</property> + <property name="hibernate.connection.username">${jdbc.sybase.username}</property> + <property name="hibernate.connection.password">${jdbc.sybase.password}</property> +  + +  + <property name="hibernate.jdbc.use_get_generated_keys">false</property> Copied: jbpm4/trunk/modules/jpdl/src/main/resources/jbpm-hsqldb-ds.xml (from rev 3739, jbpm4/branches/hbraun/modules/jpdl/src/main/resources/jbpm-hsqldb-ds.xml) =================================================================== --- jbpm4/trunk/modules/jpdl/src/main/resources/jbpm-hsqldb-ds.xml (rev 0) +++ jbpm4/trunk/modules/jpdl/src/main/resources/jbpm-hsqldb-ds.xml 2009-02-02 14:27:18 UTC (rev 3740) @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding="UTF-8"?> +<datasources> + + <local-tx-datasource> + <jndi-name>JbpmDS</jndi-name> + + <connection-url>jdbc:hsqldb:${jboss.server.data.dir}${/}hypersonic${/}jbpmDB</connection-url> + <driver-class>org.hsqldb.jdbcDriver</driver-class> + <user-name>sa</user-name> + <password></password> + +  + <min-pool-size>1</min-pool-size> + <max-pool-size>5</max-pool-size> + +  + <idle-timeout-minutes>0</idle-timeout-minutes> +  + <track-statements /> +  + <prepared-statement-cache-size>32</prepared-statement-cache-size> + +  + <metadata> + <type-mapping>Hypersonic SQL</type-mapping> + </metadata> + +  + <depends>jboss:service=Hypersonic,database=jbpmDB</depends> + </local-tx-datasource> + + <mbean code="org.jboss.jdbc.HypersonicDatabase" name="jboss:service=Hypersonic,database=jbpmDB"> + <attribute name="Database">jbpmDB</attribute> + <attribute name="InProcessMode">true</attribute> + </mbean> + +</datasources> Copied: jbpm4/trunk/modules/jpdl/src/main/resources/jbpm-mysql-ds.xml (from rev 3739, jbpm4/branches/hbraun/modules/jpdl/src/main/resources/jbpm-mysql-ds.xml) =================================================================== --- jbpm4/trunk/modules/jpdl/src/main/resources/jbpm-mysql-ds.xml (rev 0) +++ jbpm4/trunk/modules/jpdl/src/main/resources/jbpm-mysql-ds.xml 2009-02-02 14:27:18 UTC (rev 3740) @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="UTF-8"?> +<datasources> + + <xa-datasource> + <jndi-name>JbpmDS</jndi-name> + + <xa-datasource-class>com.mysql.jdbc.jdbc2.optional.MysqlXADataSource</xa-datasource-class> + <xa-datasource-property name="ServerName">${jdbc.mysql.server}</xa-datasource-property> + <xa-datasource-property name="PortNumber">${jdbc.mysql.port}</xa-datasource-property> + <xa-datasource-property name="DatabaseName">${jdbc.mysql.database}</xa-datasource-property> + <user-name>${jdbc.mysql.username}</user-name> + <password>${jdbc.mysql.password}</password> + +  + <transaction-isolation>TRANSACTION_READ_COMMITTED</transaction-isolation> +  + <no-tx-separate-pools /> +  + <track-connection-by-tx /> + +  + <exception-sorter-class-name> + com.mysql.jdbc.integration.jboss.ExtendedMysqlExceptionSorter + </exception-sorter-class-name> + <valid-connection-checker-class-name> + com.mysql.jdbc.integration.jboss.MysqlValidConnectionChecker + </valid-connection-checker-class-name> + +  + <metadata> + <type-mapping>mySQL</type-mapping> + </metadata> + </xa-datasource> + +</datasources> \ No newline at end of file Copied: jbpm4/trunk/modules/jpdl/src/main/resources/jbpm-postgresql-ds.xml (from rev 3739, jbpm4/branches/hbraun/modules/jpdl/src/main/resources/jbpm-postgresql-ds.xml) =================================================================== --- jbpm4/trunk/modules/jpdl/src/main/resources/jbpm-postgresql-ds.xml (rev 0) +++ jbpm4/trunk/modules/jpdl/src/main/resources/jbpm-postgresql-ds.xml 2009-02-02 14:27:18 UTC (rev 3740) @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<datasources> + + <xa-datasource> + <jndi-name>JbpmDS</jndi-name> + + <xa-datasource-class>org.postgresql.xa.PGXADataSource</xa-datasource-class> + <xa-datasource-property name="ServerName">${jdbc.postgresql.server}</xa-datasource-property> + <xa-datasource-property name="PortNumber">${jdbc.postgresql.port}</xa-datasource-property> + <xa-datasource-property name="DatabaseName">${jdbc.postgresql.database}</xa-datasource-property> + <user-name>${jdbc.postgresql.username}</user-name> + <password>${jdbc.postgresql.password}</password> + +  + <track-connection-by-tx /> + +  + <metadata> + <type-mapping>PostgreSQL 8.0</type-mapping> + </metadata> + </xa-datasource> + +</datasources> Copied: jbpm4/trunk/modules/jpdl/src/main/resources/jbpm-sybase-ds.xml (from rev 3739, jbpm4/branches/hbraun/modules/jpdl/src/main/resources/jbpm-sybase-ds.xml) =================================================================== --- jbpm4/trunk/modules/jpdl/src/main/resources/jbpm-sybase-ds.xml (rev 0) +++ jbpm4/trunk/modules/jpdl/src/main/resources/jbpm-sybase-ds.xml 2009-02-02 14:27:18 UTC (rev 3740) @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<datasources> + + <xa-datasource> + <jndi-name>JbpmDS</jndi-name> + + <xa-datasource-class>${jdbc.sybase.datasource}</xa-datasource-class> + <xa-datasource-property name="ServerName">${jdbc.sybase.server}</xa-datasource-property> + <xa-datasource-property name="PortNumber">${jdbc.sybase.port}</xa-datasource-property> + <xa-datasource-property name="DatabaseName">${jdbc.sybase.database}</xa-datasource-property> + <user-name>${jdbc.sybase.username}</user-name> + <password>${jdbc.sybase.password}</password> + +  + <track-connection-by-tx /> + + <exception-sorter-class-name> + org.jboss.resource.adapter.jdbc.vendor.SybaseExceptionSorter + </exception-sorter-class-name> + +  + <metadata> + <type-mapping>Sybase</type-mapping> + </metadata> + </xa-datasource> + +</datasources> Copied: jbpm4/trunk/modules/jpdl/src/main/resources/jbpm.cfg.xml (from rev 3739, jbpm4/branches/hbraun/modules/jpdl/src/main/resources/jbpm.cfg.xml) =================================================================== --- jbpm4/trunk/modules/jpdl/src/main/resources/jbpm.cfg.xml (rev 0) +++ jbpm4/trunk/modules/jpdl/src/main/resources/jbpm.cfg.xml 2009-02-02 14:27:18 UTC (rev 3740) @@ -0,0 +1,72 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<jbpm-configuration xmlns="http://jbpm.org/xsd/cfg"> + + <process-engine> + + <deployer-manager> + <assign-file-type> + <file extension=".jpdl.xml" type="jpdl" /> + </assign-file-type> + <parse-jpdl /> + <check-process /> + <check-problems /> + <save /> + </deployer-manager> + + <process-service /> + <execution-service /> + <management-service /> + <task-service /> + + <command-service> + <retry-interceptor /> + <environment-interceptor /> + <standard-transaction-interceptor /> + </command-service> + + <hibernate-configuration> + <mapping resource="hibernate.cfg.xml"/> +  + </hibernate-configuration> + + <hibernate-session-factory /> + + <job-executor auto-start="false" /> + <job-test-helper /> + + <id-generator /> + <types resource="jbpm.pvm.types.xml" /> + + <business-calendar> + <monday hours="9:00-12:00 and 12:30-17:00"/> + <tuesday hours="9:00-12:00 and 12:30-17:00"/> + <wednesday hours="9:00-12:00 and 12:30-17:00"/> + <thursday hours="9:00-12:00 and 12:30-17:00"/> + <friday hours="9:00-12:00 and 12:30-17:00"/> + <holiday period="01/07/2008 - 31/08/2008"/> + </business-calendar> + + </process-engine> + + <environment> + <hibernate-session /> + <transaction /> + <pvm-db-session /> + <job-db-session /> + <task-db-session /> + <message-session /> + <timer-session /> + </environment> + +</jbpm-configuration> Copied: jbpm4/trunk/modules/jpdl/src/main/resources/logging.properties (from rev 3739, jbpm4/branches/hbraun/modules/jpdl/src/main/resources/logging.properties) =================================================================== --- jbpm4/trunk/modules/jpdl/src/main/resources/logging.properties (rev 0) +++ jbpm4/trunk/modules/jpdl/src/main/resources/logging.properties 2009-02-02 14:27:18 UTC (rev 3740) @@ -0,0 +1,28 @@ +handlers= java.util.logging.ConsoleHandler +# to add the error triggered file handler +# handlers= java.util.logging.ConsoleHandler org.jbpm.util.ErrorTriggeredFileHandler + +redirect.commons.logging = enabled + +java.util.logging.ConsoleHandler.level = FINEST +java.util.logging.ConsoleHandler.formatter = org.jbpm.log.LogFormatter + +# org.jbpm.util.ErrorTriggeredFileHandler.size = 500 +# org.jbpm.util.ErrorTriggeredFileHandler.push = OFF +# org.jbpm.util.ErrorTriggeredFileHandler.pattern = %h/jbpm%u.log + +# For example, set the com.xyz.foo logger to only log SEVERE messages: +# com.xyz.foo.level = SEVERE + +org.jbpm.level=FINEST +org.jbpm.pvm.internal.tx.level=FINE +org.jbpm.pvm.internal.wire.level=FINE +org.jbpm.pvm.internal.util.level=FINE + +org.hibernate.level=FINEST +org.hibernate.cfg.HbmBinder.level=SEVERE +org.hibernate.cfg.SettingsFactory.level=SEVERE +# org.hibernate.SQL.level=FINEST +# org.hibernate.type.level=FINEST +# org.hibernate.tool.hbm2ddl.SchemaExport.level=FINEST +# org.hibernate.transaction.level=FINEST Property changes on: jbpm4/trunk/modules/jpdl/src/test ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/jpdl/src/test/java ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/jpdl/src/test/java/org ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/controlflow ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/test ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/test/xml ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/jpdl/src/test/resources ___________________________________________________________________ Name: svn:ignore + *.iml Deleted: jbpm4/trunk/modules/jpdl/src/test/resources/hibernate.properties =================================================================== --- jbpm4/trunk/modules/jpdl/src/test/resources/hibernate.properties 2009-02-02 13:49:27 UTC (rev 3739) +++ jbpm4/trunk/modules/jpdl/src/test/resources/hibernate.properties 2009-02-02 14:27:18 UTC (rev 3740) @@ -1,11 +0,0 @@ -hibernate.dialect org.hibernate.dialect.HSQLDialect -hibernate.connection.driver_class org.hsqldb.jdbcDriver -hibernate.connection.url jdbc:hsqldb:mem:. -hibernate.connection.username sa -hibernate.connection.password -hibernate.hbm2ddl.auto create-drop -hibernate.cache.use_second_level_cache true -hibernate.cache.provider_class org.hibernate.cache.HashtableCacheProvider -# hibernate.show_sql true -hibernate.format_sql true -hibernate.use_sql_comments true Property changes on: jbpm4/trunk/modules/jpdl/src/test/resources/org ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/jpdl/src/test/resources/org/jbpm ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/jpdl/src/test/resources/org/jbpm/test ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/jpdl/src/test/resources/org/jbpm/test/xml ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/log ___________________________________________________________________ Name: svn:ignore - target + *.iml Property changes on: jbpm4/trunk/modules/log/src ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/log/src/main ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/log/src/main/java ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/log/src/main/java/org ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/log/src/main/java/org/jbpm ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/log/src/main/java/org/jbpm/log ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm ___________________________________________________________________ Name: svn:ignore - target .settings + *.iml Modified: jbpm4/trunk/modules/pvm/pom.xml =================================================================== --- jbpm4/trunk/modules/pvm/pom.xml 2009-02-02 13:49:27 UTC (rev 3739) +++ jbpm4/trunk/modules/pvm/pom.xml 2009-02-02 14:27:18 UTC (rev 3740) @@ -1,18 +1,18 @@ <?xml version="1.0" encoding="UTF-8"?> -  -  -  -  -  -  -  -  + + + + + + + + -  + <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"> + 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>jBPM 4 - PVM</name> @@ -31,7 +31,7 @@  <properties> <table.prefix>JBPM_</table.prefix> - <test.resources.directory>${project.build.directory}/test-resources</test.resources.directory> +  </properties>  @@ -48,7 +48,7 @@ <groupId>org.jbpm.jbpm4</groupId> <artifactId>jbpm-test-base</artifactId> </dependency> - + <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> @@ -59,11 +59,11 @@ </dependency> <dependency> <groupId>juel</groupId> - <artifactId>juel-engine</artifactId> + <artifactId>juel-impl</artifactId> </dependency> <dependency> <groupId>juel</groupId> - <artifactId>juel-impl</artifactId> + <artifactId>juel-engine</artifactId> </dependency> <dependency> <groupId>org.hibernate</groupId> @@ -107,7 +107,7 @@ <exclude>**/*TestCase.java</exclude>  - <exclude>**/NormalMessageTest.java</exclude> + <exclude>**/NormalMessageTest.java</exclude> </excludes> </configuration> </plugin> @@ -117,7 +117,7 @@  <profiles> </profiles> - + <reporting> <plugins> <plugin> @@ -127,10 +127,11 @@ <quiet>true</quiet> <source>1.5</source> <verbose>false</verbose> - <noqualifier>all</noqualifier> + <noqualifier>all</noqualifier> <excludePackageNames>*.internal:*.test</excludePackageNames> </configuration> </plugin> + </plugins> </reporting> Property changes on: jbpm4/trunk/modules/pvm/src ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/main ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/main/java ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/main/java/org ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cal ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cfg ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/deploy ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jms ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/job ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/lob ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/script ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/spring ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/stream ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/test ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/type ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/type/converter ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/type/matcher ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/type/variable ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding ___________________________________________________________________ Name: svn:ignore + *.iml Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/HibernateConfigurationBinding.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/HibernateConfigurationBinding.java 2009-02-02 13:49:27 UTC (rev 3739) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/HibernateConfigurationBinding.java 2009-02-02 14:27:18 UTC (rev 3740) @@ -120,10 +120,34 @@ descriptor.setSchemaOperation(HibernateConfigurationDescriptor.UpdateSchema.getInstance()); } } - + + // [hb] parse external configuration file or use inlined elements + // but for no, it's one or the other to avoid side effects and overlays + if(element.hasAttribute("resource")) + { + parseConfigurationFile(element, descriptor); + log.info("Configuring form external resource "+element.getAttribute("resource")+ + ", skip inline configuration elements."); + } + else + { + parseInlineConfiguration(element, parse, descriptor, parser); + } + return descriptor; + } + + private void parseConfigurationFile(Element element, HibernateConfigurationDescriptor descriptor) + { + String hibernateConfigResource = element.getAttribute("resource"); + descriptor.setHibernateConfigResource(hibernateConfigResource); + + } + + private void parseInlineConfiguration(Element element, Parse parse, HibernateConfigurationDescriptor descriptor, Parser parser) + { List<Element> configElements = XmlUtil.elements(element); for (Element configElement: configElements) { - + if ("mappings".equals(XmlUtil.getTagLocalName(configElement))) { if (configElement.hasAttribute("resource")) { String resources = configElement.getAttribute("resource"); @@ -144,28 +168,28 @@ parse.addProblem("couldn't parse hibernate mapping resources '"+resources+"'", e); } } - + } else if ("mapping".equals(XmlUtil.getTagLocalName(configElement))) { - + parseMapping(configElement, descriptor, parse); - + } else if ("properties".equals(XmlUtil.getTagLocalName(configElement))) { PropertiesDescriptor propertiesDescriptor = (PropertiesDescriptor) propertiesBinding.parse(configElement, parse, parser); descriptor.setPropertiesDescriptor(propertiesDescriptor); - + } else if ("cache-configuration".equals(XmlUtil.getTagLocalName(configElement))) { StreamInput streamSource = null; - + String cacheUsage = configElement.getAttribute("usage"); if (! ( ("read-only".equals(cacheUsage)) - || ("nonstrict-read-write".equals(cacheUsage)) - || ("read-write".equals(cacheUsage)) - || ("transactional".equals(cacheUsage)) + || ("nonstrict-read-write".equals(cacheUsage)) + || ("read-write".equals(cacheUsage)) + || ("transactional".equals(cacheUsage)) ) ){ parse.addProblem("problem in cache-configuration: no usage attribute or illegal value: "+cacheUsage+" Possible values are {read-only, nonstrict-read-write, read-write, transactional}"); } else { - + if (configElement.hasAttribute("file")) { String fileName = configElement.getAttribute("file"); File file = new File(fileName); @@ -175,12 +199,12 @@ parse.addProblem("file "+fileName+" isn't a file"); } } - + if (configElement.hasAttribute("resource")) { String resource = configElement.getAttribute("resource"); streamSource = new ResourceStreamInput(resource, parse.getClassLoader()); } - + if (configElement.hasAttribute("url")) { String urlText = configElement.getAttribute("url"); try { @@ -190,22 +214,22 @@ parse.addProblem("couldn't open url "+urlText, e); } } - + if (streamSource != null) { parser.importStream(streamSource, configElement, parse); } - + // parse the cache configurations in the same way as the hibernate cfg schema // translate the contents of the file into invoke operations for methods // Configuration.setCacheConcurrencyStrategy(String clazz, String concurrencyStrategy, String region) - // Configuration.setCollectionCacheConcurrencyStrategy(String collectionRole, String concurrencyStrategy) + // Configuration.setCollectionCacheConcurrencyStrategy(String collectionRole, String concurrencyStrategy) // <class-cache class="org.hibernate.auction.Item" usage="read-write"/> // <class-cache class="org.hibernate.auction.Bid" usage="read-only"/> // <collection-cache collection="org.hibernate.auction.Item.bids" usage="read-write"/> List<Element> cacheElements = XmlUtil.elements(configElement); if (cacheElements!=null) { for (Element cacheElement : cacheElements) { - + if ("class-cache".equals(XmlUtil.getTagLocalName(cacheElement))) { String className = cacheElement.getAttribute("class"); descriptor.addCacheOperation(new HibernateConfigurationDescriptor.SetCacheConcurrencyStrategy(className, cacheUsage)); @@ -225,8 +249,6 @@ parse.addProblem("unknown hibernate configuration element "+XmlUtil.toString(configElement)); } } - - return descriptor; } } Property changes on: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor ___________________________________________________________________ Name: svn:ignore + *.iml Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/HibernateConfigurationDescriptor.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/HibernateConfigurationDescriptor.java 2009-02-02 13:49:27 UTC (rev 3739) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/HibernateConfigurationDescriptor.java 2009-02-02 14:27:18 UTC (rev 3740) @@ -21,6 +21,23 @@ */ package org.jbpm.pvm.internal.wire.descriptor; +import org.hibernate.JDBCException; +import org.hibernate.HibernateException; +import org.hibernate.cfg.Configuration; +import org.hibernate.connection.ConnectionProvider; +import org.hibernate.connection.ConnectionProviderFactory; +import org.hibernate.dialect.Dialect; +import org.hibernate.tool.hbm2ddl.DatabaseMetadata; +import org.hibernate.util.JDBCExceptionReporter; +import org.jbpm.JbpmException; +import org.jbpm.log.Log; +import org.jbpm.pvm.internal.util.ReflectUtil; +import org.jbpm.pvm.internal.wire.WireContext; +import org.jbpm.pvm.internal.wire.WireDefinition; +import org.jbpm.pvm.internal.wire.WireException; +import org.jbpm.pvm.internal.wire.operation.Operation; + +import java.io.InputStream; import java.net.URL; import java.sql.Connection; import java.sql.SQLException; @@ -30,29 +47,13 @@ import java.util.List; import java.util.Properties; -import org.jbpm.JbpmException; -import org.jbpm.log.Log; -import org.jbpm.pvm.internal.util.ReflectUtil; -import org.jbpm.pvm.internal.wire.WireContext; -import org.jbpm.pvm.internal.wire.WireDefinition; -import org.jbpm.pvm.internal.wire.WireException; -import org.jbpm.pvm.internal.wire.operation.Operation; - -import org.hibernate.JDBCException; -import org.hibernate.cfg.Configuration; -import org.hibernate.connection.ConnectionProvider; -import org.hibernate.connection.ConnectionProviderFactory; -import org.hibernate.dialect.Dialect; -import org.hibernate.tool.hbm2ddl.DatabaseMetadata; -import org.hibernate.util.JDBCExceptionReporter; - /** * @author Tom Baeyens */ public class HibernateConfigurationDescriptor extends AbstractDescriptor { - + private static final long serialVersionUID = 1L; - + private static final Log log = Log.getLog(HibernateConfigurationDescriptor.class.getName()); String className; @@ -62,32 +63,47 @@ PropertiesDescriptor propertiesDescriptor; private Operation schemaOperation; + // a hibernate xml config, i.e. hibernate.cfg.xml + private String hibernateConfigResource = null; + public Object construct(WireContext wireContext) { // instantiation of the configuration Configuration configuration = null; if (className!=null) { ClassLoader classLoader = wireContext.getClassLoader(); - log.trace("instantiating hibernate configation class "+className); + log.trace("instantiating hibernate configuration class "+className); Class<?> configurationClass = ReflectUtil.loadClass(classLoader, className); configuration = (Configuration) ReflectUtil.newInstance(configurationClass); } else { - log.trace("instantiating default hibernate configation"); + log.trace("instantiating default hibernate configuration"); configuration = new Configuration(); } return configuration; } - + public void initialize(Object object, WireContext wireContext) { + Configuration configuration = (Configuration) object; - apply(mappingOperations, configuration, wireContext); - apply(cacheOperations, configuration, wireContext); - if (propertiesDescriptor!=null) { - Properties properties = (Properties) wireContext.create(propertiesDescriptor, false); - if (log.isDebugEnabled()) log.debug("adding properties to hibernate configuration: "+properties); - configuration.addProperties(properties); + + // [hb] use one or the other for now, but don't mix external and inline configuration + if(hibernateConfigResource!=null) + { + configuration.configure(hibernateConfigResource); } - if (schemaOperation != null) { - schemaOperation.apply(configuration, wireContext); + else + { + apply(mappingOperations, configuration, wireContext); + apply(cacheOperations, configuration, wireContext); + + if (propertiesDescriptor!=null) { + Properties properties = (Properties) wireContext.create(propertiesDescriptor, false); + if (log.isDebugEnabled()) log.debug("adding properties to hibernate configuration: "+properties); + configuration.addProperties(properties); + } + + if (schemaOperation != null) { + schemaOperation.apply(configuration, wireContext); + } } } @@ -123,9 +139,31 @@ } cacheOperations.add(operation); } - + // operations /////////////////////////////////////////////////////////////// + /** + * Applies an external configuration (i.e. hibernate.cfg.xml) + */ + public static class ExternalConfiguration implements Operation { + private static final long serialVersionUID = 1L; + String resource; + public ExternalConfiguration(String resource) { + this.resource = resource; + } + public void apply(Object target, WireContext wireContext) { + Configuration configuration = (Configuration) target; + InputStream in = wireContext.getClassLoader().getResourceAsStream(resource); + if(null==in) + throw new IllegalArgumentException("No such resource " +resource); + configuration.addInputStream(in); + } + + public String toString() { + return "using external hibernate configuration "+resource; + } + } + public static class AddResource implements Operation { private static final long serialVersionUID = 1L; String resource; @@ -229,7 +267,7 @@ public static class CreateSchema implements Operation { private static final long serialVersionUID = 1L; - + /** The sole instance of this class */ private static final Operation instance = new CreateSchema(); @@ -273,7 +311,7 @@ public static class UpdateSchema implements Operation { private static final long serialVersionUID = 1L; - + private static final Operation instance = new UpdateSchema(); private UpdateSchema() { @@ -289,7 +327,7 @@ Connection connection = connectionProvider.getConnection(); try { DatabaseMetadata metadata = new DatabaseMetadata(connection, dialect); - String[] updateScript = configuration.generateSchemaUpdateScript(dialect, metadata); + String[] updateScript = configuration.generateSchemaUpdateScript(dialect, metadata); log.debug("updating db schema"); executeScript(connection, updateScript); } @@ -335,9 +373,9 @@ } return exceptions; } - + // getters and setters ////////////////////////////////////////////////////// - + public String getClassName() { return className; } @@ -362,4 +400,8 @@ public void setSchemaOperation(Operation schemaOperation) { this.schemaOperation = schemaOperation; } + public void setHibernateConfigResource(String hibernateConfigResource) + { + this.hibernateConfigResource = hibernateConfigResource; + } } Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/HibernateSessionFactoryDescriptor.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/HibernateSessionFactoryDescriptor.java 2009-02-02 13:49:27 UTC (rev 3739) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/HibernateSessionFactoryDescriptor.java 2009-02-02 14:27:18 UTC (rev 3740) @@ -31,6 +31,8 @@ import org.hibernate.SessionFactory; import org.hibernate.cfg.Configuration; +import java.net.URL; + /** * @author Tom Baeyens */ @@ -58,7 +60,7 @@ if (configuration==null) { throw new WireException("couldn't find configuration"); } - + SessionFactory sessionFactory = configuration.buildSessionFactory(); wireContext.addListener(new SessionFactoryCloser(sessionFactory)); Property changes on: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/operation ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/xml ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/xml ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/model ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/main/resources ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/test ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/test/java ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/test/java/org ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/activities ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/builder ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/eventlistener ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/executionmode ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/executionmode/embedded ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/executionmode/object ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/cron ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/type ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/util ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/println ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/spring ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/tx ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/variables ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/test/resources ___________________________________________________________________ Name: svn:ignore + *.iml Deleted: jbpm4/trunk/modules/pvm/src/test/resources/hibernate.properties =================================================================== --- jbpm4/trunk/modules/pvm/src/test/resources/hibernate.properties 2009-02-02 13:49:27 UTC (rev 3739) +++ jbpm4/trunk/modules/pvm/src/test/resources/hibernate.properties 2009-02-02 14:27:18 UTC (rev 3740) @@ -1,11 +0,0 @@ -hibernate.dialect org.hibernate.dialect.HSQLDialect -hibernate.connection.driver_class org.hsqldb.jdbcDriver -hibernate.connection.url jdbc:hsqldb:mem:. -hibernate.connection.username sa -hibernate.connection.password -hibernate.hbm2ddl.auto create-drop -hibernate.cache.use_second_level_cache true -hibernate.cache.provider_class org.hibernate.cache.HashtableCacheProvider -# hibernate.show_sql true -# hibernate.format_sql true -# hibernate.use_sql_comments true Copied: jbpm4/trunk/modules/pvm/src/test/resources/hibernate.properties (from rev 3739, jbpm4/branches/hbraun/modules/pvm/src/test/resources/hibernate.properties) =================================================================== --- jbpm4/trunk/modules/pvm/src/test/resources/hibernate.properties (rev 0) +++ jbpm4/trunk/modules/pvm/src/test/resources/hibernate.properties 2009-02-02 14:27:18 UTC (rev 3740) @@ -0,0 +1,8 @@ +hibernate.dialect=org.hibernate.dialect.HSQLDialect +hibernate.connection.driver_class=org.hsqldb.jdbcDriver +hibernate.connection.url=jdbc:hsqldb:mem:. +hibernate.connection.username=sa +hibernate.connection.password= +hibernate.hbm2ddl.auto=create-drop +hibernate.cache.use_second_level_cache=true +hibernate.cache.provider_class=org.hibernate.cache.HashtableCacheProvider Property changes on: jbpm4/trunk/modules/pvm/src/test/resources/org ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/api ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/api/db ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/api/db/continuation ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/api/db/svc ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/api/timer ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/enterprise ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/enterprise/custom ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/executionmode ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/executionmode/embedded ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/internal ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/internal/db ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/internal/db/model ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/internal/jobexecutor ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/internal/type ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/internal/wire ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/internal/xml ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/spring ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/variables ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/wire ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/xml ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/task ___________________________________________________________________ Name: svn:ignore - target .settings + *.iml Modified: jbpm4/trunk/modules/task/pom.xml =================================================================== --- jbpm4/trunk/modules/task/pom.xml 2009-02-02 13:49:27 UTC (rev 3739) +++ jbpm4/trunk/modules/task/pom.xml 2009-02-02 14:27:18 UTC (rev 3740) @@ -1,18 +1,18 @@ <?xml version="1.0" encoding="UTF-8"?> -  -  -  -  -  -  -  -  + + + + + + + + -  + <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"> + 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>jBPM 4 - Task</name> @@ -32,20 +32,9 @@ <dependencies> <dependency> <groupId>org.jbpm.jbpm4</groupId> - <artifactId>jbpm-api</artifactId> - </dependency> - <dependency> - <groupId>org.jbpm.jbpm4</groupId> - <artifactId>jbpm-log</artifactId> - </dependency> - <dependency> - <groupId>org.jbpm.jbpm4</groupId> - <artifactId>jbpm-test-base</artifactId> - </dependency> - <dependency> - <groupId>org.jbpm.jbpm4</groupId> <artifactId>jbpm-pvm</artifactId> </dependency> + <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> @@ -56,11 +45,11 @@ </dependency> <dependency> <groupId>juel</groupId> - <artifactId>juel-engine</artifactId> + <artifactId>juel-impl</artifactId> </dependency> <dependency> <groupId>juel</groupId> - <artifactId>juel-impl</artifactId> + <artifactId>juel-engine</artifactId> </dependency> <dependency> <groupId>org.hibernate</groupId> Property changes on: jbpm4/trunk/modules/task/src ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/task/src/main ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/task/src/main/docs ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/task/src/main/java ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/task/src/main/java/org ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/task/src/main/java/org/jbpm ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/task/src/main/java/org/jbpm/task ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/cmd ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/hibernate ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/model ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/wire ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/wire/binding ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/wire/descriptor ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/session ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/task/src/main/resources ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/task/src/test ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/task/src/test/java ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/task/src/test/java/org ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/task/src/test/java/org/jbpm ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/task/src/test/java/org/jbpm/task ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/task/src/test/java/org/jbpm/task/internal ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/task/src/test/java/org/jbpm/task/internal/model ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/task/src/test/resources ___________________________________________________________________ Name: svn:ignore + *.iml Deleted: jbpm4/trunk/modules/task/src/test/resources/hibernate.properties =================================================================== --- jbpm4/trunk/modules/task/src/test/resources/hibernate.properties 2009-02-02 13:49:27 UTC (rev 3739) +++ jbpm4/trunk/modules/task/src/test/resources/hibernate.properties 2009-02-02 14:27:18 UTC (rev 3740) @@ -1,11 +0,0 @@ -hibernate.dialect org.hibernate.dialect.HSQLDialect -hibernate.connection.driver_class org.hsqldb.jdbcDriver -hibernate.connection.url jdbc:hsqldb:mem:. -hibernate.connection.username sa -hibernate.connection.password -hibernate.hbm2ddl.auto create-drop -hibernate.cache.use_second_level_cache true -hibernate.cache.provider_class org.hibernate.cache.HashtableCacheProvider -# hibernate.show_sql true -hibernate.format_sql true -hibernate.use_sql_comments true Property changes on: jbpm4/trunk/modules/test-base ___________________________________________________________________ Name: svn:ignore - target + *.iml Property changes on: jbpm4/trunk/modules/test-base/src ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/test-base/src/main ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/test-base/src/main/java ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/test-base/src/main/java/org ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/test-base/src/main/java/org/jbpm ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/test-db ___________________________________________________________________ Name: svn:ignore - target + *.iml Copied: jbpm4/trunk/modules/test-db/jpm4-test-db.iml (from rev 3739, jbpm4/branches/hbraun/modules/test-db/jpm4-test-db.iml) =================================================================== --- jbpm4/trunk/modules/test-db/jpm4-test-db.iml (rev 0) +++ jbpm4/trunk/modules/test-db/jpm4-test-db.iml 2009-02-02 14:27:18 UTC (rev 3740) @@ -0,0 +1,254 @@ +<?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/java" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" /> + </content> + <orderEntry type="inheritedJdk" /> + <orderEntry type="sourceFolder" forTests="false" /> + <orderEntry type="module" module-name="jbpm4-toplevel" /> + <orderEntry type="module-library" exported=""> + <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" exported=""> + <library name="M2 Dep: junit:junit:jar:3.8.1:compile"> + <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" exported=""> + <library name="M2 Dep: org.jbpm.jbpm4.dependencies.esb:jbossesb-rosetta:jar:4.4.0.GA:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jbpm/jbpm4/dependencies/esb/jbossesb-rosetta/4.4.0.GA/jbossesb-rosetta-4.4.0.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <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" exported=""> + <library name="M2 Dep: commons-logging:commons-logging:jar:1.0.4:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: stax:stax-api:jar:1.0.1:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/stax/stax-api/1.0.1/stax-api-1.0.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.client:jbossall-client:jar:4.2.2.GA:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/client/jbossall-client/4.2.2.GA/jbossall-client-4.2.2.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <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" exported=""> + <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" exported=""> + <library name="M2 Dep: stax:stax:jar:1.2.0:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/stax/stax/1.2.0/stax-1.2.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: jboss:jboss-j2ee:jar:4.2.2.GA:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/jboss/jboss-j2ee/4.2.2.GA/jboss-j2ee-4.2.2.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: hsqldb:hsqldb:jar:1.8.0.7:test"> + <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" exported=""> + <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" exported=""> + <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> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/dom4j/dom4j/1.6.1/dom4j-1.6.1-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <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" exported=""> + <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" exported=""> + <library name="M2 Dep: org.jbpm.jbpm4.dependencies.esb:test-util:jar:4.4.0.GA:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jbpm/jbpm4/dependencies/esb/test-util/4.4.0.GA/test-util-4.4.0.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <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" exported=""> + <library name="M2 Dep: jboss.jbossts:jbossts-common:jar:4.4.0.GA:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/jboss/jbossts/jbossts-common/4.4.0.GA/jbossts-common-4.4.0.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: log4j:log4j:jar:1.2.14:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/log4j/log4j/1.2.14/log4j-1.2.14.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/log4j/log4j/1.2.14/log4j-1.2.14-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: javax.servlet:servlet-api:jar:2.5:test"> + <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" exported=""> + <library name="M2 Dep: org.springframework:spring:jar:2.5.4:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/springframework/spring/2.5.4/spring-2.5.4.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.livetribe:livetribe-jsr223:jar:2.0.5:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/livetribe/livetribe-jsr223/2.0.5/livetribe-jsr223-2.0.5.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: juel:juel-engine:jar:2.1.0:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/juel/juel-engine/2.1.0/juel-engine-2.1.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: juel:juel:jar:2.1.0:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/juel/juel/2.1.0/juel-2.1.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: juel:juel-impl:jar:2.1.0:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/juel/juel-impl/2.1.0/juel-impl-2.1.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntryProperties /> + </component> +</module> + Modified: jbpm4/trunk/modules/test-db/pom.xml =================================================================== --- jbpm4/trunk/modules/test-db/pom.xml 2009-02-02 13:49:27 UTC (rev 3739) +++ jbpm4/trunk/modules/test-db/pom.xml 2009-02-02 14:27:18 UTC (rev 3740) @@ -27,54 +27,79 @@  <dependencies> - <dependency> - <groupId>org.jbpm.jbpm4</groupId> - <artifactId>jbpm-api</artifactId> - <version>${version}</version> - </dependency> <dependency> <groupId>org.jbpm.jbpm4</groupId> - <artifactId>jbpm-test-base</artifactId> - <version>${version}</version> - </dependency> - - <dependency> - <groupId>org.jbpm.jbpm4</groupId> <artifactId>jbpm-jpdl</artifactId> <version>${version}</version> <scope>test</scope> </dependency> - + <dependency> <groupId>org.jbpm.jbpm4</groupId> - <artifactId>jbpm-task</artifactId> + <artifactId>jbpm-test-base</artifactId> <version>${version}</version> - <scope>test</scope> </dependency> - -  - <dependency> - <groupId>org.jbpm.jbpm4</groupId> - <artifactId>jbpm-pvm</artifactId> - <version>${version}</version> - <scope>test</scope> - </dependency> - + </dependencies> - +  <build> <plugins> - <plugin> + <plugin>  <artifactId>maven-surefire-plugin</artifactId> <configuration> <testSourceDirectory>src/main/java</testSourceDirectory> <classesDirectory>target/classes</classesDirectory> - <testClassesDirectory>target/classes</testClassesDirectory> + <testClassesDirectory>target/classes</testClassesDirectory> </configuration> </plugin> + + <plugin> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <id>unpack.jbpm.db</id> + <phase>generate-test-resources</phase> + <goals> + <goal>unpack</goal> + </goals> + <configuration> + <artifactItems> + <artifactItem> + <groupId>org.jbpm.jbpm4</groupId> + <artifactId>jbpm-jpdl</artifactId> + <classifier>config</classifier> + <overWrite>true</overWrite> + </artifactItem> + </artifactItems> + <excludeTransitive>true</excludeTransitive> + <outputDirectory>target/jpdl-config</outputDirectory> + </configuration> + </execution> + </executions> + </plugin> + + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <id>install.hibernate.database.properties</id> + <phase>generate-test-resources</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <tasks> + <copy file="target/jpdl-config/hibernate.cfg.${database}.xml" + tofile="target/classes/testDb-hibernate.cfg.xml" + overwrite="true" /> + </tasks> + </configuration> + </execution> + </executions> + </plugin> </plugins> </build> - + </project> \ No newline at end of file Property changes on: jbpm4/trunk/modules/test-db/src ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/test-db/src/main ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/test-db/src/main/java ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/test-db/src/main/java/org ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/test-db/src/main/java/org/jbpm ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/activities ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/cfg ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/task ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/variables ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/test-db/src/main/resources ___________________________________________________________________ Name: svn:ignore + *.iml Deleted: jbpm4/trunk/modules/test-db/src/main/resources/hibernate.properties =================================================================== --- jbpm4/trunk/modules/test-db/src/main/resources/hibernate.properties 2009-02-02 13:49:27 UTC (rev 3739) +++ jbpm4/trunk/modules/test-db/src/main/resources/hibernate.properties 2009-02-02 14:27:18 UTC (rev 3740) @@ -1,11 +0,0 @@ -hibernate.dialect org.hibernate.dialect.HSQLDialect -hibernate.connection.driver_class org.hsqldb.jdbcDriver -hibernate.connection.url jdbc:hsqldb:mem:. -hibernate.connection.username sa -hibernate.connection.password -hibernate.hbm2ddl.auto create-drop -hibernate.cache.use_second_level_cache true -hibernate.cache.provider_class org.hibernate.cache.HashtableCacheProvider -# hibernate.show_sql true -# hibernate.format_sql true -# hibernate.use_sql_comments true Modified: jbpm4/trunk/modules/test-db/src/main/resources/jbpm.cfg.xml =================================================================== --- jbpm4/trunk/modules/test-db/src/main/resources/jbpm.cfg.xml 2009-02-02 13:49:27 UTC (rev 3739) +++ jbpm4/trunk/modules/test-db/src/main/resources/jbpm.cfg.xml 2009-02-02 14:27:18 UTC (rev 3740) @@ -25,19 +25,7 @@ <standard-transaction-interceptor /> </command-service> - <hibernate-configuration> - <properties resource="hibernate.properties" /> - <mapping resource="jbpm.pvm.typedefs.hbm.xml" /> - <mapping resource="jbpm.pvm.wire.hbm.xml" /> - <mapping resource="jbpm.pvm.definition.hbm.xml" /> - <mapping resource="jbpm.pvm.execution.hbm.xml" /> - <mapping resource="jbpm.pvm.variable.hbm.xml" /> - <mapping resource="jbpm.pvm.job.hbm.xml" /> - <mapping resource="jbpm.jpdl.hbm.xml" /> - <mapping resource="jbpm.task.hbm.xml" /> - <cache-configuration resource="jbpm.pvm.cache.xml" - usage="nonstrict-read-write" /> - </hibernate-configuration> + <hibernate-configuration resource="testDb-hibernate.cfg.xml"/> <hibernate-session-factory /> Property changes on: jbpm4/trunk/modules/test-load ___________________________________________________________________ Name: svn:ignore - target + *.iml Property changes on: jbpm4/trunk/modules/test-load/src ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/test-load/src/main ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/test-load/src/main/parked ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/test-load/src/main/scripts ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/test-load/src/test ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/test-load/src/test/java ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/test-load/src/test/java/org ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/test-load/src/test/java/org/jbpm ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/test-load/src/test/resources ___________________________________________________________________ Name: svn:ignore + *.iml Deleted: jbpm4/trunk/modules/test-load/src/test/resources/hibernate.properties =================================================================== --- jbpm4/trunk/modules/test-load/src/test/resources/hibernate.properties 2009-02-02 13:49:27 UTC (rev 3739) +++ jbpm4/trunk/modules/test-load/src/test/resources/hibernate.properties 2009-02-02 14:27:18 UTC (rev 3740) @@ -1,16 +0,0 @@ -hibernate.dialect=org.hibernate.dialect.HSQLDialect -hibernate.connection.driver_class=org.hsqldb.jdbcDriver -hibernate.connection.url=jdbc:hsqldb:mem:. -hibernate.connection.username=sa -hibernate.connection.password= - -hibernate.hbm2ddl.auto=create-drop - -hibernate.cache.use_second_level_cache=true -hibernate.cache.provider_class=org.hibernate.cache.HashtableCacheProvider - -# hibernate.jdbc.batch_size=1 - -# hibernate.show_sql true -# hibernate.format_sql true -# hibernate.use_sql_comments true Property changes on: jbpm4/trunk/modules/test-load/src/test/resources/org ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/test-load/src/test/resources/org/jbpm ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/test-load/src/test/resources/org/jbpm/test ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/test-load/src/test/resources/org/jbpm/test/load ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/test-pojo ___________________________________________________________________ Name: svn:ignore - target .settings + *.iml Property changes on: jbpm4/trunk/modules/test-pojo/src ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/test-pojo/src/main ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/test-pojo/src/main/java ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/test-pojo/src/main/java/org ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/test-pojo/src/main/resources ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/userguide ___________________________________________________________________ Name: svn:ignore - target .settings + *.iml Property changes on: jbpm4/trunk/modules/userguide/src ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/userguide/src/main ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/userguide/src/main/diagrams ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/userguide/src/main/diagrams/bpmn ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/userguide/src/main/docbook ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/userguide/src/main/docbook/en ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/userguide/src/main/docbook/en/images ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/userguide/src/main/docbook/en/modules ___________________________________________________________________ Name: svn:ignore + *.iml Modified: jbpm4/trunk/pom.xml =================================================================== --- jbpm4/trunk/pom.xml 2009-02-02 13:49:27 UTC (rev 3739) +++ jbpm4/trunk/pom.xml 2009-02-02 14:27:18 UTC (rev 3740) @@ -1,18 +1,18 @@ <?xml version="1.0" encoding="UTF-8"?> -  -  -  -  -  -  -  -  + + + + + + + + -  + <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"> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -30,27 +30,30 @@  <modules> + <module>modules/log</module> <module>modules/api</module> + <module>modules/pvm</module> <module>modules/examples</module> - <module>modules/enterprise</module> <module>modules/jpdl</module> - <module>modules/log</module> - <module>modules/pvm</module> <module>modules/task</module> +  <module>modules/test-base</module> <module>modules/test-db</module> - <module>modules/test-pojo</module> +  </modules>  <properties> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <apache.ant.version>1.7.0</apache.ant.version> <cactus.version>13-1.7.1</cactus.version> <hibernate.version>3.2.6.ga</hibernate.version> <hsqldb.version>1.8.0.7</hsqldb.version> + <izpack.version>4.1.0</izpack.version> <jboss.j2ee.version>4.2.2.GA</jboss.j2ee.version> <jbossesb.version>4.4.0.GA</jbossesb.version> <jboss.client.version>4.2.2.GA</jboss.client.version> - <jsr233.version>2.0.3</jsr233.version> + <jsr233.version>2.0.5</jsr233.version> <juel.version>2.1.0</juel.version> <junit.version>3.8.1</junit.version> <log4j.version>1.2.14</log4j.version> @@ -82,9 +85,31 @@ <artifactId>jbpm-pvm</artifactId> <version>${version}</version> </dependency> + <dependency> + <groupId>org.jbpm.jbpm4</groupId> + <artifactId>jbpm-db</artifactId> + <version>${version}</version> + </dependency> + <dependency> + <groupId>org.livetribe</groupId> + <artifactId>livetribe-jsr223</artifactId> + <version>${jsr233.version}</version> + </dependency> + <dependency> + <groupId>org.jbpm.jbpm4</groupId> + <artifactId>jbpm-gpd</artifactId> + <type>zip</type> + <version>${version}</version> + </dependency> +  <dependency> + <groupId>org.apache.ant</groupId> + <artifactId>ant</artifactId> + <version>${apache.ant.version}</version> + </dependency> + <dependency> <groupId>cactus</groupId> <artifactId>cactus</artifactId> <version>${cactus.version}</version> @@ -100,6 +125,11 @@ <version>${hsqldb.version}</version> </dependency> <dependency> + <groupId>izpack</groupId> + <artifactId>standalone-compiler</artifactId> + <version>${izpack.version}</version> + </dependency> + <dependency> <groupId>jboss</groupId> <artifactId>jboss-j2ee</artifactId> <version>${jboss.j2ee.version}</version> @@ -126,12 +156,12 @@ </dependency> <dependency> <groupId>juel</groupId> - <artifactId>juel-engine</artifactId> + <artifactId>juel-impl</artifactId> <version>${juel.version}</version> </dependency> <dependency> <groupId>juel</groupId> - <artifactId>juel-impl</artifactId> + <artifactId>juel-engine</artifactId> <version>${juel.version}</version> </dependency> <dependency> @@ -140,11 +170,6 @@ <version>${junit.version}</version> </dependency> <dependency> - <groupId>org.livetribe</groupId> - <artifactId>livetribe-jsr223</artifactId> - <version>${jsr233.version}</version> - </dependency> - <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> <version>${log4j.version}</version> @@ -184,6 +209,12 @@  <build> + <resources> + <resource> + <directory>src/main/resources</directory> + <filtering>true</filtering> + </resource> + </resources> <plugins> <plugin> <artifactId>maven-compiler-plugin</artifactId> @@ -229,6 +260,17 @@ </systemProperties> </configuration> </plugin> + <plugin> + <artifactId>maven-javadoc-plugin</artifactId> + <executions> + <execution> + <id>attach-javadocs</id> + <goals> + <goal>jar</goal> + </goals> + </execution> + </executions> + </plugin> </plugins>  @@ -274,10 +316,10 @@  <profiles> + <profile> <id>distro</id> <modules> - <module>modules/db</module> <module>modules/devguide</module> <module>modules/distro</module> <module>modules/userguide</module> @@ -297,7 +339,6 @@ <profile> <id>load</id> <modules> - <module>modules/db</module> <module>modules/test-load</module> </modules> </profile> @@ -316,134 +357,51 @@ </build> </profile> +  <profile> - <id>database</id> + <id>no-database</id> <activation> <property> - <name>database</name> + <name>!database</name> </property> </activation> + <properties> + <database>hsqldb</database> + </properties> <dependencies> <dependency> - <groupId>org.jbpm.jbpm4</groupId> - <artifactId>jbpm-db</artifactId> - <version>${version}</version> + <groupId>hsqldb</groupId> + <artifactId>hsqldb</artifactId> + <scope>test</scope> </dependency> </dependencies> - <build> - <plugins> + </profile> - <plugin> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <id>unpack.jbpm.db</id> - <phase>validate</phase> - <goals> - <goal>unpack-dependencies</goal> - </goals> - <configuration> - <includeArtifactIds>jbpm-db</includeArtifactIds> - <excludeTransitive>true</excludeTransitive> - <outputDirectory>target/jbpm-db</outputDirectory> - </configuration> - </execution> - </executions> - </plugin> - - <plugin> - <artifactId>maven-resources-plugin</artifactId> - <executions> - <execution> - <id>resolve props</id> - <phase>compile</phase> - <goals> - <goal>copy-resources</goal> - </goals> - <configuration> - <outputDirectory>target/resolved.properties</outputDirectory> - <resources> - <resource> - <directory>target/jbpm-db/db.properties</directory> - <filtering>true</filtering> - </resource> - </resources> - </configuration> - </execution> - </executions> - </plugin> - - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <id>install.hibernate.database.properties</id> - <phase>compile</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <tasks> - <mkdir dir="target/test-classes" /> - <copy file="target/resolved.properties/${database}.properties" - tofile="target/test-classes/hibernate.properties" - overwrite="true" /> - </tasks> - </configuration> - </execution> - <execution> - <id>create.schema</id> - <phase>test-compile</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <tasks> - <property file="target/test-classes/hibernate.properties" /> - <sql src="target/jbpm-db/drop/jbpm.${database}.drop.sql" - driver="${hibernate.connection.driver_class}" url="${hibernate.connection.url}" - userid="${hibernate.connection.username}" password="${hibernate.connection.password}" - onerror="continue"> - <classpath> - <path refid="maven.test.classpath" /> - </classpath> - </sql> - <sql src="target/jbpm-db/create/jbpm.${database}.create.sql" - driver="${hibernate.connection.driver_class}" url="${hibernate.connection.url}" - userid="${hibernate.connection.username}" password="${hibernate.connection.password}" - onerror="continue"> - <classpath> - <path refid="maven.test.classpath" /> - </classpath> - </sql> - </tasks> - </configuration> - </execution> - <execution> - <id>drop.schema</id> - <phase>prepare-package</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <tasks> - <property file="target/test-classes/hibernate.properties" /> - <sql src="target/jbpm-db/drop/jbpm.${database}.drop.sql" - driver="${hibernate.connection.driver_class}" url="${hibernate.connection.url}" - userid="${hibernate.connection.username}" password="${hibernate.connection.password}"> - <classpath> - <path refid="maven.test.classpath" /> - </classpath> - </sql> - </tasks> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> +  + <profile> + <id>hsqldb</id> + <activation> + <property> + <name>database</name> + <value>hsqldb</value> + </property> + </activation> + <dependencies> + <dependency> + <groupId>hsqldb</groupId> + <artifactId>hsqldb</artifactId> + <scope>test</scope> + </dependency> + </dependencies> </profile> +  <profile> <id>oracle</id> Modified: jbpm4/trunk/profiles.xml.example =================================================================== --- jbpm4/trunk/profiles.xml.example 2009-02-02 13:49:27 UTC (rev 3739) +++ jbpm4/trunk/profiles.xml.example 2009-02-02 14:27:18 UTC (rev 3740) @@ -1,12 +1,66 @@ -<profilesXml xmlns="http://maven.apache.org/POM/4.0.0" +<profilesXml xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/profiles-1.0.0.xsd"> <profiles> - +  - + <profile> + <id>jboss-home-profile</id> + <activation> + <property> + <name>user.name</name> + </property> + </activation> + <properties> + +  + + <jboss422.home>/Users/hbraun/dev/prj/jbossas/tags/JBoss_4_2_2_GA/build/output/jboss-4.2.2.GA</jboss422.home> + <jboss423.home>/Users/hbraun/dev/prj/jbossas/tags/JBoss_4_2_3_GA/build/output/jboss-4.2.3.GA</jboss423.home> + <jboss500.home>/Users/hbraun/dev/prj/jbossas/tags/JBoss_5_0_0_GA/build/output/jboss-5.0.0.GA</jboss500.home> + +  + + <jdbc.hsql.server>localhost</jdbc.hsql.server> + <jdbc.hsql.port>3306</jdbc.hsql.port> + <jdbc.hsql.database>jbpmtest</jdbc.hsql.database> + <jdbc.hsql.url>jdbc:hsqldb:mem:.</jdbc.hsql.url> + <jdbc.hsql.username>sa</jdbc.hsql.username> + <jdbc.hsql.password></jdbc.hsql.password> + + <jdbc.mysql.server>localhost</jdbc.mysql.server> + <jdbc.mysql.port>3306</jdbc.mysql.port> + <jdbc.mysql.database>jbpm4</jdbc.mysql.database> + <jdbc.mysql.url>jdbc:mysql://${jdbc.mysql.server}:${jdbc.mysql.port}/${jdbc.mysql.database}</jdbc.mysql.url> + <jdbc.mysql.username>jbpmtest</jdbc.mysql.username> + <jdbc.mysql.password></jdbc.mysql.password> + + <jdbc.postgresql.server>localhost</jdbc.postgresql.server> + <jdbc.postgresql.port>5432</jdbc.postgresql.port> + <jdbc.postgresql.database>jbpm4</jdbc.postgresql.database> + <jdbc.postgresql.url>jdbc:postgresql://${jdbc.postgresql.server}:${jdbc.postgresql.port}/${jdbc.postgresql.database}</jdbc.postgresql.url> + <jdbc.postgresql.username>jbpmtest</jdbc.postgresql.username> + <jdbc.postgresql.password></jdbc.postgresql.password> + + <jdbc.sybase.server>localhost</jdbc.sybase.server> + <jdbc.sybase.port>5000</jdbc.sybase.port> + <jdbc.sybase.database>jbpm4</jdbc.sybase.database> + <jdbc.sybase.url>jdbc:sybase:Tds:${jdbc.sybase.server}:${jdbc.sybase.port}/${jdbc.sybase.database}</jdbc.sybase.url> + <jdbc.sybase.username>jbpmtest</jdbc.sybase.username> + <jdbc.sybase.password>jbpmtest</jdbc.sybase.password> + <jdbc.sybase.driver>com.sybase.jdbc3.jdbc.SybDriver</jdbc.sybase.driver> + <jdbc.sybase.datasource>com.sybase.jdbc3.jdbc.SybXADataSource</jdbc.sybase.datasource> + + </properties> + </profile> + + <profile> <id>oracle-private-properties</id> <activation> <property> @@ -37,7 +91,7 @@ <jdbc.dbname>JBPM</jdbc.dbname> </properties> </profile> - + </profiles> </profilesXml>

15 years, 4 months

1
0
0 / 0

JBoss JBPM SVN: r3739 - in jbpm4/branches/hbraun/modules/jpdl: src/main/resources and 1 other directory.

by do-not-reply＠jboss.org

Author: heiko.braun(a)jboss.com Date: 2009-02-02 08:49:27 -0500 (Mon, 02 Feb 2009) New Revision: 3739 Removed: jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/ Modified: jbpm4/branches/hbraun/modules/jpdl/pom.xml Log: remove legacy db.properties Modified: jbpm4/branches/hbraun/modules/jpdl/pom.xml =================================================================== --- jbpm4/branches/hbraun/modules/jpdl/pom.xml 2009-02-02 13:46:16 UTC (rev 3738) +++ jbpm4/branches/hbraun/modules/jpdl/pom.xml 2009-02-02 13:49:27 UTC (rev 3739) @@ -146,26 +146,6 @@ </execution> </executions> </plugin> - -  </plugins> </build>

15 years, 4 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

jbpm-commits February 2009