Author: ryanzhang Date: 2010-08-18 04:12:55 -0400 (Wed, 18 Aug 2010) New Revision: 6606 Added: jbpm3/branches/jbpm-soa5.1-mavenise/modules/soa-distribution/post-patch/overlay_jbpm_jpdl_jar.xml Removed: jbpm3/branches/jbpm-soa5.1-mavenise/modules/soa-distribution/post-patch/overlay_jbpm_conf.xml Modified: jbpm3/branches/jbpm-soa5.1-mavenise/modules/core/pom.xml jbpm3/branches/jbpm-soa5.1-mavenise/modules/core/scripts/antrun-jbpm-config.xml 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/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_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 Log: Remove core module soa profile, add the logic into soa-distribution. update some soa patch Modified: jbpm3/branches/jbpm-soa5.1-mavenise/modules/core/pom.xml =================================================================== --- jbpm3/branches/jbpm-soa5.1-mavenise/modules/core/pom.xml 2010-08-18 02:53:16 UTC (rev 6605) +++ jbpm3/branches/jbpm-soa5.1-mavenise/modules/core/pom.xml 2010-08-18 08:12:55 UTC (rev 6606) @@ -185,37 +185,6 @@ <!-- Profiles --> <profiles> - - <!-- - Name: soa - Desc: 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> - <property name="database" value="${database}" /> - <ant antfile="scripts/antrun-jbpm-config.xml" target="concat" /> - <ant antfile="scripts/antrun-jbpm-config.xml" target="jbpm-cfg-xml-soa" /> - </tasks> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - <!-- Name: jdk14 Desc: Dependencies specific to JDK 1.4 Modified: jbpm3/branches/jbpm-soa5.1-mavenise/modules/core/scripts/antrun-jbpm-config.xml =================================================================== --- jbpm3/branches/jbpm-soa5.1-mavenise/modules/core/scripts/antrun-jbpm-config.xml 2010-08-18 02:53:16 UTC (rev 6605) +++ jbpm3/branches/jbpm-soa5.1-mavenise/modules/core/scripts/antrun-jbpm-config.xml 2010-08-18 08:12:55 UTC (rev 6606) @@ -102,10 +102,4 @@ <echo message="${hibernate.properties.xml}"/> </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 +</project> Modified: jbpm3/branches/jbpm-soa5.1-mavenise/modules/soa-distribution/build.xml =================================================================== --- jbpm3/branches/jbpm-soa5.1-mavenise/modules/soa-distribution/build.xml 2010-08-18 02:53:16 UTC (rev 6605) +++ jbpm3/branches/jbpm-soa5.1-mavenise/modules/soa-distribution/build.xml 2010-08-18 08:12:55 UTC (rev 6606) @@ -22,16 +22,17 @@ <arg value="${module_base_dir}/../distribution/target/autosetup.xml"/> </java> - <copy todir="${module_base_dir}/target/work/jbpm-jpdl" overwrite="true"> + </target> + + <target name="assemble"> + <copy todir="${module_base_dir}/target/dist/jbpm-jpdl" overwrite="true"> <fileset dir="${jbpm_install_path}"/> </copy> - <copy todir="${module_base_dir}/target/work/jbpm-jpdl/deploy" overwrite="true"> + <copy todir="${module_base_dir}/target/dist/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"/> @@ -43,10 +44,6 @@ </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"/> @@ -60,15 +57,14 @@ tofile="jbpm-jpdl-soa.${build_version}.zip"/> <checksum file="jbpm-jpdl-soa.${build_version}.zip"/> --> - <!-- unpack the javadocs --> - <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"/> + <!-- unpack the javadocs --> + <copy todir="${module_base_dir}/target/dist/javadocs" overwrite="true"> + <fileset dir="${module_base_dir}/target/work/javadocs" includes="**/*" /> + </copy> + <zip destfile="${module_base_dir}/target/${module_build_finalName}.zip" > - <zipfileset dir="${module_base_dir}/target/dist" prefix="jbpm" includes="**/*" /> + <zipfileset dir="${module_base_dir}/target/dist" prefix="jbpm" includes="**/*" excludes="javadocs/**"/> </zip> </target> Modified: jbpm3/branches/jbpm-soa5.1-mavenise/modules/soa-distribution/pom.xml =================================================================== --- jbpm3/branches/jbpm-soa5.1-mavenise/modules/soa-distribution/pom.xml 2010-08-18 02:53:16 UTC (rev 6605) +++ jbpm3/branches/jbpm-soa5.1-mavenise/modules/soa-distribution/pom.xml 2010-08-18 08:12:55 UTC (rev 6606) @@ -71,7 +71,7 @@ </configuration> </execution> <execution> - <id>cp-jsf-console-soa</id> + <id>cp-jsf-console-soa-distribution</id> <phase>process-resources</phase> <goals> <goal>copy</goal> @@ -80,9 +80,8 @@ <artifactItems> <artifactItem> <groupId>org.jbpm.jbpm3</groupId> - <artifactId>jsf-console</artifactId> + <artifactId>jsf-console-soa-distribution</artifactId> <version>3.2.9</version> - <classifier>soa</classifier> <type>war</type> </artifactItem> </artifactItems> @@ -96,14 +95,7 @@ <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> + <!--dependency> <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> <version>1.7.1</version> @@ -122,7 +114,7 @@ <groupId>org.apache.ant</groupId> <artifactId>ant-trax</artifactId> <version>1.7.1</version> - </dependency> + </dependency--> <dependency> <groupId>org.codehaus.groovy</groupId> <artifactId>groovy-all</artifactId> Modified: 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 2010-08-18 02:53:16 UTC (rev 6605) +++ jbpm3/branches/jbpm-soa5.1-mavenise/modules/soa-distribution/post-patch/overlay_database_sql.xml 2010-08-18 08:12:55 UTC (rev 6606) @@ -5,9 +5,6 @@ <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> Modified: 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 2010-08-18 02:53:16 UTC (rev 6605) +++ jbpm3/branches/jbpm-soa5.1-mavenise/modules/soa-distribution/post-patch/overlay_hibernate_conf.xml 2010-08-18 08:12:55 UTC (rev 6606) @@ -31,13 +31,5 @@ <property name="hibernate.current_session_context_class">jta</property>]]></replacevalue> </replace> - <!-- jBPM framework version --> - <!-- SOA-959 - set name of transaction --> - <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> Deleted: 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 2010-08-18 02:53:16 UTC (rev 6605) +++ jbpm3/branches/jbpm-soa5.1-mavenise/modules/soa-distribution/post-patch/overlay_jbpm_conf.xml 2010-08-18 08:12:55 UTC (rev 6606) @@ -1,7 +0,0 @@ -<project name="overlay_hibernate_conf" default="apply.patch"> - <!-- Generate the custom jbpm.cfg.xml for the SOA platform --> - - <target name="apply.patch" > - <!--TODO Move soa profile from core module to soa-distribution module--> - </target> -</project> Added: jbpm3/branches/jbpm-soa5.1-mavenise/modules/soa-distribution/post-patch/overlay_jbpm_jpdl_jar.xml =================================================================== --- jbpm3/branches/jbpm-soa5.1-mavenise/modules/soa-distribution/post-patch/overlay_jbpm_jpdl_jar.xml (rev 0) +++ jbpm3/branches/jbpm-soa5.1-mavenise/modules/soa-distribution/post-patch/overlay_jbpm_jpdl_jar.xml 2010-08-18 08:12:55 UTC (rev 6606) @@ -0,0 +1,18 @@ +<project name="Generate the customer jbpm.cfg.xml" default="apply.patch"> + <!-- Generate the custom jbpm.cfg.xml for the SOA platform --> + <property name="module_work_dir" value="${module_base_dir}/target/work" /> + <property name="jbpm_config" value="${module_work_dir}/patch_jbpm_cfg/org/jbpm/default.jbpm.cfg.xml" /> + + + <target name="apply.patch" > + <unjar src="${module_work_dir}/jbpm-installed/lib/jbpm-jpdl.jar" dest="${module_work_dir}/patch_jbpm_cfg/" overwrite="true"/> + + + <!--Disable the logging service--> + <replace file="${jbpm_config}" token='&lt;!-- Logging Service (begin) --&gt;' value='&lt;!-- Logging Service (begin) ===' /> + <replace file="${jbpm_config}" token='&lt;!-- Logging Service (end) --&gt;' value='=== Logging Service (begin) --&gt;' /> + + <delete file="${module_work_dir}/jbpm-installed/lib/jbpm-jpdl.jar" /> + <jar destfile="${module_work_dir}/jbpm-installed/lib/jbpm-jpdl.jar" basedir="${module_work_dir}/patch_jbpm_cfg/" /> + </target> +</project> Modified: 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 2010-08-18 02:53:16 UTC (rev 6605) +++ jbpm3/branches/jbpm-soa5.1-mavenise/modules/soa-distribution/post-patch/overlay_jsf_console.xml 2010-08-18 08:12:55 UTC (rev 6606) @@ -1,15 +1,14 @@ -<project name="overlay_jsf_console" default="apply.patch"> +<project name="overlay jsf console with SOA version" default="apply.patch"> + <property name="module_work_dir" value="${module_base_dir}/target/work" /> <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> + <delete file="${module_work_dir}/jbpm-installed/lib/jsf-console.war" /> + <copy tofile="${module_work_dir}/jbpm-installed/lib/jsf-console.war" overwrite="true" > + <fileset dir="${module_base_dir}/target/dependency/" includes="jsf-console*" /> </copy> + + <delete dir="${module_work_dir}/jboss/server/default/deploy/jbpm/jsf-console.war" /> + <unwar src="${module_work_dir}/jbpm-installed/lib/jsf-console.war" dest="${module_work_dir}/jboss/server/default/deploy/jbpm/jsf-console.war" overwrite="true" /> + </target> </project> Modified: 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 2010-08-18 02:53:16 UTC (rev 6605) +++ jbpm3/branches/jbpm-soa5.1-mavenise/modules/soa-distribution/post-patch/remove_uninstaller.xml 2010-08-18 08:12:55 UTC (rev 6606) @@ -1,7 +1,7 @@ <project name="remove_uninstall" default="apply.patch"> <target name="apply.patch" > <!-- Remove redundant installer leftovers --> - <delete dir="${module_base_dir}/target/work/jbpm-jpdl/Uninstaller"/> - <delete file="${module_base_dir}/target/work/jbpm-jpdl/.installationinformation"/> + <delete dir="${module_base_dir}/target/work/jbpm-installed/Uninstaller"/> + <delete file="${module_base_dir}/target/work/jbpm-installed/.installationinformation"/> </target> </project> Modified: 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 2010-08-18 02:53:16 UTC (rev 6605) +++ jbpm3/branches/jbpm-soa5.1-mavenise/modules/soa-distribution/post-patch/remove_unneeded_docs.xml 2010-08-18 08:12:55 UTC (rev 6606) @@ -1,7 +1,12 @@ <project name="patchname" default="apply.patch"> - <property name="package_root" value="${module_base_dir}/target/work/jbpm-jpdl" /> + <property name="package_root" value="${module_base_dir}/target/work/jbpm-installed" /> <target name="apply.patch"> + <unzip src="${package_root}/docs/jbpm-enterprise-javadoc.jar" + dest="${module_base_dir}/target/work/javadocs/enterprise"/> + <unzip src="${package_root}/docs/jbpm-identity-javadoc.jar" dest="${module_base_dir}/target/work/javadocs/identity"/> + <unzip src="${package_root}/docs/jbpm-jpdl-javadoc.jar" dest="${module_base_dir}/target/work/javadocs/jbpm-jpdl"/> + <!-- SOA-1585 --> <delete dir="${package_root}/docs"/>