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> - <!-- replace jsf-console.war with the SOA platform build --> - <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"> + + <!-- + !! Define convenience variables for this build file here. Avoid duplicate properties existed in dependencies! + !!--> + <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> + <!-- src is in the jbpm-jpdl.zip so don't need to do anything for src --> + <!-- + <copy file="${soa_work_dir}/jbpm/dist/jbpm-jpdl.zip" + 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"/> + + <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"?> + +<!-- ====================================================================== --> +<!-- jBPM: Workflow in Java --> +<!-- --> +<!-- Distributable under LGPL license. --> +<!-- See terms of license at http://www.gnu.org. --> +<!-- ====================================================================== --> + +<!-- $Id: pom.xml 7412 2008-06-06 13:42:30Z thomas.diesler(a)jboss.com $ --> + +<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 --> + <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> + + <!-- Plugins --> + <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" > + <!-- SOA platform version --> + <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="&lt;!-- JDBC connection properties (end)" + value="==== JDBC connection properties (end)"/> + <replacefilter token=" DataSource properties (begin) ===" + value=" DataSource properties (begin) -->"/> + <replacefilter token="java:comp/env/jdbc/JbpmDataSource" + value="java:/JbpmDS"/> + <replacefilter token="==== DataSource properties (end)" + value="&lt;!-- DataSource properties (end)"/> + + <!-- "JTA transaction properties (begin)" is handled below --> + <replacefilter token="==== JTA transaction properties (end)" + value="&lt;!-- JTA transaction properties (end)"/> + <replacefilter token="Automatic schema creation (begin) -->" + value="Automatic schema creation (begin) ==="/> + <replacefilter token="&lt;!-- Automatic schema creation (end)" + value="==== Automatic schema creation (end)"/> + </replace> + + <!-- SOA-959 - set name of transaction --> + <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> + + <!-- 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> 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"> + <!-- 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_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" > + <!-- Remove redundant installer leftovers --> + <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"> + <!-- SOA-1585 --> + <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> + <!-- + Name: SOA + Descr: For SOA-P productization + --> + <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>