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

[do-not-reply at jboss.org]

Author: thomas.diesler at jboss.com
Date: 2008-08-27 09:03:34 -0400 (Wed, 27 Aug 2008)
New Revision: 2032

Modified:
   jbpm3/trunk/modules/jpdl/core/pom.xml
   jbpm3/trunk/modules/jpdl/core/src/main/resources/hibernate.properties.mysql.xml
   jbpm3/trunk/pom.xml
Log:
MySQL setup ok

Modified: jbpm3/trunk/modules/jpdl/core/pom.xml
===================================================================
--- jbpm3/trunk/modules/jpdl/core/pom.xml	2008-08-27 12:11:27 UTC (rev 2031)
+++ jbpm3/trunk/modules/jpdl/core/pom.xml	2008-08-27 13:03:34 UTC (rev 2032)
@@ -79,11 +79,6 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>hsqldb</groupId>
-      <artifactId>hsqldb</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
       <groupId>jaxen</groupId>
       <artifactId>jaxen</artifactId>
       <scope>test</scope>
@@ -204,8 +199,8 @@
             </goals>
             <configuration>
               <tasks>
-                <property name="database" value="${database}"/>
-                <ant antfile="scripts/antrun-jbpm-config.xml" target="concat"/>
+                <property name="database" value="${database}" />
+                <ant antfile="scripts/antrun-jbpm-config.xml" target="concat" />
               </tasks>
             </configuration>
           </execution>
@@ -231,6 +226,56 @@
       <properties>
         <database>hsqldb</database>
       </properties>
+      <dependencies>
+        <dependency>
+          <groupId>hsqldb</groupId>
+          <artifactId>hsqldb</artifactId>
+          <scope>test</scope>
+        </dependency>
+      </dependencies>
     </profile>
+
+    <!-- 
+    Name:  hsqldb
+    Descr: Hypersonic Database Setup   
+    -->
+    <profile>
+      <id>hsqldb</id>
+      <activation>
+        <property>
+          <name>database</name>
+          <value>hsqldb</value>
+        </property>
+      </activation>
+      <dependencies>
+        <dependency>
+          <groupId>hsqldb</groupId>
+          <artifactId>hsqldb</artifactId>
+          <scope>test</scope>
+        </dependency>
+      </dependencies>
+    </profile>
+
+    <!-- 
+    Name:  mysql
+    Descr: MySQL Database Setup   
+    -->
+    <profile>
+      <id>mysql</id>
+      <activation>
+        <property>
+          <name>database</name>
+          <value>mysql</value>
+        </property>
+      </activation>
+      <dependencies>
+        <dependency>
+          <groupId>mysql</groupId>
+          <artifactId>mysql-connector-java</artifactId>
+          <scope>test</scope>
+        </dependency>
+      </dependencies>
+    </profile>
+    
   </profiles>
 </project>
\ No newline at end of file

Modified: jbpm3/trunk/modules/jpdl/core/src/main/resources/hibernate.properties.mysql.xml
===================================================================
--- jbpm3/trunk/modules/jpdl/core/src/main/resources/hibernate.properties.mysql.xml	2008-08-27 12:11:27 UTC (rev 2031)
+++ jbpm3/trunk/modules/jpdl/core/src/main/resources/hibernate.properties.mysql.xml	2008-08-27 13:03:34 UTC (rev 2032)
@@ -5,8 +5,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">username</property>
-    <property name="hibernate.connection.password">password</property>
+    <property name="hibernate.connection.username">jbpmtest</property>
+    <property name="hibernate.connection.password"></property>
     <property name="hibernate.query.substitutions">true 1, false 0</property>
 
     <property name="hibernate.cache.provider_class">org.hibernate.cache.HashtableCacheProvider</property>

Modified: jbpm3/trunk/pom.xml
===================================================================
--- jbpm3/trunk/pom.xml	2008-08-27 12:11:27 UTC (rev 2031)
+++ jbpm3/trunk/pom.xml	2008-08-27 13:03:34 UTC (rev 2032)
@@ -51,7 +51,6 @@
     <hibernate.version>3.2.6.ga</hibernate.version>
     <hibernate.annotations.version>3.3.1.GA</hibernate.annotations.version>
     <hibernate.validator.version>3.0.0.ga</hibernate.validator.version>
-    <hsqldb.version>1.8.0.7</hsqldb.version>
     <izpack.version>4.0.0</izpack.version>
     <jasper.reports.version>3.0.0</jasper.reports.version>
     <javax.ejb.version>3.0</javax.ejb.version>
@@ -73,6 +72,10 @@
     <poi.version>3.0.2-FINAL</poi.version>
     <richfaces.ui.version>3.2.1.GA</richfaces.ui.version>
     <slf4j.version>1.5.2</slf4j.version>
+    
+    <!-- Database Driver Versions  -->
+    <hsqldb.version>1.8.0.7</hsqldb.version>
+    <mysql.connector.version>5.1.6</mysql.connector.version>
   </properties>
 
   <!-- DependencyManagement -->
@@ -159,11 +162,6 @@
           <version>${gwt.version}</version>
        </dependency>
       <dependency>
-        <groupId>hsqldb</groupId>
-        <artifactId>hsqldb</artifactId>
-        <version>${hsqldb.version}</version>
-      </dependency>
-      <dependency>
         <groupId>jasperreports</groupId>
         <artifactId>jasperreports</artifactId>
         <version>${jasper.reports.version}</version>
@@ -352,6 +350,18 @@
         <artifactId>poi-scratchpad</artifactId>
         <version>${poi.version}</version>
       </dependency>
+      
+      <!-- Database Driver Versions  -->
+      <dependency>
+        <groupId>hsqldb</groupId>
+        <artifactId>hsqldb</artifactId>
+        <version>${hsqldb.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>mysql</groupId>
+        <artifactId>mysql-connector-java</artifactId>
+        <version>${mysql.connector.version}</version>
+      </dependency>
     </dependencies>
   </dependencyManagement>