JBoss JBPM SVN: r3809 - jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/exe.
by do-not-reply＠jboss.org
Author: camunda
Date: 2009-02-09 07:38:03 -0500 (Mon, 09 Feb 2009)
New Revision: 3809
Modified:
jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/exe/ProcessInstance.java
jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/exe/Token.java
Log:
JBPM-2033 / JBPM-1471: ended token cannot be signaled any more. Ending sub process doesn't signal ended super process any more as well..
Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/exe/ProcessInstance.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/exe/ProcessInstance.java 2009-02-09 11:23:23 UTC (rev 3808)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/exe/ProcessInstance.java 2009-02-09 12:38:03 UTC (rev 3809)
@@ -350,7 +350,7 @@
rootToken.addLog(new ProcessInstanceEndLog());
// check if this process was started as a subprocess of a super process
- if (superProcessToken != null)
+ if (superProcessToken != null && !superProcessToken.hasEnded())
{
addCascadeProcessInstance(superProcessToken.getProcessInstance());
Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/exe/Token.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/exe/Token.java 2009-02-09 11:23:23 UTC (rev 3808)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/exe/Token.java 2009-02-09 12:38:03 UTC (rev 3809)
@@ -210,6 +210,10 @@
{
throw new JbpmException("this token is locked by " + lock);
}
+ if (hasEnded())
+ {
+ throw new JbpmException("Token '" + name + "' (" + id + ") is already ended and cannot be signaled");
+ }
startCompositeLog(new SignalLog(transition));
try
17 years, 2 months
JBoss JBPM SVN: r3808 - jbpm3/branches.
by do-not-reply＠jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-02-09 06:23:23 -0500 (Mon, 09 Feb 2009)
New Revision: 3808
Removed:
jbpm3/branches/jbpm-3.3.x-SOA-4.2/
Log:
Delete stale branch jbpm-3.3.x-SOA-4.2
17 years, 2 months
JBoss JBPM SVN: r3807 - jbpm3/branches.
by do-not-reply＠jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-02-09 06:22:56 -0500 (Mon, 09 Feb 2009)
New Revision: 3807
Removed:
jbpm3/branches/jbpm-3.2.4.SP/
Log:
delete stale branch jbpm-3.2.4.SP
17 years, 2 months
JBoss JBPM SVN: r3806 - in jbpm3/trunk/modules/core: scripts and 1 other directories.
by do-not-reply＠jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-02-09 06:15:39 -0500 (Mon, 09 Feb 2009)
New Revision: 3806
Modified:
jbpm3/trunk/modules/core/pom.xml
jbpm3/trunk/modules/core/scripts/antrun-jbpm-config.xml
jbpm3/trunk/modules/core/src/main/resources/org/jbpm/default.jbpm.cfg.xml
Log:
[JBPM-1450] Disable jBPM logging in SOA profile
Modified: jbpm3/trunk/modules/core/pom.xml
===================================================================
--- jbpm3/trunk/modules/core/pom.xml 2009-02-09 11:15:34 UTC (rev 3805)
+++ jbpm3/trunk/modules/core/pom.xml 2009-02-09 11:15:39 UTC (rev 3806)
@@ -207,6 +207,34 @@
<profiles>
<!--
+ Name: soa
+ Descr: Customizations for the SOA build
+ -->
+ <profile>
+ <id>soa</id>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <ant antfile="scripts/antrun-jbpm-config.xml" target="jbpm-cfg-xml-soa" />
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <!--
Name: no-database
Descr: Setup the default database
-->
Modified: jbpm3/trunk/modules/core/scripts/antrun-jbpm-config.xml
===================================================================
--- jbpm3/trunk/modules/core/scripts/antrun-jbpm-config.xml 2009-02-09 11:15:34 UTC (rev 3805)
+++ jbpm3/trunk/modules/core/scripts/antrun-jbpm-config.xml 2009-02-09 11:15:39 UTC (rev 3806)
@@ -79,6 +79,7 @@
</sequential>
</macrodef>
+ <!-- Concatenates the hibernate config scripts -->
<target name="concat" >
<macro-database-cfg database="db2" />
<macro-database-cfg database="derby" />
@@ -101,7 +102,12 @@
<loadfile property="hibernate.properties.xml" srcFile="${build.resources.directory}/hibernate.properties.${database}.xml"/>
<echo message="${hibernate.properties.xml}"/>
<echo/>
-
</target>
-
+
+ <!-- Generate the custom jbpm.cfg.xml for the SOA platform -->
+ <target name="jbpm-cfg-xml-soa" >
+ <echo message="Generate the custom jbpm.cfg.xml for the SOA platform" />
+ <macro-disable section="Logging Service" file="${project.build.directory}/classes/org/jbpm/default.jbpm.cfg.xml"/>
+ </target>
+
</project>
\ No newline at end of file
Modified: jbpm3/trunk/modules/core/src/main/resources/org/jbpm/default.jbpm.cfg.xml
===================================================================
--- jbpm3/trunk/modules/core/src/main/resources/org/jbpm/default.jbpm.cfg.xml 2009-02-09 11:15:34 UTC (rev 3805)
+++ jbpm3/trunk/modules/core/src/main/resources/org/jbpm/default.jbpm.cfg.xml 2009-02-09 11:15:39 UTC (rev 3806)
@@ -10,7 +10,9 @@
<jbpm-context>
<service name="authentication" factory="org.jbpm.security.authentication.DefaultAuthenticationServiceFactory" />
+ <!-- Logging Service (begin) -->
<service name="logging" factory="org.jbpm.logging.db.DbLoggingServiceFactory" />
+ <!-- Logging Service (end) -->
<service name="message" factory="org.jbpm.msg.db.DbMessageServiceFactory" />
<service name="persistence" factory="org.jbpm.persistence.db.DbPersistenceServiceFactory" />
<service name="scheduler" factory="org.jbpm.scheduler.db.DbSchedulerServiceFactory" />
17 years, 2 months
JBoss JBPM SVN: r3805 - jbpm4/trunk/hudson.
by do-not-reply＠jboss.org
Author: heiko.braun(a)jboss.com
Date: 2009-02-09 06:15:34 -0500 (Mon, 09 Feb 2009)
New Revision: 3805
Modified:
jbpm4/trunk/hudson/jbpm4-base.sh
jbpm4/trunk/hudson/jbpm4-db.sh
jbpm4/trunk/hudson/jbpm4-load.sh
Log:
Don't overwrite profiles.xml, but throw execption upon missing file
Modified: jbpm4/trunk/hudson/jbpm4-base.sh
===================================================================
--- jbpm4/trunk/hudson/jbpm4-base.sh 2009-02-09 11:12:45 UTC (rev 3804)
+++ jbpm4/trunk/hudson/jbpm4-base.sh 2009-02-09 11:15:34 UTC (rev 3805)
@@ -12,7 +12,10 @@
#
# default environment settings
#
-cp $JBPMDIR/profiles.xml.example $JBPMDIR/profiles.xml
+if [ ! -f $JBPMDIR/profiles.xml ]; then
+ echo "WARN: $JBPMDIR/profiles.xml is missing!"
+ exit 1
+fi
#
# build the tests
Modified: jbpm4/trunk/hudson/jbpm4-db.sh
===================================================================
--- jbpm4/trunk/hudson/jbpm4-db.sh 2009-02-09 11:12:45 UTC (rev 3804)
+++ jbpm4/trunk/hudson/jbpm4-db.sh 2009-02-09 11:15:34 UTC (rev 3805)
@@ -13,7 +13,10 @@
#
# default environment settings
#
-cp $JBPMDIR/profiles.xml.example $JBPMDIR/profiles.xml
+if [ ! -f $JBPMDIR/profiles.xml ]; then
+ echo "WARN: $JBPMDIR/profiles.xml is missing!"
+ exit 1
+fi
#
# build the tests
Modified: jbpm4/trunk/hudson/jbpm4-load.sh
===================================================================
--- jbpm4/trunk/hudson/jbpm4-load.sh 2009-02-09 11:12:45 UTC (rev 3804)
+++ jbpm4/trunk/hudson/jbpm4-load.sh 2009-02-09 11:15:34 UTC (rev 3805)
@@ -12,9 +12,11 @@
#
# default environment settings
#
-cp $JBPMDIR/profiles.xml.example $JBPMDIR/profiles.xml
+if [ ! -f $JBPMDIR/profiles.xml ]; then
+ echo "WARN: $JBPMDIR/profiles.xml is missing!"
+ exit 1
+fi
-
#
# build the tests
#
17 years, 2 months
JBoss JBPM SVN: r3804 - in jbpm3/branches/jbpm-3.2.5.SP/modules/core: scripts and 1 other directories.
by do-not-reply＠jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-02-09 06:12:45 -0500 (Mon, 09 Feb 2009)
New Revision: 3804
Modified:
jbpm3/branches/jbpm-3.2.5.SP/modules/core/pom.xml
jbpm3/branches/jbpm-3.2.5.SP/modules/core/scripts/antrun-jbpm-config.xml
jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/default.jbpm.cfg.xml
Log:
[JBPM-1450] Disable jBPM logging in SOA profile
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-09 10:44:08 UTC (rev 3803)
+++ jbpm3/branches/jbpm-3.2.5.SP/modules/core/pom.xml 2009-02-09 11:12:45 UTC (rev 3804)
@@ -207,6 +207,34 @@
<profiles>
<!--
+ Name: soa
+ Descr: Customizations for the SOA build
+ -->
+ <profile>
+ <id>soa</id>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <ant antfile="scripts/antrun-jbpm-config.xml" target="jbpm-cfg-xml-soa" />
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <!--
Name: no-database
Descr: Setup the default database
-->
Modified: jbpm3/branches/jbpm-3.2.5.SP/modules/core/scripts/antrun-jbpm-config.xml
===================================================================
--- jbpm3/branches/jbpm-3.2.5.SP/modules/core/scripts/antrun-jbpm-config.xml 2009-02-09 10:44:08 UTC (rev 3803)
+++ jbpm3/branches/jbpm-3.2.5.SP/modules/core/scripts/antrun-jbpm-config.xml 2009-02-09 11:12:45 UTC (rev 3804)
@@ -79,6 +79,7 @@
</sequential>
</macrodef>
+ <!-- Concatenates the hibernate config scripts -->
<target name="concat" >
<macro-database-cfg database="db2" />
<macro-database-cfg database="derby" />
@@ -101,7 +102,12 @@
<loadfile property="hibernate.properties.xml" srcFile="${build.resources.directory}/hibernate.properties.${database}.xml"/>
<echo message="${hibernate.properties.xml}"/>
<echo/>
-
</target>
-
+
+ <!-- Generate the custom jbpm.cfg.xml for the SOA platform -->
+ <target name="jbpm-cfg-xml-soa" >
+ <echo message="Generate the custom jbpm.cfg.xml for the SOA platform" />
+ <macro-disable section="Logging Service" file="${project.build.directory}/classes/org/jbpm/default.jbpm.cfg.xml"/>
+ </target>
+
</project>
\ No newline at end of file
Modified: jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/default.jbpm.cfg.xml
===================================================================
--- jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/default.jbpm.cfg.xml 2009-02-09 10:44:08 UTC (rev 3803)
+++ jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/default.jbpm.cfg.xml 2009-02-09 11:12:45 UTC (rev 3804)
@@ -10,7 +10,9 @@
<jbpm-context>
<service name="authentication" factory="org.jbpm.security.authentication.DefaultAuthenticationServiceFactory" />
+ <!-- Logging Service (begin) -->
<service name="logging" factory="org.jbpm.logging.db.DbLoggingServiceFactory" />
+ <!-- Logging Service (end) -->
<service name="message" factory="org.jbpm.msg.db.DbMessageServiceFactory" />
<service name="persistence" factory="org.jbpm.persistence.db.DbPersistenceServiceFactory" />
<service name="scheduler" factory="org.jbpm.scheduler.db.DbSchedulerServiceFactory" />
17 years, 2 months
JBoss JBPM SVN: r3803 - in jbpm4/trunk: modules/jpdl/src/main/resources and 1 other directory.
by do-not-reply＠jboss.org
Author: heiko.braun(a)jboss.com
Date: 2009-02-09 05:44:08 -0500 (Mon, 09 Feb 2009)
New Revision: 3803
Modified:
jbpm4/trunk/modules/jpdl/src/main/resources/hibernate.properties.oracle.xml
jbpm4/trunk/profiles.xml.example
Log:
JDBC username substituation
Modified: jbpm4/trunk/modules/jpdl/src/main/resources/hibernate.properties.oracle.xml
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/resources/hibernate.properties.oracle.xml 2009-02-09 09:43:01 UTC (rev 3802)
+++ jbpm4/trunk/modules/jpdl/src/main/resources/hibernate.properties.oracle.xml 2009-02-09 10:44:08 UTC (rev 3803)
@@ -1,7 +1,7 @@
<!-- hibernate dialect -->
<property name="hibernate.dialect">org.hibernate.dialect.Oracle9Dialect</property>
-
+
<!-- JDBC connection properties (begin) -->
<!-- fetch driver from http://www.oracle.com -->
<property name="hibernate.connection.driver_class">oracle.jdbc.driver.OracleDriver</property>
@@ -9,4 +9,3 @@
<property name="hibernate.connection.username">${jdbc.oracle.username}</property>
<property name="hibernate.connection.password">${jdbc.oracle.password}</property>
<!-- JDBC connection properties (end) -->
-
Modified: jbpm4/trunk/profiles.xml.example
===================================================================
--- jbpm4/trunk/profiles.xml.example 2009-02-09 09:43:01 UTC (rev 3802)
+++ jbpm4/trunk/profiles.xml.example 2009-02-09 10:44:08 UTC (rev 3803)
@@ -58,12 +58,11 @@
<jdbc.sybase.datasource>com.sybase.jdbc3.jdbc.SybXADataSource</jdbc.sybase.datasource>
<jdbc.oracle.server>localhost</jdbc.oracle.server>
- <jdbc.oracle.port>5432</jdbc.oracle.port>
+ <jdbc.oracle.port>1521</jdbc.oracle.port>
<jdbc.oracle.database>jbpm4</jdbc.oracle.database>
<jdbc.oracle.username>jbpmtest</jdbc.oracle.username>
<jdbc.oracle.password></jdbc.oracle.password>
- <jdbc.oracle.url>jdbc:oracle:thin:${jdbc.oracle.user}/${jdbc.oracle.password}@${jdbc.oracle.database}</jdbc.oracle.url>
-
+ <jdbc.oracle.url>jdbc:oracle:thin:${jdbc.oracle.username}/${jdbc.oracle.password}@${jdbc.oracle.server}:${jdbc.oracle.port}:${jdbc.oracle.database}</jdbc.oracle.url>
</properties>
</profile>
17 years, 2 months
JBoss JBPM SVN: r3802 - in jbpm4/trunk/modules/pvm/src: test/java/org/jbpm/pvm/internal/identity and 1 other directory.
by do-not-reply＠jboss.org
Author: tom.baeyens(a)jboss.com
Date: 2009-02-09 04:43:01 -0500 (Mon, 09 Feb 2009)
New Revision: 3802
Modified:
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/impl/IdentitySessionImpl.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/identity/IdentityTest.java
Log:
JBPM-1993 Interface with the JBoss identity component
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/impl/IdentitySessionImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/impl/IdentitySessionImpl.java 2009-02-07 23:23:40 UTC (rev 3801)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/impl/IdentitySessionImpl.java 2009-02-09 09:43:01 UTC (rev 3802)
@@ -211,7 +211,9 @@
List<Group> groups = new ArrayList<Group>();
GroupType identityGroupType = new SimpleGroupType(groupType);
- Collection<org.jboss.identity.idm.api.Group> identityGroups = identitySession.getRelationshipManager().findAssociatedGroups(identity, identityGroupType);
+ Collection<org.jboss.identity.idm.api.Group> identityGroups = identitySession
+ .getRoleManager()
+ .findGroupsWithRelatedRole(identity, identityGroupType, null);
for (org.jboss.identity.idm.api.Group identityGroup: identityGroups) {
String groupName = identityGroup.getName();
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/identity/IdentityTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/identity/IdentityTest.java 2009-02-07 23:23:40 UTC (rev 3801)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/identity/IdentityTest.java 2009-02-09 09:43:01 UTC (rev 3802)
@@ -72,8 +72,8 @@
List<Group> groups = identityService.findGroupsByUserAndGroupType("jackblack", Group.TYPE_ORGANISATION_UNIT);
- // assertEquals(1, groups.size());
- // Group group = groups.get(0);
- // assertEquals("jboss", group.getName());
+ assertEquals(1, groups.size());
+ Group group = groups.get(0);
+ assertEquals("jboss", group.getName());
}
}
17 years, 2 months
JBoss JBPM SVN: r3801 - in jbpm3/trunk/modules: distribution/src/main/resources/installer and 1 other directories.
by do-not-reply＠jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-02-07 18:23:40 -0500 (Sat, 07 Feb 2009)
New Revision: 3801
Modified:
jbpm3/trunk/modules/distribution/scripts/assembly-deploy-artifacts.xml
jbpm3/trunk/modules/distribution/src/main/resources/installer/install-definition.xml
jbpm3/trunk/modules/examples/scripts/assembly-examples.xml
Log:
[JBPM-2005] IzPack distribution does not contain all examples
Modified: jbpm3/trunk/modules/distribution/scripts/assembly-deploy-artifacts.xml
===================================================================
--- jbpm3/trunk/modules/distribution/scripts/assembly-deploy-artifacts.xml 2009-02-07 23:17:30 UTC (rev 3800)
+++ jbpm3/trunk/modules/distribution/scripts/assembly-deploy-artifacts.xml 2009-02-07 23:23:40 UTC (rev 3801)
@@ -51,16 +51,6 @@
<unpack>true</unpack>
</dependencySet>
- <!-- examples -->
- <dependencySet>
- <outputDirectory>examples</outputDirectory>
- <useStrictFiltering>true</useStrictFiltering>
- <includes>
- <include>*:jbpm-examples:jar:examples</include>
- </includes>
- <unpack>true</unpack>
- </dependencySet>
-
<!-- sources -->
<dependencySet>
<!-- Must be called 'src' because the GPD has a dependency on it -->
Modified: jbpm3/trunk/modules/distribution/src/main/resources/installer/install-definition.xml
===================================================================
--- jbpm3/trunk/modules/distribution/src/main/resources/installer/install-definition.xml 2009-02-07 23:17:30 UTC (rev 3800)
+++ jbpm3/trunk/modules/distribution/src/main/resources/installer/install-definition.xml 2009-02-07 23:23:40 UTC (rev 3801)
@@ -131,12 +131,6 @@
unpack="true" override="true" />
<!--
- 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/designer
-->
<fileset dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/designer" override="true">
@@ -144,9 +138,19 @@
</fileset>
<file src="@{deploy.artifacts.dir}/etc/version.info.xml" targetdir="$INSTALL_PATH/src/resources/gpd"
override="true" />
- <fileset dir="@{deploy.artifacts.dir}/examples" targetdir="$INSTALL_PATH/examples" override="true"/>
<!--
+ jbpm3/examples
+ -->
+ <file src="@{deploy.artifacts.dir}/lib/jbpm-examples-examples.jar" targetdir="$INSTALL_PATH/examples" unpack="true" override="true"/>
+
+ <!--
+ 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
-->
<fileset dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/lib" override="true">
Modified: jbpm3/trunk/modules/examples/scripts/assembly-examples.xml
===================================================================
--- jbpm3/trunk/modules/examples/scripts/assembly-examples.xml 2009-02-07 23:17:30 UTC (rev 3800)
+++ jbpm3/trunk/modules/examples/scripts/assembly-examples.xml 2009-02-07 23:23:40 UTC (rev 3801)
@@ -7,12 +7,12 @@
<includeBaseDirectory>false</includeBaseDirectory>
<fileSets>
<fileSet>
- <directory>src/test/resources/simple</directory>
- <outputDirectory>/simple/src/main/jpdl</outputDirectory>
+ <directory>.</directory>
+ <outputDirectory>/</outputDirectory>
<includes>
- <include>gpd.xml</include>
- <include>processdefinition.xml</include>
- <include>processimage.jpg</include>
+ <include>scripts/*.xml</include>
+ <include>src/**</include>
+ <include>pom.xml</include>
</includes>
</fileSet>
</fileSets>
17 years, 2 months
JBoss JBPM SVN: r3800 - in jbpm3/branches/jbpm-3.2.5.SP/modules: distribution/src/main/resources/installer and 1 other directories.
by do-not-reply＠jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-02-07 18:17:30 -0500 (Sat, 07 Feb 2009)
New Revision: 3800
Modified:
jbpm3/branches/jbpm-3.2.5.SP/modules/distribution/scripts/assembly-deploy-artifacts.xml
jbpm3/branches/jbpm-3.2.5.SP/modules/distribution/src/main/resources/installer/install-definition.xml
jbpm3/branches/jbpm-3.2.5.SP/modules/examples/scripts/assembly-examples.xml
Log:
[JBPM-2005] IzPack distribution does not contain all examples
Modified: jbpm3/branches/jbpm-3.2.5.SP/modules/distribution/scripts/assembly-deploy-artifacts.xml
===================================================================
--- jbpm3/branches/jbpm-3.2.5.SP/modules/distribution/scripts/assembly-deploy-artifacts.xml 2009-02-07 22:37:12 UTC (rev 3799)
+++ jbpm3/branches/jbpm-3.2.5.SP/modules/distribution/scripts/assembly-deploy-artifacts.xml 2009-02-07 23:17:30 UTC (rev 3800)
@@ -60,16 +60,6 @@
<unpack>true</unpack>
</dependencySet>
- <!-- examples -->
- <dependencySet>
- <outputDirectory>examples</outputDirectory>
- <useStrictFiltering>true</useStrictFiltering>
- <includes>
- <include>*:jbpm-examples:jar:examples</include>
- </includes>
- <unpack>true</unpack>
- </dependencySet>
-
<!-- sources -->
<dependencySet>
<!-- Must be called 'src' because the GPD has a dependency on it -->
Modified: jbpm3/branches/jbpm-3.2.5.SP/modules/distribution/src/main/resources/installer/install-definition.xml
===================================================================
--- jbpm3/branches/jbpm-3.2.5.SP/modules/distribution/src/main/resources/installer/install-definition.xml 2009-02-07 22:37:12 UTC (rev 3799)
+++ jbpm3/branches/jbpm-3.2.5.SP/modules/distribution/src/main/resources/installer/install-definition.xml 2009-02-07 23:17:30 UTC (rev 3800)
@@ -131,12 +131,6 @@
unpack="true" override="true" />
<!--
- 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/designer
-->
<fileset dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/designer" override="true">
@@ -144,9 +138,19 @@
</fileset>
<file src="@{deploy.artifacts.dir}/etc/version.info.xml" targetdir="$INSTALL_PATH/src/resources/gpd"
override="true" />
- <fileset dir="@{deploy.artifacts.dir}/examples" targetdir="$INSTALL_PATH/examples" override="true"/>
<!--
+ jbpm3/examples
+ -->
+ <file src="@{deploy.artifacts.dir}/lib/jbpm-examples-examples.jar" targetdir="$INSTALL_PATH/examples" unpack="true" override="true"/>
+
+ <!--
+ 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
-->
<fileset dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/lib" override="true">
Modified: jbpm3/branches/jbpm-3.2.5.SP/modules/examples/scripts/assembly-examples.xml
===================================================================
--- jbpm3/branches/jbpm-3.2.5.SP/modules/examples/scripts/assembly-examples.xml 2009-02-07 22:37:12 UTC (rev 3799)
+++ jbpm3/branches/jbpm-3.2.5.SP/modules/examples/scripts/assembly-examples.xml 2009-02-07 23:17:30 UTC (rev 3800)
@@ -7,12 +7,12 @@
<includeBaseDirectory>false</includeBaseDirectory>
<fileSets>
<fileSet>
- <directory>src/test/resources/simple</directory>
- <outputDirectory>/simple/src/main/jpdl</outputDirectory>
+ <directory>.</directory>
+ <outputDirectory>/</outputDirectory>
<includes>
- <include>gpd.xml</include>
- <include>processdefinition.xml</include>
- <include>processimage.jpg</include>
+ <include>scripts/*.xml</include>
+ <include>src/**</include>
+ <include>pom.xml</include>
</includes>
</fileSet>
</fileSets>
17 years, 2 months