[jbpm-commits] JBoss JBPM SVN: r2143 - in jbpm3/trunk: modules/core and 1 other directories.

Author: thomas.diesler(a)jboss.com Date: 2008-09-08 11:17:21 -0400 (Mon, 08 Sep 2008) New Revision: 2143 Modified: jbpm3/trunk/modules/core/pom.xml jbpm3/trunk/modules/core/src/main/resources/hibernate.properties.sybase.xml jbpm3/trunk/pom.xml Log: Fix sybase connection Modified: jbpm3/trunk/modules/core/pom.xml =================================================================== --- jbpm3/trunk/modules/core/pom.xml 2008-09-08 14:01:30 UTC (rev 2142) +++ jbpm3/trunk/modules/core/pom.xml 2008-09-08 15:17:21 UTC (rev 2143) @@ -1,15 +1,15 @@ <?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. --> -<!-- --> -<!-- ====================================================================== --> + <!-- ====================================================================== --> + <!-- --> + <!-- JBoss, the OpenSource J2EE webOS --> + <!-- --> + <!-- Distributable under LGPL license. --> + <!-- See terms of license at http://www.gnu.org. --> + <!-- --> + <!-- ====================================================================== --> -<!-- $Id$ --> + <!-- $Id$ --> <project 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/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -18,21 +18,21 @@ <artifactId>jbpm-core</artifactId> <packaging>jar</packaging> - <!-- Parent --> + <!-- Parent --> <parent> <groupId>org.jboss.jbpm</groupId> <artifactId>jbpm</artifactId> <version>3.3.0-SNAPSHOT</version> </parent> - <!-- Dependencies --> + <!-- Dependencies --> <dependencies> - <!-- jBPM Dependencies --> + <!-- jBPM Dependencies --> <!-- dependency> <groupId>org.jboss.jbpm</groupId> <artifactId>jbpm-api</artifactId> <version>${version}</version> </dependency --> - <!-- Compile Dependencies --> + <!-- Compile Dependencies --> <dependency> <groupId>bsh</groupId> <artifactId>bsh</artifactId> @@ -73,6 +73,8 @@ <groupId>org.hibernate</groupId> <artifactId>hibernate</artifactId> </dependency> + + <!-- Test Dependencies --> <dependency> <groupId>dumbster</groupId> <artifactId>dumbster</artifactId> @@ -83,13 +85,17 @@ <artifactId>jaxen</artifactId> <scope>test</scope> </dependency> + <!-- Remove this static dependency --> <dependency> + <groupId>hsqldb</groupId> + <artifactId>hsqldb</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> <scope>test</scope> </dependency> - - <!-- Test Dependencies --> </dependencies> <!-- Plugins --> @@ -148,10 +154,10 @@ </plugin> </plugins> </build> - + <!-- Profiles --> <profiles> - + <!-- Name: no-database Descr: Setup the default database @@ -170,8 +176,7 @@ <configuration> <excludes> <!-- - Cleanup stale tests from the testsuite - http://jira.jboss.org/jira/browse/JBPM-1205 + Cleanup stale tests from the testsuite http://jira.jboss.org/jira/browse/JBPM-1205 --> <exclude>org/jbpm/context/exe/VariableQueryDbTest.java</exclude> <exclude>org/jbpm/db/ContextSessionDbTest.java</exclude> @@ -208,7 +213,7 @@ </plugins> </build> </profile> - + <!-- Name: hsqldb Descr: Hypersonic Database Setup @@ -228,8 +233,7 @@ <configuration> <excludes> <!-- - Cleanup stale tests from the testsuite - http://jira.jboss.org/jira/browse/JBPM-1205 + Cleanup stale tests from the testsuite http://jira.jboss.org/jira/browse/JBPM-1205 --> <exclude>org/jbpm/context/exe/VariableQueryDbTest.java</exclude> <exclude>org/jbpm/db/ContextSessionDbTest.java</exclude> @@ -266,7 +270,7 @@ </plugins> </build> </profile> - + <!-- Name: mysql Descr: MySQL Database Setup @@ -286,8 +290,7 @@ <configuration> <excludes> <!-- - Cleanup stale tests from the testsuite - http://jira.jboss.org/jira/browse/JBPM-1205 + Cleanup stale tests from the testsuite http://jira.jboss.org/jira/browse/JBPM-1205 --> <exclude>org/jbpm/context/exe/VariableQueryDbTest.java</exclude> <exclude>org/jbpm/db/ContextSessionDbTest.java</exclude> @@ -330,7 +333,7 @@ </plugins> </build> </profile> - + <!-- Name: postgresql Descr: MySQL Database Setup @@ -350,8 +353,7 @@ <configuration> <excludes> <!-- - Cleanup stale tests from the testsuite - http://jira.jboss.org/jira/browse/JBPM-1205 + Cleanup stale tests from the testsuite http://jira.jboss.org/jira/browse/JBPM-1205 --> <exclude>org/jbpm/context/exe/VariableQueryDbTest.java</exclude> <exclude>org/jbpm/db/ContextSessionDbTest.java</exclude> @@ -388,7 +390,7 @@ </plugins> </build> </profile> - + <!-- Name: sybase Descr: Sybase Database Setup @@ -408,8 +410,7 @@ <configuration> <excludes> <!-- - Cleanup stale tests from the testsuite - http://jira.jboss.org/jira/browse/JBPM-1205 + Cleanup stale tests from the testsuite http://jira.jboss.org/jira/browse/JBPM-1205 --> <exclude>org/jbpm/context/exe/VariableQueryDbTest.java</exclude> <exclude>org/jbpm/db/ContextSessionDbTest.java</exclude> Modified: jbpm3/trunk/modules/core/src/main/resources/hibernate.properties.sybase.xml =================================================================== --- jbpm3/trunk/modules/core/src/main/resources/hibernate.properties.sybase.xml 2008-09-08 14:01:30 UTC (rev 2142) +++ jbpm3/trunk/modules/core/src/main/resources/hibernate.properties.sybase.xml 2008-09-08 15:17:21 UTC (rev 2143) @@ -6,6 +6,6 @@ <property name="hibernate.connection.driver_class">com.sybase.jdbc3.jdbc.SybDriver</property> <property name="hibernate.connection.url">jdbc:sybase:Tds:dev01.qa.atl.jboss.com:4100/jbpmteam</property> <property name="hibernate.connection.username">jbpmteam</property> - <property name="hibernate.connection.password"></property> + <property name="hibernate.connection.password">jbpmteam</property> <!-- JDBC connection properties (end) --> \ No newline at end of file Modified: jbpm3/trunk/pom.xml =================================================================== --- jbpm3/trunk/pom.xml 2008-09-08 14:01:30 UTC (rev 2142) +++ jbpm3/trunk/pom.xml 2008-09-08 15:17:21 UTC (rev 2143) @@ -1,15 +1,15 @@ <?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. --> -<!-- --> -<!-- ====================================================================== --> + <!-- ====================================================================== --> + <!-- --> + <!-- JBoss, the OpenSource J2EE webOS --> + <!-- --> + <!-- Distributable under LGPL license. --> + <!-- See terms of license at http://www.gnu.org. --> + <!-- --> + <!-- ====================================================================== --> -<!-- $Id: pom.xml 7412 2008-06-06 13:42:30Z thomas.diesler(a)jboss.com $ --> + <!-- $Id: pom.xml 7412 2008-06-06 13:42:30Z thomas.diesler(a)jboss.com $ --> <project 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/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -76,7 +76,7 @@ <richfaces.ui.version>3.2.1.GA</richfaces.ui.version> <slf4j.version>1.5.2</slf4j.version> <sun.facelets.version>1.1.14</sun.facelets.version> - + <!-- Database Driver Versions --> <hsqldb.version>1.8.0.7</hsqldb.version> <mysql.connector.version>5.1.6</mysql.connector.version> @@ -359,7 +359,7 @@ <artifactId>poi-scratchpad</artifactId> <version>${poi.version}</version> </dependency> - + <!-- Database Driver Versions --> <dependency> <groupId>hsqldb</groupId> @@ -393,7 +393,7 @@ <scope>test</scope> </dependency> </dependencies> - + <!-- Plugins --> <build> <plugins> @@ -408,7 +408,7 @@ </plugin> </plugins> </build> - + <!-- DistributionManagement --> <distributionManagement> <site> @@ -454,7 +454,7 @@ </plugins> </build> </profile> - + <!-- Name: skiptests Desc: Skips the tests @@ -494,9 +494,9 @@ </plugins> </build> </profile> - + <!-- DATABASE PROFILES ***************************************************************************** --> - + <!-- Name: no-database Descr: Setup the default database @@ -561,7 +561,7 @@ </dependency> </dependencies> </profile> - + <!-- Name: postgresql Descr: MySQL Database Setup @@ -583,7 +583,7 @@ </dependency> </dependencies> </profile> - + <!-- Name: sybase Descr: Sybase Database Setup @@ -598,13 +598,17 @@ </activation> <dependencies> <dependency> - <groupId>jconnect</groupId> + <groupId>com.sybase</groupId> <artifactId>jconnect</artifactId> - <version>6.0</version> - <systemPath>/local/opt/jdbc-drivers/jConnect-6_0/classes/jconn3.jar</systemPath> - <scope>system</scope> + <version>6.0.5</version> </dependency> </dependencies> + <repositories> + <repository> + <id>qa.jboss.com</id> + <url>http://www.qa.jboss.com/jdbc-drivers/maven2</url> + </repository> + </repositories> </profile> </profiles> </project>