[jbpm-commits] JBoss JBPM SVN: r2611 - in jbpm3/trunk: hudson/hudson-home and 3 other directories.

Author: thomas.diesler(a)jboss.com Date: 2008-10-24 11:25:58 -0400 (Fri, 24 Oct 2008) New Revision: 2611 Modified: jbpm3/trunk/hudson/hudson-home/command.sh jbpm3/trunk/modules/core/pom.xml jbpm3/trunk/modules/core/scripts/antrun-jbpm-config.xml jbpm3/trunk/modules/core/src/main/resources/hibernate.properties.mysql.xml jbpm3/trunk/modules/core/src/main/resources/hibernate.properties.postgresql.xml jbpm3/trunk/modules/core/src/main/resources/hibernate.properties.sybase.xml jbpm3/trunk/profiles.xml.example Log: [JBPM-1408] externalize jdbc properties Modified: jbpm3/trunk/hudson/hudson-home/command.sh =================================================================== --- jbpm3/trunk/hudson/hudson-home/command.sh 2008-10-24 15:23:02 UTC (rev 2610) +++ jbpm3/trunk/hudson/hudson-home/command.sh 2008-10-24 15:25:58 UTC (rev 2611) @@ -83,7 +83,7 @@ # # execute tests # -MVN_CMD="mvn -o $ENVIRONMENT -DtestFailureIgnore=true test" +MVN_CMD="mvn -o -fae $ENVIRONMENT test" echo $MVN_CMD; $MVN_CMD 2>&1 | tee $WORKSPACE/tests.log cat $WORKSPACE/tests.log | egrep FIXME\|FAILED | sort -u | tee $WORKSPACE/fixme.txt cat $WORKSPACE/fixme.txt | egrep "\[\S*]" > $WORKSPACE/errata-$CONTAINER.txt Modified: jbpm3/trunk/modules/core/pom.xml =================================================================== --- jbpm3/trunk/modules/core/pom.xml 2008-10-24 15:23:02 UTC (rev 2610) +++ jbpm3/trunk/modules/core/pom.xml 2008-10-24 15:25:58 UTC (rev 2611) @@ -120,6 +120,12 @@ <!-- Plugins --> <build> + <resources> + <resource> + <directory>src/main/resources</directory> + <filtering>true</filtering> + </resource> + </resources> <plugins> <plugin> <artifactId>maven-assembly-plugin</artifactId> @@ -159,7 +165,7 @@ <artifactId>maven-antrun-plugin</artifactId> <executions> <execution> - <phase>generate-resources</phase> + <phase>compile</phase> <goals> <goal>run</goal> </goals> Modified: jbpm3/trunk/modules/core/scripts/antrun-jbpm-config.xml =================================================================== --- jbpm3/trunk/modules/core/scripts/antrun-jbpm-config.xml 2008-10-24 15:23:02 UTC (rev 2610) +++ jbpm3/trunk/modules/core/scripts/antrun-jbpm-config.xml 2008-10-24 15:25:58 UTC (rev 2611) @@ -14,7 +14,7 @@ <project default="concat"> <property name="project.build.directory" value="${basedir}/target"/> - <property name="project.resources.directory" value="${basedir}/src/main/resources"/> + <property name="project.resources.directory" value="${basedir}/target/classes"/> <!-- macrodef: macro-database-cfg Modified: jbpm3/trunk/modules/core/src/main/resources/hibernate.properties.mysql.xml =================================================================== --- jbpm3/trunk/modules/core/src/main/resources/hibernate.properties.mysql.xml 2008-10-24 15:23:02 UTC (rev 2610) +++ jbpm3/trunk/modules/core/src/main/resources/hibernate.properties.mysql.xml 2008-10-24 15:25:58 UTC (rev 2611) @@ -4,8 +4,8 @@ <!-- JDBC connection properties (begin) --> <property name="hibernate.connection.driver_class">com.mysql.jdbc.Driver</property> - <property name="hibernate.connection.url">jdbc:mysql://localhost:3306/jbpmtest</property> - <property name="hibernate.connection.username">jbpmtest</property> - <property name="hibernate.connection.password"></property> + <property name="hibernate.connection.url">${jdbc.mysql.url}</property> + <property name="hibernate.connection.username">${jdbc.mysql.username}</property> + <property name="hibernate.connection.password">${jdbc.mysql.password}</property> <property name="hibernate.query.substitutions">true 1, false 0</property> <!-- JDBC connection properties (end) --> Modified: jbpm3/trunk/modules/core/src/main/resources/hibernate.properties.postgresql.xml =================================================================== --- jbpm3/trunk/modules/core/src/main/resources/hibernate.properties.postgresql.xml 2008-10-24 15:23:02 UTC (rev 2610) +++ jbpm3/trunk/modules/core/src/main/resources/hibernate.properties.postgresql.xml 2008-10-24 15:25:58 UTC (rev 2611) @@ -4,7 +4,7 @@ <!-- JDBC connection properties (begin) --> <property name="hibernate.connection.driver_class">org.postgresql.Driver</property> - <property name="hibernate.connection.url">jdbc:postgresql://localhost:5432/jbpmtest</property> - <property name="hibernate.connection.username">jbpmtest</property> - <property name="hibernate.connection.password"></property> + <property name="hibernate.connection.url">${jdbc.postgresql.url}</property> + <property name="hibernate.connection.username">${jdbc.postgresql.username}</property> + <property name="hibernate.connection.password">${jdbc.postgresql.password}</property> <!-- JDBC connection properties (end) --> Modified: jbpm3/trunk/modules/core/src/main/resources/hibernate.properties.sybase.xml =================================================================== --- jbpm3/trunk/modules/core/src/main/resources/hibernate.properties.sybase.xml 2008-10-24 15:23:02 UTC (rev 2610) +++ jbpm3/trunk/modules/core/src/main/resources/hibernate.properties.sybase.xml 2008-10-24 15:25:58 UTC (rev 2611) @@ -11,8 +11,8 @@ <!-- JDBC connection properties (begin) --> <property name="hibernate.connection.driver_class">net.sourceforge.jtds.jdbc.Driver</property> - <property name="hibernate.connection.url">jdbc:jtds:sybase://dev01.qa.atl.jboss.com:4100/jbpmteam</property> - <property name="hibernate.connection.username">jbpmteam</property> - <property name="hibernate.connection.password">jbpmteam</property> + <property name="hibernate.connection.url">${jdbc.sybase.url}</property> + <property name="hibernate.connection.username">${jdbc.sybase.username}</property> + <property name="hibernate.connection.password">${jdbc.sybase.password}</property> <!-- JDBC connection properties (end) --> Modified: jbpm3/trunk/profiles.xml.example =================================================================== --- jbpm3/trunk/profiles.xml.example 2008-10-24 15:23:02 UTC (rev 2610) +++ jbpm3/trunk/profiles.xml.example 2008-10-24 15:25:58 UTC (rev 2611) @@ -2,8 +2,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/profiles-1.0.0.xsd"> <profiles> - <!-- [JBPM-1763] JIRA integration test --> - <!-- This profile can also be defined in ~/.m2/settings.xml --> <profile> <id>jboss-home-profile</id> @@ -13,9 +11,19 @@ </property> </activation> <properties> - <jboss422.home>/home/tdiesler/svn/jbossas/tags/JBoss_4_2_2_GA/build/output/jboss-4.2.2.GA</jboss422.home> - <jboss423.home>/home/tdiesler/svn/jbossas/tags/JBoss_4_2_3_GA/build/output/jboss-4.2.3.GA</jboss423.home> - <jboss500.home>/home/tdiesler/svn/jbossas/tags/JBoss_5_0_0_CR2/build/output/jboss-5.0.0.CR2</jboss500.home> + <!-- + <jdbc.mysql.url>jdbc:mysql://localhost:3306/jbpmtest</jdbc.mysql.url> + <jdbc.mysql.username>jbpmtest</jdbc.mysql.username> + <jdbc.mysql.password></jdbc.mysql.password> + + <jdbc.postgresql.url>jdbc:postgresql://localhost:5432/jbpmtest</jdbc.postgresql.url> + <jdbc.postgresql.username>jbpmtest</jdbc.postgresql.username> + <jdbc.postgresql.password></jdbc.postgresql.password> + + <jdbc.sybase.url>jdbc:jtds:sybase://dev01.qa.atl.jboss.com:4100/jbpmteam</jdbc.sybase.url> + <jdbc.sybase.username>jbpmteam</jdbc.sybase.username> + <jdbc.sybase.password>jbpmteam</jdbc.sybase.password> + --> </properties> </profile>