[jbpm-commits] JBoss JBPM SVN: r6226 - jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources and 2 other directories.

[do-not-reply at jboss.org]

Author: alex.guizar at jboss.com
Date: 2010-03-17 06:46:54 -0400 (Wed, 17 Mar 2010)
New Revision: 6226

Modified:
   jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/jbpm-hsqldb-ds.xml
   jbpm3/branches/jbpm-3.2-soa/modules/db/pom.xml
   jbpm3/branches/jbpm-3.2-soa/pom.xml
   projects/jsf-console/branches/jsf-console-3.2-soa/pom.xml
Log:
correct version numbers of db2 and oracle drivers in db module
bump javax.faces.version to 1.2_13 as 1.2_03 is no longer available from repository
revert database name in hsql data source

Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/jbpm-hsqldb-ds.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/jbpm-hsqldb-ds.xml	2010-03-17 10:20:03 UTC (rev 6225)
+++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/jbpm-hsqldb-ds.xml	2010-03-17 10:46:54 UTC (rev 6226)
@@ -4,7 +4,7 @@
   <local-tx-datasource>
     <jndi-name>JbpmDS</jndi-name>
 
-    <connection-url>jdbc:hsqldb:${jboss.server.data.dir}${/}hypersonic${/}${jdbc.hsqldb.database}</connection-url>
+    <connection-url>jdbc:hsqldb:${jboss.server.data.dir}${/}hypersonic${/}jbpmDB</connection-url>
     <driver-class>${jdbc.hsqldb.driver}</driver-class>
     <user-name>${jdbc.hsqldb.username}</user-name>
     <password>${jdbc.hsqldb.password}</password>
@@ -20,12 +20,12 @@
     <type-mapping>Hypersonic SQL</type-mapping>
 
     <!-- ensure the datasource is not initialized before the database itself -->
-    <depends>jboss:service=Hypersonic,database=${jdbc.hsqldb.database}</depends>
+    <depends>jboss:service=Hypersonic,database=jbpmDB</depends>
   </local-tx-datasource>
 
   <!-- for hsqldb accessed from jboss only, in-process (standalone) mode -->
-  <mbean code="org.jboss.jdbc.HypersonicDatabase" name="jboss:service=Hypersonic,database=${jdbc.hsqldb.database}">
-    <attribute name="Database">${jdbc.hsqldb.database}</attribute>
+  <mbean code="org.jboss.jdbc.HypersonicDatabase" name="jboss:service=Hypersonic,database=jbpmDB">
+    <attribute name="Database">jbpmDB</attribute>
     <attribute name="InProcessMode">true</attribute>
   </mbean>
 

Modified: jbpm3/branches/jbpm-3.2-soa/modules/db/pom.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/db/pom.xml	2010-03-17 10:20:03 UTC (rev 6225)
+++ jbpm3/branches/jbpm-3.2-soa/modules/db/pom.xml	2010-03-17 10:46:54 UTC (rev 6226)
@@ -262,6 +262,7 @@
               <dependency>
                 <groupId>com.ibm</groupId>
                 <artifactId>db2jcc_license_cu</artifactId>
+                <version>${db2jcc.version}</version>
               </dependency>
             </dependencies>
 
@@ -402,7 +403,7 @@
               <dependency>
                 <groupId>com.oracle</groupId>
                 <artifactId>ojdbc14</artifactId>
-                <version>${ojdbc14.version}</version>
+                <version>${ojdbc.version}</version>
               </dependency>
             </dependencies>
 

Modified: jbpm3/branches/jbpm-3.2-soa/pom.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/pom.xml	2010-03-17 10:20:03 UTC (rev 6225)
+++ jbpm3/branches/jbpm-3.2-soa/pom.xml	2010-03-17 10:46:54 UTC (rev 6226)
@@ -52,7 +52,6 @@
     <jackrabbit.version>1.4.5</jackrabbit.version>
     <jasper.reports.version>3.5.3</jasper.reports.version>
     <javax.el.version>1.2</javax.el.version>
-    <javax.faces.version>1.2_03</javax.faces.version>
     <javax.jcr.version>1.0.1</javax.jcr.version>
     <javax.mail.version>1.4</javax.mail.version>
     <javax.servlet.version>2.5</javax.servlet.version>
@@ -207,16 +206,6 @@
         <version>${jaxen.version}</version>
       </dependency>
       <dependency>
-        <groupId>javax.faces</groupId>
-        <artifactId>jsf-api</artifactId>
-        <version>${javax.faces.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>javax.faces</groupId>
-        <artifactId>jsf-impl</artifactId>
-        <version>${javax.faces.version}</version>
-      </dependency>
-      <dependency>
         <groupId>org.jboss.client</groupId>
         <artifactId>jbossall-client</artifactId>
         <version>${jboss.client.version}</version>

Modified: projects/jsf-console/branches/jsf-console-3.2-soa/pom.xml
===================================================================
--- projects/jsf-console/branches/jsf-console-3.2-soa/pom.xml	2010-03-17 10:20:03 UTC (rev 6225)
+++ projects/jsf-console/branches/jsf-console-3.2-soa/pom.xml	2010-03-17 10:46:54 UTC (rev 6226)
@@ -38,7 +38,7 @@
     <commons.io.version>1.4</commons.io.version>
     <commons.logging.version>1.1.1</commons.logging.version>
     <javax.el.version>1.2</javax.el.version>
-    <javax.faces.version>1.2_03</javax.faces.version>
+    <javax.faces.version>1.2_13</javax.faces.version>
     <javax.servlet.version>2.5</javax.servlet.version>
     <jbpm.version>3.2.8</jbpm.version>
     <jboss.gravel.version>1.0.0.GA</jboss.gravel.version>