JBoss JBPM SVN: r5026 - jbpm4/trunk/modules/userguide/src/main/docbook/en/modules.
by do-not-reply＠jboss.org
Author: tom.baeyens(a)jboss.com
Date: 2009-06-11 04:16:50 -0400 (Thu, 11 Jun 2009)
New Revision: 5026
Modified:
jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch06-Jpdl.xml
Log:
improving docs on async continuations based on joram's feedback
Modified: jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch06-Jpdl.xml
===================================================================
--- jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch06-Jpdl.xml 2009-06-10 19:16:22 UTC (rev 5025)
+++ jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch06-Jpdl.xml 2009-06-11 08:16:50 UTC (rev 5026)
@@ -2522,7 +2522,7 @@
<title>Asynchronous continuations</title>
<para>Each invocation of <literal>ExecutionService.startProcessInstanceById(...)</literal>
or <literal>ExecutionService.signalProcessInstanceById(...)</literal> will cause
- the process to be executed in the thread of the client. In other words, those
+ the process to be executed in the thread it was called from (=client). In other words, those
methods will only return after the process execution has arrived in a wait state.
</para>
<para>This default behaviour has a couple of advantages: user application transactions
@@ -2530,15 +2530,18 @@
transaction context. Secondly, it's possible for a client to get an exception in
case something goes wrong during execution of the process. Usually, the automatic
work that has to be done as part of the process inbetween two wait states is
- relatively small. E.g. < 1 second, even if multiple automatic activities
+ relatively small. Even if multiple automatic activities
are executed inbetween 2 wait states. So in most situations, it's good to
do all that work in a single transaction. This explains that the default behaviour
of jPDL is to perform all work of the process synchronously in the thread of client.
</para>
- <para>For those cases where it is needed, jPDL allows for very fine grained control over
+ <para>For those cases where you don't want the call to jBPM to be blocking until
+ all the automatic work is done, jPDL allows for very fine grained control over
transaction boundaries. On various places in the process, asynchronous continuations
- can be introduced. Asynchronous continuations are placed on places where logically
- the jBPM engine remains in control for executing a series of automatic steps.
+ can be introduced. Asynchronous continuations cause the transaction to commit and
+ the jBPM method invocation will return. jBPM will then start a new transaction in a
+ new thread and continue the rest of the automatic process work asynchronously. jBPM
+ uses asynchronous messaging internally to accomplish this.
</para>
<para>Upon an asynchronous continuation, an asynchronous message will be sent as
part of the currently ongoing transaction. And then the originally invoked method
@@ -2586,8 +2589,10 @@
The ongoing transaction is committed and the element is executed in a
new transaction. Transactional asynchronous messaging is used by the jBPM
implementation to achieve this. Exclusive messages will not be processed
- concurrently. The JobExecutor(s) will serialize all exclusive job
- executions. This can be used to prevent optimistic locking failures in case
+ concurrently. jBPM will make sure that exclusive jobs for the same process instance
+ are not executed concurrently, even if your jBPM configuration has multiple
+ asynchronous message processors (like the JobExecutor) running on different
+ systems. This can be used to prevent optimistic locking failures in case
multiple, potentially conflicting jobs are scheduled in the same transaction.
</listitem>
</itemizedlist>
@@ -2647,7 +2652,7 @@
<para>In a normal configuration, the job executor will automatically pick up
the message and execute it. But for testing scenarios and for these examples we
want to control when messages are executed so the job executor is not configured.
- Therefor we have to execute the jobs manually like this:
+ Therefore we have to execute the jobs manually like this:
</para>
<programlisting>Job job = managementService.createJobQuery()
.processInstanceId(processInstanceId)
16 years, 10 months
JBoss JBPM SVN: r5025 - in jbpm3/branches/jbpm-3.2-soa/modules: enterprise/scripts and 1 other directory.
by do-not-reply＠jboss.org
Author: alex.guizar(a)jboss.com
Date: 2009-06-10 15:16:22 -0400 (Wed, 10 Jun 2009)
New Revision: 5025
Modified:
jbpm3/branches/jbpm-3.2-soa/modules/core/pom.xml
jbpm3/branches/jbpm-3.2-soa/modules/enterprise/scripts/antrun-test-jars.xml
Log:
JBPM-2094: Unindexed Foreign Keys cause deadlocks in oracle (REOPENED)
Exclude JBPM2094Test in Sybase profile
Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/pom.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/core/pom.xml 2009-06-10 17:57:53 UTC (rev 5024)
+++ jbpm3/branches/jbpm-3.2-soa/modules/core/pom.xml 2009-06-10 19:16:22 UTC (rev 5025)
@@ -314,6 +314,10 @@
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <!-- JBPM-2094 Unindexed Foreign Keys cause deadlocks in oracle -->
+ <excludes>org.jbpm.jbpm2094.JBPM2094Test</excludes>
+ </configuration>
</plugin>
</plugins>
</build>
Modified: jbpm3/branches/jbpm-3.2-soa/modules/enterprise/scripts/antrun-test-jars.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/enterprise/scripts/antrun-test-jars.xml 2009-06-10 17:57:53 UTC (rev 5024)
+++ jbpm3/branches/jbpm-3.2-soa/modules/enterprise/scripts/antrun-test-jars.xml 2009-06-10 19:16:22 UTC (rev 5025)
@@ -1,11 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- ============================================================ -->
-<!-- JBoss, the OpenSource J2EE webOS -->
-<!-- Distributable under LGPL license. -->
-<!-- See terms of license at http://www.gnu.org. -->
-<!-- ============================================================ -->
-
<!-- $Id$ -->
<project>
@@ -28,9 +22,9 @@
</war>
<!-- fork-join-example -->
- <jar jarfile="${tests.output.dir}/test-libs/fork-join-example.par">
+ <zip destfile="${tests.output.dir}/test-libs/fork-join-example.par">
<fileset dir="${tests.resources.dir}/deployment/fork-join-example" />
- </jar>
+ </zip>
<!-- Please add alphabetically -->
16 years, 10 months
JBoss JBPM SVN: r5024 - jbpm3/branches/jbpm-3.2-soa/modules/distribution/scripts.
by do-not-reply＠jboss.org
Author: alex.guizar(a)jboss.com
Date: 2009-06-10 13:57:53 -0400 (Wed, 10 Jun 2009)
New Revision: 5024
Modified:
jbpm3/branches/jbpm-3.2-soa/modules/distribution/scripts/antrun-installer.xml
Log:
JBPM-2291: Process project creation wizard in JBDS 2.0 fails to create a complete sample project (RESOLVED)
Remove the extra directory under examples/*/src/main/jpdl
Modified: jbpm3/branches/jbpm-3.2-soa/modules/distribution/scripts/antrun-installer.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/distribution/scripts/antrun-installer.xml 2009-06-10 16:35:31 UTC (rev 5023)
+++ jbpm3/branches/jbpm-3.2-soa/modules/distribution/scripts/antrun-installer.xml 2009-06-10 17:57:53 UTC (rev 5024)
@@ -57,8 +57,8 @@
<basename file="${basedir}" property="example.dir"/>
<echo message="${example.dir}" />
<!-- copy jpdl resources -->
- <mkdir dir="${deploy.artifacts.resources}/jbpm-examples-dist/${example.dir}/src/main/jpdl/${example.dir}"/>
- <copy todir="${deploy.artifacts.resources}/jbpm-examples-dist/${example.dir}/src/main/jpdl/${example.dir}">
+ <mkdir dir="${deploy.artifacts.resources}/jbpm-examples-dist/${example.dir}/src/main/jpdl"/>
+ <copy todir="${deploy.artifacts.resources}/jbpm-examples-dist/${example.dir}/src/main/jpdl">
<fileset dir="${deploy.artifacts.resources}/jbpm-examples-examples/src/test/resources/${example.dir}"/>
</copy>
<!-- copy main java files -->
16 years, 10 months
JBoss JBPM SVN: r5023 - projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/action.
by do-not-reply＠jboss.org
Author: alex.guizar(a)jboss.com
Date: 2009-06-10 12:35:31 -0400 (Wed, 10 Jun 2009)
New Revision: 5023
Modified:
projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/action/DeleteActionListener.java
Log:
JBPM-2103: Deleting timer in JSF console prints stack trace (RESOLVED)
Invoke SchedulerService.deleteTimer() instead of JobSession.deleteJob() from DeleteActionListener, giving EntitySchedulerService the opportunity to cancel the EJB timer
Modified: projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/action/DeleteActionListener.java
===================================================================
--- projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/action/DeleteActionListener.java 2009-06-10 12:09:38 UTC (rev 5022)
+++ projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/action/DeleteActionListener.java 2009-06-10 16:35:31 UTC (rev 5023)
@@ -3,6 +3,7 @@
import org.jbpm.graph.def.ProcessDefinition;
import org.jbpm.graph.exe.ProcessInstance;
import org.jbpm.job.Job;
+import org.jbpm.job.Timer;
import org.jbpm.jsf.JbpmActionListener;
import org.jbpm.jsf.JbpmJsfContext;
@@ -40,6 +41,9 @@
} else if (value instanceof ProcessInstance) {
context.getJbpmContext().getGraphSession().deleteProcessInstance((ProcessInstance) value);
context.addSuccessMessage("Process instance deleted");
+ } else if (value instanceof Timer) {
+ context.getJbpmContext().getServices().getSchedulerService().deleteTimer((Timer) value);
+ context.addSuccessMessage("Timer deleted");
} else if (value instanceof Job) {
context.getJbpmContext().getJobSession().deleteJob((Job) value);
context.addSuccessMessage("Job deleted");
16 years, 10 months
JBoss JBPM SVN: r5022 - in projects/jsf-console/branches/jsf-console-3.2-soa: soa/src/main/webapp/WEB-INF and 1 other directory.
by do-not-reply＠jboss.org
Author: alex.guizar(a)jboss.com
Date: 2009-06-10 08:09:38 -0400 (Wed, 10 Jun 2009)
New Revision: 5022
Modified:
projects/jsf-console/branches/jsf-console-3.2-soa/console/src/main/webapp/WEB-INF/web.xml
projects/jsf-console/branches/jsf-console-3.2-soa/soa/src/main/webapp/WEB-INF/web.xml
Log:
JBPM-1958: Security issue allows arbitrary java code to be deployed and executed (REOPENED)
Reenable upload servlet in SOA overlay and move it back to the secure area
Modified: projects/jsf-console/branches/jsf-console-3.2-soa/console/src/main/webapp/WEB-INF/web.xml
===================================================================
--- projects/jsf-console/branches/jsf-console-3.2-soa/console/src/main/webapp/WEB-INF/web.xml 2009-06-10 09:53:23 UTC (rev 5021)
+++ projects/jsf-console/branches/jsf-console-3.2-soa/console/src/main/webapp/WEB-INF/web.xml 2009-06-10 12:09:38 UTC (rev 5022)
@@ -83,7 +83,7 @@
</auth-constraint>
</security-constraint>
- <!-- Example Login page - lists user names -->
+ <!-- Example Login page - lists sample users -->
<login-config>
<auth-method>FORM</auth-method>
<form-login-config>
@@ -121,10 +121,9 @@
<!-- Bootstrap listener ==>
<listener>
<description>
- Force initialization of the hibernate session factory.
- This will create the DB tables on new installations,
- provided that the hibernate.hbm2ddl.auto property
- is set to "create".
+ Builds the Hibernate session factory on initialization.
+ This will create the database tables in new installations,
+ provided the hibernate.hbm2ddl.auto property is set.
</description>
<listener-class>org.jbpm.web.BootstrapListener</listener-class>
</listener>
@@ -132,7 +131,7 @@
<listener>
<description>
- Closes the jBPM configuration on destruction, releasing application resources.
+ Closes the jBPM configuration on destruction, releasing resources.
This listener should appear after the job executor launcher,
to avoid reopening the configuration.
</description>
Modified: projects/jsf-console/branches/jsf-console-3.2-soa/soa/src/main/webapp/WEB-INF/web.xml
===================================================================
--- projects/jsf-console/branches/jsf-console-3.2-soa/soa/src/main/webapp/WEB-INF/web.xml 2009-06-10 09:53:23 UTC (rev 5021)
+++ projects/jsf-console/branches/jsf-console-3.2-soa/soa/src/main/webapp/WEB-INF/web.xml 2009-06-10 12:09:38 UTC (rev 5022)
@@ -40,12 +40,15 @@
<welcome-file>index.jsp</welcome-file>
</welcome-file-list>
- <!-- GPD Deployer Servlet ==>
<servlet>
<description>
Server counterpart for the Graphical Process Designer deployment feature.
- SECURITY WARNING. GPD deployment is a development aid, not for use in production.
- Make sure you either secure or remove this servlet prior to production deployment.
+ GPD WARNING. The SOA distribution of jBPM is tuned for production deployment
+ and maps this servlet to a URL pattern in the secured area. In consequence,
+ the upload servlet is no longer able to accept GPD deployment requests,
+ as GPD does not support authentication.
+ To reenable GPD deployment, map the servlet to the path expected by the GPD,
+ namely "/upload/*".
</description>
<servlet-name>GPD Deployer Servlet</servlet-name>
<servlet-class>org.jbpm.web.ProcessUploadServlet</servlet-class>
@@ -54,9 +57,8 @@
<servlet-mapping>
<servlet-name>GPD Deployer Servlet</servlet-name>
- <url-pattern>/upload/*</url-pattern>
+ <url-pattern>/app/upload/*</url-pattern>
</servlet-mapping>
- <!== GPD Deployer Servlet -->
<!--
This role list should be changed to include all the relevant roles for your environment.
@@ -122,17 +124,16 @@
<listener>
<description>
- Force initialization of the hibernate session factory.
- This will create the DB tables on new installations,
- provided that the hibernate.hbm2ddl.auto property
- is set to "create".
+ Builds the Hibernate session factory on initialization.
+ This will create the database tables in new installations,
+ provided the hibernate.hbm2ddl.auto property is set.
</description>
<listener-class>org.jbpm.web.BootstrapListener</listener-class>
</listener>
<listener>
<description>
- Closes the jBPM configuration on destruction, releasing application resources.
+ Closes the jBPM configuration on destruction, releasing resources.
This listener should appear after the job executor launcher,
to avoid reopening the configuration.
</description>
16 years, 10 months
JBoss JBPM SVN: r5020 - jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/job.
by do-not-reply＠jboss.org
Author: tom.baeyens(a)jboss.com
Date: 2009-06-10 04:11:40 -0400 (Wed, 10 Jun 2009)
New Revision: 5020
Modified:
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/job/TimerImpl.java
Log:
reverting timer change to fix compilation error in enterprise
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/job/TimerImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/job/TimerImpl.java 2009-06-09 22:21:22 UTC (rev 5019)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/job/TimerImpl.java 2009-06-10 08:11:40 UTC (rev 5020)
@@ -47,7 +47,7 @@
* @author Pascal Verdage
* @author Alejandro Guizar
*/
-public class TimerImpl extends JobImpl<Void> implements Timer {
+public class TimerImpl extends JobImpl<Boolean> implements Timer {
private static final long serialVersionUID = 1L;
private static final Log log = Log.getLog(TimerImpl.class.getName());
@@ -94,7 +94,7 @@
}
}
- public Void execute(Environment environment) throws Exception {
+ public Boolean execute(Environment environment) throws Exception {
if (log.isDebugEnabled()) log.debug("executing " + this);
if (environment==null) {
@@ -112,6 +112,7 @@
execution.fire(eventName, eventSource);
}
+ boolean deleteThisJob = true;
// if there is no repeat on this timer
if (repeat==null) {
// delete the job
@@ -123,6 +124,7 @@
dbSession.delete(this);
} else { // there is a repeat on this timer
+ deleteThisJob = false;
// suppose that it took the timer runner thread a very long time to execute the timers
// then the repeat action dueDate could already have passed
do {
@@ -145,12 +147,12 @@
transaction.registerSynchronization(jobNotificator);
}
}
-
- return null;
+
+ return deleteThisJob;
}
public String toString() {
- StringBuilder text = new StringBuilder();
+ StringBuilder text = new StringBuilder();
text.append("timer[");
text.append(dbid);
if (dueDate!=null) {
@@ -170,7 +172,7 @@
}
public static String formatDueDate(Date date) {
- return new SimpleDateFormat(dateFormat).format(date);
+ return new SimpleDateFormat(dateFormat).format(date);
}
public String getSignalName() {
16 years, 10 months
JBoss JBPM SVN: r5019 - in jbpm3/branches/jbpm-3.2-soa/modules: distribution/src/main/resources/installer and 1 other directories.
by do-not-reply＠jboss.org
Author: alex.guizar(a)jboss.com
Date: 2009-06-09 18:21:22 -0400 (Tue, 09 Jun 2009)
New Revision: 5019
Modified:
jbpm3/branches/jbpm-3.2-soa/modules/distribution/scripts/antrun-installer.xml
jbpm3/branches/jbpm-3.2-soa/modules/distribution/scripts/assembly-deploy-artifacts.xml
jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/installer/install-definition.xml
jbpm3/branches/jbpm-3.2-soa/modules/examples/pom.xml
Log:
JBPM-2291: Process project creation wizard in JBDS 2.0 fails to create a complete sample project (RESOLVED)
Update the distribution script so that the installed examples conform to the layout produced by the process project wizard.
Modified: jbpm3/branches/jbpm-3.2-soa/modules/distribution/scripts/antrun-installer.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/distribution/scripts/antrun-installer.xml 2009-06-09 19:48:25 UTC (rev 5018)
+++ jbpm3/branches/jbpm-3.2-soa/modules/distribution/scripts/antrun-installer.xml 2009-06-09 22:21:22 UTC (rev 5019)
@@ -1,14 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- ====================================================================== -->
-<!-- -->
-<!-- JBoss, the OpenSource J2EE webOS -->
-<!-- -->
-<!-- Distributable under LGPL license. -->
-<!-- See terms of license at http://www.gnu.org. -->
-<!-- -->
-<!-- ====================================================================== -->
-
<!-- $Id$ -->
<project>
@@ -62,6 +53,28 @@
<!-- ================================================================== -->
<!-- Configuration -->
<!-- ================================================================== -->
+ <target name="reorganize-example">
+ <basename file="${basedir}" property="example.dir"/>
+ <echo message="${example.dir}" />
+ <!-- copy jpdl resources -->
+ <mkdir dir="${deploy.artifacts.resources}/jbpm-examples-dist/${example.dir}/src/main/jpdl/${example.dir}"/>
+ <copy todir="${deploy.artifacts.resources}/jbpm-examples-dist/${example.dir}/src/main/jpdl/${example.dir}">
+ <fileset dir="${deploy.artifacts.resources}/jbpm-examples-examples/src/test/resources/${example.dir}"/>
+ </copy>
+ <!-- copy main java files -->
+ <mkdir dir="${deploy.artifacts.resources}/jbpm-examples-dist/${example.dir}/src/main/java"/>
+ <copy todir="${deploy.artifacts.resources}/jbpm-examples-dist/${example.dir}/src/main/java">
+ <fileset dir="${deploy.artifacts.resources}/jbpm-examples-examples/src/test/java"
+ includes="org/jbpm/examples/${example.dir}/**" excludes="org/jbpm/examples/${example.dir}/*Test.java"/>
+ </copy>
+ <!-- copy test java files -->
+ <mkdir dir="${deploy.artifacts.resources}/jbpm-examples-dist/${example.dir}/src/test/java"/>
+ <copy todir="${deploy.artifacts.resources}/jbpm-examples-dist/${example.dir}/src/test/java">
+ <fileset dir="${deploy.artifacts.resources}/jbpm-examples-examples/src/test/java"
+ includes="org/jbpm/examples/${example.dir}/*Test.java"/>
+ </copy>
+ </target>
+
<target name="configure" depends="init">
<property name="hsqldb.cfg.xml" value="${deploy.artifacts.resources}/jbpm-jpdl-config/hibernate.cfg.hsqldb.xml"/>
@@ -110,6 +123,9 @@
<equals arg1="${database}" arg2="oracle"/>
</condition>
+ <subant genericantfile="${ant.file}" target="reorganize-example" inheritall="yes">
+ <dirset dir="${deploy.artifacts.resources}/jbpm-examples-examples/src/test/resources" includes="*"/>
+ </subant>
</target>
<!-- ================================================================== -->
Modified: jbpm3/branches/jbpm-3.2-soa/modules/distribution/scripts/assembly-deploy-artifacts.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/distribution/scripts/assembly-deploy-artifacts.xml 2009-06-09 19:48:25 UTC (rev 5018)
+++ jbpm3/branches/jbpm-3.2-soa/modules/distribution/scripts/assembly-deploy-artifacts.xml 2009-06-09 22:21:22 UTC (rev 5019)
@@ -50,6 +50,14 @@
</includes>
<unpack>true</unpack>
</dependencySet>
+ <dependencySet>
+ <outputDirectory>resources/jbpm-examples-examples</outputDirectory>
+ <useStrictFiltering>true</useStrictFiltering>
+ <includes>
+ <include>*:jbpm-examples:jar:examples</include>
+ </includes>
+ <unpack>true</unpack>
+ </dependencySet>
<!-- sources -->
<dependencySet>
Modified: jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/installer/install-definition.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/installer/install-definition.xml 2009-06-09 19:48:25 UTC (rev 5018)
+++ jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/installer/install-definition.xml 2009-06-09 22:21:22 UTC (rev 5019)
@@ -9,18 +9,12 @@
<appversion>@{product.version}</appversion>
<uninstaller name="remove.task" write="yes" />
</info>
- <guiprefs width="600" height="440" resizable="yes">
- <!--
- <laf name="kunststoff">
- <os family="unix" />
- </laf>
- -->
- </guiprefs>
+ <guiprefs width="600" height="440" resizable="yes" />
<locale>
<langpack iso3="eng" />
</locale>
- <!-- It is necessary to include everything needed, in this case ant self -->
+ <!-- It is necessary to include everything needed, in this case ant itself -->
<jar src="@{deploy.artifacts.dir}/lib/ant.jar" stage="both" />
<jar src="@{deploy.artifacts.dir}/lib/ant-launcher.jar" stage="both" />
@@ -120,43 +114,31 @@
<file src="@{deploy.artifacts.dir}/etc/release.notes.html" targetdir="$INSTALL_PATH" override="true" />
<file src="@{deploy.artifacts.dir}/etc/JBossORG-EULA.txt" targetdir="$INSTALL_PATH" override="true" />
- <!--
- jbpm3/config
- -->
+ <!-- jbpm3/config -->
<file src="@{deploy.artifacts.dir}/lib/jbpm-jpdl-config.jar" targetdir="$INSTALL_PATH/config"
unpack="true" override="true" />
<file src="@{deploy.artifacts.dir}/etc/version.info.xml" targetdir="$INSTALL_PATH/config"
override="true" />
- <!--
- jbpm3/database
- -->
+ <!-- jbpm3/database -->
<file src="@{deploy.artifacts.dir}/lib/jbpm-db.jar" targetdir="$INSTALL_PATH/database"
unpack="true" override="true" />
- <!--
- jbpm3/designer
- -->
+ <!-- jbpm3/designer -->
<fileset dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/designer" override="true">
<include name="jbpm-jpdl-designer-site.zip" />
</fileset>
<file src="@{deploy.artifacts.dir}/etc/version.info.xml" targetdir="$INSTALL_PATH/src/resources/gpd"
override="true" />
- <!--
- jbpm3/examples
- -->
- <file src="@{deploy.artifacts.dir}/lib/jbpm-examples-examples.jar" targetdir="$INSTALL_PATH/examples" unpack="true" override="true"/>
+ <!-- jbpm3/examples -->
+ <fileset dir="@{deploy.artifacts.dir}/resources/jbpm-examples-dist" targetdir="$INSTALL_PATH/examples" override="true" />
- <!--
- jbpm3/docs
- -->
+ <!-- jbpm3/docs -->
<file src="@{deploy.artifacts.dir}/lib/jbpm-userguide.jdocbook" targetdir="$INSTALL_PATH/docs/userguide" unpack="true" override="true" />
<fileset dir="@{deploy.artifacts.dir}/javadoc" targetdir="$INSTALL_PATH/docs" override="true"/>
- <!--
- jbpm3/lib
- -->
+ <!-- jbpm3/lib -->
<fileset dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/lib" override="true">
<include name="activation.jar" />
<include name="antlr.jar" />
@@ -176,9 +158,7 @@
<include name="log4j.jar" />
</fileset>
- <!--
- jbpm3/src - Must be called 'src' because the GPD has a dependency on it
- -->
+ <!-- jbpm3/src - Must be called 'src' because the GPD has a dependency on it -->
<fileset dir="@{deploy.artifacts.dir}/src" targetdir="$INSTALL_PATH/src" override="true">
<include name="jsf-console-sources.jar" />
<include name="jbpm-jpdl-sources.jar" />
Modified: jbpm3/branches/jbpm-3.2-soa/modules/examples/pom.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/examples/pom.xml 2009-06-09 19:48:25 UTC (rev 5018)
+++ jbpm3/branches/jbpm-3.2-soa/modules/examples/pom.xml 2009-06-09 22:21:22 UTC (rev 5019)
@@ -108,7 +108,7 @@
<!--
Repositories
- [JBPM-2050] jBPM exmaples cannot be compiled
+ [JBPM-2050] jBPM examples cannot be compiled
-->
<repositories>
<repository>
@@ -117,33 +117,4 @@
</repository>
</repositories>
- <profiles>
- <!--
- Name: sybase
- Descr: Sybase Database Setup
- -->
- <profile>
- <id>sybase</id>
- <activation>
- <property>
- <name>database</name>
- <value>sybase</value>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <excludes>
- <!-- [JBPM-1827] Investigate example test failures against Sybase -->
- <exclude>org/jbpm/examples/taskinstance/CustomTaskInstanceTest.java</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
</project>
16 years, 10 months
JBoss JBPM SVN: r5018 - projects/jsf-console/branches/jsf-console-3.2-soa/console/src/main/webapp/WEB-INF.
by do-not-reply＠jboss.org
Author: alex.guizar(a)jboss.com
Date: 2009-06-09 15:48:25 -0400 (Tue, 09 Jun 2009)
New Revision: 5018
Modified:
projects/jsf-console/branches/jsf-console-3.2-soa/console/src/main/webapp/WEB-INF/jboss-web.xml
Log:
JBPM-2289: Upload servlet path is not aligned with the GPD defaults (CODING IN PROGRESS)
Eliminate undue differences in jboss-web.xml between jsf-console and soa-webapp
Modified: projects/jsf-console/branches/jsf-console-3.2-soa/console/src/main/webapp/WEB-INF/jboss-web.xml
===================================================================
--- projects/jsf-console/branches/jsf-console-3.2-soa/console/src/main/webapp/WEB-INF/jboss-web.xml 2009-06-09 19:43:30 UTC (rev 5017)
+++ projects/jsf-console/branches/jsf-console-3.2-soa/console/src/main/webapp/WEB-INF/jboss-web.xml 2009-06-09 19:48:25 UTC (rev 5018)
@@ -1,5 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE jboss-web PUBLIC "-//JBoss//DTD Web Application 2.4//EN" "http://www.jboss.org/j2ee/dtd/jboss-web_4_0.dtd">
+<!DOCTYPE jboss-web PUBLIC
+ "-//JBoss//DTD Web Application 2.4//EN"
+ "http://www.jboss.org/j2ee/dtd/jboss-web_4_0.dtd">
<jboss-web>
<!--
16 years, 10 months
JBoss JBPM SVN: r5017 - in jbpm3/branches/jbpm-3.2-soa: modules/core and 8 other directories.
by do-not-reply＠jboss.org
Author: alex.guizar(a)jboss.com
Date: 2009-06-09 15:43:30 -0400 (Tue, 09 Jun 2009)
New Revision: 5017
Modified:
jbpm3/branches/jbpm-3.2-soa/modules/core/pom.xml
jbpm3/branches/jbpm-3.2-soa/modules/db/pom.xml
jbpm3/branches/jbpm-3.2-soa/modules/distribution/pom.xml
jbpm3/branches/jbpm-3.2-soa/modules/enterprise/pom.xml
jbpm3/branches/jbpm-3.2-soa/modules/examples/pom.xml
jbpm3/branches/jbpm-3.2-soa/modules/identity/pom.xml
jbpm3/branches/jbpm-3.2-soa/modules/simulation/pom.xml
jbpm3/branches/jbpm-3.2-soa/modules/userguide/pom.xml
jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/en/master.xml
jbpm3/branches/jbpm-3.2-soa/pom.xml
Log:
JBPM-2037: Release jBPM 3.2.7 (OPEN)
set project version jsf-console.version to 3.2.7
Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/pom.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/core/pom.xml 2009-06-09 16:37:58 UTC (rev 5016)
+++ jbpm3/branches/jbpm-3.2-soa/modules/core/pom.xml 2009-06-09 19:43:30 UTC (rev 5017)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.jbpm.jbpm3</groupId>
<artifactId>jbpm</artifactId>
- <version>3.2.5.SP6</version>
+ <version>3.2.7</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: jbpm3/branches/jbpm-3.2-soa/modules/db/pom.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/db/pom.xml 2009-06-09 16:37:58 UTC (rev 5016)
+++ jbpm3/branches/jbpm-3.2-soa/modules/db/pom.xml 2009-06-09 19:43:30 UTC (rev 5017)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.jbpm.jbpm3</groupId>
<artifactId>jbpm</artifactId>
- <version>3.2.5.SP6</version>
+ <version>3.2.7</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: jbpm3/branches/jbpm-3.2-soa/modules/distribution/pom.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/distribution/pom.xml 2009-06-09 16:37:58 UTC (rev 5016)
+++ jbpm3/branches/jbpm-3.2-soa/modules/distribution/pom.xml 2009-06-09 19:43:30 UTC (rev 5017)
@@ -21,7 +21,7 @@
<parent>
<groupId>org.jbpm.jbpm3</groupId>
<artifactId>jbpm</artifactId>
- <version>3.2.5.SP6</version>
+ <version>3.2.7</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: jbpm3/branches/jbpm-3.2-soa/modules/enterprise/pom.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/enterprise/pom.xml 2009-06-09 16:37:58 UTC (rev 5016)
+++ jbpm3/branches/jbpm-3.2-soa/modules/enterprise/pom.xml 2009-06-09 19:43:30 UTC (rev 5017)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.jbpm.jbpm3</groupId>
<artifactId>jbpm</artifactId>
- <version>3.2.5.SP6</version>
+ <version>3.2.7</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: jbpm3/branches/jbpm-3.2-soa/modules/examples/pom.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/examples/pom.xml 2009-06-09 16:37:58 UTC (rev 5016)
+++ jbpm3/branches/jbpm-3.2-soa/modules/examples/pom.xml 2009-06-09 19:43:30 UTC (rev 5017)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.jbpm.jbpm3</groupId>
<artifactId>jbpm</artifactId>
- <version>3.2.5.SP6</version>
+ <version>3.2.7</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: jbpm3/branches/jbpm-3.2-soa/modules/identity/pom.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/identity/pom.xml 2009-06-09 16:37:58 UTC (rev 5016)
+++ jbpm3/branches/jbpm-3.2-soa/modules/identity/pom.xml 2009-06-09 19:43:30 UTC (rev 5017)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.jbpm.jbpm3</groupId>
<artifactId>jbpm</artifactId>
- <version>3.2.5.SP6</version>
+ <version>3.2.7</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: jbpm3/branches/jbpm-3.2-soa/modules/simulation/pom.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/simulation/pom.xml 2009-06-09 16:37:58 UTC (rev 5016)
+++ jbpm3/branches/jbpm-3.2-soa/modules/simulation/pom.xml 2009-06-09 19:43:30 UTC (rev 5017)
@@ -21,7 +21,7 @@
<parent>
<groupId>org.jbpm.jbpm3</groupId>
<artifactId>jbpm</artifactId>
- <version>3.2.5.SP6</version>
+ <version>3.2.7</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: jbpm3/branches/jbpm-3.2-soa/modules/userguide/pom.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/userguide/pom.xml 2009-06-09 16:37:58 UTC (rev 5016)
+++ jbpm3/branches/jbpm-3.2-soa/modules/userguide/pom.xml 2009-06-09 19:43:30 UTC (rev 5017)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.jbpm.jbpm3</groupId>
<artifactId>jbpm</artifactId>
- <version>3.2.5.SP6</version>
+ <version>3.2.7</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/en/master.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/en/master.xml 2009-06-09 16:37:58 UTC (rev 5016)
+++ jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/en/master.xml 2009-06-09 19:43:30 UTC (rev 5017)
@@ -21,7 +21,7 @@
<!ENTITY security SYSTEM "modules/security.xml">
<!ENTITY tdd SYSTEM "modules/tdd.xml">
<!ENTITY pluggable SYSTEM "modules/pluggable.xml">
-<!ENTITY version "3.2.5.SP6">
+<!ENTITY version "3.2.7">
]>
<book lang="en">
<bookinfo>
Modified: jbpm3/branches/jbpm-3.2-soa/pom.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/pom.xml 2009-06-09 16:37:58 UTC (rev 5016)
+++ jbpm3/branches/jbpm-3.2-soa/pom.xml 2009-06-09 19:43:30 UTC (rev 5017)
@@ -18,7 +18,7 @@
<groupId>org.jbpm.jbpm3</groupId>
<artifactId>jbpm</artifactId>
<packaging>pom</packaging>
- <version>3.2.5.SP6</version>
+ <version>3.2.7</version>
<!-- Parent -->
<parent>
@@ -66,7 +66,7 @@
<jaxen.version>1.1.1</jaxen.version>
<jboss.j2ee.version>4.0.2</jboss.j2ee.version>
<jbpm.designer.version>3.1.7</jbpm.designer.version>
- <jbpm.jsf-console.version>3.2.6.SP3</jbpm.jsf-console.version>
+ <jbpm.jsf-console.version>3.2.7</jbpm.jsf-console.version>
<jboss.client.version>4.0.5.GA</jboss.client.version>
<jboss.gravel.version>1.0.0.GA</jboss.gravel.version>
<jdocbook.version>2.1.2</jdocbook.version>
16 years, 10 months
JBoss JBPM SVN: r5016 - projects/jsf-console/branches/jsf-console-3.2-soa/console.
by do-not-reply＠jboss.org
Author: alex.guizar(a)jboss.com
Date: 2009-06-09 12:37:58 -0400 (Tue, 09 Jun 2009)
New Revision: 5016
Modified:
projects/jsf-console/branches/jsf-console-3.2-soa/console/
Log:
ignore eclipse .settings directory in version control
Property changes on: projects/jsf-console/branches/jsf-console-3.2-soa/console
___________________________________________________________________
Name: svn:ignore
- target
+ target
.settings
16 years, 10 months