August 2010 - jbpm-commits - Jboss List Archives

JBoss JBPM SVN: r6585 - jbpm3/branches/jbpm-3.2-soa/modules/enterprise.

by do-not-reply＠jboss.org

Author: alex.guizar(a)jboss.com Date: 2010-08-12 04:54:54 -0400 (Thu, 12 Aug 2010) New Revision: 6585 Modified: jbpm3/branches/jbpm-3.2-soa/modules/enterprise/pom.xml Log: exclude JBPM-1952 test from sybase suite Modified: jbpm3/branches/jbpm-3.2-soa/modules/enterprise/pom.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/enterprise/pom.xml 2010-08-12 06:44:13 UTC (rev 6584) +++ jbpm3/branches/jbpm-3.2-soa/modules/enterprise/pom.xml 2010-08-12 08:54:54 UTC (rev 6585) @@ -303,5 +303,32 @@ </plugins> </build> </profile> + +  + <profile> + <id>sybase</id> + <activation> + <property> + <name>database</name> + <value>sybase</value> + </property> + </activation> + <build> + <plugins> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <excludes> +  + <exclude>org/jbpm/enterprise/jbpm1952/JBPM1952Test.java</exclude> + </excludes> + </configuration> + </plugin> + </plugins> + </build> + </profile> </profiles> </project>

13 years, 10 months

1
0
0 / 0

JBoss JBPM SVN: r6584 - in jbpm3/branches/jbpm-soa5.1-mavenise: modules and 4 other directories.

by do-not-reply＠jboss.org

Author: ryanzhang Date: 2010-08-12 02:44:13 -0400 (Thu, 12 Aug 2010) New Revision: 6584 Added: jbpm3/branches/jbpm-soa5.1-mavenise/modules/soa-distribution/ jbpm3/branches/jbpm-soa5.1-mavenise/modules/soa-distribution/build.xml jbpm3/branches/jbpm-soa5.1-mavenise/modules/soa-distribution/pom.xml jbpm3/branches/jbpm-soa5.1-mavenise/modules/soa-distribution/post-patch/ jbpm3/branches/jbpm-soa5.1-mavenise/modules/soa-distribution/post-patch/overlay_database_sql.xml jbpm3/branches/jbpm-soa5.1-mavenise/modules/soa-distribution/post-patch/overlay_hibernate_conf.xml jbpm3/branches/jbpm-soa5.1-mavenise/modules/soa-distribution/post-patch/overlay_jbpm_conf.xml jbpm3/branches/jbpm-soa5.1-mavenise/modules/soa-distribution/post-patch/overlay_jsf_console.xml jbpm3/branches/jbpm-soa5.1-mavenise/modules/soa-distribution/post-patch/remove_uninstaller.xml jbpm3/branches/jbpm-soa5.1-mavenise/modules/soa-distribution/post-patch/remove_unneeded_docs.xml jbpm3/branches/jbpm-soa5.1-mavenise/modules/soa-distribution/resource/ jbpm3/branches/jbpm-soa5.1-mavenise/modules/soa-distribution/resource/autosetup.xml Modified: jbpm3/branches/jbpm-soa5.1-mavenise/modules/distribution/pom.xml jbpm3/branches/jbpm-soa5.1-mavenise/pom.xml Log: Refactor soa profile, Put SOA productization patches into a seperate module soa-distribution Modified: jbpm3/branches/jbpm-soa5.1-mavenise/modules/distribution/pom.xml =================================================================== --- jbpm3/branches/jbpm-soa5.1-mavenise/modules/distribution/pom.xml 2010-08-12 06:37:03 UTC (rev 6583) +++ jbpm3/branches/jbpm-soa5.1-mavenise/modules/distribution/pom.xml 2010-08-12 06:44:13 UTC (rev 6584) @@ -243,45 +243,4 @@ </plugins> </build> - <profiles> - <profile> - <id>soa</id> - <dependencies> - <dependency> - <groupId>org.jbpm.jbpm3</groupId> - <artifactId>jsf-console</artifactId> - <classifier>soa</classifier> - <type>war</type> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <id>soa-console</id> - <phase>package</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <tasks> -  - <property name="project.build.assembly.lib" - value="${project.build.assemblyDirectory}/lib" /> - <copy file="${project.build.assembly.lib}/jsf-console-soa.war" - tofile="${project.build.assembly.lib}/jsf-console.war" - overwrite="yes" /> - </tasks> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - </profiles> - -</project> \ No newline at end of file +</project> Added: jbpm3/branches/jbpm-soa5.1-mavenise/modules/soa-distribution/build.xml =================================================================== --- jbpm3/branches/jbpm-soa5.1-mavenise/modules/soa-distribution/build.xml (rev 0) +++ jbpm3/branches/jbpm-soa5.1-mavenise/modules/soa-distribution/build.xml 2010-08-12 06:44:13 UTC (rev 6584) @@ -0,0 +1,75 @@ +<project name="jBPM SOA Sub-Builder" default="default"> + +  + <property name="jbpm_install_path" location="${module_base_dir}/target/work/jbpm-installed"/> + + <target name="build"> + <mkdir dir="${jbpm_install_path}"/> + <mkdir dir="${module_base_dir}/target/work/jboss"/> + + <copy todir="${module_base_dir}/../distribution/target/" overwrite="true"> + <fileset dir="${module_base_dir}/resource" includes="autosetup.xml"/> + <filterset> + <filter token="JBPM_INSTALL_PATH" value="${jbpm_install_path}"/> + <filter token="JBOSS_INSTALL_PATH" value="${module_base_dir}/target/work/jboss"/> + </filterset> + </copy> + + <java jar="${module_base_dir}/../distribution/target/jbpm-installer-${project.version}.jar" + fork="true"> + <arg value="${module_base_dir}/../distribution/target/autosetup.xml"/> + </java> + + <copy todir="${module_base_dir}/target/work/jbpm-jpdl" overwrite="true"> + <fileset dir="${jbpm_install_path}"/> + </copy> + + <copy todir="${module_base_dir}/target/work/jbpm-jpdl/deploy" overwrite="true"> + <fileset dir="${module_base_dir}/target/work/jboss"/> + </copy> + </target> + + <target name="assemble"> + <copy todir="${module_base_dir}/target/dist/jbpm-config" overwrite="true"> + <fileset dir="${jbpm_install_path}/lib"> + <include name="jbpm-jpdl.jar"/> + <include name="jbpm-identity.jar"/> + </fileset> + <fileset dir="${jbpm_install_path}/config"> + <include name="jbpm.mail.templates.xml"/> + <include name="hibernate.cfg.xml"/> + </fileset> + </copy> + + <copy todir="${module_base_dir}/target/dist/jbpm-jpdl" overwrite="true"> + <fileset dir="${module_base_dir}/target/work/jbpm-jpdl"/> + </copy> + + <copy todir="${module_base_dir}/target/dist/jbpm-sql" overwrite="true"> + <fileset dir="${jbpm_install_path}/database"> + <include name="*.sql"/> + <exclude name="*.drop.sql"/> + </fileset> + + </copy> +  +  +  + <mkdir dir="${module_base_dir}/target/dist/javadocs"/> + <unzip src="${jbpm_install_path}/docs/jbpm-enterprise-javadoc.jar" + dest="${module_base_dir}/target/dist/javadocs/enterprise"/> + <unzip src="${jbpm_install_path}/docs/jbpm-identity-javadoc.jar" dest="${module_base_dir}/target/dist/javadocs/identity"/> + <unzip src="${jbpm_install_path}/docs/jbpm-jpdl-javadoc.jar" dest="${module_base_dir}/target/dist/javadocs/jbpm-jpdl"/> + + <zip destfile="${module_base_dir}/target/${module_build_finalName}.zip" > + <zipfileset dir="${module_base_dir}/target/dist" prefix="jbpm" includes="**/*" /> + </zip> + </target> + +</project> Added: jbpm3/branches/jbpm-soa5.1-mavenise/modules/soa-distribution/pom.xml =================================================================== --- jbpm3/branches/jbpm-soa5.1-mavenise/modules/soa-distribution/pom.xml (rev 0) +++ jbpm3/branches/jbpm-soa5.1-mavenise/modules/soa-distribution/pom.xml 2010-08-12 06:44:13 UTC (rev 6584) @@ -0,0 +1,176 @@ +<?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"> + <modelVersion>4.0.0</modelVersion> + <name>JBOSS jBPM3- Build distribution for SOA-P </name> + <groupId>org.jbpm.jbpm3</groupId> + <artifactId>jbpm-soa</artifactId> + <packaging>pom</packaging> + +  + <parent> + <groupId>org.jbpm.jbpm3</groupId> + <artifactId>jbpm</artifactId> + <version>3.2.9</version> + <relativePath>../../pom.xml</relativePath> + </parent> + + <properties> + <soa_common_build_src.groupId>org.jboss.jbosssoa</soa_common_build_src.groupId> + <soa_common_build_src.artifactId>soa-common-build-src</soa_common_build_src.artifactId> + <soa_common_build_src.version>1.0.0</soa_common_build_src.version> + </properties> + + <dependencies> + <dependency> + <groupId>${soa_common_build_src.groupId}</groupId> + <artifactId>${soa_common_build_src.artifactId}</artifactId> + <version>${soa_common_build_src.version}</version> + <type>zip</type> + </dependency> + <dependency> + <groupId>org.codehaus.groovy</groupId> + <artifactId>groovy-all</artifactId> + <version>1.7.0</version> + </dependency> + </dependencies> + +  + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <id>unpack-soa-common-build-src</id> + <phase>process-resources</phase> + <goals> + <goal>unpack</goal> + </goals> + <configuration> + <outputDirectory>${project.basedir}</outputDirectory> + <artifactItems> + <artifactItem> + <groupId>${soa_common_build_src.groupId}</groupId> + <artifactId>${soa_common_build_src.artifactId}</artifactId> + <version>${soa_common_build_src.version}</version> + <type>zip</type> + </artifactItem> + </artifactItems> + </configuration> + </execution> + <execution> + <id>cp-jsf-console-soa</id> + <phase>process-resources</phase> + <goals> + <goal>copy</goal> + </goals> + <configuration> + <artifactItems> + <artifactItem> + <groupId>org.jbpm.jbpm3</groupId> + <artifactId>jsf-console</artifactId> + <version>3.2.9</version> + <classifier>soa</classifier> + <type>war</type> + </artifactItem> + </artifactItems> + </configuration> + </execution> + </executions> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-antrun-plugin</artifactId> + <version>1.3</version> + <dependencies> + <dependency> + <groupId>org.jbpm.jbpm3</groupId> + <artifactId>jsf-console</artifactId> + <version>3.2.9</version> + <classifier>soa</classifier> + <type>war</type> + </dependency> + <dependency> + <groupId>org.apache.ant</groupId> + <artifactId>ant</artifactId> + <version>1.7.1</version> + </dependency> + <dependency> + <groupId>org.apache.ant</groupId> + <artifactId>ant-nodeps</artifactId> + <version>1.7.1</version> + </dependency> + <dependency> + <groupId>org.apache.ant</groupId> + <artifactId>ant-launcher</artifactId> + <version>1.7.1</version> + </dependency> + <dependency> + <groupId>org.apache.ant</groupId> + <artifactId>ant-trax</artifactId> + <version>1.7.1</version> + </dependency> + <dependency> + <groupId>org.codehaus.groovy</groupId> + <artifactId>groovy-all</artifactId> + <version>1.7.0</version> + </dependency> + </dependencies> + <executions> + <execution> + <id>SOA-P build process</id> + <phase>package</phase> + <configuration> + <tasks> + <ant antfile="build-common.xml" target="soa.routine.build" dir="${project.basedir}" inheritAll="false"> + <property name="module_base_dir" value="${project.basedir}"/> + <property name="module_build_finalName" value="${project.build.finalName}"/> + <property name="project.version" value="${project.version}"/> + <property name="groovy.path" value="${maven.dependency.org.codehaus.groovy.groovy-all.jar.path}" /> + </ant> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + <version>1.2</version> + <executions> + <execution> + <phase>package</phase> + <goals> + <goal>attach-artifact</goal> + </goals> + <configuration> + <artifacts> + <artifact> + <file>${project.build.directory}/${project.build.finalName}.zip</file> + <type>zip</type> + </artifact> + </artifacts> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + +</project> Added: jbpm3/branches/jbpm-soa5.1-mavenise/modules/soa-distribution/post-patch/overlay_database_sql.xml =================================================================== --- jbpm3/branches/jbpm-soa5.1-mavenise/modules/soa-distribution/post-patch/overlay_database_sql.xml (rev 0) +++ jbpm3/branches/jbpm-soa5.1-mavenise/modules/soa-distribution/post-patch/overlay_database_sql.xml 2010-08-12 06:44:13 UTC (rev 6584) @@ -0,0 +1,14 @@ +<project name="overlay_database_sql" default="apply.patch"> + + <target name="apply.patch" > + <delete> + <fileset dir="${module_base_dir}/target/work/jbpm-installed/database"> + <include name="**/jbpm.jpdl.*.update322.sql"/> + </fileset> + <fileset dir="${module_base_dir}/target/work/jbpm-jpdl/database"> + <include name="**/jbpm.jpdl.*.update322.sql"/> + </fileset> + </delete> + + </target> +</project> Added: jbpm3/branches/jbpm-soa5.1-mavenise/modules/soa-distribution/post-patch/overlay_hibernate_conf.xml =================================================================== --- jbpm3/branches/jbpm-soa5.1-mavenise/modules/soa-distribution/post-patch/overlay_hibernate_conf.xml (rev 0) +++ jbpm3/branches/jbpm-soa5.1-mavenise/modules/soa-distribution/post-patch/overlay_hibernate_conf.xml 2010-08-12 06:44:13 UTC (rev 6584) @@ -0,0 +1,43 @@ +<project name="overlay_hibernate_conf" default="apply.patch"> + + <target name="apply.patch" > +  + <replace file="${module_base_dir}/target/work/jbpm-installed/config/hibernate.cfg.xml"> + <replacefilter token="JDBC connection properties (begin) -->" + value="JDBC connection properties (begin) ==="/> + <replacefilter token=""/> + <replacefilter token="java:comp/env/jdbc/JbpmDataSource" + value="java:/JbpmDS"/> + <replacefilter token="==== DataSource properties (end)" + value=" + <replacefilter token="==== JTA transaction properties (end)" + value="" + value="Automatic schema creation (begin) ==="/> + <replacefilter token=" + <replace file="${module_base_dir}/target/work/jbpm-installed/config/hibernate.cfg.xml"> + <replacetoken><![CDATA[JTA transaction properties (begin) ===]]></replacetoken> + <replacevalue><![CDATA[JTA transaction properties (begin) --> + <property name="jta.UserTransaction">UserTransaction</property> + <property name="hibernate.current_session_context_class">jta</property>]]></replacevalue> + </replace> + +  +  + <replace file="${module_base_dir}/target/work/jbpm-jpdl/config/hibernate.cfg.xml"> + <replacetoken><![CDATA[JTA transaction properties (begin) ===]]></replacetoken> + <replacevalue><![CDATA[JTA transaction properties (begin) === + <property name="jta.UserTransaction">UserTransaction</property> + <property name="hibernate.current_session_context_class">jta</property>]]></replacevalue> + </replace> +</target> +</project> Added: jbpm3/branches/jbpm-soa5.1-mavenise/modules/soa-distribution/post-patch/overlay_jbpm_conf.xml =================================================================== --- jbpm3/branches/jbpm-soa5.1-mavenise/modules/soa-distribution/post-patch/overlay_jbpm_conf.xml (rev 0) +++ jbpm3/branches/jbpm-soa5.1-mavenise/modules/soa-distribution/post-patch/overlay_jbpm_conf.xml 2010-08-12 06:44:13 UTC (rev 6584) @@ -0,0 +1,7 @@ +<project name="overlay_hibernate_conf" default="apply.patch"> +  + + <target name="apply.patch" > +  + </target> +</project> Added: jbpm3/branches/jbpm-soa5.1-mavenise/modules/soa-distribution/post-patch/overlay_jsf_console.xml =================================================================== --- jbpm3/branches/jbpm-soa5.1-mavenise/modules/soa-distribution/post-patch/overlay_jsf_console.xml (rev 0) +++ jbpm3/branches/jbpm-soa5.1-mavenise/modules/soa-distribution/post-patch/overlay_jsf_console.xml 2010-08-12 06:44:13 UTC (rev 6584) @@ -0,0 +1,15 @@ +<project name="overlay_jsf_console" default="apply.patch"> + + <target name="apply.patch" > + <delete> + <fileset dir="${module_base_dir}/target/work/jbpm-installed/lib"> + <include name="jsf-console.war"/> + </fileset> + </delete> + <copy tofile="${module_base_dir}/target/work/jbpm-installed/lib/jsf-console.war" overwrite="yes" > + <fileset dir="${module_base_dir}/target/dependency/"> + <include name="jsf-console*.war"/> + </fileset> + </copy> + </target> +</project> Added: jbpm3/branches/jbpm-soa5.1-mavenise/modules/soa-distribution/post-patch/remove_uninstaller.xml =================================================================== --- jbpm3/branches/jbpm-soa5.1-mavenise/modules/soa-distribution/post-patch/remove_uninstaller.xml (rev 0) +++ jbpm3/branches/jbpm-soa5.1-mavenise/modules/soa-distribution/post-patch/remove_uninstaller.xml 2010-08-12 06:44:13 UTC (rev 6584) @@ -0,0 +1,7 @@ +<project name="remove_uninstall" default="apply.patch"> + <target name="apply.patch" > +  + <delete dir="${module_base_dir}/target/work/jbpm-jpdl/Uninstaller"/> + <delete file="${module_base_dir}/target/work/jbpm-jpdl/.installationinformation"/> + </target> +</project> Added: jbpm3/branches/jbpm-soa5.1-mavenise/modules/soa-distribution/post-patch/remove_unneeded_docs.xml =================================================================== --- jbpm3/branches/jbpm-soa5.1-mavenise/modules/soa-distribution/post-patch/remove_unneeded_docs.xml (rev 0) +++ jbpm3/branches/jbpm-soa5.1-mavenise/modules/soa-distribution/post-patch/remove_unneeded_docs.xml 2010-08-12 06:44:13 UTC (rev 6584) @@ -0,0 +1,9 @@ +<project name="patchname" default="apply.patch"> + + <property name="package_root" value="${module_base_dir}/target/work/jbpm-jpdl" /> + <target name="apply.patch"> +  + <delete dir="${package_root}/docs"/> + + </target> +</project> Added: jbpm3/branches/jbpm-soa5.1-mavenise/modules/soa-distribution/resource/autosetup.xml =================================================================== --- jbpm3/branches/jbpm-soa5.1-mavenise/modules/soa-distribution/resource/autosetup.xml (rev 0) +++ jbpm3/branches/jbpm-soa5.1-mavenise/modules/soa-distribution/resource/autosetup.xml 2010-08-12 06:44:13 UTC (rev 6584) @@ -0,0 +1,33 @@ +<AutomatedInstallation langpack="eng"> + <com.izforge.izpack.panels.HelloPanel /> + <com.izforge.izpack.panels.TargetPanel> + <installpath>@JBPM_INSTALL_PATH@</installpath> + </com.izforge.izpack.panels.TargetPanel> + <com.izforge.izpack.panels.TreePacksPanel> + <pack name="jBPM3 Standalone" index="0" selected="true"/> + <pack name="jBPM3 JBoss Integration" index="1" selected="true"/> + <pack name="JSF-Console" index="2" selected="true"/> + <pack name="Optional Components" index="3" selected="false"/> + <pack name="Download JBoss-5.0.0" index="4" selected="false"/> + <pack name="Download Eclipse-3.4.0" index="5" selected="false"/> + </com.izforge.izpack.panels.TreePacksPanel> + <com.izforge.izpack.panels.UserInputPanel> + <userInput> + <entry key="jbossTargetServer" value="default" /> + <entry key="jbossSelection" value="jboss423" /> + </userInput> + </com.izforge.izpack.panels.UserInputPanel> + <com.izforge.izpack.panels.UserInputPanel> + <userInput> + <entry key="dbSelection" value="hsqldb"/> + </userInput> + </com.izforge.izpack.panels.UserInputPanel> + <com.izforge.izpack.panels.UserInputPanel> + <userInput> + <entry key="jbossInstallPath" value="@JBOSS_INSTALL_PATH@" /> + </userInput> + </com.izforge.izpack.panels.UserInputPanel> + <com.izforge.izpack.panels.SummaryPanel /> + <com.izforge.izpack.panels.InstallPanel /> + <com.izforge.izpack.panels.FinishPanel /> +</AutomatedInstallation> Modified: jbpm3/branches/jbpm-soa5.1-mavenise/pom.xml =================================================================== --- jbpm3/branches/jbpm-soa5.1-mavenise/pom.xml 2010-08-12 06:37:03 UTC (rev 6583) +++ jbpm3/branches/jbpm-soa5.1-mavenise/pom.xml 2010-08-12 06:44:13 UTC (rev 6584) @@ -93,13 +93,6 @@ </dependency> <dependency> <groupId>org.jbpm.jbpm3</groupId> - <artifactId>jsf-console</artifactId> - <version>${jbpm.jsf-console.version}</version> - <classifier>soa</classifier> - <type>war</type> - </dependency> - <dependency> - <groupId>org.jbpm.jbpm3</groupId> <artifactId>gpd-deployer</artifactId> <version>${jbpm.jsf-console.version}</version> <type>war</type> @@ -727,5 +720,43 @@ </repository> </repositories> </profile> - </profiles> +  + <profile> + <id>soa</id> + <modules> + <module>modules/db</module> + <module>modules/userguide</module> + <module>modules/distribution</module> + <module>modules/soa-distribution</module> + </modules> + <build> + <plugins> + <plugin> + <artifactId>maven-javadoc-plugin</artifactId> + <configuration> + <quiet>true</quiet> + </configuration> + <executions> + <execution> + <id>attach-javadocs</id> + <goals> + <goal>jar</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <skipTests>true</skipTests> + </configuration> + </plugin> + </plugins> + </build> + </profile> + + </profiles> </project>

13 years, 10 months

1
0
0 / 0

JBoss JBPM SVN: r6583 - in projects/jsf-console/branches/jsf-console-soa5.1-mavenise: console and 6 other directories.

by do-not-reply＠jboss.org

Author: ryanzhang Date: 2010-08-12 02:37:03 -0400 (Thu, 12 Aug 2010) New Revision: 6583 Added: projects/jsf-console/branches/jsf-console-soa5.1-mavenise/soa-distribution/ projects/jsf-console/branches/jsf-console-soa5.1-mavenise/soa-distribution/build.xml projects/jsf-console/branches/jsf-console-soa5.1-mavenise/soa-distribution/pom.xml projects/jsf-console/branches/jsf-console-soa5.1-mavenise/soa-distribution/post-patch/ projects/jsf-console/branches/jsf-console-soa5.1-mavenise/soa-distribution/post-patch/patch_gpd_deployer_ui.xml projects/jsf-console/branches/jsf-console-soa5.1-mavenise/soa-distribution/post-patch/patch_jbpm_console_ui.xml projects/jsf-console/branches/jsf-console-soa5.1-mavenise/soa-distribution/resource/ projects/jsf-console/branches/jsf-console-soa5.1-mavenise/soa-distribution/resource/gpd-console/ projects/jsf-console/branches/jsf-console-soa5.1-mavenise/soa-distribution/resource/gpd-console/jboss-web.xml projects/jsf-console/branches/jsf-console-soa5.1-mavenise/soa-distribution/resource/gpd-console/web.xml projects/jsf-console/branches/jsf-console-soa5.1-mavenise/soa-distribution/resource/jbpm-console/ projects/jsf-console/branches/jsf-console-soa5.1-mavenise/soa-distribution/resource/jbpm-console/JBossLogo.jpg projects/jsf-console/branches/jsf-console-soa5.1-mavenise/soa-distribution/resource/jbpm-console/WEB-INF/ projects/jsf-console/branches/jsf-console-soa5.1-mavenise/soa-distribution/resource/jbpm-console/WEB-INF/jboss-web.xml projects/jsf-console/branches/jsf-console-soa5.1-mavenise/soa-distribution/resource/jbpm-console/WEB-INF/web.xml projects/jsf-console/branches/jsf-console-soa5.1-mavenise/soa-distribution/resource/jbpm-console/login.jsp projects/jsf-console/branches/jsf-console-soa5.1-mavenise/soa-distribution/resource/jbpm-console/web.xml Removed: projects/jsf-console/branches/jsf-console-soa5.1-mavenise/soa/ Modified: projects/jsf-console/branches/jsf-console-soa5.1-mavenise/console/pom.xml projects/jsf-console/branches/jsf-console-soa5.1-mavenise/pom.xml Log: Refactor soa profile and put the SOA productization patches into the projects Modified: projects/jsf-console/branches/jsf-console-soa5.1-mavenise/console/pom.xml =================================================================== --- projects/jsf-console/branches/jsf-console-soa5.1-mavenise/console/pom.xml 2010-08-12 05:47:06 UTC (rev 6582) +++ projects/jsf-console/branches/jsf-console-soa5.1-mavenise/console/pom.xml 2010-08-12 06:37:03 UTC (rev 6583) @@ -52,66 +52,5 @@ <scope>provided</scope> </dependency> </dependencies> - - <profiles> - <profile> - <id>soa</id> - <dependencies> - <dependency> - <groupId>org.jbpm.jbpm3</groupId> - <artifactId>soa-webapp</artifactId> - <version>${project.version}</version> - <type>war</type> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <artifactId>maven-war-plugin</artifactId> - - <executions> - <execution> - <id>default-war</id> - <goals> - <goal>war</goal> - </goals> - <configuration> - <overlays> - <overlay> - <groupId>org.jbpm.jbpm3</groupId> - <artifactId>soa-webapp</artifactId> - <skip>true</skip> - </overlay> - </overlays> - </configuration> - </execution> - - <execution> - <id>soa-war</id> - <goals> - <goal>war</goal> - </goals> - <configuration> - <classifier>soa</classifier> - <primaryArtifact>false</primaryArtifact> - <webappDirectory> - ${project.build.directory}/${project.build.finalName}-soa - </webappDirectory> - <overlays> - <overlay> - <groupId>org.jbpm.jbpm3</groupId> - <artifactId>soa-webapp</artifactId> - </overlay> -  - <overlay /> - </overlays> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - </profiles> + </project> Modified: projects/jsf-console/branches/jsf-console-soa5.1-mavenise/pom.xml =================================================================== --- projects/jsf-console/branches/jsf-console-soa5.1-mavenise/pom.xml 2010-08-12 05:47:06 UTC (rev 6582) +++ projects/jsf-console/branches/jsf-console-soa5.1-mavenise/pom.xml 2010-08-12 06:37:03 UTC (rev 6583) @@ -169,7 +169,7 @@ <profile> <id>soa</id> <modules> - <module>soa</module> + <module>soa-distribution</module> </modules> </profile> </profiles> Added: projects/jsf-console/branches/jsf-console-soa5.1-mavenise/soa-distribution/build.xml =================================================================== --- projects/jsf-console/branches/jsf-console-soa5.1-mavenise/soa-distribution/build.xml (rev 0) +++ projects/jsf-console/branches/jsf-console-soa5.1-mavenise/soa-distribution/build.xml 2010-08-12 06:37:03 UTC (rev 6583) @@ -0,0 +1,34 @@ +<project name="SOA jbpm console builder"> + + <target name="build"> + <copy todir="${module_base_dir}/target/work" file="${module_base_dir}/../console/target/jsf-console-${project.version}.war" /> + <unzip src="${module_base_dir}/target/work/jsf-console-${project.version}.war" dest="${module_base_dir}/target/work/console-war"/> + <delete file="${module_base_dir}/target/work/console-war/WEB-INF/web.xml" /> + <copy todir="${module_base_dir}/target/work/console-war/" > + <fileset dir="${module_base_dir}/resource/jbpm-console/" includes="**/*" excludes="web.xml" /> + </copy> + <copy todir="${module_base_dir}/target/work/console-war/WEB-INF" file="resource/jbpm-console/web.xml" /> + <unzip src="../gpd-deployer/target/gpd-deployer-${project.version}.war" dest="${module_base_dir}/target/work/gpd-war"/> + <delete file="${module_base_dir}/target/work/gpd-war/WEB-INF/web.xml" /> + <copy todir="${module_base_dir}/target/work/gpd-war/WEB-INF" file="${module_base_dir}/resource/gpd-console/web.xml" /> + + </target> + <target name="assemble"> + <copy preservelastmodified="true" todir="${module_base_dir}/target/dist/jbpm-console.war"> + <fileset dir="${module_base_dir}/target/work/console-war" includes="**/*" /> + </copy> + + <copy preservelastmodified="true" todir="${module_base_dir}/target/dist/gpd-deployer.war"> + <fileset dir="${module_base_dir}/target/work/gpd-war" includes="**/*" /> + </copy> + + <war destfile="${module_base_dir}/target/${module_build_finalName}.war" webxml="${module_base_dir}/target/dist/jbpm-console.war/WEB-INF/web.xml"> + <fileset dir="${module_base_dir}/target/dist/jbpm-console.war" includes="**/*" /> + </war> + + <zip destfile="${module_base_dir}/target/${module_build_finalName}.zip" > + <zipfileset dir="${module_base_dir}/target/dist" prefix="jbpm-console" includes="**/*" /> + </zip> + + </target> +</project> Added: projects/jsf-console/branches/jsf-console-soa5.1-mavenise/soa-distribution/pom.xml =================================================================== --- projects/jsf-console/branches/jsf-console-soa5.1-mavenise/soa-distribution/pom.xml (rev 0) +++ projects/jsf-console/branches/jsf-console-soa5.1-mavenise/soa-distribution/pom.xml 2010-08-12 06:37:03 UTC (rev 6583) @@ -0,0 +1,151 @@ +<?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"> + <modelVersion>4.0.0</modelVersion> + <name>JBOSS jBPM3 - Build SOA-P distribution</name> + <groupId>org.jbpm.jbpm3</groupId> + <artifactId>jsf-console-soa</artifactId> + <packaging>pom</packaging> + +  + <parent> + <groupId>org.jbpm.jbpm3</groupId> + <artifactId>jsf-console-parent</artifactId> + <version>3.2.9</version> + <relativePath>../pom.xml</relativePath> + </parent> + + <properties> + <soa_common_build_src.groupId>org.jboss.jbosssoa</soa_common_build_src.groupId> + <soa_common_build_src.artifactId>soa-common-build-src</soa_common_build_src.artifactId> + <soa_common_build_src.version>1.0.0</soa_common_build_src.version> + </properties> + + <dependencies> + <dependency> + <groupId>${soa_common_build_src.groupId}</groupId> + <artifactId>${soa_common_build_src.artifactId}</artifactId> + <version>${soa_common_build_src.version}</version> + <type>zip</type> + </dependency> + </dependencies> + +  + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <id>unpack-soa-common-build-src</id> + <phase>process-resources</phase> + <goals> + <goal>unpack</goal> + </goals> + <configuration> + <outputDirectory>${project.basedir}</outputDirectory> + <artifactItems> + <artifactItem> + <groupId>${soa_common_build_src.groupId}</groupId> + <artifactId>${soa_common_build_src.artifactId}</artifactId> + <version>${soa_common_build_src.version}</version> + <type>zip</type> + </artifactItem> + </artifactItems> + </configuration> + </execution> + </executions> + </plugin> + + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <version>1.3</version> + <configuration> + <source>1.6</source> + <target>1.6</target> + </configuration> + <dependencies> + <dependency> + <groupId>org.apache.ant</groupId> + <artifactId>ant</artifactId> + <version>1.7.1</version> + </dependency> + <dependency> + <groupId>org.apache.ant</groupId> + <artifactId>ant-nodeps</artifactId> + <version>1.7.1</version> + </dependency> + <dependency> + <groupId>org.apache.ant</groupId> + <artifactId>ant-launcher</artifactId> + <version>1.7.1</version> + </dependency> + <dependency> + <groupId>org.apache.ant</groupId> + <artifactId>ant-trax</artifactId> + <version>1.7.1</version> + </dependency> + <dependency> + <groupId>org.codehaus.groovy</groupId> + <artifactId>groovy-all</artifactId> + <version>1.7.0</version> + </dependency> + </dependencies> + + <executions> + <execution> + <id>SOA build process</id> + <phase>process-classes</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <tasks> + <ant antfile="build-common.xml" target="soa.routine.build" dir="${project.basedir}" inheritAll="false"> + <property name="module_base_dir" value="${project.basedir}"/> + <property name="module_build_finalName" value="${project.build.finalName}"/> + <property name="project.version" value="${project.version}"/> + <property name="groovy.path" value="${maven.dependency.org.codehaus.groovy.groovy-all.jar.path}" /> + </ant> + </tasks> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + <version>1.2</version> + <executions> + <execution> + <phase>package</phase> + <goals> + <goal>attach-artifact</goal> + </goals> + <configuration> + <artifacts> + <artifact> + <file>${project.build.directory}/${project.build.finalName}.zip</file> + <type>zip</type> + </artifact> + <artifact> + <file>${project.build.directory}/${project.build.finalName}.war</file> + <type>war</type> + </artifact> + </artifacts> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> +</project> Added: projects/jsf-console/branches/jsf-console-soa5.1-mavenise/soa-distribution/post-patch/patch_gpd_deployer_ui.xml =================================================================== --- projects/jsf-console/branches/jsf-console-soa5.1-mavenise/soa-distribution/post-patch/patch_gpd_deployer_ui.xml (rev 0) +++ projects/jsf-console/branches/jsf-console-soa5.1-mavenise/soa-distribution/post-patch/patch_gpd_deployer_ui.xml 2010-08-12 06:37:03 UTC (rev 6583) @@ -0,0 +1,23 @@ +<project name="patchname" default="apply.patch"> +  + <property name="gpd_war_dir" location="${module_base_dir}/target/work/gpd-war" /> + + <target name="apply.patch"> + <delete file="${gpd_war_dir}/jbpm.css" /> + <replace file="${gpd_war_dir}/index.html" > + <replacetoken><![CDATA[jbpm.css]]></replacetoken> + <replacevalue><![CDATA[/css/soa.css]]></replacevalue> + </replace> + <replace file="${gpd_war_dir}/index.html" > + <replacetoken><![CDATA[<body>]]></replacetoken> + <replacevalue><![CDATA[<body><script language="javascript" type="text/javascript" src="/css/header.js" ></script>]]></replacevalue> + </replace> + <replace file="${gpd_war_dir}/index.html" > + <replacetoken><![CDATA[</body>]]></replacetoken> + <replacevalue><![CDATA[</body><script language="javascript" type="text/javascript" src="/css/footer.js" ></script>]]></replacevalue> + </replace> + + <delete file="${gpd_war_dir}/WEB-INF/jboss-web.xml" /> + <copy todir="${gpd_war_dir}/WEB-INF" file="${module_base_dir}/resource/gpd-console/jboss-web.xml" /> + </target> +</project> Added: projects/jsf-console/branches/jsf-console-soa5.1-mavenise/soa-distribution/post-patch/patch_jbpm_console_ui.xml =================================================================== --- projects/jsf-console/branches/jsf-console-soa5.1-mavenise/soa-distribution/post-patch/patch_jbpm_console_ui.xml (rev 0) +++ projects/jsf-console/branches/jsf-console-soa5.1-mavenise/soa-distribution/post-patch/patch_jbpm_console_ui.xml 2010-08-12 06:37:03 UTC (rev 6583) @@ -0,0 +1,63 @@ +<project name="patchname" default="apply.patch"> +  + <target name="apply.patch"> + <replace file="${module_base_dir}/target/work/console-war/login.jsp" > + <replacetoken><![CDATA[<a href="/"><img src="/console-war/JBossLogo.jpg" alt="JBoss SOA Platform"/></a> +]]></replacetoken> + <replacevalue></replacevalue> + </replace> + <replace file="${module_base_dir}/target/work/console-war/login.jsp" > + <replacetoken><![CDATA[</head>]]></replacetoken> + <replacevalue><![CDATA[<link href="/css/soa.css" rel="stylesheet" type="text/css"/> + </head>]]></replacevalue> + </replace> + + <replace file="${module_base_dir}/target/work/console-war/login.jsp"> + <replacetoken><![CDATA[<body>]]></replacetoken> + <replacevalue><![CDATA[<body><script language="javascript" type="text/javascript" src="/css/header.js" ></script>]]> + </replacevalue> + </replace> + <replace file="${module_base_dir}/target/work/console-war/login.jsp"> + <replacetoken><![CDATA[</body>]]></replacetoken> + <replacevalue><![CDATA[<script language="javascript" type="text/javascript" src="/css/footer.js" ></script></body>]]> + </replacevalue> + </replace> + + <replace file="${module_base_dir}/target/work/console-war/login.jsp"> + <replacetoken><![CDATA[background: #ff8c00;]]></replacetoken> + <replacevalue><![CDATA[background: #cc0000; color: white;]]></replacevalue> + </replace> + <replace file="${module_base_dir}/target/work/console-war/login.jsp"> + <replacetoken><![CDATA[Invalid Login/Password]]></replacetoken> + <replacevalue><![CDATA[Invalid User Name/Password]]></replacevalue> + </replace> + <replace file="${module_base_dir}/target/work/console-war/login.jsp"> + <replacetoken><![CDATA[background-color: gainsboro;]]></replacetoken> + <replacevalue><![CDATA[background-color: #cccccc;]]></replacevalue> + </replace> + + <replace file="${module_base_dir}/target/work/console-war/ua/t_base.xhtml" > + <replacetoken><![CDATA[</head>]]></replacetoken> + <replacevalue><![CDATA[<link href="/css/soa.css" rel="stylesheet" type="text/css"/> + </head>]]></replacevalue> + </replace> + + <replace file="${module_base_dir}/target/work/console-war/ua/t_base.xhtml" > + <replacetoken><![CDATA[<ui:insert name="top"/> + <img src="../images/background.gif" alt=""/>]]></replacetoken> + <replacevalue><![CDATA[<script language="javascript" type="text/javascript" src="/css/header.js" ></script> + <ui:insert name="top"/>]]></replacevalue> + </replace> + <replace file="${module_base_dir}/target/work/console-war/ua/t_base.xhtml" > + <replacetoken><![CDATA[<tr> + <td colspan="2" class="layoutfooter"><h:outputText value="#{msgs['title']}"/></td> + </tr> + </tbody> + </table> +]]></replacetoken> + <replacevalue><![CDATA[</tbody> + </table> + <script language="javascript" type="text/javascript" src="/css/footer.js" ></script>]]></replacevalue> + </replace> + </target> +</project> Added: projects/jsf-console/branches/jsf-console-soa5.1-mavenise/soa-distribution/resource/gpd-console/jboss-web.xml =================================================================== --- projects/jsf-console/branches/jsf-console-soa5.1-mavenise/soa-distribution/resource/gpd-console/jboss-web.xml (rev 0) +++ projects/jsf-console/branches/jsf-console-soa5.1-mavenise/soa-distribution/resource/gpd-console/jboss-web.xml 2010-08-12 06:37:03 UTC (rev 6583) @@ -0,0 +1,13 @@ +<?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"> + +<jboss-web> +  + <security-domain>java:/jaas/soa</security-domain> + +</jboss-web> Added: projects/jsf-console/branches/jsf-console-soa5.1-mavenise/soa-distribution/resource/gpd-console/web.xml =================================================================== --- projects/jsf-console/branches/jsf-console-soa5.1-mavenise/soa-distribution/resource/gpd-console/web.xml (rev 0) +++ projects/jsf-console/branches/jsf-console-soa5.1-mavenise/soa-distribution/resource/gpd-console/web.xml 2010-08-12 06:37:03 UTC (rev 6583) @@ -0,0 +1,47 @@ +<?xml version="1.0" encoding="UTF-8"?> +<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"> + <servlet> + <description>Server counterpart for the Graphical Process Designer + deployment feature.</description> + <servlet-name>GPD Deployer Servlet</servlet-name> + <servlet-class>org.jbpm.web.ProcessUploadServlet</servlet-class> + </servlet> + + <servlet-mapping> + <servlet-name>GPD Deployer Servlet</servlet-name> + <url-pattern>/upload/*</url-pattern> + </servlet-mapping> + + <security-role> + <description>This role list should be changed to include all the relevant + roles for your environment.</description> + <role-name>admin</role-name> + </security-role> + + <security-constraint> + <web-resource-collection> + <web-resource-name>Secure Area</web-resource-name> + <description>If you are deploying to JBoss AS, be sure to specify the + security domain in jboss-web.xml.</description> + <url-pattern>/*</url-pattern> + <http-method>GET</http-method> + <http-method>POST</http-method> + </web-resource-collection> + <auth-constraint> + <description>Optionally customize the role name to require a login before + access is allowed to the application.</description> + <role-name>JBossAdmin</role-name> + </auth-constraint> + </security-constraint> + + <login-config> + <auth-method>BASIC</auth-method> + <realm-name>jBPM GPD Deployer</realm-name> + </login-config> + + <security-role> + <role-name>JBossAdmin</role-name> + </security-role> +</web-app> Added: projects/jsf-console/branches/jsf-console-soa5.1-mavenise/soa-distribution/resource/jbpm-console/JBossLogo.jpg =================================================================== (Binary files differ) Property changes on: projects/jsf-console/branches/jsf-console-soa5.1-mavenise/soa-distribution/resource/jbpm-console/JBossLogo.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: projects/jsf-console/branches/jsf-console-soa5.1-mavenise/soa-distribution/resource/jbpm-console/WEB-INF/jboss-web.xml =================================================================== --- projects/jsf-console/branches/jsf-console-soa5.1-mavenise/soa-distribution/resource/jbpm-console/WEB-INF/jboss-web.xml (rev 0) +++ projects/jsf-console/branches/jsf-console-soa5.1-mavenise/soa-distribution/resource/jbpm-console/WEB-INF/jboss-web.xml 2010-08-12 06:37:03 UTC (rev 6583) @@ -0,0 +1,34 @@ +<?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"> + +<jboss-web> +  + <security-domain>java:/jaas/soa</security-domain> + <context-root>jbpm-console</context-root> + + <resource-ref> + <res-ref-name>jdbc/JbpmDataSource</res-ref-name> + <jndi-name>java:/JbpmDS</jndi-name> + </resource-ref> + + <resource-ref> + <res-ref-name>jms/JbpmConnectionFactory</res-ref-name> + <jndi-name>java:JmsXA</jndi-name> + </resource-ref> + + <ejb-local-ref> + <ejb-ref-name>ejb/TimerEntityBean</ejb-ref-name> + <local-jndi-name>java:jbpm/TimerEntityBean</local-jndi-name> + </ejb-local-ref> + +  + <message-destination-ref> + <message-destination-ref-name>jms/JobQueue</message-destination-ref-name> + <jndi-name>queue/JbpmJobQueue</jndi-name> + </message-destination-ref> + +</jboss-web> Added: projects/jsf-console/branches/jsf-console-soa5.1-mavenise/soa-distribution/resource/jbpm-console/WEB-INF/web.xml =================================================================== --- projects/jsf-console/branches/jsf-console-soa5.1-mavenise/soa-distribution/resource/jbpm-console/WEB-INF/web.xml (rev 0) +++ projects/jsf-console/branches/jsf-console-soa5.1-mavenise/soa-distribution/resource/jbpm-console/WEB-INF/web.xml 2010-08-12 06:37:03 UTC (rev 6583) @@ -0,0 +1,148 @@ +<?xml version="1.0" encoding="UTF-8"?> +<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"> + + <servlet> + <description>Enable the JSF servlet. See faces-config.xml for Faces-specific configuration.</description> + <servlet-name>Faces Servlet</servlet-name> + <servlet-class>javax.faces.webapp.FacesServlet</servlet-class> + <load-on-startup>1</load-on-startup> + </servlet> + +  + <servlet-mapping> + <servlet-name>Faces Servlet</servlet-name> + <url-pattern>*.jsf</url-pattern> + </servlet-mapping> + +  + <servlet-mapping> + <servlet-name>Faces Servlet</servlet-name> + <url-pattern>/app/pi/*</url-pattern> + </servlet-mapping> + + <context-param> + <description>Use Documents Saved as *.xhtml</description> + <param-name>javax.faces.DEFAULT_SUFFIX</param-name> + <param-value>.xhtml</param-value> + </context-param> + + <context-param> + <description>Facelets debug output</description> + <param-name>facelets.DEVELOPMENT</param-name> + <param-value>false</param-value> + </context-param> + +  + <welcome-file-list> + <welcome-file>index.jsp</welcome-file> + </welcome-file-list> + +  + <security-role> + <role-name>admin</role-name> + </security-role> + <security-role> + <role-name>user</role-name> + </security-role> + +  + <security-constraint> + <web-resource-collection> + <web-resource-name>Secure Area</web-resource-name> + <url-pattern>/app/*</url-pattern> + <http-method>GET</http-method> + <http-method>POST</http-method> + </web-resource-collection> + <auth-constraint> + <role-name>user</role-name> + </auth-constraint> + </security-constraint> + +  + <login-config> + <auth-method>FORM</auth-method> + <form-login-config> + <form-login-page>/login.jsp</form-login-page> + <form-error-page>/login.jsp?error=1</form-error-page> + </form-login-config> + </login-config> + +  + +  + +  + + <listener> + <description>Closes the jBPM configuration on destruction, releasing resources. + This listener should appear after the job executor launcher, + to avoid reopening the configuration.</description> + <listener-class>org.jbpm.web.JbpmConfigurationCloser</listener-class> + </listener> + + <resource-ref> + <description>Logical name of the data source that provides connections to the persistence service. + Must match the hibernate.connection.datasource property in the Hibernate + configuration file.</description> + <res-ref-name>jdbc/JbpmDataSource</res-ref-name> + <res-type>javax.sql.DataSource</res-type> + <res-auth>Container</res-auth> + </resource-ref> + + <resource-ref> + <description>Logical name of the factory that provides JMS connections to the message service. + Required for processes that contain asynchronous continuations.</description> + <res-ref-name>jms/JbpmConnectionFactory</res-ref-name> + <res-type>javax.jms.ConnectionFactory</res-type> + <res-auth>Container</res-auth> + </resource-ref> + + <ejb-local-ref> + <description>Link to the local entity bean that implements the scheduler service. + Required for processes that contain timers.</description> + <ejb-ref-name>ejb/TimerEntityBean</ejb-ref-name> + <ejb-ref-type>Entity</ejb-ref-type> + <local-home>org.jbpm.ejb.LocalTimerEntityHome</local-home> + <local>org.jbpm.ejb.LocalTimerEntity</local> + </ejb-local-ref> + + <message-destination-ref> + <description>The message service sends job messages to the queue referenced here. To ensure + this is the same queue from which the JobListenerBean receives messages, the + message-destination-link element points to a common logical destination, JobQueue.</description> + <message-destination-ref-name>jms/JobQueue</message-destination-ref-name> + <message-destination-type>javax.jms.Queue</message-destination-type> + <message-destination-usage>Produces</message-destination-usage> + <message-destination-link>JobQueue</message-destination-link> + </message-destination-ref> + +</web-app> Added: projects/jsf-console/branches/jsf-console-soa5.1-mavenise/soa-distribution/resource/jbpm-console/login.jsp =================================================================== --- projects/jsf-console/branches/jsf-console-soa5.1-mavenise/soa-distribution/resource/jbpm-console/login.jsp (rev 0) +++ projects/jsf-console/branches/jsf-console-soa5.1-mavenise/soa-distribution/resource/jbpm-console/login.jsp 2010-08-12 06:37:03 UTC (rev 6583) @@ -0,0 +1,100 @@ +<% + if (request.getRemoteUser() != null) { + response.sendRedirect("app/"); + return; + } + // System.out.println("PATH: " + request.getRequestURI()); + +%> +<html> +<head> + <title>JBoss SOA Login</title> + + <style type="text/css"> + body { + font-family: sans-serif; + margin-left: 0; + margin-right: 0; + + padding-left: 0; + padding-right: 0; + + } + + img { + border: 0; + } + + #content { + padding: 15px; + } + + h3 { + color: #8c8c8c; + } + + a:link, a:visited, a { + font-weight: bold; + color: #333333; + } + + a:hover { + color: slategray; + } + + #topsep { + width: 100%; + background: url( '/Gradient.jpg' ); + } + + #footer { + text-align: center; + font-size: 10px; + } + + </style> + +</head> +<body> +<a href="/"><img src="/jbpm-console/JBossLogo.jpg" alt="JBoss SOA Platform"/></a> + +<div id="topsep"> </div> + +<div style="border: 1px solid darkgray; background: #ff8c00; font-weight: bold; padding: 10px; margin: 5px"> + You must provide security credentials to access this management console. +</div> + +<% if ("1".equals(request.getParameter("error"))) { %> +<div style="border: 1px solid darkgray; color: white; background: darkred; font-weight: bold; padding: 10px; margin: 5px"> + Invalid Login/Password. Please Try Again. +</div> +<% }%> + +<div align="center" style="border: 1px solid darkgray; background-color: gainsboro; font-size: 11px; padding: 15px;"> + <form name="loginform" method="post" action="j_security_check"> + <table class="leftmenu"> + <tbody> + <tr class="leftmenu"> + <th>User Name</th> + <td> + <input name="j_username" type="text"/> + </td> + </tr> + <tr class="leftmenu"> + <th>Password</th> + <td> + <input name="j_password" type="password"/> + </td> + </tr> + <tr class="leftmenu"> + <th/> + <td> + <input type="submit" value="Log In"/> + </td> + </tr> + </tbody> + </table> + </form> +</div> +</body> +</html> \ No newline at end of file Added: projects/jsf-console/branches/jsf-console-soa5.1-mavenise/soa-distribution/resource/jbpm-console/web.xml =================================================================== --- projects/jsf-console/branches/jsf-console-soa5.1-mavenise/soa-distribution/resource/jbpm-console/web.xml (rev 0) +++ projects/jsf-console/branches/jsf-console-soa5.1-mavenise/soa-distribution/resource/jbpm-console/web.xml 2010-08-12 06:37:03 UTC (rev 6583) @@ -0,0 +1,157 @@ +<?xml version="1.0" encoding="UTF-8"?> +<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"> + + <servlet> + <description>Enable the JSF servlet. See faces-config.xml for Faces-specific configuration.</description> + <servlet-name>Faces Servlet</servlet-name> + <servlet-class>javax.faces.webapp.FacesServlet</servlet-class> + <load-on-startup>1</load-on-startup> + </servlet> + +  + <servlet-mapping> + <servlet-name>Faces Servlet</servlet-name> + <url-pattern>*.jsf</url-pattern> + </servlet-mapping> + +  + <servlet-mapping> + <servlet-name>Faces Servlet</servlet-name> + <url-pattern>/app/pi/*</url-pattern> + </servlet-mapping> + + <context-param> + <description> Use Documents Saved as *.xhtml </description> + <param-name>javax.faces.DEFAULT_SUFFIX</param-name> + <param-value>.xhtml</param-value> + </context-param> + + <context-param> + <description> Facelets debug output </description> + <param-name>facelets.DEVELOPMENT</param-name> + <param-value>false</param-value> + </context-param> + +  + <welcome-file-list> + <welcome-file>index.jsp</welcome-file> + </welcome-file-list> + +  + <security-role> + <role-name>admin</role-name> + </security-role> + <security-role> + <role-name>user</role-name> + </security-role> + +  + <security-constraint> + <web-resource-collection> + <web-resource-name>Secure Area</web-resource-name> + <url-pattern>/app/*</url-pattern> + <http-method>GET</http-method> + <http-method>POST</http-method> + </web-resource-collection> + <auth-constraint> + <role-name>user</role-name> + </auth-constraint> + </security-constraint> + +  + <login-config> + <auth-method>FORM</auth-method> + <form-login-config> + <form-login-page>/login.jsp</form-login-page> + <form-error-page>/login.jsp?error=1</form-error-page> + </form-login-config> + </login-config> + +  + +  + +  + +  + +  + +  + +  + +  + +</web-app>

13 years, 10 months

1
0
0 / 0

JBoss JBPM SVN: r6582 - in jbpm4/trunk/modules: pvm/src/main/java/org/jbpm/pvm/internal/cmd and 2 other directories.

by do-not-reply＠jboss.org

Author: rebody Date: 2010-08-12 01:47:06 -0400 (Thu, 12 Aug 2010) New Revision: 6582 Added: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/ResumeProcessInstanceCmd.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/SuspendProcessInstanceCmd.java jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/execution/SuspendProcessInstanceTest.java Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/ExecutionService.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/EndProcessInstance.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/ExecutionServiceImpl.java Log: JBPM-2815 expose suspend and resume process instance in api interface. Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/ExecutionService.java =================================================================== --- jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/ExecutionService.java 2010-08-12 03:19:01 UTC (rev 6581) +++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/ExecutionService.java 2010-08-12 05:47:06 UTC (rev 6582) @@ -35,13 +35,13 @@ * @param processDefinitionId the {@link ProcessDefinition#getId() unique id} of the process definition. */ ProcessInstance startProcessInstanceById(String processDefinitionId); - /** starts a new process instance for the ProcessDefinition with the given processDefinitionDbid. + /** starts a new process instance for the ProcessDefinition with the given processDefinitionDbid. * @param processDefinitionId the {@link ProcessDefinition#getId() unique id} of the process definition. - * @param processInstanceKey is a user provided reference for the new process instance that must be unique over all + * @param processInstanceKey is a user provided reference for the new process instance that must be unique over all * process definition versions with the same name. */ ProcessInstance startProcessInstanceById(String processDefinitionId, String processInstanceKey); - /** starts a new process instance for the ProcessDefinition with the given processDefinitionDbid. + /** starts a new process instance for the ProcessDefinition with the given processDefinitionDbid. * @param processDefinitionId the {@link ProcessDefinition#getId() unique id} of the process definition. * @param variables are the initial values of the process variables that will be set before the execution starts. */ ProcessInstance startProcessInstanceById(String processDefinitionId, Map<String, ?> variables); @@ -49,7 +49,7 @@ /** starts a new process instance for the ProcessDefinition with the given processDefinitionDbid. * @param processDefinitionId the {@link ProcessDefinition#getId() unique id} of the process definition. * @param variables are the initial values of the process variables that will be set before the execution starts. - * @param processInstanceKey is a user provided reference for the new process instance that must be unique over all + * @param processInstanceKey is a user provided reference for the new process instance that must be unique over all * process versions with the same name. */ ProcessInstance startProcessInstanceById(String processDefinitionId, Map<String, ?> variables, String processInstanceKey); @@ -109,10 +109,10 @@ /** creates or overwrites variable values in the referenced execution */ void setVariables(String executionId, Map<String, ?> variables); - + /** creates a variable value in the referenced execution. optionally enables variable history tracking. */ void createVariable(String executionId, String name, Object value, boolean historyEnabled); - + /** creates variable values in the referenced execution. optionally enables variable history tracking. */ void createVariables(String executionId, Map<String, ?> variables, boolean historyEnabled); @@ -124,11 +124,17 @@ /** retrieves a map of variables */ Map<String, Object> getVariables(String executionId, Set<String> variableNames); - + + /** suspend a process instance. */ + void suspendProcessInstance(String processInstanceId); + + /** resume a process instance. */ + void resumeProcessInstance(String processInstanceId); + /** end a process instance */ void endProcessInstance(String processInstanceId, String state); - /** delete a process instance. The history information will still be in the database. + /** delete a process instance. The history information will still be in the database. * @throws JbpmException if the given processInstanceId doesn't exist*/ void deleteProcessInstance(String processInstanceId); Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/EndProcessInstance.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/EndProcessInstance.java 2010-08-12 03:19:01 UTC (rev 6581) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/EndProcessInstance.java 2010-08-12 05:47:06 UTC (rev 6582) @@ -22,7 +22,7 @@ package org.jbpm.pvm.internal.cmd; import org.jbpm.api.cmd.Environment; -import org.jbpm.pvm.internal.model.ExecutionImpl; +import org.jbpm.pvm.internal.client.ClientExecution; import org.jbpm.pvm.internal.session.DbSession; @@ -32,10 +32,10 @@ public class EndProcessInstance extends AbstractCommand<Object> { private static final long serialVersionUID = 1L; - + protected String processInstanceId; protected String state; - + public EndProcessInstance(String processInstanceId, String state) { super(); this.processInstanceId = processInstanceId; @@ -44,7 +44,7 @@ public Object execute(Environment environment) throws Exception { DbSession dbSession = environment.get(DbSession.class); - ExecutionImpl processInstance = (ExecutionImpl) dbSession.findProcessInstanceById(processInstanceId); + ClientExecution processInstance = dbSession.findProcessInstanceById(processInstanceId); processInstance.end(state); return null; } Added: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/ResumeProcessInstanceCmd.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/ResumeProcessInstanceCmd.java (rev 0) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/ResumeProcessInstanceCmd.java 2010-08-12 05:47:06 UTC (rev 6582) @@ -0,0 +1,57 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jbpm.pvm.internal.cmd; + +import org.jbpm.api.JbpmException; +import org.jbpm.api.cmd.Command; +import org.jbpm.api.cmd.Environment; +import org.jbpm.pvm.internal.client.ClientExecution; +import org.jbpm.pvm.internal.session.DbSession; + + +/** + * @author Huisheng Xu + */ +public class ResumeProcessInstanceCmd implements Command<Object> { + + private static final long serialVersionUID = 1L; + + private String processInstanceId; + + public ResumeProcessInstanceCmd(String processInstanceId) { + if (processInstanceId == null) { + throw new JbpmException("process instance id cannot be null"); + } + this.processInstanceId = processInstanceId; + } + + public Object execute(Environment environment) throws Exception { + DbSession dbSession = environment.get(DbSession.class); + ClientExecution processInstance = dbSession.findExecutionById(processInstanceId); + if (processInstance == null) { + throw new JbpmException("cannot find process instance by [" + processInstanceId + "]"); + } + processInstance.resume(); + return null; + } + +} Added: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/SuspendProcessInstanceCmd.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/SuspendProcessInstanceCmd.java (rev 0) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/SuspendProcessInstanceCmd.java 2010-08-12 05:47:06 UTC (rev 6582) @@ -0,0 +1,57 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jbpm.pvm.internal.cmd; + +import org.jbpm.api.JbpmException; +import org.jbpm.api.cmd.Command; +import org.jbpm.api.cmd.Environment; +import org.jbpm.pvm.internal.client.ClientExecution; +import org.jbpm.pvm.internal.session.DbSession; + + +/** + * @author Huisheng Xu + */ +public class SuspendProcessInstanceCmd implements Command<Object> { + + private static final long serialVersionUID = 1L; + + private String processInstanceId; + + public SuspendProcessInstanceCmd(String processInstanceId) { + if (processInstanceId == null) { + throw new JbpmException("process instance id cannot be null"); + } + this.processInstanceId = processInstanceId; + } + + public Object execute(Environment environment) throws Exception { + DbSession dbSession = environment.get(DbSession.class); + ClientExecution processInstance = dbSession.findExecutionById(processInstanceId); + if (processInstance == null) { + throw new JbpmException("cannot find process instance by [" + processInstanceId + "]"); + } + processInstance.suspend(); + return null; + } + +} Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/ExecutionServiceImpl.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/ExecutionServiceImpl.java 2010-08-12 03:19:01 UTC (rev 6581) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/ExecutionServiceImpl.java 2010-08-12 05:47:06 UTC (rev 6582) @@ -33,6 +33,8 @@ import org.jbpm.pvm.internal.cmd.CreateProcessInstanceQueryCmd; import org.jbpm.pvm.internal.cmd.DeleteProcessInstance; import org.jbpm.pvm.internal.cmd.EndProcessInstance; +import org.jbpm.pvm.internal.cmd.SuspendProcessInstanceCmd; +import org.jbpm.pvm.internal.cmd.ResumeProcessInstanceCmd; import org.jbpm.pvm.internal.cmd.FindExecutionCmd; import org.jbpm.pvm.internal.cmd.GetExecutionVariableNamesCmd; import org.jbpm.pvm.internal.cmd.GetExecutionVariablesCmd; @@ -62,15 +64,15 @@ public ProcessInstance startProcessInstanceById(String processDefinitionId, Map<String, ?> variables, String executionKey){ return commandService.execute(new StartProcessInstanceCmd(processDefinitionId, variables, executionKey)); } - + public ProcessInstance startProcessInstanceByKey(String processDefinitionKey) { return commandService.execute(new StartProcessInstanceInLatestCmd(processDefinitionKey, null, null)); } - + public ProcessInstance startProcessInstanceByKey(String processDefinitionKey, Map<String, ?> variables){ return commandService.execute(new StartProcessInstanceInLatestCmd(processDefinitionKey, variables, null)); } - + public ProcessInstance startProcessInstanceByKey(String processDefinitionKey, String executionKey) { return commandService.execute(new StartProcessInstanceInLatestCmd(processDefinitionKey, null, executionKey)); } @@ -79,8 +81,8 @@ return commandService.execute(new StartProcessInstanceInLatestCmd(processDefinitionKey, variables, executionKey)); } - - + + public ProcessInstance signalExecutionById(String executionId) { return commandService.execute(new SignalCmd(executionId, null, null)); } @@ -97,22 +99,30 @@ return commandService.execute(new SignalCmd(executionId, null, parameters)); } - + public Execution findExecutionById(String executionId) { return commandService.execute(new FindExecutionCmd(executionId)); } - + public ProcessInstance findProcessInstanceById(String executionId) { return (ProcessInstance) commandService.execute(new FindExecutionCmd(executionId)); } - + public ProcessInstanceQuery createProcessInstanceQuery() { ProcessInstanceQueryImpl query = commandService.execute(new CreateProcessInstanceQueryCmd()); query.setCommandService(commandService); return query; } + public void suspendProcessInstance(String processInstanceId) { + commandService.execute(new SuspendProcessInstanceCmd(processInstanceId)); + } + + public void resumeProcessInstance(String processInstanceId) { + commandService.execute(new ResumeProcessInstanceCmd(processInstanceId)); + } + public void endProcessInstance(String processInstanceId, String state) { commandService.execute(new EndProcessInstance(processInstanceId, state)); } @@ -120,7 +130,7 @@ public void deleteProcessInstance(String processInstanceId) { commandService.execute(new DeleteProcessInstance(processInstanceId)); } - + public void deleteProcessInstanceCascade(String processInstanceId) { commandService.execute(new DeleteProcessInstance(processInstanceId, true)); } @@ -151,7 +161,7 @@ cmd.setVariables(variables); commandService.execute(cmd); } - + public void createVariable(String executionId, String name, Object value, boolean historyEnabled) { CreateExecutionVariablesCmd cmd = new CreateExecutionVariablesCmd(executionId, historyEnabled); cmd.addVariable(name, value); Added: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/execution/SuspendProcessInstanceTest.java =================================================================== --- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/execution/SuspendProcessInstanceTest.java (rev 0) +++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/execution/SuspendProcessInstanceTest.java 2010-08-12 05:47:06 UTC (rev 6582) @@ -0,0 +1,71 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jbpm.test.execution; + +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; + +import org.jbpm.api.JbpmException; +import org.jbpm.api.ProcessInstance; +import org.jbpm.test.JbpmTestCase; + + +/** + * @author Huisheng Xu + */ +public class SuspendProcessInstanceTest extends JbpmTestCase { + + public void testSuspendProcessInstance() { + deployJpdlXmlString( + "<process name='Insurance claim' key='ICL'>" + + " <start>" + + " <transition to='a' />" + + " </start>" + + " <state name='a'>" + + " <transition to='b' />" + + " </state>" + + " <state name='b'>" + + " <transition to='c' />" + + " </state>" + + " <state name='c' />" + + "</process>" + ); + + ProcessInstance processInstance = executionService.startProcessInstanceByKey("ICL", "82436"); + + assertTrue(processInstance.isActive("a")); + + executionService.suspendProcessInstance(processInstance.getId()); + try { + processInstance = executionService.signalExecutionById("ICL.82436"); + } catch(JbpmException ex) { + assertEquals("execution[ICL.82436] is not active: suspended", ex.getMessage()); + } + executionService.resumeProcessInstance(processInstance.getId()); + + processInstance = executionService.signalExecutionById("ICL.82436"); + + assertTrue(processInstance.isActive("b")); + } +}

13 years, 10 months

1
0
0 / 0

JBoss JBPM SVN: r6581 - projects/jsf-console/branches.

by do-not-reply＠jboss.org

Author: ryanzhang Date: 2010-08-11 23:19:01 -0400 (Wed, 11 Aug 2010) New Revision: 6581 Added: projects/jsf-console/branches/jsf-console-soa5.1-mavenise/ Log: Create branch for SOA-P5.1 mavenise development. This branch is copied from https://svn.jboss.org/repos/jbpm/projects/jsf-console/branches/@6388 Copied: projects/jsf-console/branches/jsf-console-soa5.1-mavenise (from rev 6388, projects/jsf-console/branches/jsf-console-3.2-soa)

13 years, 10 months

1
0
0 / 0

JBoss JBPM SVN: r6580 - jbpm3/branches.

by do-not-reply＠jboss.org

Author: ryanzhang Date: 2010-08-11 23:11:45 -0400 (Wed, 11 Aug 2010) New Revision: 6580 Added: jbpm3/branches/jbpm-soa5.1-mavenise/ Log: Create Branch for SOA5.1 ER1 release. This branch is created from https://svn.jboss.org/repos/jbpm/jbpm3/branches/jbpm-3.2-soa/@6407 Will merge new soa profile in this branch. Copied: jbpm3/branches/jbpm-soa5.1-mavenise (from rev 6407, jbpm3/branches/jbpm-3.2-soa)

13 years, 10 months

1
0
0 / 0

JBoss JBPM SVN: r6579 - in jbpm3/branches/jbpm-3.2-soa/modules: core/src/test/java/org/jbpm/jbpm2818 and 3 other directories.

by do-not-reply＠jboss.org

Author: alex.guizar(a)jboss.com Date: 2010-08-11 23:08:13 -0400 (Wed, 11 Aug 2010) New Revision: 6579 Added: jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/jbpm2818/ jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/jbpm2818/JBPM2818Test.java jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/resources/org/jbpm/jbpm2818/ jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/resources/org/jbpm/jbpm2818/gpd.xml jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/resources/org/jbpm/jbpm2818/processdefinition.xml Modified: jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/en-US/modelling.xml Log: JBPM-2818 test super-state leaving transition review and improve super-state documentation Added: jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/jbpm2818/JBPM2818Test.java =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/jbpm2818/JBPM2818Test.java (rev 0) +++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/jbpm2818/JBPM2818Test.java 2010-08-12 03:08:13 UTC (rev 6579) @@ -0,0 +1,52 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jbpm.jbpm2818; + +import org.jbpm.db.AbstractDbTestCase; +import org.jbpm.graph.def.ProcessDefinition; +import org.jbpm.graph.exe.ProcessInstance; + +/** + * Leaving node in super-state throws JbpmException: cannot leave Node without leaving + * transition. + * + * @see <a href="https://jira.jboss.org/browse/JBPM-2818">JBPM-2818</a> + * @author Alejandro Guizar + */ +public class JBPM2818Test extends AbstractDbTestCase { + + protected void setUp() throws Exception { + super.setUp(); + ProcessDefinition processDefinition = ProcessDefinition.parseXmlResource("org/jbpm/jbpm2818/processdefinition.xml"); + deployProcessDefinition(processDefinition); + } + + public void testSuperStateLeavingTransition() { + ProcessInstance processInstance = jbpmContext.newProcessInstance("jbpm2818"); + processInstance.signal(); + assertEquals("state1", processInstance.getRootToken().getNode().getName()); + + processInstance = saveAndReload(processInstance); + processInstance.signal(); + assertTrue("expected " + processInstance + " to have ended", processInstance.hasEnded()); + } +} Property changes on: jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/jbpm2818/JBPM2818Test.java ___________________________________________________________________ Name: svn:eol-style + native Added: jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/resources/org/jbpm/jbpm2818/gpd.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/resources/org/jbpm/jbpm2818/gpd.xml (rev 0) +++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/resources/org/jbpm/jbpm2818/gpd.xml 2010-08-12 03:08:13 UTC (rev 6579) @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<root-container name="jbpm2818" width="842" height="584"> + <node name="start" x="72" y="36" width="145" height="37"> + <edge> + <label x="5" y="-10"/> + </edge> + </node> + <node-container name="super-state1" x="36" y="120" width="217" height="145"> + <node name="node1" x="33" y="15" width="132" height="36"> + <edge> + <label x="5" y="-10"/> + </edge> + </node> + <node name="state1" x="33" y="80" width="132" height="36"/> + <edge> + <label x="5" y="-10"/> + </edge> + </node-container> + <node name="end" x="84" y="312" width="121" height="37"/> + <deployment serverName="" serverPort="" serverDeployer=""> + <classesAndResources/> + <filesAndFolders> + <element value="/jbpm-jpdl/src/test/resources/org/jbpm/jbpm2818/gpd.xml"/> + <element value="/jbpm-jpdl/src/test/resources/org/jbpm/jbpm2818/processdefinition.xml"/> + </filesAndFolders> + </deployment> +</root-container> Property changes on: jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/resources/org/jbpm/jbpm2818/gpd.xml ___________________________________________________________________ Name: svn:eol-style + native Added: jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/resources/org/jbpm/jbpm2818/processdefinition.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/resources/org/jbpm/jbpm2818/processdefinition.xml (rev 0) +++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/resources/org/jbpm/jbpm2818/processdefinition.xml 2010-08-12 03:08:13 UTC (rev 6579) @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<process-definition name="jbpm2818" xmlns="urn:jbpm.org:jpdl-3.2"> + <start-state name="start"> + <transition to="super-state1" /> + </start-state> + + <super-state name="super-state1"> + <transition to="end" /> + + <node name="node1"> + <transition to="state1"/> + </node> + <state name="state1"/> + </super-state> + + <end-state name="end" /> +</process-definition> \ No newline at end of file Property changes on: jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/resources/org/jbpm/jbpm2818/processdefinition.xml ___________________________________________________________________ Name: svn:eol-style + native Modified: jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/en-US/modelling.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/en-US/modelling.xml 2010-08-11 23:44:35 UTC (rev 6578) +++ jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/en-US/modelling.xml 2010-08-12 03:08:13 UTC (rev 6579) @@ -583,15 +583,16 @@ <para> A super-state is a group of nodes. They can be nested recursively and are used to add a hierarchy to the process - definition. (For example, use this functionality - to group all of the nodes belonging to a process in phases.) + definition. For example, this functionality is useful + to group the nodes belonging to a process in phases. </para> <para> - Actions can be associated with super-state events. A consequence - of this is that a token can be in multiple nested nodes at any - given time. This can be convenient when checking if a process - execution is in, for example, the start-up phase. One is free to - group any set of nodes into a super-state. + Actions can be associated with super-state events. Events + fired by tokens in nested nodes bubble up the super-state + hierarchy up to the process definition. The token therefore + acts as being in every node in the hierarchy at the same + time. This can be convenient when checking if a process + execution is in, for example, the start-up phase. </para> <section id="superstatetransitions"> @@ -600,14 +601,18 @@ </title> <para> - Any of the transitions leaving a super-state can be taken by - tokens in the nodes found within that same super state. + Any transition leaving a super-state can be taken by a + token positioned in any node within that super-state. + One use case for this feature is to model a <emphasis> + cancel</emphasis> transition which can be taken at any time. + </para> + <para> Transitions can also arrive in super-states, in which case the - token will be redirected to the first node in it. + token will be redirected to the first node in document order. Furthermore, nodes which are outside the super-state can have transitions directly to nodes that are inside it - and vice versa. Finally, super-states can also be - self-referential. + and viceversa. Finally, as any other node, super-states can + also self-transition. </para> </section> @@ -621,8 +626,8 @@ <systemitem>superstate-enter</systemitem> and <systemitem>superstate-leave</systemitem>. They will be fired irrespective of which transitions the node has entered or - left. (As long as a token takes transitions within the - super-state, these events will not be fired.) + left. As long as a token takes transitions within the + super-state, these events will not be fired. </para> <note> @@ -641,13 +646,13 @@ </title> <para> - Node names have to be unique (within their - <firstterm>scope</firstterm>.) The scope of the node is its - <firstterm>node-collection</firstterm>. (Both the process - definition and the super-state are node collections.) To refer + Node names have to be unique within their + <firstterm>scope</firstterm>. The scope of the node is its + <firstterm>node-collection</firstterm>. Both the process + definition and the super-state are node collections. To refer to nodes in super-states, specify the relative, slash - (<code>/</code>) separated name. (The slash separates the node - names. Use <code>.</code> to refer to an upper level.) The next + (<code>/</code>) separated name. The slash separates the node + names. Use <code>..</code> to refer to an upper level. The next example shows how to refer to a node in a super-state: </para>

13 years, 10 months

1
0
0 / 0

JBoss JBPM SVN: r6578 - jbpm4/trunk/modules/api/src/main/resources.

by do-not-reply＠jboss.org

Author: rebody Date: 2010-08-11 19:44:35 -0400 (Wed, 11 Aug 2010) New Revision: 6578 Modified: jbpm4/trunk/modules/api/src/main/resources/jpdl-4.5.xsd Log: fixed targetNamespace Modified: jbpm4/trunk/modules/api/src/main/resources/jpdl-4.5.xsd =================================================================== --- jbpm4/trunk/modules/api/src/main/resources/jpdl-4.5.xsd 2010-08-11 16:24:15 UTC (rev 6577) +++ jbpm4/trunk/modules/api/src/main/resources/jpdl-4.5.xsd 2010-08-11 23:44:35 UTC (rev 6578) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://jbpm.org/4.4/jpdl" - xmlns:tns="http://jbpm.org/4.4/jpdl" elementFormDefault="qualified"> +<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://jbpm.org/4.5/jpdl" + xmlns:tns="http://jbpm.org/4.5/jpdl" elementFormDefault="qualified"> <annotation> <documentation>Schema for jPDL 4 process descriptions; the top level element is process.</documentation>

13 years, 10 months

1
0
0 / 0

JBoss JBPM SVN: r6577 - jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home.

by do-not-reply＠jboss.org

Author: alex.guizar(a)jboss.com Date: 2010-08-11 12:24:15 -0400 (Wed, 11 Aug 2010) New Revision: 6577 Modified: jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/container.sh Log: JBPM-2916 change multicast address environment variable name to match the jboss hudson instance Modified: jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/container.sh =================================================================== --- jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/container.sh 2010-08-11 14:34:42 UTC (rev 6576) +++ jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/container.sh 2010-08-11 16:24:15 UTC (rev 6577) @@ -10,7 +10,7 @@ # DATABASE db2, hsqldb, mssql, mysql, oracle, postgresql # CONTAINER jboss405, jboss423, jboss501, jboss510 # MYTESTIP_1 bind address -# MCASTIP multicast address +# MCAST_ADDR multicast address # SOURCE_REPO location of jboss distributions # Determine JBoss AS version @@ -134,7 +134,7 @@ # Start JBoss AS $JBOSS_HOME/bin/run.sh -b $MYTESTIP_1 -c $JBOSS_SERVER -g jbpm3-$CONTAINER-$DATABASE \ - -u $MCASTIP &> /dev/null & + -u $MCAST_ADDR &> /dev/null & # Was it successfully started? wget --spider --retry-connrefused --waitretry=24 --no-verbose $MYTESTIP_1:8080

13 years, 10 months

1
0
0 / 0

JBoss JBPM SVN: r6576 - jbpm3/branches/jbpm-3.2-soa/modules/enterprise.

by do-not-reply＠jboss.org

Author: alex.guizar(a)jboss.com Date: 2010-08-11 10:34:42 -0400 (Wed, 11 Aug 2010) New Revision: 6576 Modified: jbpm3/branches/jbpm-3.2-soa/modules/enterprise/pom.xml Log: JBPM-2916 exclude JBPM1952Test from db2 test suite Modified: jbpm3/branches/jbpm-3.2-soa/modules/enterprise/pom.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/enterprise/pom.xml 2010-08-11 13:56:21 UTC (rev 6575) +++ jbpm3/branches/jbpm-3.2-soa/modules/enterprise/pom.xml 2010-08-11 14:34:42 UTC (rev 6576) @@ -218,7 +218,34 @@ </dependencies> </profile> -  + <profile> + <id>db2</id> + <activation> + <property> + <name>database</name> + <value>db2</value> + </property> + </activation> + <build> + <plugins> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <excludes> +  + <exclude>org/jbpm/enterprise/jbpm1952/JBPM1952Test.java</exclude> + </excludes> + </configuration> + </plugin> + </plugins> + </build> + </profile> + +

13 years, 10 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

jbpm-commits August 2010