8:20 a.m.
Author: heiko.braun(a)jboss.com
Date: 2009-01-30 09:20:23 -0500 (Fri, 30 Jan 2009)
New Revision: 3736
Modified:
jbpm4/branches/hbraun/hudson/jbpm4-base.sh
jbpm4/branches/hbraun/hudson/jbpm4-db.sh
jbpm4/branches/hbraun/hudson/jbpm4-load.sh
jbpm4/branches/hbraun/pom.xml
jbpm4/branches/hbraun/profiles.xml.example
Log:
Use default profiles.xml in hudson scripts
Modified: jbpm4/branches/hbraun/hudson/jbpm4-base.sh
===================================================================
--- jbpm4/branches/hbraun/hudson/jbpm4-base.sh 2009-01-30 10:43:24 UTC (rev 3735)
+++ jbpm4/branches/hbraun/hudson/jbpm4-base.sh 2009-01-30 14:20:23 UTC (rev 3736)
@@ -10,6 +10,11 @@
DISTRODIR=$JBPMDIR/modules/distribution/target
#
+# default environment settings
+#
+cp $JBPMDIR/profiles.xml.example $JBPMDIR/profiles.xml
+
+#
# build the tests
#
cd $JBPMDIR
Modified: jbpm4/branches/hbraun/hudson/jbpm4-db.sh
===================================================================
--- jbpm4/branches/hbraun/hudson/jbpm4-db.sh 2009-01-30 10:43:24 UTC (rev 3735)
+++ jbpm4/branches/hbraun/hudson/jbpm4-db.sh 2009-01-30 14:20:23 UTC (rev 3736)
@@ -11,10 +11,9 @@
JBPMDIR=$WORKSPACE/jbpm4
#
-# copy the profiles.xml
+# default environment settings
#
-echo copying profiles.xml from resources
-cp -f $WORKSPACE/resources/profiles-db.xml $JBPMDIR/profiles.xml
+cp $JBPMDIR/profiles.xml.example $JBPMDIR/profiles.xml
#
# build the tests
Modified: jbpm4/branches/hbraun/hudson/jbpm4-load.sh
===================================================================
--- jbpm4/branches/hbraun/hudson/jbpm4-load.sh 2009-01-30 10:43:24 UTC (rev 3735)
+++ jbpm4/branches/hbraun/hudson/jbpm4-load.sh 2009-01-30 14:20:23 UTC (rev 3736)
@@ -10,11 +10,11 @@
DISTRODIR=$JBPMDIR/modules/distribution/target
#
-# copy the profiles.xml
+# default environment settings
#
-echo copying profiles.xml from resources
-cp -f $WORKSPACE/resources/profiles-load.xml $JBPMDIR/profiles.xml
+cp $JBPMDIR/profiles.xml.example $JBPMDIR/profiles.xml
+
#
# build the tests
#
Modified: jbpm4/branches/hbraun/pom.xml
===================================================================
--- jbpm4/branches/hbraun/pom.xml 2009-01-30 10:43:24 UTC (rev 3735)
+++ jbpm4/branches/hbraun/pom.xml 2009-01-30 14:20:23 UTC (rev 3736)
@@ -316,9 +316,10 @@
<!-- Profiles -->
<profiles>
+
<profile>
<id>distro</id>
- <modules>
+ <modules>
<module>modules/devguide</module>
<module>modules/distro</module>
<module>modules/userguide</module>
@@ -337,7 +338,7 @@
<profile>
<id>load</id>
- <modules>
+ <modules>
<module>modules/test-load</module>
</modules>
</profile>
Modified: jbpm4/branches/hbraun/profiles.xml.example
===================================================================
--- jbpm4/branches/hbraun/profiles.xml.example 2009-01-30 10:43:24 UTC (rev 3735)
+++ jbpm4/branches/hbraun/profiles.xml.example 2009-01-30 14:20:23 UTC (rev 3736)
@@ -1,90 +1,97 @@
- <profilesXml 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/profiles-1.0.0.xsd">
+<profilesXml 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/profiles-1.0.0.xsd">
- <profiles>
+ <profiles>
- <!-- This profile can also be defined in ~/.m2/settings.xml -->
+ <!-- This profile can also be defined in ~/.m2/settings.xml -->
- <profile>
- <id>jboss-home-profile</id>
- <activation>
- <property>
- <name>user.name</name>
- </property>
- </activation>
- <properties>
-
<jboss422.home>/home/hbraun/dev/prj/jbossas/tags/JBoss_4_2_2_GA/build/output/jboss-4.2.2.GA</jboss422.home>
-
<jboss423.home>/home/hbraun/dev/prj/jbossas/tags/JBoss_4_2_3_GA/build/output/jboss-4.2.3.GA</jboss423.home>
-
<jboss500.home>/home/hbraun/dev/prj/jbossas/tags/JBoss_5_0_0_GA/build/output/jboss-5.0.0.GA</jboss500.home>
+ <profile>
+ <id>jboss-home-profile</id>
+ <activation>
+ <property>
+ <name>user.name</name>
+ </property>
+ </activation>
+ <properties>
- <jdbc.hsql.server>localhost</jdbc.hsql.server>
- <jdbc.hsql.port>3306</jdbc.hsql.port>
- <jdbc.hsql.database>jbpmtest</jdbc.hsql.database>
-
<!--jdbc.hsql.url>jdbc:hsqldb:hsql://${jdbc.hsql.server}:${jdbc.hsql.port}/${jdbc.hsql.database}</jdbc.hsql.url-->
- <jdbc.hsql.url>jdbc:hsqldb:mem:.</jdbc.hsql.url>
- <jdbc.hsql.username>sa</jdbc.hsql.username>
- <jdbc.hsql.password></jdbc.hsql.password>
+ <!--
+ JBOSS_HOME FOR INTEGRATION TESTS
+ -->
+
+
<jboss422.home>/Users/hbraun/dev/prj/jbossas/tags/JBoss_4_2_2_GA/build/output/jboss-4.2.2.GA</jboss422.home>
+
<jboss423.home>/Users/hbraun/dev/prj/jbossas/tags/JBoss_4_2_3_GA/build/output/jboss-4.2.3.GA</jboss423.home>
+
<jboss500.home>/Users/hbraun/dev/prj/jbossas/tags/JBoss_5_0_0_GA/build/output/jboss-5.0.0.GA</jboss500.home>
- <!--
- <jdbc.mysql.server>localhost</jdbc.mysql.server>
- <jdbc.mysql.port>3306</jdbc.mysql.port>
- <jdbc.mysql.database>jbpmtest</jdbc.mysql.database>
-
<jdbc.mysql.url>jdbc:mysql://${jdbc.mysql.server}:${jdbc.mysql.port}/${jdbc.mysql.database}</jdbc.mysql.url>
- <jdbc.mysql.username>jbpmtest</jdbc.mysql.username>
- <jdbc.mysql.password></jdbc.mysql.password>
+ <!--
+ DEFAULT CONNECTION SETTINGS FOR THE JBPM QA ENV
+ -->
+
+ <jdbc.hsql.server>localhost</jdbc.hsql.server>
+ <jdbc.hsql.port>3306</jdbc.hsql.port>
+ <jdbc.hsql.database>jbpmtest</jdbc.hsql.database>
+ <jdbc.hsql.url>jdbc:hsqldb:mem:.</jdbc.hsql.url>
+ <jdbc.hsql.username>sa</jdbc.hsql.username>
+ <jdbc.hsql.password></jdbc.hsql.password>
- <jdbc.postgresql.server>localhost</jdbc.postgresql.server>
- <jdbc.postgresql.port>5432</jdbc.postgresql.port>
- <jdbc.postgresql.database>jbpmtest</jdbc.postgresql.database>
-
<jdbc.postgresql.url>jdbc:postgresql://${jdbc.postgresql.server}:${jdbc.postgresql.port}/${jdbc.postgresql.database}</jdbc.postgresql.url>
- <jdbc.postgresql.username>jbpmtest</jdbc.postgresql.username>
- <jdbc.postgresql.password></jdbc.postgresql.password>
+ <jdbc.mysql.server>localhost</jdbc.mysql.server>
+ <jdbc.mysql.port>3306</jdbc.mysql.port>
+ <jdbc.mysql.database>jbpm4</jdbc.mysql.database>
+
<jdbc.mysql.url>jdbc:mysql://${jdbc.mysql.server}:${jdbc.mysql.port}/${jdbc.mysql.database}</jdbc.mysql.url>
+ <jdbc.mysql.username>jbpmtest</jdbc.mysql.username>
+ <jdbc.mysql.password></jdbc.mysql.password>
- <jdbc.sybase.server>localhost</jdbc.sybase.server>
- <jdbc.sybase.port>5000</jdbc.sybase.port>
- <jdbc.sybase.database>jbpmtest</jdbc.sybase.database>
-
<jdbc.sybase.url>jdbc:sybase:Tds:${jdbc.sybase.server}:${jdbc.sybase.port}/${jdbc.sybase.database}</jdbc.sybase.url>
- <jdbc.sybase.username>jbpmtest</jdbc.sybase.username>
- <jdbc.sybase.password>jbpmtest</jdbc.sybase.password>
-
<jdbc.sybase.driver>com.sybase.jdbc3.jdbc.SybDriver</jdbc.sybase.driver>
-
<jdbc.sybase.datasource>com.sybase.jdbc3.jdbc.SybXADataSource</jdbc.sybase.datasource>
- -->
- </properties>
- </profile>
+ <jdbc.postgresql.server>localhost</jdbc.postgresql.server>
+ <jdbc.postgresql.port>5432</jdbc.postgresql.port>
+ <jdbc.postgresql.database>jbpm4</jdbc.postgresql.database>
+
<jdbc.postgresql.url>jdbc:postgresql://${jdbc.postgresql.server}:${jdbc.postgresql.port}/${jdbc.postgresql.database}</jdbc.postgresql.url>
+ <jdbc.postgresql.username>jbpmtest</jdbc.postgresql.username>
+ <jdbc.postgresql.password></jdbc.postgresql.password>
- <profile>
- <id>oracle-private-properties</id>
- <activation>
- <property>
- <name>database</name>
- <value>oracle</value>
- </property>
- </activation>
- <properties>
- <jdbc.username>xxxx</jdbc.username>
- <jdbc.password>xxxx</jdbc.password>
- <jdbc.server>localhost</jdbc.server>
- <jdbc.dbname>XE</jdbc.dbname>
- </properties>
- </profile>
+ <jdbc.sybase.server>localhost</jdbc.sybase.server>
+ <jdbc.sybase.port>5000</jdbc.sybase.port>
+ <jdbc.sybase.database>jbpm4</jdbc.sybase.database>
+
<jdbc.sybase.url>jdbc:sybase:Tds:${jdbc.sybase.server}:${jdbc.sybase.port}/${jdbc.sybase.database}</jdbc.sybase.url>
+ <jdbc.sybase.username>jbpmtest</jdbc.sybase.username>
+ <jdbc.sybase.password>jbpmtest</jdbc.sybase.password>
+
<jdbc.sybase.driver>com.sybase.jdbc3.jdbc.SybDriver</jdbc.sybase.driver>
+
<jdbc.sybase.datasource>com.sybase.jdbc3.jdbc.SybXADataSource</jdbc.sybase.datasource>
- <profile>
- <id>mysql-private-properties</id>
- <activation>
- <property>
- <name>database</name>
- <value>mysql</value>
- </property>
- </activation>
- <properties>
- <jdbc.username>xxxx</jdbc.username>
- <jdbc.password>xxxx</jdbc.password>
- <jdbc.server>localhost</jdbc.server>
- <jdbc.dbname>JBPM</jdbc.dbname>
- </properties>
- </profile>
+ </properties>
+ </profile>
- </profiles>
+ <profile>
+ <id>oracle-private-properties</id>
+ <activation>
+ <property>
+ <name>database</name>
+ <value>oracle</value>
+ </property>
+ </activation>
+ <properties>
+ <jdbc.username>xxxx</jdbc.username>
+ <jdbc.password>xxxx</jdbc.password>
+ <jdbc.server>localhost</jdbc.server>
+ <jdbc.dbname>XE</jdbc.dbname>
+ </properties>
+ </profile>
- </profilesXml>
+ <profile>
+ <id>mysql-private-properties</id>
+ <activation>
+ <property>
+ <name>database</name>
+ <value>mysql</value>
+ </property>
+ </activation>
+ <properties>
+ <jdbc.username>xxxx</jdbc.username>
+ <jdbc.password>xxxx</jdbc.password>
+ <jdbc.server>localhost</jdbc.server>
+ <jdbc.dbname>JBPM</jdbc.dbname>
+ </properties>
+ </profile>
+
+ </profiles>
+
+</profilesXml>