[exo-jcr-commits] exo-jcr SVN: r4049 - in core/trunk: exo.core.component.database and 3 other directories.

[do-not-reply at jboss.org]

Author: tolusha
Date: 2011-03-03 10:02:13 -0500 (Thu, 03 Mar 2011)
New Revision: 4049

Modified:
   core/trunk/exo.core.component.database/pom.xml
   core/trunk/exo.core.component.database/src/main/java/org/exoplatform/services/database/ExoDatasource.java
   core/trunk/exo.core.component.database/src/test/java/org/exoplatform/services/database/TestDatabaseService.java
   core/trunk/packaging/module/src/main/javascript/core.packaging.module.js
   core/trunk/pom.xml
Log:
EXOJCR-1159: update libraries

Modified: core/trunk/exo.core.component.database/pom.xml
===================================================================
--- core/trunk/exo.core.component.database/pom.xml	2011-03-03 12:51:45 UTC (rev 4048)
+++ core/trunk/exo.core.component.database/pom.xml	2011-03-03 15:02:13 UTC (rev 4049)
@@ -74,7 +74,7 @@
          <artifactId>jta</artifactId>
       </dependency>
       <dependency>
-         <groupId>hsqldb</groupId>
+         <groupId>org.hsqldb</groupId>
          <artifactId>hsqldb</artifactId>
          <scope>runtime</scope>
       </dependency>

Modified: core/trunk/exo.core.component.database/src/main/java/org/exoplatform/services/database/ExoDatasource.java
===================================================================
--- core/trunk/exo.core.component.database/src/main/java/org/exoplatform/services/database/ExoDatasource.java	2011-03-03 12:51:45 UTC (rev 4048)
+++ core/trunk/exo.core.component.database/src/main/java/org/exoplatform/services/database/ExoDatasource.java	2011-03-03 15:02:13 UTC (rev 4049)
@@ -18,10 +18,13 @@
  */
 package org.exoplatform.services.database;
 
+import org.exoplatform.commons.utils.SecurityHelper;
 import org.exoplatform.services.database.table.IDGenerator;
 
+import java.security.PrivilegedExceptionAction;
 import java.sql.Connection;
 import java.sql.DatabaseMetaData;
+import java.sql.SQLException;
 
 import javax.sql.DataSource;
 
@@ -84,10 +87,18 @@
     * @param ds
     * @throws Exception
     */
-   public ExoDatasource(DataSource ds) throws Exception
+   public ExoDatasource(final DataSource ds) throws Exception
    {
       xaDatasource_ = ds;
-      DatabaseMetaData metaData = ds.getConnection().getMetaData();
+      DatabaseMetaData metaData =
+         SecurityHelper.doPrivilegedSQLExceptionAction(new PrivilegedExceptionAction<DatabaseMetaData>()
+         {
+            public DatabaseMetaData run() throws SQLException
+            {
+               return ds.getConnection().getMetaData();
+            }
+         });
+      
       databaseName_ = metaData.getDatabaseProductName();
       databaseVersion_ = metaData.getDatabaseProductVersion();
 

Modified: core/trunk/exo.core.component.database/src/test/java/org/exoplatform/services/database/TestDatabaseService.java
===================================================================
--- core/trunk/exo.core.component.database/src/test/java/org/exoplatform/services/database/TestDatabaseService.java	2011-03-03 12:51:45 UTC (rev 4048)
+++ core/trunk/exo.core.component.database/src/test/java/org/exoplatform/services/database/TestDatabaseService.java	2011-03-03 15:02:13 UTC (rev 4049)
@@ -64,7 +64,7 @@
       try
       {
          s = conn.createStatement();
-         s.addBatch("create table test (name varchar, data varchar)");
+         s.addBatch("create table test (name varchar(25), data varchar(25))");
          s.addBatch("insert into test values('name1', 'value1')");
          s.executeBatch();
          s.close();

Modified: core/trunk/packaging/module/src/main/javascript/core.packaging.module.js
===================================================================
--- core/trunk/packaging/module/src/main/javascript/core.packaging.module.js	2011-03-03 12:51:45 UTC (rev 4048)
+++ core/trunk/packaging/module/src/main/javascript/core.packaging.module.js	2011-03-03 15:02:13 UTC (rev 4049)
@@ -33,7 +33,7 @@
    //addDependency(new Project("jotm", "jotm_jrmp_stubs", "jar", "2.0.10")).
    //addDependency(new Project("jotm", "jotm", "jar", "2.0.10")).
    //addDependency(new Project("howl", "howl-logger", "jar", "0.1.11")).
-    addDependency(new Project("hsqldb", "hsqldb", "jar", "1.8.0.7")).
+    addDependency(new Project("org.hsqldb", "hsqldb", "jar", "2.0.0")).
     addDependency(new Project("javax.resource", "connector-api", "jar", "1.5"));
 
   module.component.documents =

Modified: core/trunk/pom.xml
===================================================================
--- core/trunk/pom.xml	2011-03-03 12:51:45 UTC (rev 4048)
+++ core/trunk/pom.xml	2011-03-03 15:02:13 UTC (rev 4049)
@@ -172,9 +172,9 @@
          </dependency>
          
          <dependency>
-            <groupId>hsqldb</groupId>
+            <groupId>org.hsqldb</groupId>
             <artifactId>hsqldb</artifactId>
-            <version>1.8.0.7</version>
+            <version>2.0.0</version>
          </dependency>
 
          <dependency>