[exo-jcr-commits] exo-jcr SVN: r2463 - in jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl: storage/jdbc/init and 2 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Fri Jun 4 02:10:02 EDT 2010
Author: tolusha
Date: 2010-06-04 02:10:01 -0400 (Fri, 04 Jun 2010)
New Revision: 2463
Modified:
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/config/JDBCConfigurationPersister.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/init/IngresSQLDBInitializer.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/init/OracleDBInitializer.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/init/StorageDBInitializer.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/cas/JDBCValueContentAddressStorageImpl.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/jdbc/DBInitializer.java
Log:
EXOJCR-754: revert changes
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/config/JDBCConfigurationPersister.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/config/JDBCConfigurationPersister.java 2010-06-03 15:50:48 UTC (rev 2462)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/config/JDBCConfigurationPersister.java 2010-06-04 06:10:01 UTC (rev 2463)
@@ -34,7 +34,6 @@
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
-import java.sql.Statement;
import javax.naming.InitialContext;
import javax.naming.NamingException;
@@ -242,7 +241,6 @@
}
finally
{
- ps.close();
con.close();
}
}
@@ -266,13 +264,12 @@
try
{
Connection con = openConnection();
- PreparedStatement ps = null;
try
{
if (isDbInitialized(con))
{
- ps = con.prepareStatement("SELECT * FROM " + configTableName + " WHERE NAME=?");
+ PreparedStatement ps = con.prepareStatement("SELECT * FROM " + configTableName + " WHERE NAME=?");
ps.setString(1, CONFIGNAME);
ResultSet res = ps.executeQuery();
@@ -293,10 +290,6 @@
}
finally
{
- if (ps != null)
- {
- ps.close();
- }
con.close();
}
}
@@ -331,9 +324,7 @@
if (!isDbInitialized(con))
{
// init db
- Statement st = con.createStatement();
- st.executeUpdate(sql = initSQL);
- st.close();
+ con.createStatement().executeUpdate(sql = initSQL);
con.commit();
con.close();
@@ -371,7 +362,6 @@
.warn("Repository service configuration doesn't stored ok. No rows was affected in JDBC operation. Datasource "
+ sourceName + ". SQL: " + sql);
}
- ps.close();
}
else
throw new ConfigurationNotInitializedException(
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/init/IngresSQLDBInitializer.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/init/IngresSQLDBInitializer.java 2010-06-03 15:50:48 UTC (rev 2462)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/init/IngresSQLDBInitializer.java 2010-06-04 06:10:01 UTC (rev 2463)
@@ -22,7 +22,6 @@
import java.sql.Connection;
import java.sql.ResultSet;
import java.sql.SQLException;
-import java.sql.Statement;
/**
* Created by The eXo Platform SAS
@@ -69,11 +68,9 @@
protected boolean isSequenceExists(Connection conn, String sequenceName) throws SQLException
{
String seqName = sequenceName.toUpperCase().toLowerCase();
- Statement st = null;
try
{
- st = conn.createStatement();
- ResultSet srs = st.executeQuery("SELECT NEXT VALUE FOR " + seqName);
+ ResultSet srs = conn.createStatement().executeQuery("SELECT NEXT VALUE FOR " + seqName);
if (srs.next())
{
return true;
@@ -99,13 +96,6 @@
}
};
}
- finally
- {
- if (st != null)
- {
- st.close();
- }
- }
}
}
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/init/OracleDBInitializer.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/init/OracleDBInitializer.java 2010-06-03 15:50:48 UTC (rev 2462)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/init/OracleDBInitializer.java 2010-06-04 06:10:01 UTC (rev 2463)
@@ -22,7 +22,6 @@
import java.sql.Connection;
import java.sql.ResultSet;
import java.sql.SQLException;
-import java.sql.Statement;
/**
* Created by The eXo Platform SAS
@@ -47,10 +46,9 @@
@Override
protected boolean isSequenceExists(Connection conn, String sequenceName) throws SQLException
{
- Statement st = conn.createStatement();
try
{
- ResultSet srs = st.executeQuery("SELECT " + sequenceName + ".nextval FROM DUAL");
+ ResultSet srs = conn.createStatement().executeQuery("SELECT " + sequenceName + ".nextval FROM DUAL");
if (srs.next())
{
return true;
@@ -65,29 +63,17 @@
return false;
throw e;
}
- finally
- {
- st.close();
- }
}
@Override
protected boolean isTriggerExists(Connection conn, String triggerName) throws SQLException
{
String sql = "SELECT COUNT(trigger_name) FROM all_triggers WHERE trigger_name = '" + triggerName + "'";
- Statement st = conn.createStatement();
- try
- {
- ResultSet r = st.executeQuery(sql);
- if (r.next())
- return r.getInt(1) > 0;
- else
- return false;
- }
- finally
- {
- st.close();
- }
+ ResultSet r = conn.createStatement().executeQuery(sql);
+ if (r.next())
+ return r.getInt(1) > 0;
+ else
+ return false;
}
@Override
@@ -95,9 +81,7 @@
{
try
{
- Statement st = conn.createStatement();
- st.executeUpdate("SELECT 1 FROM " + tableName);
- st.close();
+ conn.createStatement().executeUpdate("SELECT 1 FROM " + tableName);
return true;
}
catch (SQLException e)
@@ -114,18 +98,10 @@
{
// use of oracle system view
String sql = "SELECT COUNT(index_name) FROM all_indexes WHERE index_name='" + indexName + "'";
- Statement st = conn.createStatement();
- ResultSet r = st.executeQuery(sql);
- try
- {
- if (r.next())
- return r.getInt(1) > 0;
- else
- return false;
- }
- finally
- {
- st.close();
- }
+ ResultSet r = conn.createStatement().executeQuery(sql);
+ if (r.next())
+ return r.getInt(1) > 0;
+ else
+ return false;
}
}
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/init/StorageDBInitializer.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/init/StorageDBInitializer.java 2010-06-03 15:50:48 UTC (rev 2462)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/init/StorageDBInitializer.java 2010-06-04 06:10:01 UTC (rev 2463)
@@ -24,7 +24,6 @@
import java.io.IOException;
import java.sql.Connection;
import java.sql.SQLException;
-import java.sql.Statement;
/**
* JCR Storage DB initializer.
@@ -38,7 +37,7 @@
{
protected final boolean multiDb;
-
+
public StorageDBInitializer(String containerName, Connection connection, String scriptPath, boolean multiDb)
throws IOException
{
@@ -56,8 +55,7 @@
"select * from JCR_" + MDB + "ITEM where ID='" + Constants.ROOT_PARENT_UUID + "' and PARENT_ID='"
+ Constants.ROOT_PARENT_UUID + "'";
- Statement st = connection.createStatement();
- if (!st.executeQuery(select).next())
+ if (!connection.createStatement().executeQuery(select).next())
{
String insert =
"insert into JCR_" + MDB + "ITEM(ID, PARENT_ID, NAME, " + (multiDb ? "" : "CONTAINER_NAME, ")
@@ -65,8 +63,7 @@
+ Constants.ROOT_PARENT_UUID + "', '__root_parent', " + (multiDb ? "" : "'__root_parent_container', ")
+ "0, 0, 0, 0)";
- st.executeUpdate(insert);
+ connection.createStatement().executeUpdate(insert);
}
- st.close();
}
}
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/cas/JDBCValueContentAddressStorageImpl.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/cas/JDBCValueContentAddressStorageImpl.java 2010-06-03 15:50:48 UTC (rev 2462)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/cas/JDBCValueContentAddressStorageImpl.java 2010-06-04 06:10:01 UTC (rev 2463)
@@ -29,7 +29,6 @@
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
-import java.sql.Statement;
import java.util.ArrayList;
import java.util.List;
import java.util.Properties;
@@ -205,17 +204,16 @@
// check if table already exists
if (!trs.next())
{
- Statement st = conn.createStatement();
-
// create table
- st.executeUpdate("CREATE TABLE " + tableName
- + " (PROPERTY_ID VARCHAR(96) NOT NULL, ORDER_NUM INTEGER NOT NULL, CAS_ID VARCHAR(512) NOT NULL, "
- + "CONSTRAINT " + sqlConstraintPK + " PRIMARY KEY(PROPERTY_ID, ORDER_NUM))");
+ conn.createStatement().executeUpdate(
+ "CREATE TABLE " + tableName
+ + " (PROPERTY_ID VARCHAR(96) NOT NULL, ORDER_NUM INTEGER NOT NULL, CAS_ID VARCHAR(512) NOT NULL, "
+ + "CONSTRAINT " + sqlConstraintPK + " PRIMARY KEY(PROPERTY_ID, ORDER_NUM))");
// create index on hash (CAS_ID)
- st.executeUpdate("CREATE INDEX " + sqlVCASIDX + " ON " + tableName + "(CAS_ID, PROPERTY_ID, ORDER_NUM)");
+ conn.createStatement().executeUpdate(
+ "CREATE INDEX " + sqlVCASIDX + " ON " + tableName + "(CAS_ID, PROPERTY_ID, ORDER_NUM)");
- st.close();
if (LOG.isDebugEnabled())
{
LOG.debug("JDBC Value Content Address Storage initialized in database " + sn);
@@ -405,10 +403,9 @@
try
{
Connection con = dataSource.getConnection();
- PreparedStatement ps = null;
try
{
- ps = con.prepareStatement(sqlSelectRecord);
+ PreparedStatement ps = con.prepareStatement(sqlSelectRecord);
ps.setString(1, propertyId);
ps.setInt(2, orderNum);
ResultSet rs = ps.executeQuery();
@@ -425,10 +422,6 @@
}
finally
{
- if (ps != null)
- {
- ps.close();
- }
con.close();
}
}
@@ -446,10 +439,10 @@
try
{
Connection con = dataSource.getConnection();
- PreparedStatement ps = null;
try
{
List<String> ids = new ArrayList<String>();
+ PreparedStatement ps;
if (ownOnly)
{
@@ -495,10 +488,6 @@
}
finally
{
- if (ps != null)
- {
- ps.close();
- }
con.close();
}
}
@@ -516,19 +505,14 @@
try
{
Connection con = dataSource.getConnection();
- PreparedStatement ps = null;
try
{
- ps = con.prepareStatement(sqlSelectSharingProps);
+ PreparedStatement ps = con.prepareStatement(sqlSelectSharingProps);
ps.setString(1, propertyId);
return ps.executeQuery().next();
}
finally
{
- if (ps != null)
- {
- ps.close();
- }
con.close();
}
}
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/jdbc/DBInitializer.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/jdbc/DBInitializer.java 2010-06-03 15:50:48 UTC (rev 2462)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/jdbc/DBInitializer.java 2010-06-04 06:10:01 UTC (rev 2463)
@@ -28,7 +28,6 @@
import java.sql.DatabaseMetaData;
import java.sql.ResultSet;
import java.sql.SQLException;
-import java.sql.Statement;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -325,11 +324,9 @@
}
String sql = null;
- Statement st = null;
try
{
connection.setAutoCommit(false);
- st = connection.createStatement();
for (String scr : scripts)
{
@@ -344,7 +341,7 @@
LOG.debug("Execute script: \n[" + sql + "]");
}
- st.executeUpdate(sql);
+ connection.createStatement().executeUpdate(sql);
}
}
@@ -382,10 +379,6 @@
{
try
{
- if (st != null)
- {
- st.close();
- }
connection.close();
}
catch (SQLException e)
More information about the exo-jcr-commits
mailing list