[jbpm-commits] JBoss JBPM SVN: r5586 - in jbpm4/trunk: modules/distro/src/main/files and 2 other directories.

do-not-reply at jboss.org do-not-reply at jboss.org
Sat Aug 29 04:58:56 EDT 2009


Author: tom.baeyens at jboss.com
Date: 2009-08-29 04:58:55 -0400 (Sat, 29 Aug 2009)
New Revision: 5586

Added:
   jbpm4/trunk/qa/demo.setup.jboss.sh
   jbpm4/trunk/qa/demo.setup.tomcat.bat
   jbpm4/trunk/qa/demo.setup.tomcat.sh
Removed:
   jbpm4/trunk/modules/distro/scripts/antrun-installer.xml
   jbpm4/trunk/modules/distro/src/main/files/db/
   jbpm4/trunk/modules/distro/src/main/files/gpd/
   jbpm4/trunk/modules/distro/src/main/files/jboss/
   jbpm4/trunk/qa/test.demo.setup.sh
Modified:
   jbpm4/trunk/modules/distro/scripts/assembly-distro.xml
   jbpm4/trunk/modules/distro/src/main/files/install/build.xml
Log:
distribution cleanup

Deleted: jbpm4/trunk/modules/distro/scripts/antrun-installer.xml
===================================================================
--- jbpm4/trunk/modules/distro/scripts/antrun-installer.xml	2009-08-28 21:23:48 UTC (rev 5585)
+++ jbpm4/trunk/modules/distro/scripts/antrun-installer.xml	2009-08-29 08:58:55 UTC (rev 5586)
@@ -1,191 +0,0 @@
-<?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: antrun-installer.xml 3319 2008-12-10 14:29:01Z thomas.diesler at jboss.com $ -->
-<project>
-
-  <!-- ================================================================== -->
-  <!-- Setup                                                              -->
-  <!-- ================================================================== -->
-  <property name="output.dir" value="${basedir}/target" />
-  <property name="resources.dir" value="${basedir}/src/main/resources" />
-  <property name="filtered.resources.dir" value="${output.dir}/resources" />
-  <property name="deploy.artifacts.dir" value="${output.dir}/deploy-artifacts" />
-  <property name="deploy.artifacts.lib" value="${deploy.artifacts.dir}/lib" />
-  <property name="deploy.artifacts.resources" value="${deploy.artifacts.dir}/resources" />
-
-  <!-- ================================================================== -->
-  <!-- Initialization                                                     -->
-  <!-- ================================================================== -->
-  <target name="init">
-  </target>
-
-  <!-- ================================================================== -->
-  <!-- Configuration                                                     -->
-  <!-- ================================================================== -->
-  <target name="configure" depends="init">
-    <mkdir dir="${deploy.artifacts.dir}/resources/hsqldb" />
-
-    <echo message="creating hsqldb db" />
-
-    <echo message="USER DIR: ${user.dir}/target/db" />
-    <mkdir dir="${user.dir}/target/db" />
-    
-    <ant antfile="src/main/resources/config-tool/build.xml" 
-    	   target="db.create" 
-    	   inheritall="false">
-
-      <property name="test_classpath" value="${maven.test.classpath}" />
-      <property name="runtime_classpath" value="${maven.runtime.classpath}" />
-      
-      <property name="database" value="hsqldb.url" />
-      <property name="jdbc.hsqldb.url" value="jdbc:hsqldb:file:target/db/jbpm4DB" />
-      <property name="config.files.dir" value="${deploy.artifacts.resources}/jbpm-hsqldb-config" />
-      <property name="db.scripts.dir" value="${output.dir}/config.tool.tmp/hsqldb.scripts" />
-      <property name="tmp.dir" value="${output.dir}/config.tool.tmp" />
-      <property name="libs.dir" value="${deploy.artifacts.dir}/lib" />
-    </ant>
-
-    <sql driver="org.hsqldb.jdbcDriver"
-        url="jdbc:hsqldb:file:target/db/jbpm4DB"
-        userid="sa"
-        password=""
-        onerror="continue">
-      <transaction>SHUTDOWN</transaction>
-
-      <classpath>        
-        <pathelement path="${maven.runtime.classpath}"/>
-      </classpath>
-      
-      <!--classpath>
-        <fileset dir="${deploy.artifacts.dir}/lib">
-          <include name="*.jar"/>
-        </fileset>
-      </classpath-->
-    </sql>
-
-    <mkdir dir="${deploy.artifacts.dir}/resources/hsqldb" />
-    <copy todir="${deploy.artifacts.dir}/resources/hsqldb">
-      <fileset dir="${user.dir}/target/db" />
-    </copy>
-
-    
-    <echo message="creating db configurations" />
-    <ant antfile="src/main/resources/config-tool/build.xml" target="create.db.scripts" inheritall="false">
-
-      <property name="test_classpath" value="${maven.test.classpath}" />
-      <property name="runtime_classpath" value="${maven.runtime.classpath}" />
-
-      <property name="database" value="hsqldb" />
-      <property name="connection.type" value="datasource" />
-      <property name="deployment.type" value="sar" />
-      <property name="hibernate.session" value="current" />
-      <property name="config.files.dir" value="${deploy.artifacts.resources}/jbpm-hsqldb-config" />
-      <property name="db.scripts.dir" value="${deploy.artifacts.dir}/db.scripts" />
-      <property name="tmp.dir" value="${output.dir}/config.tool.tmp" />
-      <property name="libs.dir" value="${deploy.artifacts.dir}/lib" />
-    </ant>
-    <ant antfile="src/main/resources/config-tool/build.xml" target="create.db.scripts" inheritall="false">
-
-      <property name="test_classpath" value="${maven.test.classpath}" />
-      <property name="runtime_classpath" value="${maven.runtime.classpath}" />
-
-      <property name="database" value="mysql" />
-      <property name="connection.type" value="datasource" />
-      <property name="deployment.type" value="sar" />
-      <property name="hibernate.session" value="current" />
-      <property name="config.files.dir" value="${deploy.artifacts.resources}/jbpm-mysql-config" />
-      <property name="db.scripts.dir" value="${deploy.artifacts.dir}/db.scripts" />
-      <property name="tmp.dir" value="${output.dir}/config.tool.tmp" />
-      <property name="libs.dir" value="${deploy.artifacts.dir}/lib" />
-    </ant>
-    <ant antfile="src/main/resources/config-tool/build.xml" target="create.db.scripts" inheritall="false">
-
-      <property name="test_classpath" value="${maven.test.classpath}" />
-      <property name="runtime_classpath" value="${maven.runtime.classpath}" />
-                  
-      <property name="database" value="oracle" />
-      <property name="connection.type" value="datasource" />
-      <property name="deployment.type" value="sar" />
-      <property name="hibernate.session" value="current" />
-      <property name="config.files.dir" value="${deploy.artifacts.resources}/jbpm-oracle-config" />
-      <property name="db.scripts.dir" value="${deploy.artifacts.dir}/db.scripts" />
-      <property name="tmp.dir" value="${output.dir}/config.tool.tmp" />
-      <property name="libs.dir" value="${deploy.artifacts.dir}/lib" />
-    </ant>
-
-
-    <!-- the next copy depends on previous config-tool execution -->
-    <mkdir dir="${deploy.artifacts.dir}/resources/datasources" />
-    <copy todir="${deploy.artifacts.dir}/resources/datasources">
-      <fileset dir="${output.dir}/config.tool.tmp/resolved/jboss/datasource"/>
-    </copy>
-
-    <condition property="database.is.hsqldb" value="true" else="false">
-      <equals arg1="${database}" arg2="hsqldb"/>
-    </condition>
-    <condition property="database.is.mysql" value="true" else="false">
-      <equals arg1="${database}" arg2="mysql"/>
-    </condition>
-    <condition property="database.is.postgresql" value="true" else="false">
-      <equals arg1="${database}" arg2="postgresql"/>
-    </condition>
-    <condition property="database.is.oracle" value="true" else="false">
-      <equals arg1="${database}" arg2="oracle"/>
-    </condition>
-    <condition property="database.is.sybase" value="true" else="false">
-      <equals arg1="${database}" arg2="sybase"/>
-    </condition>
-
-  </target>
-
-  <!-- ================================================================== -->
-  <!-- Distribution                                                       -->
-  <!-- ================================================================== -->
-  <target name="build-installer" depends="configure">
-
-    <copy todir="${filtered.resources.dir}" filtering="true" overwrite="true">
-      <fileset dir="${resources.dir}/installer" />
-      <filterset>
-        <filter token="database" value="${database}" />
-        <filter token="database.is.hsqldb" value="${database.is.hsqldb}" />
-        <filter token="database.is.mysql" value="${database.is.mysql}" />
-        <filter token="database.is.postgresql" value="${database.is.postgresql}" />
-        <filter token="database.is.oracle" value="${database.is.oracle}" />
-        <filter token="database.is.sybase" value="${database.is.sybase}" />
-        <filter token="jbpm.target.container" value="${jbpm.target.container}" />
-        <filter token="jboss.home" value="${jboss.home}" />
-        <filter token="product.version" value="${product.version}" />
-        <filter token="user.home" value="${user.home}" />
-      </filterset>
-    </copy>
-
-    <!-- Allows us to use the IzPack Ant task, standalone-compiler.jar added to Ant lib -->
-    <taskdef name="izpack" classname="com.izforge.izpack.ant.IzPackTask">
-      <classpath>
-        <pathelement path="${maven.runtime.classpath}" />
-      </classpath>
-    </taskdef>
-    <property name="izpack.temp.dir" value="${output.dir}/izpack-temp" />
-    <mkdir dir="${izpack.temp.dir}" />
-
-    <!-- Run installer build -->
-    <echo message="Running IzPack to build the installer..." />
-    <izpack input="${resources.dir}/installer/install-definition.xml" 
-            output="${output.dir}/jbpm-installer-${product.version}.jar"
-            installerType="standard" 
-            inheritAll="true" 
-            basedir="${izpack.temp.dir}" />
-
-    <!-- Clean working directory -->
-    <delete dir="${izpack.temp.dir}" quiet="true" includeemptydirs="true" />
-  </target>
-</project>
\ No newline at end of file

Modified: jbpm4/trunk/modules/distro/scripts/assembly-distro.xml
===================================================================
--- jbpm4/trunk/modules/distro/scripts/assembly-distro.xml	2009-08-28 21:23:48 UTC (rev 5585)
+++ jbpm4/trunk/modules/distro/scripts/assembly-distro.xml	2009-08-29 08:58:55 UTC (rev 5586)
@@ -79,13 +79,6 @@
     </fileSet>
     <fileSet>
       <directory>../db/target/classes</directory>
-      <outputDirectory>db/schema.scripts</outputDirectory>
-      <includes>
-        <include>*.sql</include>
-      </includes>
-    </fileSet>
-    <fileSet>
-      <directory>../db/target/classes</directory>
       <outputDirectory>install/src/db</outputDirectory>
       <includes>
         <include>*.sql</include>

Modified: jbpm4/trunk/modules/distro/src/main/files/install/build.xml
===================================================================
--- jbpm4/trunk/modules/distro/src/main/files/install/build.xml	2009-08-28 21:23:48 UTC (rev 5585)
+++ jbpm4/trunk/modules/distro/src/main/files/install/build.xml	2009-08-29 08:58:55 UTC (rev 5586)
@@ -285,8 +285,10 @@
       </fileset>
     </copy>
   	
-  	<!-- Copy Signavio war into /webapps -->
+  	<!-- Copy Signavio war into /webapps
+  	commented cause it doesn't seem to run on jdk 5
   	<antcall target="install.signavio.into.jboss" />
+  	-->
 
     <copy todir="${jboss.server.config.dir}/deploy/jbpm" overwrite="true">
       <fileset dir="${jbpm.home}/lib">

Copied: jbpm4/trunk/qa/demo.setup.jboss.sh (from rev 5585, jbpm4/trunk/qa/test.demo.setup.sh)
===================================================================
--- jbpm4/trunk/qa/demo.setup.jboss.sh	                        (rev 0)
+++ jbpm4/trunk/qa/demo.setup.jboss.sh	2009-08-29 08:58:55 UTC (rev 5586)
@@ -0,0 +1,3 @@
+set MAVEN_OPTS=-Xms1024M -Xmx1024M
+mvn -U -Pdistro clean install
+ant -f qa/build.xml manual.testrun.setup

Added: jbpm4/trunk/qa/demo.setup.tomcat.bat
===================================================================
--- jbpm4/trunk/qa/demo.setup.tomcat.bat	                        (rev 0)
+++ jbpm4/trunk/qa/demo.setup.tomcat.bat	2009-08-29 08:58:55 UTC (rev 5586)
@@ -0,0 +1,6 @@
+echo To run this, make sure that at least you have jbpm.parent.dir specified in your ${user.home}/.jbpm4/build.properties
+cmd /C mvn -U -Pdistro clean install
+cmd /C ant -f qa/build.xml reinstall.jbpm
+cmd /C ant -f modules/distro/src/main/files/install/build.xml demo.setup.tomcat
+
+echo 
\ No newline at end of file

Added: jbpm4/trunk/qa/demo.setup.tomcat.sh
===================================================================
--- jbpm4/trunk/qa/demo.setup.tomcat.sh	                        (rev 0)
+++ jbpm4/trunk/qa/demo.setup.tomcat.sh	2009-08-29 08:58:55 UTC (rev 5586)
@@ -0,0 +1,4 @@
+set MAVEN_OPTS=-Xms1024M -Xmx1024M
+mvn -U -Pdistro clean install
+ant -f qa/build.xml reinstall.jbpm
+ant -f modules/distro/src/main/files/install/build.xml demo.setup.tomcat

Deleted: jbpm4/trunk/qa/test.demo.setup.sh
===================================================================
--- jbpm4/trunk/qa/test.demo.setup.sh	2009-08-28 21:23:48 UTC (rev 5585)
+++ jbpm4/trunk/qa/test.demo.setup.sh	2009-08-29 08:58:55 UTC (rev 5586)
@@ -1,3 +0,0 @@
-set MAVEN_OPTS=-Xms1024M -Xmx1024M
-mvn -U -Pdistro clean install
-ant -f qa/build.xml manual.testrun.setup



More information about the jbpm-commits mailing list