3:19 p.m.
Author: tom.baeyens(a)jboss.com
Date: 2009-03-11 16:19:50 -0400 (Wed, 11 Mar 2009)
New Revision: 4232
Added:
jbpm4/branches/tbaeyens/windows/
jbpm4/branches/tbaeyens/windows/test.distro.bat
Modified:
jbpm4/branches/tbaeyens/build.xml
jbpm4/branches/tbaeyens/modules/distro/pom.xml
jbpm4/branches/tbaeyens/modules/distro/scripts/antrun-installer.xml
jbpm4/branches/tbaeyens/modules/distro/src/main/resources/installer/install-definition.xml
jbpm4/branches/tbaeyens/modules/examples/pom.xml
jbpm4/branches/tbaeyens/modules/test-db/pom.xml
Log:
work
Modified: jbpm4/branches/tbaeyens/build.xml
===================================================================
--- jbpm4/branches/tbaeyens/build.xml 2009-03-11 19:10:37 UTC (rev 4231)
+++ jbpm4/branches/tbaeyens/build.xml 2009-03-11 20:19:50 UTC (rev 4232)
@@ -60,8 +60,8 @@
<target name="distro.test" depends="distro.build,
distro.install" />
<target name="distro.build">
- <exec dir="." executable="${mvn.executable}" os="Windows
Vista, Windows XP,Windows 2000,Windows 98">
- <arg line="${mvn.executable} -Pdistro -Ddatabase=hsqldb
-Djbpm.target.container=jboss500
-Djboss.home=${distro.installation.dir}/jbpm-${distro.version}/jboss-${distro.jboss.version}
clean install" />
+ <exec dir="." executable="cmd" os="Windows Vista, Windows
XP,Windows 2000,Windows 98">
+ <arg line="/C ${mvn.executable} -Pdistro -Ddatabase=hsqldb
-Djbpm.target.container=jboss500
-Djboss.home=${distro.installation.dir}/jbpm-${distro.version}/jboss-${distro.jboss.version}
clean install" />
</exec>
</target>
Modified: jbpm4/branches/tbaeyens/modules/distro/pom.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/distro/pom.xml 2009-03-11 19:10:37 UTC (rev 4231)
+++ jbpm4/branches/tbaeyens/modules/distro/pom.xml 2009-03-11 20:19:50 UTC (rev 4232)
@@ -81,6 +81,12 @@
<classifier>config</classifier>
</dependency>
+ <dependency>
+ <groupId>hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
+ <scope>test</scope>
+ </dependency>
+
<!-- GWT Console -->
<dependency>
<groupId>org.jboss.bpm</groupId>
Modified: jbpm4/branches/tbaeyens/modules/distro/scripts/antrun-installer.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/distro/scripts/antrun-installer.xml 2009-03-11
19:10:37 UTC (rev 4231)
+++ jbpm4/branches/tbaeyens/modules/distro/scripts/antrun-installer.xml 2009-03-11
20:19:50 UTC (rev 4232)
@@ -35,7 +35,9 @@
<mkdir dir="${deploy.artifacts.dir}/resources/hsqldb" />
<echo message="creating hsqldb db" />
- <ant antfile="src/main/resources/config-tool/build.xml"
target="db.create" inheritall="false">
+ <ant antfile="src/main/resources/config-tool/build.xml"
+ target="db.create"
+ inheritall="false">
<property name="database" value="hsqldb.url" />
<property name="jdbc.hsqldb.url"
value="jdbc:hsqldb:file:target/deploy-artifacts/resources/hypersonic/Jbpm4DB"
/>
<property name="config.files.dir"
value="${deploy.artifacts.resources}/jbpm-hsqldb-config" />
@@ -44,6 +46,19 @@
<property name="libs.dir"
value="${deploy.artifacts.dir}/lib" />
</ant>
+ <sql driver="org.hsqldb.jdbcDriver"
+
url="jdbc:hsqldb:file:target/deploy-artifacts/resources/hypersonic/Jbpm4DB"
+ userid="sa"
+ password=""
+ onerror="continue">
+ <transaction>SHUTDOWN</transaction>
+ <classpath>
+ <fileset dir="${deploy.artifacts.dir}/lib">
+ <include name="*.jar"/>
+ </fileset>
+ </classpath>
+ </sql>
+
<echo message="creating db configurations" />
<ant antfile="src/main/resources/config-tool/build.xml"
target="create.db.scripts" inheritall="false">
<property name="database" value="hsqldb" />
Modified:
jbpm4/branches/tbaeyens/modules/distro/src/main/resources/installer/install-definition.xml
===================================================================
---
jbpm4/branches/tbaeyens/modules/distro/src/main/resources/installer/install-definition.xml 2009-03-11
19:10:37 UTC (rev 4231)
+++
jbpm4/branches/tbaeyens/modules/distro/src/main/resources/installer/install-definition.xml 2009-03-11
20:19:50 UTC (rev 4232)
@@ -193,10 +193,6 @@
<include name="jbpm-destinations-service.xml"/>
</fileset>
- <!-- TODO: include the example configuration files -->
-
- <!-- TODO: include the db scripts -->
-
<!--
==============================
JBoss 422
Modified: jbpm4/branches/tbaeyens/modules/examples/pom.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/examples/pom.xml 2009-03-11 19:10:37 UTC (rev 4231)
+++ jbpm4/branches/tbaeyens/modules/examples/pom.xml 2009-03-11 20:19:50 UTC (rev 4232)
@@ -61,10 +61,16 @@
</dependency>
</dependencies>
+
<profiles>
+ <!-- -Ddatabase= -->
<profile>
- <!-- mvn -Pusedb -Ddatabase=oracle clean install -->
- <id>usedb</id>
+ <id>use.database.directly</id>
+ <activation>
+ <property>
+ <name>database</name>
+ </property>
+ </activation>
<build>
<plugins>
<plugin>
@@ -92,9 +98,14 @@
</build>
</profile>
+ <!-- -Djboss.bind.address= -->
<profile>
- <!-- mvn -Pusejboss -Djboss.bind.address= -->
- <id>usejboss</id>
+ <id>use.jboss.directly</id>
+ <activation>
+ <property>
+ <name>jboss.bind.address</name>
+ </property>
+ </activation>
<dependencies>
<dependency>
<groupId>org.jbpm.jbpm4</groupId>
@@ -135,7 +146,6 @@
</plugins>
</build>
</profile>
-
</profiles>
-
+
</project>
\ No newline at end of file
Modified: jbpm4/branches/tbaeyens/modules/test-db/pom.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/test-db/pom.xml 2009-03-11 19:10:37 UTC (rev 4231)
+++ jbpm4/branches/tbaeyens/modules/test-db/pom.xml 2009-03-11 20:19:50 UTC (rev 4232)
@@ -42,9 +42,14 @@
</dependencies>
<profiles>
+ <!-- -Ddatabase= -->
<profile>
- <!-- mvn -Pusedb -Ddatabase=oracle clean install -->
- <id>usedb</id>
+ <id>use.database.directly</id>
+ <activation>
+ <property>
+ <name>database</name>
+ </property>
+ </activation>
<build>
<plugins>
<plugin>
@@ -72,9 +77,14 @@
</build>
</profile>
+ <!-- -Djboss.bind.address= -->
<profile>
- <!-- mvn -Pusejboss -Djboss.bind.address= -->
- <id>usejboss</id>
+ <id>use.jboss.directly</id>
+ <activation>
+ <property>
+ <name>jboss.bind.address</name>
+ </property>
+ </activation>
<dependencies>
<dependency>
<groupId>org.jbpm.jbpm4</groupId>
@@ -115,7 +125,6 @@
</plugins>
</build>
</profile>
-
</profiles>
</project>
\ No newline at end of file
Added: jbpm4/branches/tbaeyens/windows/test.distro.bat
===================================================================
--- jbpm4/branches/tbaeyens/windows/test.distro.bat (rev 0)
+++ jbpm4/branches/tbaeyens/windows/test.distro.bat 2009-03-11 20:19:50 UTC (rev 4232)
@@ -0,0 +1,16 @@
+set JBPM4_ROOT=c:\wsjbpm4\jbpm4
+set JBPM_VERSION=4.0.0-SNAPSHOT
+set JBOSS_PARENT=C:\Software
+set DOWNLOAD_DIR=C:\Downloads\jboss
+set JBOSS_VERSION=5.0.0.GA
+set CONTAINER=jboss500
+set DATABASE=hsqldb
+
+set JBOSS_DISTRO_FILE=C:\Downloads\jboss\jboss-%JBOSS_VERSION%.zip
+set JBOSS_HOME=C:\Software\jboss-%JBOSS_VERSION%
+
+cd %JBPM4_ROOT%
+mvn -DskipTests -Pdistro -Ddatabase=%DATABASE% -Djbpm.target.container=%CONTAINER%
-Djboss.home=%JBOSS_HOME% clean install
+rmdir /S /Q %JBOSS_HOME%
+unzip %JBOSS_DISTRO_FILE% -d c:\Software
+java -jar modules\distro\target\jbpm-installer-%JBPM_VERSION%.jar
modules\distro\target\resources\auto-install-template.xml