[jbpm-commits] JBoss JBPM SVN: r2104 - in jbpm3/trunk: modules/console and 9 other directories.

Author: thomas.diesler(a)jboss.com Date: 2008-09-04 09:45:19 -0400 (Thu, 04 Sep 2008) New Revision: 2104 Added: jbpm3/trunk/modules/distribution/src/main/resources/installer/ant-actions-spec.xml jbpm3/trunk/modules/distribution/src/main/resources/installer/download-helper.xml jbpm3/trunk/modules/distribution/src/main/resources/installer/install-definition.xml jbpm3/trunk/modules/distribution/src/main/resources/installer/target-panel-dir.txt jbpm3/trunk/modules/distribution/src/main/resources/installer/user-input-spec.xml jbpm3/trunk/modules/jpdl/identity/scripts/assembly-service.xml jbpm3/trunk/modules/jpdl/identity/src/main/etc/ jbpm3/trunk/modules/jpdl/identity/src/main/etc/jboss-service.xml Removed: jbpm3/trunk/modules/console/scripts/ jbpm3/trunk/modules/console/src/main/resources/login/ jbpm3/trunk/modules/distribution/scripts/install-definition.xml jbpm3/trunk/modules/distribution/src/main/resources/installer/userInputSpec.xml Modified: jbpm3/trunk/modules/console/pom.xml jbpm3/trunk/modules/distribution/pom.xml jbpm3/trunk/modules/distribution/scripts/antrun-installer.xml jbpm3/trunk/modules/enterprise/pom.xml jbpm3/trunk/modules/jpdl/identity/pom.xml jbpm3/trunk/pom.xml Log: Add installer download for jboss + eclipse Modified: jbpm3/trunk/modules/console/pom.xml =================================================================== --- jbpm3/trunk/modules/console/pom.xml 2008-09-04 11:58:50 UTC (rev 2103) +++ jbpm3/trunk/modules/console/pom.xml 2008-09-04 13:45:19 UTC (rev 2104) @@ -120,24 +120,6 @@ <showDeprecation>false</showDeprecation> </configuration> </plugin> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <executions> - <execution> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - <configuration> - <finalName>${project.build.finalName}</finalName> - <appendAssemblyId>true</appendAssemblyId> - <descriptors> - <descriptor>scripts/assembly-service.xml</descriptor> - </descriptors> - </configuration> - </execution> - </executions> - </plugin> </plugins> </build> </project> \ No newline at end of file Modified: jbpm3/trunk/modules/distribution/pom.xml =================================================================== --- jbpm3/trunk/modules/distribution/pom.xml 2008-09-04 11:58:50 UTC (rev 2103) +++ jbpm3/trunk/modules/distribution/pom.xml 2008-09-04 13:45:19 UTC (rev 2104) @@ -35,13 +35,6 @@ </dependency> <dependency> <groupId>org.jboss.jbpm</groupId> - <artifactId>jbpm-console</artifactId> - <classifier>service</classifier> - <version>${version}</version> - <type>zip</type> - </dependency> - <dependency> - <groupId>org.jboss.jbpm</groupId> <artifactId>jbpm-enterprise</artifactId> <version>${version}</version> </dependency> @@ -75,10 +68,23 @@ </dependency> <dependency> <groupId>org.jboss.jbpm</groupId> + <artifactId>jbpm-jpdl-identity</artifactId> + <classifier>service</classifier> + <version>${version}</version> + <type>zip</type> + </dependency> + <dependency> + <groupId>org.jboss.jbpm</groupId> <artifactId>jbpm-jpdl-integration</artifactId> <version>${version}</version> </dependency> + + <!-- Thirdparty Dependencies --> <dependency> + <groupId>org.apache.ant</groupId> + <artifactId>ant</artifactId> + </dependency> + <dependency> <groupId>izpack</groupId> <artifactId>standalone-compiler</artifactId> </dependency> @@ -95,7 +101,7 @@ </dependency> </dependencies> - <!-- Plugins --> + <!-- Plugins --> <build> <plugins> <plugin> Modified: jbpm3/trunk/modules/distribution/scripts/antrun-installer.xml =================================================================== --- jbpm3/trunk/modules/distribution/scripts/antrun-installer.xml 2008-09-04 11:58:50 UTC (rev 2103) +++ jbpm3/trunk/modules/distribution/scripts/antrun-installer.xml 2008-09-04 13:45:19 UTC (rev 2104) @@ -103,6 +103,7 @@ <fileset dir="${resources.dir}/installer" /> <filterset> <filter token="jboss.home" value="${jboss422.home}" /> + <filter token="product.version" value="${product.version}" /> </filterset> </copy> @@ -120,7 +121,7 @@ <!-- Run installer build --> <echo message="Running IzPack to build the installer..." /> - <izpack input="${basedir}/scripts/install-definition.xml" output="${output.dir}/${product.short.name}-${product.version}-izpack.jar" + <izpack input="${resources.dir}/installer/install-definition.xml" output="${output.dir}/${product.short.name}-${product.version}-izpack.jar" installerType="standard" inheritAll="true" basedir="${izpack.temp.dir}" /> <!-- Clean working directory --> Deleted: jbpm3/trunk/modules/distribution/scripts/install-definition.xml =================================================================== --- jbpm3/trunk/modules/distribution/scripts/install-definition.xml 2008-09-04 11:58:50 UTC (rev 2103) +++ jbpm3/trunk/modules/distribution/scripts/install-definition.xml 2008-09-04 13:45:19 UTC (rev 2104) @@ -1,120 +0,0 @@ -<?xml version="1.0" encoding="iso-8859-1" standalone="yes" ?> -<installation version="1.0"> - <!-- - Ant properties in this file can be referenced with @{}, - otherwise use variables below in installer files with ${} - --> - <info> - <appname&gt;(a){product.name}&lt;/appname&gt; - <appversion&gt;(a){product.version}&lt;/appversion&gt; - <uninstaller name="remove.task" write="yes" /> - </info> - - <guiprefs width="600" height="480" resizable="no"> - <laf name="kunststoff"> - <os family="unix" /> - </laf> - </guiprefs> - - <locale> - <langpack iso3="eng" /> - </locale> - - <!-- Need to define ant properties we want to use during install as variables --> - <variables> - <variable name="jboss422.home" value=&quot;(a){jboss422.home}&quot; /> - <variable name="jboss423.home" value=&quot;(a){jboss423.home}&quot; /> - <variable name="jboss500.home" value=&quot;(a){jboss500.home}&quot; /> - </variables> - <dynamicvariables> - <variable name="jboss.home" value="${jboss422.home}" condition="isJBoss422" /> - <variable name="jboss.home" value="${jboss423.home}" condition="isJBoss423" /> - <variable name="jboss.home" value="${jboss500.home}" condition="isJBoss500" /> - </dynamicvariables> - <conditions> - <condition type="variable" id="isJBoss422"> - <name>jbossSelection</name> - <value>jboss422</value> - </condition> - <condition type="variable" id="isJBoss423"> - <name>jbossSelection</name> - <value>jboss423</value> - </condition> - <condition type="variable" id="isJBoss500"> - <name>jbossSelection</name> - <value>jboss500</value> - </condition> - </conditions> - - <resources> - <res id="userInputSpec.xml" src=&quot;(a){filtered.resources.dir}/userInputSpec.xml&quot; /> - </resources> - - <panels> - <panel classname="HelloPanel" /> - <panel classname="UserInputPanel" /> - <panel classname="UserInputPanel" /> - <!-- http://jira.codehaus.org/browse/IZPACK-154 --> - <panel classname="TreePacksPanel" /> - <panel classname="SummaryPanel" /> - <panel classname="InstallPanel" /> - <panel classname="FinishPanel" /> - </panels> - - <packs> - <!-- jBPM Main Components --> - <pack name="jBPM3" required="yes" installGroups="Main" preselected="yes"> - <description>The jBPM Main Components</description> - <fileset dir=&quot;(a){deploy.artifacts.dir}/lib&quot; targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar" - override="true"> - <include name="jboss-bpm-api.jar" /> - <include name="jbpm-jpdl-core.jar" /> - <include name="jbpm-jpdl-identity.jar" /> - <include name="jbpm-jpdl-integration.jar" /> - </fileset> - <fileset dir=&quot;(a){deploy.artifacts.dir}/lib&quot; targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm" override="true"> - <include name="jbpm-enterprise.jar" /> - </fileset> - <file src=&quot;(a){deploy.artifacts.dir}/lib/jbpm-console.zip&quot; targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-console.war" - unpack="true" override="true" /> - <file src=&quot;(a){deploy.artifacts.dir}/lib/jbpm-console-service.zip&quot; targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar" - unpack="true" override="true" /> - <file src=&quot;(a){deploy.artifacts.dir}/resources/jbpm-enterprise-config/jbpm.cfg.xml&quot; targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar"/> - </pack> - - <!-- jBPM Hypersonic Database --> - <pack name="jBPM3 Hypersonic Database" required="no" installGroups="Database" preselected="yes"> - <description>The Hypersonic Database</description> - <fileset dir=&quot;(a){resources.dir}/database&quot; targetdir="${installPath}/server/${jbossTargetServer}/data"> - <include name="hypersonic/jbpmDB.*" /> - </fileset> - <file src=&quot;(a){resources.dir}/database/jbpm-hsqldb-ds.xml&quot; targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm"/> - <singlefile src=&quot;(a){deploy.artifacts.dir}/resources/jbpm-core-config/hibernate.cfg.hsqldb.xml&quot; - target="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar/hibernate.cfg.xml"/> - </pack> - - <!-- jBPM MySQL Database --> - <pack name="jBPM3 MySQL Database" required="no" installGroups="Database" preselected="no"> - <description>The MySQL Database</description> - <fileset dir=&quot;(a){deploy.artifacts.dir}/lib&quot; targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar" - override="true"> - <include name="mysql-connector-java.jar" /> - </fileset> - <file src=&quot;(a){resources.dir}/database/jbpm-mysql-ds.xml&quot; targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm"/> - <singlefile src=&quot;(a){deploy.artifacts.dir}/resources/jbpm-core-config/hibernate.cfg.mysql.xml&quot; - target="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar/hibernate.cfg.xml"/> - </pack> - - <!-- jBPM PostgreSQL Database --> - <pack name="jBPM3 PostgreSQL Database" required="no" installGroups="Database" preselected="no"> - <description>The PostgreSQL Database</description> - <fileset dir=&quot;(a){deploy.artifacts.dir}/lib&quot; targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar" - override="true"> - <include name="postgresql-jdbc3.jar" /> - </fileset> - <file src=&quot;(a){resources.dir}/database/jbpm-postgresql-ds.xml&quot; targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm"/> - <singlefile src=&quot;(a){deploy.artifacts.dir}/resources/jbpm-core-config/hibernate.cfg.postgresql.xml&quot; - target="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar/hibernate.cfg.xml"/> - </pack> - </packs> -</installation> \ No newline at end of file Added: jbpm3/trunk/modules/distribution/src/main/resources/installer/ant-actions-spec.xml =================================================================== --- jbpm3/trunk/modules/distribution/src/main/resources/installer/ant-actions-spec.xml (rev 0) +++ jbpm3/trunk/modules/distribution/src/main/resources/installer/ant-actions-spec.xml 2008-09-04 13:45:19 UTC (rev 2104) @@ -0,0 +1,14 @@ +<antactions> + <pack name="Download JBoss-4.2.2"> + <antcall order="afterpack" buildfile="$INSTALL_PATH/Uninstaller/download-helper.xml"> + <property name="install.path" value="$INSTALL_PATH"/> + <target name="download-jboss"/> + </antcall> + </pack> + <pack name="Download Eclipse-3.4.0"> + <antcall order="afterpack" buildfile="$INSTALL_PATH/Uninstaller/download-helper.xml"> + <property name="install.path" value="$INSTALL_PATH"/> + <target name="download-eclipse"/> + </antcall> + </pack> +</antactions> \ No newline at end of file Property changes on: jbpm3/trunk/modules/distribution/src/main/resources/installer/ant-actions-spec.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: jbpm3/trunk/modules/distribution/src/main/resources/installer/download-helper.xml =================================================================== --- jbpm3/trunk/modules/distribution/src/main/resources/installer/download-helper.xml (rev 0) +++ jbpm3/trunk/modules/distribution/src/main/resources/installer/download-helper.xml 2008-09-04 13:45:19 UTC (rev 2104) @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- ====================================================================== --> +<!-- --> +<!-- JBoss, the OpenSource J2EE webOS --> +<!-- --> +<!-- Distributable under LGPL license. --> +<!-- See terms of license at http://www.gnu.org. --> +<!-- --> +<!-- ====================================================================== --> + +<!-- $Id$ --> +<project> + + <target name="download-jboss"> + <get src="http://downloads.sourceforge.net/jboss/jboss-4.2.2.GA.zip" dest="${install.path}/Uninstaller/jboss-4.2.2.GA.zip" usetimestamp="true"/> + <unzip src="${install.path}/Uninstaller/jboss-4.2.2.GA.zip" dest="${install.path}"/> + </target> + <target name="download-eclipse"> + <get src="http://download.eclipse.org/technology/epp/downloads/release/ga... + dest="${install.path}/Uninstaller/eclipse-java-ganymede-linux-gtk.tar.gz" usetimestamp="true"/> + <untar src="${install.path}/Uninstaller/eclipse-java-ganymede-linux-gtk.tar.gz" dest="${install.path}" compression="gzip"/> + </target> + +</project> \ No newline at end of file Property changes on: jbpm3/trunk/modules/distribution/src/main/resources/installer/download-helper.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Copied: jbpm3/trunk/modules/distribution/src/main/resources/installer/install-definition.xml (from rev 2100, jbpm3/trunk/modules/distribution/scripts/install-definition.xml) =================================================================== --- jbpm3/trunk/modules/distribution/src/main/resources/installer/install-definition.xml (rev 0) +++ jbpm3/trunk/modules/distribution/src/main/resources/installer/install-definition.xml 2008-09-04 13:45:19 UTC (rev 2104) @@ -0,0 +1,173 @@ +<?xml version="1.0" encoding="iso-8859-1" standalone="yes" ?> +<installation version="1.0"> + <!-- + Ant properties in this file can be referenced with @{}, + otherwise use variables below in installer files with ${} + --> + <info> + <appname&gt;(a){product.name}&lt;/appname&gt; + <appversion&gt;(a){product.version}&lt;/appversion&gt; + <uninstaller name="remove.task" write="yes" /> + </info> + <guiprefs width="600" height="480" resizable="no"> + <laf name="kunststoff"> + <os family="unix" /> + </laf> + </guiprefs> + <locale> + <langpack iso3="eng" /> + </locale> + + <!-- It is necessary to include everything needed, in this case ant self --> + <jar src=&quot;(a){deploy.artifacts.dir}/lib/ant.jar&quot; stage="both" /> + <jar src=&quot;(a){deploy.artifacts.dir}/lib/ant-launcher.jar&quot; stage="both" /> + + <!-- Setup the Ant Action Listener --> + <listeners> + <listener installer="AntActionInstallerListener" /> + </listeners> + + <!-- Resources --> + <resources> + <res id="AntActionsSpec.xml" src=&quot;(a){filtered.resources.dir}/ant-actions-spec.xml&quot; /> + <res id="userInputSpec.xml" src=&quot;(a){filtered.resources.dir}/user-input-spec.xml&quot; /> + <res id="TargetPanel.dir" src=&quot;(a){filtered.resources.dir}/target-panel-dir.txt&quot; /> + </resources> + + <!-- Variables --> + <variables> + <variable name="jboss422.home" value=&quot;(a){jboss422.home}&quot; /> + <variable name="jboss423.home" value=&quot;(a){jboss423.home}&quot; /> + <variable name="jboss500.home" value=&quot;(a){jboss500.home}&quot; /> + </variables> + + <!-- Dynamic Variables --> + <dynamicvariables> + <variable name="jboss.home" value="${jboss422.home}" condition="isJBoss422" /> + <variable name="jboss.home" value="${jboss423.home}" condition="isJBoss423" /> + <variable name="jboss.home" value="${jboss500.home}" condition="isJBoss500" /> + <variable name="installPath" value="$INSTALL_PATH/jboss-4.2.2.GA" condition="isJBoss422Download" /> + <variable name="jbossTargetServer" value="default" condition="isJBoss422Download" /> + </dynamicvariables> + + <!-- Conditions --> + <conditions> + <condition type="packselection" id="isJBoss422Download"> + <packid>Download JBoss-4.2.2</packid> + </condition> + <condition type="variable" id="isJBoss422"> + <name>jbossSelection</name> + <value>jboss422</value> + </condition> + <condition type="variable" id="isJBoss423"> + <name>jbossSelection</name> + <value>jboss423</value> + </condition> + <condition type="variable" id="isJBoss500"> + <name>jbossSelection</name> + <value>jboss500</value> + </condition> + </conditions> + + <!-- Panels --> + <panels> + <panel classname="HelloPanel" /> + <panel classname="TargetPanel" /> + <panel classname="TreePacksPanel" /> + <panel classname="UserInputPanel" /> + <panel classname="UserInputPanel" /> + <panel classname="SummaryPanel" /> + <panel classname="InstallPanel" /> + <panel classname="FinishPanel" /> + <!-- http://jira.codehaus.org/browse/IZPACK-154 --> + </panels> + + <!-- Packs --> + <packs> + <!-- jBPM3 Standalone --> + <pack name="jBPM3 Standalone" required="yes" preselected="no"> + <description>The jBPM3 Standalone Components</description> + <fileset dir=&quot;(a){deploy.artifacts.dir}/lib&quot; targetdir="$INSTALL_PATH/jbpm3/lib" override="true"> + <include name="jboss-bpm-api.jar" /> + <include name="jbpm-enterprise.jar" /> + <include name="jbpm-jpdl-core.jar" /> + <include name="jbpm-jpdl-identity.jar" /> + <include name="jbpm-jpdl-integration.jar" /> + </fileset> + </pack> + + <!-- Optional Downloads --> + <pack name="Optional Downloads" required="no" preselected="no"> + <description>Optional jBPM3 Downloads</description> + </pack> + + <!-- JBoss-4.2.2 --> + <pack name="Download JBoss-4.2.2" required="no" parent="Optional Downloads" preselected="no"> + <description>Download and Install JBoss-4.2.2</description> + <file src=&quot;(a){resources.dir}/installer/download-helper.xml&quot; targetdir="$INSTALL_PATH/Uninstaller"/> + </pack> + + <!-- Eclipse-3.4.0 --> + <pack name="Download Eclipse-3.4.0" required="no" parent="Optional Downloads" preselected="no"> + <description>Download and Install Eclipse-3.4.0</description> + <file src=&quot;(a){resources.dir}/installer/download-helper.xml&quot; targetdir="$INSTALL_PATH/tmp"/> + </pack> + + <!-- jBPM3 Server Components --> + <pack name="jBPM3 Server Components" required="yes" preselected="yes"> + <description>The jBPM3 Server Components</description> + <fileset dir=&quot;(a){deploy.artifacts.dir}/lib&quot; targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar" + override="true"> + <include name="jboss-bpm-api.jar" /> + <include name="jbpm-jpdl-core.jar" /> + <include name="jbpm-jpdl-identity.jar" /> + <include name="jbpm-jpdl-integration.jar" /> + </fileset> + <fileset dir=&quot;(a){deploy.artifacts.dir}/lib&quot; targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm" override="true"> + <include name="jbpm-enterprise.jar" /> + </fileset> + <file src=&quot;(a){deploy.artifacts.dir}/lib/jbpm-console.zip&quot; targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-console.war" + unpack="true" override="true" /> + <file src=&quot;(a){deploy.artifacts.dir}/lib/jbpm-jpdl-identity-service.zip&quot; targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar" + unpack="true" override="true" /> + <file src=&quot;(a){deploy.artifacts.dir}/resources/jbpm-enterprise-config/jbpm.cfg.xml&quot; targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar" /> + </pack> + + <!-- jBPM Databases --> + <pack name="jBPM3 Databases" required="no" preselected="no"> + <description>The jBPM3 Supported Databases.</description> + </pack> + + <!-- jBPM Hypersonic Database --> + <pack name="jBPM3 Hypersonic Database" required="no" parent="jBPM3 Databases" preselected="yes"> + <description>The Hypersonic Database</description> + <fileset dir=&quot;(a){resources.dir}/database&quot; targetdir="${installPath}/server/${jbossTargetServer}/data"> + <include name="hypersonic/jbpmDB.*" /> + </fileset> + <file src=&quot;(a){resources.dir}/database/jbpm-hsqldb-ds.xml&quot; targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm" /> + <singlefile src=&quot;(a){deploy.artifacts.dir}/resources/jbpm-core-config/hibernate.cfg.hsqldb.xml&quot; target="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar/hibernate.cfg.xml" /> + </pack> + + <!-- jBPM MySQL Database --> + <pack name="jBPM3 MySQL Database" required="no" parent="jBPM3 Databases" preselected="no"> + <description>The MySQL Database</description> + <fileset dir=&quot;(a){deploy.artifacts.dir}/lib&quot; targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar" + override="true"> + <include name="mysql-connector-java.jar" /> + </fileset> + <file src=&quot;(a){resources.dir}/database/jbpm-mysql-ds.xml&quot; targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm" /> + <singlefile src=&quot;(a){deploy.artifacts.dir}/resources/jbpm-core-config/hibernate.cfg.mysql.xml&quot; target="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar/hibernate.cfg.xml" /> + </pack> + + <!-- jBPM PostgreSQL Database --> + <pack name="jBPM3 PostgreSQL Database" required="no" parent="jBPM3 Databases" preselected="no"> + <description>The PostgreSQL Database</description> + <fileset dir=&quot;(a){deploy.artifacts.dir}/lib&quot; targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar" + override="true"> + <include name="postgresql-jdbc3.jar" /> + </fileset> + <file src=&quot;(a){resources.dir}/database/jbpm-postgresql-ds.xml&quot; targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm" /> + <singlefile src=&quot;(a){deploy.artifacts.dir}/resources/jbpm-core-config/hibernate.cfg.postgresql.xml&quot; target="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar/hibernate.cfg.xml" /> + </pack> + </packs> +</installation> \ No newline at end of file Added: jbpm3/trunk/modules/distribution/src/main/resources/installer/target-panel-dir.txt =================================================================== --- jbpm3/trunk/modules/distribution/src/main/resources/installer/target-panel-dir.txt (rev 0) +++ jbpm3/trunk/modules/distribution/src/main/resources/installer/target-panel-dir.txt 2008-09-04 13:45:19 UTC (rev 2104) @@ -0,0 +1 @@ +$USER_HOME/jBPM-(a)product.version@ \ No newline at end of file Property changes on: jbpm3/trunk/modules/distribution/src/main/resources/installer/target-panel-dir.txt ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Copied: jbpm3/trunk/modules/distribution/src/main/resources/installer/user-input-spec.xml (from rev 2100, jbpm3/trunk/modules/distribution/src/main/resources/installer/userInputSpec.xml) =================================================================== --- jbpm3/trunk/modules/distribution/src/main/resources/installer/user-input-spec.xml (rev 0) +++ jbpm3/trunk/modules/distribution/src/main/resources/installer/user-input-spec.xml 2008-09-04 13:45:19 UTC (rev 2104) @@ -0,0 +1,22 @@ +<userInput> + <panel order="0"> + <createForUnselectedPack name="Download JBoss-4.2.2" /> + <field type="radio" variable="jbossSelection"> + <description align="left" txt="Please choose your target server" /> + <spec> + <choice txt="JBoss-4.2.2" value="jboss422" set="true" /> + <choice txt="JBoss-4.2.3" value="jboss423" /> + <choice txt="JBoss-5.0.0" value="jboss500" /> + </spec> + </field> + <field type="text" variable="jbossTargetServer"> + <spec txt="Server:" size="15" set="default" /> + </field> + </panel> + <panel order="1"> + <createForUnselectedPack name="Download JBoss-4.2.2" /> + <field type="dir" align="left" variable="installPath"> + <spec txt="Install Path:" size="25" set="${jboss.home}" /> + </field> + </panel> +</userInput> \ No newline at end of file Deleted: jbpm3/trunk/modules/distribution/src/main/resources/installer/userInputSpec.xml =================================================================== --- jbpm3/trunk/modules/distribution/src/main/resources/installer/userInputSpec.xml 2008-09-04 11:58:50 UTC (rev 2103) +++ jbpm3/trunk/modules/distribution/src/main/resources/installer/userInputSpec.xml 2008-09-04 13:45:19 UTC (rev 2104) @@ -1,23 +0,0 @@ -<userInput> - <panel order="0"> - <createForPack name="jBPM3" /> - <field type="radio" variable="jbossSelection"> - <description align="left" txt="Please choose your target server" /> - <spec> - <choice txt="JBoss-4.2.2" value="jboss422" set="true" /> - <choice txt="JBoss-4.2.3" value="jboss423" /> - <choice txt="JBoss-5.0.0" value="jboss500" /> - </spec> - </field> - <field type="text" variable="jbossTargetServer"> - <spec txt="Server:" size="15" set="default" /> - </field> - </panel> - <!-- --> - <panel order="1"> - <createForPack name="jBPM3" /> - <field type="dir" align="left" variable="installPath"> - <spec txt="Install Path:" size="25" set="${jboss.home}" /> - </field> - </panel> -</userInput> \ No newline at end of file Modified: jbpm3/trunk/modules/enterprise/pom.xml =================================================================== --- jbpm3/trunk/modules/enterprise/pom.xml 2008-09-04 11:58:50 UTC (rev 2103) +++ jbpm3/trunk/modules/enterprise/pom.xml 2008-09-04 13:45:19 UTC (rev 2104) @@ -143,7 +143,7 @@ <artifactId>maven-assembly-plugin</artifactId> <executions> <execution> - <id>config-assembly</id> + <id>assembly-config</id> <phase>package</phase> <goals> <goal>single</goal> @@ -157,7 +157,7 @@ </configuration> </execution> <execution> - <id>dependency-assembly</id> + <id>assembly-test-dependencies</id> <phase>generate-test-resources</phase> <goals> <goal>directory-single</goal> Modified: jbpm3/trunk/modules/jpdl/identity/pom.xml =================================================================== --- jbpm3/trunk/modules/jpdl/identity/pom.xml 2008-09-04 11:58:50 UTC (rev 2103) +++ jbpm3/trunk/modules/jpdl/identity/pom.xml 2008-09-04 13:45:19 UTC (rev 2104) @@ -68,6 +68,7 @@ <artifactId>maven-assembly-plugin</artifactId> <executions> <execution> + <id>assembly-config</id> <phase>package</phase> <goals> <goal>single</goal> @@ -80,6 +81,20 @@ </descriptors> </configuration> </execution> + <execution> + <id>assembly-service</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + <configuration> + <finalName>${project.build.finalName}</finalName> + <appendAssemblyId>true</appendAssemblyId> + <descriptors> + <descriptor>scripts/assembly-service.xml</descriptor> + </descriptors> + </configuration> + </execution> </executions> </plugin> <plugin> Added: jbpm3/trunk/modules/jpdl/identity/scripts/assembly-service.xml =================================================================== --- jbpm3/trunk/modules/jpdl/identity/scripts/assembly-service.xml (rev 0) +++ jbpm3/trunk/modules/jpdl/identity/scripts/assembly-service.xml 2008-09-04 13:45:19 UTC (rev 2104) @@ -0,0 +1,17 @@ +<assembly 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/xsd/assembly-1.1.0-SNAPSHOT.xsd"> + <id>service</id> + <formats> + <format>zip</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> + <fileSets> + <fileSet> + <directory>src/main/etc</directory> + <outputDirectory>/META-INF</outputDirectory> + <includes> + <include>jboss-service.xml</include> + </includes> + </fileSet> + </fileSets> +</assembly> \ No newline at end of file Property changes on: jbpm3/trunk/modules/jpdl/identity/scripts/assembly-service.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: jbpm3/trunk/modules/jpdl/identity/src/main/etc/jboss-service.xml =================================================================== --- jbpm3/trunk/modules/jpdl/identity/src/main/etc/jboss-service.xml (rev 0) +++ jbpm3/trunk/modules/jpdl/identity/src/main/etc/jboss-service.xml 2008-09-04 13:45:19 UTC (rev 2104) @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="UTF-8"?> +<server> + <!-- The custom JAAS login configuration that installs + a Configuration capable of dynamically updating the + config settings + --> + <mbean code="org.jboss.security.auth.login.DynamicLoginConfig" name="org.jboss.jbpm:service=LoginConfig"> + <attribute name="PolicyConfig" serialDataType="jbxb"> + <jaas:policy xsi:schemaLocation="urn:jboss:security-config:4.1 resource:security-config_4_1.xsd" xmlns:jaas="urn:jboss:security-config:4.1" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <jaas:application-policy name="jbpm-console"> + <jaas:authentication> + <jaas:login-module code="org.jboss.security.auth.spi.DatabaseServerLoginModule" flag="required"> + <jaas:module-option name="dsJndiName">java:/JbpmDS</jaas:module-option> + <jaas:module-option name="principalsQuery"> SELECT PASSWORD_ FROM JBPM_ID_USER WHERE NAME_=? </jaas:module-option> + <jaas:module-option name="rolesQuery"> + SELECT g.NAME_ ,'Roles' FROM JBPM_ID_USER u, JBPM_ID_MEMBERSHIP m, JBPM_ID_GROUP g + WHERE g.TYPE_='security-role' AND m.GROUP_ = g.ID_ AND m.USER_ = u.ID_ AND u.NAME_=? </jaas:module-option> + </jaas:login-module> + </jaas:authentication> + </jaas:application-policy> + </jaas:policy> + </attribute> + <depends optional-attribute-name="LoginConfigService"> jboss.security:service=XMLLoginConfig</depends> + <depends optional-attribute-name="SecurityManagerService"> jboss.security:service=JaasSecurityManager</depends> + </mbean> +</server> \ No newline at end of file Property changes on: jbpm3/trunk/modules/jpdl/identity/src/main/etc/jboss-service.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: jbpm3/trunk/pom.xml =================================================================== --- jbpm3/trunk/pom.xml 2008-09-04 11:58:50 UTC (rev 2103) +++ jbpm3/trunk/pom.xml 2008-09-04 13:45:19 UTC (rev 2104) @@ -259,7 +259,6 @@ <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> <version>${apache.ant.version}</version> - <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.cactus</groupId>