June 2010 - exo-jcr-commits - Jboss List Archives

by do-not-reply＠jboss.org

Author: pnedonosko Date: 2010-06-04 03:28:59 -0400 (Fri, 04 Jun 2010) New Revision: 2466 Added: kernel/tags/2.2.2-GA/ Log: [maven-scm] copy for tag 2.2.2-GA Copied: kernel/tags/2.2.2-GA (from rev 2465, kernel/trunk)

13 years, 11 months

1
0
0 / 0

exo-jcr SVN: r2465 - in kernel/trunk: exo.kernel.commons and 12 other directories.

by do-not-reply＠jboss.org

Author: pnedonosko Date: 2010-06-04 03:28:38 -0400 (Fri, 04 Jun 2010) New Revision: 2465 Modified: kernel/trunk/exo.kernel.commons/pom.xml kernel/trunk/exo.kernel.component.cache/pom.xml kernel/trunk/exo.kernel.component.command/pom.xml kernel/trunk/exo.kernel.component.common/pom.xml kernel/trunk/exo.kernel.component.ext.cache.impl.jboss.v3/pom.xml kernel/trunk/exo.kernel.component.remote/pom.xml kernel/trunk/exo.kernel.container/pom.xml kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int-demo/pom.xml kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int-tests/pom.xml kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int/pom.xml kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-kernel-extras/pom.xml kernel/trunk/exo.kernel.mc-integration/pom.xml kernel/trunk/packaging/module/pom.xml kernel/trunk/pom.xml Log: [maven-release-plugin] prepare release 2.2.2-GA Modified: kernel/trunk/exo.kernel.commons/pom.xml =================================================================== --- kernel/trunk/exo.kernel.commons/pom.xml 2010-06-04 07:25:48 UTC (rev 2464) +++ kernel/trunk/exo.kernel.commons/pom.xml 2010-06-04 07:28:38 UTC (rev 2465) @@ -25,7 +25,7 @@ <parent> <groupId>org.exoplatform.kernel</groupId> <artifactId>kernel-parent</artifactId> - <version>2.2.2-GA-SNAPSHOT</version> + <version>2.2.2-GA</version> </parent> <artifactId>exo.kernel.commons</artifactId> Modified: kernel/trunk/exo.kernel.component.cache/pom.xml =================================================================== --- kernel/trunk/exo.kernel.component.cache/pom.xml 2010-06-04 07:25:48 UTC (rev 2464) +++ kernel/trunk/exo.kernel.component.cache/pom.xml 2010-06-04 07:28:38 UTC (rev 2465) @@ -25,7 +25,7 @@ <parent> <groupId>org.exoplatform.kernel</groupId> <artifactId>kernel-parent</artifactId> - <version>2.2.2-GA-SNAPSHOT</version> + <version>2.2.2-GA</version> </parent> <artifactId>exo.kernel.component.cache</artifactId> Modified: kernel/trunk/exo.kernel.component.command/pom.xml =================================================================== --- kernel/trunk/exo.kernel.component.command/pom.xml 2010-06-04 07:25:48 UTC (rev 2464) +++ kernel/trunk/exo.kernel.component.command/pom.xml 2010-06-04 07:28:38 UTC (rev 2465) @@ -25,7 +25,7 @@ <parent> <groupId>org.exoplatform.kernel</groupId> <artifactId>kernel-parent</artifactId> - <version>2.2.2-GA-SNAPSHOT</version> + <version>2.2.2-GA</version> </parent> <artifactId>exo.kernel.component.command</artifactId> Modified: kernel/trunk/exo.kernel.component.common/pom.xml =================================================================== --- kernel/trunk/exo.kernel.component.common/pom.xml 2010-06-04 07:25:48 UTC (rev 2464) +++ kernel/trunk/exo.kernel.component.common/pom.xml 2010-06-04 07:28:38 UTC (rev 2465) @@ -25,7 +25,7 @@ <parent> <groupId>org.exoplatform.kernel</groupId> <artifactId>kernel-parent</artifactId> - <version>2.2.2-GA-SNAPSHOT</version> + <version>2.2.2-GA</version> </parent> <artifactId>exo.kernel.component.common</artifactId> Modified: kernel/trunk/exo.kernel.component.ext.cache.impl.jboss.v3/pom.xml =================================================================== --- kernel/trunk/exo.kernel.component.ext.cache.impl.jboss.v3/pom.xml 2010-06-04 07:25:48 UTC (rev 2464) +++ kernel/trunk/exo.kernel.component.ext.cache.impl.jboss.v3/pom.xml 2010-06-04 07:28:38 UTC (rev 2465) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.kernel</groupId> <artifactId>kernel-parent</artifactId> - <version>2.2.2-GA-SNAPSHOT</version> + <version>2.2.2-GA</version> </parent> <artifactId>exo.kernel.component.ext.cache.impl.jboss.v3</artifactId> <name>eXo Kernel :: Cache Extension :: JBoss Cache Implementation</name> Modified: kernel/trunk/exo.kernel.component.remote/pom.xml =================================================================== --- kernel/trunk/exo.kernel.component.remote/pom.xml 2010-06-04 07:25:48 UTC (rev 2464) +++ kernel/trunk/exo.kernel.component.remote/pom.xml 2010-06-04 07:28:38 UTC (rev 2465) @@ -25,7 +25,7 @@ <parent> <groupId>org.exoplatform.kernel</groupId> <artifactId>kernel-parent</artifactId> - <version>2.2.2-GA-SNAPSHOT</version> + <version>2.2.2-GA</version> </parent> <artifactId>exo.kernel.component.remote</artifactId> Modified: kernel/trunk/exo.kernel.container/pom.xml =================================================================== --- kernel/trunk/exo.kernel.container/pom.xml 2010-06-04 07:25:48 UTC (rev 2464) +++ kernel/trunk/exo.kernel.container/pom.xml 2010-06-04 07:28:38 UTC (rev 2465) @@ -12,7 +12,7 @@ <parent> <groupId>org.exoplatform.kernel</groupId> <artifactId>kernel-parent</artifactId> - <version>2.2.2-GA-SNAPSHOT</version> + <version>2.2.2-GA</version> </parent> <artifactId>exo.kernel.container</artifactId> <name>eXo Kernel :: Container</name> Modified: kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int/pom.xml =================================================================== --- kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int/pom.xml 2010-06-04 07:25:48 UTC (rev 2464) +++ kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int/pom.xml 2010-06-04 07:28:38 UTC (rev 2465) @@ -6,7 +6,7 @@ <parent> <groupId>org.exoplatform.kernel</groupId> <artifactId>mc-integration-parent</artifactId> - <version>2.2.2-GA-SNAPSHOT</version> + <version>2.2.2-GA</version> </parent> <artifactId>exo.kernel.mc-int</artifactId> Modified: kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int-demo/pom.xml =================================================================== --- kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int-demo/pom.xml 2010-06-04 07:25:48 UTC (rev 2464) +++ kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int-demo/pom.xml 2010-06-04 07:28:38 UTC (rev 2465) @@ -5,7 +5,7 @@ <parent> <groupId>org.exoplatform.kernel</groupId> <artifactId>mc-integration-parent</artifactId> - <version>2.2.2-GA-SNAPSHOT</version> + <version>2.2.2-GA</version> </parent> <artifactId>exo.kernel.mc-int-demo</artifactId> Modified: kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int-tests/pom.xml =================================================================== --- kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int-tests/pom.xml 2010-06-04 07:25:48 UTC (rev 2464) +++ kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int-tests/pom.xml 2010-06-04 07:28:38 UTC (rev 2465) @@ -5,7 +5,7 @@ <parent> <groupId>org.exoplatform.kernel</groupId> <artifactId>mc-integration-parent</artifactId> - <version>2.2.2-GA-SNAPSHOT</version> + <version>2.2.2-GA</version> </parent> <artifactId>exo.kernel.mc-int-tests</artifactId> Modified: kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-kernel-extras/pom.xml =================================================================== --- kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-kernel-extras/pom.xml 2010-06-04 07:25:48 UTC (rev 2464) +++ kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-kernel-extras/pom.xml 2010-06-04 07:28:38 UTC (rev 2465) @@ -6,7 +6,7 @@ <parent> <groupId>org.exoplatform.kernel</groupId> <artifactId>mc-integration-parent</artifactId> - <version>2.2.2-GA-SNAPSHOT</version> + <version>2.2.2-GA</version> </parent> <artifactId>exo.kernel.mc-kernel-extras</artifactId> Modified: kernel/trunk/exo.kernel.mc-integration/pom.xml =================================================================== --- kernel/trunk/exo.kernel.mc-integration/pom.xml 2010-06-04 07:25:48 UTC (rev 2464) +++ kernel/trunk/exo.kernel.mc-integration/pom.xml 2010-06-04 07:28:38 UTC (rev 2465) @@ -6,7 +6,7 @@ <parent> <groupId>org.exoplatform.kernel</groupId> <artifactId>kernel-parent</artifactId> - <version>2.2.2-GA-SNAPSHOT</version> + <version>2.2.2-GA</version> </parent> <artifactId>mc-integration-parent</artifactId> Modified: kernel/trunk/packaging/module/pom.xml =================================================================== --- kernel/trunk/packaging/module/pom.xml 2010-06-04 07:25:48 UTC (rev 2464) +++ kernel/trunk/packaging/module/pom.xml 2010-06-04 07:28:38 UTC (rev 2465) @@ -2,7 +2,7 @@ <parent> <groupId>org.exoplatform.kernel</groupId> <artifactId>kernel-parent</artifactId> - <version>2.2.2-GA-SNAPSHOT</version> + <version>2.2.2-GA</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: kernel/trunk/pom.xml =================================================================== --- kernel/trunk/pom.xml 2010-06-04 07:25:48 UTC (rev 2464) +++ kernel/trunk/pom.xml 2010-06-04 07:28:38 UTC (rev 2465) @@ -30,7 +30,7 @@ <groupId>org.exoplatform.kernel</groupId> <artifactId>kernel-parent</artifactId> - <version>2.2.2-GA-SNAPSHOT</version> + <version>2.2.2-GA</version> <packaging>pom</packaging> <name>eXo Kernel</name> @@ -43,9 +43,9 @@ </properties> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/exo-jcr/kernel/trunk</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/exo-jcr/kernel/trunk</developerConnection> - <url>http://fisheye.jboss.org/browse/exo-jcr/kernel/trunk</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/exo-jcr/kernel/tags/2.2.2-GA</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/exo-jcr/kernel/tags/2.2.2-GA</developerConnection> + <url>http://fisheye.jboss.org/browse/exo-jcr/kernel/tags/2.2.2-GA</url> </scm> <modules>

13 years, 11 months

1
0
0 / 0

exo-jcr SVN: r2464 - jcr/trunk/exo.jcr.component.core.

by do-not-reply＠jboss.org

Author: pnedonosko Date: 2010-06-04 03:25:48 -0400 (Fri, 04 Jun 2010) New Revision: 2464 Modified: jcr/trunk/exo.jcr.component.core/pom.xml Log: EXOJCR-753 JCR core pom with forkMode-true for devtests Modified: jcr/trunk/exo.jcr.component.core/pom.xml =================================================================== --- jcr/trunk/exo.jcr.component.core/pom.xml 2010-06-04 06:10:01 UTC (rev 2463) +++ jcr/trunk/exo.jcr.component.core/pom.xml 2010-06-04 07:25:48 UTC (rev 2464) @@ -712,6 +712,7 @@ <artifactId>maven-surefire-plugin</artifactId> <configuration> <phase>test</phase> + <forkMode>never</forkMode>  <goals> <goal>test</goal> @@ -733,7 +734,7 @@ <include>**/**/TestJBossCacheWorkspaceStorageCache_.java</include> <exclude>**/**/TestCleanableFileStreamValueData.java</exclude> <include>**/**/TestSVNodeDataOptimization_.java</include> - <include>**/**/TestNodeReference.java</include> + <include>**/**/TestValueConstraints.java</include> </includes> </configuration> </plugin>

13 years, 11 months

1
0
0 / 0

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.

by do-not-reply＠jboss.org

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)

13 years, 11 months

1
0
0 / 0

exo-jcr SVN: r2462 - in jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr: impl/core and 1 other directories.

by do-not-reply＠jboss.org

Author: sergiykarpenko Date: 2010-06-03 11:50:48 -0400 (Thu, 03 Jun 2010) New Revision: 2462 Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/datamodel/QPath.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/datamodel/QPathEntry.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/NodeImpl.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/jbosscache/JBossCacheWorkspaceStorageCache.java Log: EXOJCR-392: EXOJCR-392 and EXOJCR-766 changes reverted Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/datamodel/QPath.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/datamodel/QPath.java 2010-06-03 15:06:43 UTC (rev 2461) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/datamodel/QPath.java 2010-06-03 15:50:48 UTC (rev 2462) @@ -176,7 +176,7 @@ for (int i = 0; i < ancestorNames.length; i++) { - if (!names[i].equals(ancestorNames[i])) + if (!ancestorNames[i].equals(names[i])) return false; } return true; @@ -239,7 +239,7 @@ } /** - * @return last QPathEntry of this path + * @return last name of this path */ public InternalQName getName() { @@ -247,7 +247,7 @@ } /** - * @return index of last QPathEntry of this paths + * @return index */ public int getIndex() { Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/datamodel/QPathEntry.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/datamodel/QPathEntry.java 2010-06-03 15:06:43 UTC (rev 2461) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/datamodel/QPathEntry.java 2010-06-03 15:50:48 UTC (rev 2462) @@ -158,18 +158,4 @@ return getAsString(true); } - @Override - public boolean equals(Object o) - { - boolean result = super.equals(o); - - if (result == true && (o instanceof QPathEntry)) - { - return result && (index == ((QPathEntry)o).getIndex()); - } - else - { - return result; - } - } } Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/NodeImpl.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/NodeImpl.java 2010-06-03 15:06:43 UTC (rev 2461) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/NodeImpl.java 2010-06-03 15:50:48 UTC (rev 2462) @@ -2393,14 +2393,18 @@ NodeData nodeData = siblings.get(i); if (srcInd == -1) { - if (nodeData.getQPath().getName().equals(srcPath.getName())) + if (nodeData.getQPath().getName().equals(srcPath.getName()) + && (nodeData.getQPath().getIndex() == srcPath.getIndex() || srcPath.getIndex() == 0 + && nodeData.getQPath().getIndex() == 1)) { srcInd = i; } } if (destPath != null && destInd == -1) { - if (nodeData.getQPath().getName().equals(destPath.getName())) + if (nodeData.getQPath().getName().equals(destPath.getName()) + && (nodeData.getQPath().getIndex() == destPath.getIndex() || destPath.getIndex() == 0 + && nodeData.getQPath().getIndex() == 1)) { destInd = i; if (srcInd != -1) @@ -2462,7 +2466,7 @@ NodeData sdata = siblings.get(j); // calculating same name index - if (sdata.getQPath().getName().getAsString().equals(srcPath.getName().getAsString())) + if (sdata.getQPath().getName().equals(srcPath.getName())) ++sameNameIndex; // skeep unchanged @@ -2471,8 +2475,7 @@ NodeData newData = sdata; // change same name index - if (sdata.getQPath().getName().getAsString().equals(srcPath.getName().getAsString()) - && sdata.getQPath().getIndex() != sameNameIndex) + if (sdata.getQPath().getName().equals(srcPath.getName()) && sdata.getQPath().getIndex() != sameNameIndex) { // update with new index QPath siblingPath = Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/jbosscache/JBossCacheWorkspaceStorageCache.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/jbosscache/JBossCacheWorkspaceStorageCache.java 2010-06-03 15:06:43 UTC (rev 2461) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/jbosscache/JBossCacheWorkspaceStorageCache.java 2010-06-03 15:50:48 UTC (rev 2462) @@ -25,7 +25,6 @@ import org.exoplatform.services.jcr.dataflow.ItemState; import org.exoplatform.services.jcr.dataflow.ItemStateChangesLog; import org.exoplatform.services.jcr.dataflow.persistent.WorkspaceStorageCache; -import org.exoplatform.services.jcr.datamodel.IllegalPathException; import org.exoplatform.services.jcr.datamodel.InternalQName; import org.exoplatform.services.jcr.datamodel.ItemData; import org.exoplatform.services.jcr.datamodel.NodeData; @@ -903,9 +902,15 @@ .getIdentifier()); // remove from CHILD_NODES as parent - cache.removeNode(makeChildListFqn(childNodes, item.getIdentifier())); + Fqn<String> parentFqn = makeChildListFqn(childNodes, item.getIdentifier()); + Node<Serializable, Object> parent = cache.getNode(parentFqn); + if (parent != null && parent.isLeaf()) + { + cache.removeNode(parentFqn); + } // remove from CHILD_NODES_LIST as parent + cache.removeNode(makeChildListFqn(childNodesList, item.getIdentifier())); // remove from CHILD_PROPS as parent @@ -1009,87 +1014,11 @@ int prevNodeIndex = prevNode.getQPath().getEntries()[prevNode.getQPath().getEntries().length - 1].getIndex(); if (nodeIndex != prevNodeIndex) { - // its a samename reordering - updateTreePath(prevNode.getQPath(), node.getQPath(), null); // don't change ACL, it's same parent + updateTreePath(node.getIdentifier(), node.getQPath(), null); // don't change ACL, it's same parent } } /** - * Check all items in cache - is it descendant of prevRootPath, and update path according newRootPath. - * - * @param prevRootPath - * @param newRootPath - * @param acl - */ - protected void updateTreePath(final QPath prevRootPath, final QPath newRootPath, final AccessControlList acl) - { - boolean inheritACL = acl != null; - - // check all ITEMS in cache - Node<Serializable, Object> items = cache.getNode(itemsRoot); - Set<Object> childrenNames = items.getChildrenNames(); - Iterator<Object> namesIt = childrenNames.iterator(); - - while (namesIt.hasNext()) - { - String id = (String)namesIt.next(); - ItemData data = (ItemData)cache.get(makeItemFqn(id), ITEM_DATA); - - // check is this descendant of prevRootPath - QPath nodeQPath = data.getQPath(); - if (nodeQPath.isDescendantOf(prevRootPath)) - { - - //make relative path - QPathEntry[] relativePath = null; - try - { - relativePath = nodeQPath.getRelPath(nodeQPath.getDepth() - prevRootPath.getDepth()); - } - catch (IllegalPathException e) - { - // Do nothing. Never happens. - } - - // make new path - no matter node or property - QPath newPath = QPath.makeChildPath(newRootPath, relativePath); - - if (data.isNode()) - { - // update node - - NodeData prevNode = (NodeData)data; - - TransientNodeData newNode = - new TransientNodeData(newPath, prevNode.getIdentifier(), prevNode.getPersistedVersion(), prevNode - .getPrimaryTypeName(), prevNode.getMixinTypeNames(), prevNode.getOrderNumber(), prevNode - .getParentIdentifier(), inheritACL ? acl : prevNode.getACL()); // TODO check ACL - // update this node - cache.put(makeItemFqn(newNode.getIdentifier()), ITEM_DATA, newNode); - } - else - { - //update property - - PropertyData prevProp = (PropertyData)data; - - if (inheritACL - && (prevProp.getQPath().getName().equals(Constants.EXO_PERMISSIONS) || prevProp.getQPath().getName() - .equals(Constants.EXO_OWNER))) - { - inheritACL = false; - } - - TransientPropertyData newProp = - new TransientPropertyData(newPath, prevProp.getIdentifier(), prevProp.getPersistedVersion(), prevProp - .getType(), prevProp.getParentIdentifier(), prevProp.isMultiValued(), prevProp.getValues()); - cache.put(makeItemFqn(newProp.getIdentifier()), ITEM_DATA, newProp); - } - } - } - } - - /** * Update Nodes tree with new path. * * @param parentId String - root node id of JCR subtree.

13 years, 11 months

1
0
0 / 0

exo-jcr SVN: r2461 - jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/jbosscache.

by do-not-reply＠jboss.org

Author: sergiykarpenko Date: 2010-06-03 11:06:43 -0400 (Thu, 03 Jun 2010) New Revision: 2461 Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/jbosscache/JBossCacheWorkspaceStorageCache.java Log: EXOJCR-392: Implemented - check all items in cache is it descendant of reordered node. Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/jbosscache/JBossCacheWorkspaceStorageCache.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/jbosscache/JBossCacheWorkspaceStorageCache.java 2010-06-03 14:52:30 UTC (rev 2460) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/jbosscache/JBossCacheWorkspaceStorageCache.java 2010-06-03 15:06:43 UTC (rev 2461) @@ -25,6 +25,7 @@ import org.exoplatform.services.jcr.dataflow.ItemState; import org.exoplatform.services.jcr.dataflow.ItemStateChangesLog; import org.exoplatform.services.jcr.dataflow.persistent.WorkspaceStorageCache; +import org.exoplatform.services.jcr.datamodel.IllegalPathException; import org.exoplatform.services.jcr.datamodel.InternalQName; import org.exoplatform.services.jcr.datamodel.ItemData; import org.exoplatform.services.jcr.datamodel.NodeData; @@ -902,15 +903,9 @@ .getIdentifier()); // remove from CHILD_NODES as parent - Fqn<String> parentFqn = makeChildListFqn(childNodes, item.getIdentifier()); - Node<Serializable, Object> parent = cache.getNode(parentFqn); - if (parent != null && parent.isLeaf()) - { - cache.removeNode(parentFqn); - } + cache.removeNode(makeChildListFqn(childNodes, item.getIdentifier())); // remove from CHILD_NODES_LIST as parent - cache.removeNode(makeChildListFqn(childNodesList, item.getIdentifier())); // remove from CHILD_PROPS as parent @@ -1014,11 +1009,87 @@ int prevNodeIndex = prevNode.getQPath().getEntries()[prevNode.getQPath().getEntries().length - 1].getIndex(); if (nodeIndex != prevNodeIndex) { - updateTreePath(node.getIdentifier(), node.getQPath(), null); // don't change ACL, it's same parent + // its a samename reordering + updateTreePath(prevNode.getQPath(), node.getQPath(), null); // don't change ACL, it's same parent } } /** + * Check all items in cache - is it descendant of prevRootPath, and update path according newRootPath. + * + * @param prevRootPath + * @param newRootPath + * @param acl + */ + protected void updateTreePath(final QPath prevRootPath, final QPath newRootPath, final AccessControlList acl) + { + boolean inheritACL = acl != null; + + // check all ITEMS in cache + Node<Serializable, Object> items = cache.getNode(itemsRoot); + Set<Object> childrenNames = items.getChildrenNames(); + Iterator<Object> namesIt = childrenNames.iterator(); + + while (namesIt.hasNext()) + { + String id = (String)namesIt.next(); + ItemData data = (ItemData)cache.get(makeItemFqn(id), ITEM_DATA); + + // check is this descendant of prevRootPath + QPath nodeQPath = data.getQPath(); + if (nodeQPath.isDescendantOf(prevRootPath)) + { + + //make relative path + QPathEntry[] relativePath = null; + try + { + relativePath = nodeQPath.getRelPath(nodeQPath.getDepth() - prevRootPath.getDepth()); + } + catch (IllegalPathException e) + { + // Do nothing. Never happens. + } + + // make new path - no matter node or property + QPath newPath = QPath.makeChildPath(newRootPath, relativePath); + + if (data.isNode()) + { + // update node + + NodeData prevNode = (NodeData)data; + + TransientNodeData newNode = + new TransientNodeData(newPath, prevNode.getIdentifier(), prevNode.getPersistedVersion(), prevNode + .getPrimaryTypeName(), prevNode.getMixinTypeNames(), prevNode.getOrderNumber(), prevNode + .getParentIdentifier(), inheritACL ? acl : prevNode.getACL()); // TODO check ACL + // update this node + cache.put(makeItemFqn(newNode.getIdentifier()), ITEM_DATA, newNode); + } + else + { + //update property + + PropertyData prevProp = (PropertyData)data; + + if (inheritACL + && (prevProp.getQPath().getName().equals(Constants.EXO_PERMISSIONS) || prevProp.getQPath().getName() + .equals(Constants.EXO_OWNER))) + { + inheritACL = false; + } + + TransientPropertyData newProp = + new TransientPropertyData(newPath, prevProp.getIdentifier(), prevProp.getPersistedVersion(), prevProp + .getType(), prevProp.getParentIdentifier(), prevProp.isMultiValued(), prevProp.getValues()); + cache.put(makeItemFqn(newProp.getIdentifier()), ITEM_DATA, newProp); + } + } + } + } + + /** * Update Nodes tree with new path. * * @param parentId String - root node id of JCR subtree.

13 years, 11 months

1
0
0 / 0

exo-jcr SVN: r2460 - in jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr: impl/core and 1 other directory.

by do-not-reply＠jboss.org

Author: sergiykarpenko Date: 2010-06-03 10:52:30 -0400 (Thu, 03 Jun 2010) New Revision: 2460 Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/datamodel/QPath.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/datamodel/QPathEntry.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/NodeImpl.java Log: EXOJCR-766: QPathEntry - equals() method added Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/datamodel/QPath.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/datamodel/QPath.java 2010-06-03 12:44:17 UTC (rev 2459) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/datamodel/QPath.java 2010-06-03 14:52:30 UTC (rev 2460) @@ -176,7 +176,7 @@ for (int i = 0; i < ancestorNames.length; i++) { - if (!ancestorNames[i].equals(names[i])) + if (!names[i].equals(ancestorNames[i])) return false; } return true; @@ -239,7 +239,7 @@ } /** - * @return last name of this path + * @return last QPathEntry of this path */ public InternalQName getName() { @@ -247,7 +247,7 @@ } /** - * @return index + * @return index of last QPathEntry of this paths */ public int getIndex() { Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/datamodel/QPathEntry.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/datamodel/QPathEntry.java 2010-06-03 12:44:17 UTC (rev 2459) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/datamodel/QPathEntry.java 2010-06-03 14:52:30 UTC (rev 2460) @@ -158,4 +158,18 @@ return getAsString(true); } + @Override + public boolean equals(Object o) + { + boolean result = super.equals(o); + + if (result == true && (o instanceof QPathEntry)) + { + return result && (index == ((QPathEntry)o).getIndex()); + } + else + { + return result; + } + } } Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/NodeImpl.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/NodeImpl.java 2010-06-03 12:44:17 UTC (rev 2459) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/NodeImpl.java 2010-06-03 14:52:30 UTC (rev 2460) @@ -2393,18 +2393,14 @@ NodeData nodeData = siblings.get(i); if (srcInd == -1) { - if (nodeData.getQPath().getName().equals(srcPath.getName()) - && (nodeData.getQPath().getIndex() == srcPath.getIndex() || srcPath.getIndex() == 0 - && nodeData.getQPath().getIndex() == 1)) + if (nodeData.getQPath().getName().equals(srcPath.getName())) { srcInd = i; } } if (destPath != null && destInd == -1) { - if (nodeData.getQPath().getName().equals(destPath.getName()) - && (nodeData.getQPath().getIndex() == destPath.getIndex() || destPath.getIndex() == 0 - && nodeData.getQPath().getIndex() == 1)) + if (nodeData.getQPath().getName().equals(destPath.getName())) { destInd = i; if (srcInd != -1) @@ -2466,7 +2462,7 @@ NodeData sdata = siblings.get(j); // calculating same name index - if (sdata.getQPath().getName().equals(srcPath.getName())) + if (sdata.getQPath().getName().getAsString().equals(srcPath.getName().getAsString())) ++sameNameIndex; // skeep unchanged @@ -2475,7 +2471,8 @@ NodeData newData = sdata; // change same name index - if (sdata.getQPath().getName().equals(srcPath.getName()) && sdata.getQPath().getIndex() != sameNameIndex) + if (sdata.getQPath().getName().getAsString().equals(srcPath.getName().getAsString()) + && sdata.getQPath().getIndex() != sameNameIndex) { // update with new index QPath siblingPath =

13 years, 11 months

1
0
0 / 0

exo-jcr SVN: r2459 - in jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl: storage/jdbc/init and 2 other directories.

by do-not-reply＠jboss.org

Author: tolusha Date: 2010-06-03 08:44:17 -0400 (Thu, 03 Jun 2010) New Revision: 2459 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: close statements 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 09:41:41 UTC (rev 2458) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/config/JDBCConfigurationPersister.java 2010-06-03 12:44:17 UTC (rev 2459) @@ -34,6 +34,7 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; +import java.sql.Statement; import javax.naming.InitialContext; import javax.naming.NamingException; @@ -241,6 +242,7 @@ } finally { + ps.close(); con.close(); } } @@ -264,12 +266,13 @@ try { Connection con = openConnection(); + PreparedStatement ps = null; try { if (isDbInitialized(con)) { - PreparedStatement ps = con.prepareStatement("SELECT * FROM " + configTableName + " WHERE NAME=?"); + ps = con.prepareStatement("SELECT * FROM " + configTableName + " WHERE NAME=?"); ps.setString(1, CONFIGNAME); ResultSet res = ps.executeQuery(); @@ -290,6 +293,10 @@ } finally { + if (ps != null) + { + ps.close(); + } con.close(); } } @@ -324,7 +331,9 @@ if (!isDbInitialized(con)) { // init db - con.createStatement().executeUpdate(sql = initSQL); + Statement st = con.createStatement(); + st.executeUpdate(sql = initSQL); + st.close(); con.commit(); con.close(); @@ -362,6 +371,7 @@ .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 09:41:41 UTC (rev 2458) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/init/IngresSQLDBInitializer.java 2010-06-03 12:44:17 UTC (rev 2459) @@ -22,6 +22,7 @@ import java.sql.Connection; import java.sql.ResultSet; import java.sql.SQLException; +import java.sql.Statement; /** * Created by The eXo Platform SAS @@ -68,9 +69,11 @@ protected boolean isSequenceExists(Connection conn, String sequenceName) throws SQLException { String seqName = sequenceName.toUpperCase().toLowerCase(); + Statement st = null; try { - ResultSet srs = conn.createStatement().executeQuery("SELECT NEXT VALUE FOR " + seqName); + st = conn.createStatement(); + ResultSet srs = st.executeQuery("SELECT NEXT VALUE FOR " + seqName); if (srs.next()) { return true; @@ -96,6 +99,13 @@ } }; } + 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 09:41:41 UTC (rev 2458) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/init/OracleDBInitializer.java 2010-06-03 12:44:17 UTC (rev 2459) @@ -22,6 +22,7 @@ import java.sql.Connection; import java.sql.ResultSet; import java.sql.SQLException; +import java.sql.Statement; /** * Created by The eXo Platform SAS @@ -46,9 +47,10 @@ @Override protected boolean isSequenceExists(Connection conn, String sequenceName) throws SQLException { + Statement st = conn.createStatement(); try { - ResultSet srs = conn.createStatement().executeQuery("SELECT " + sequenceName + ".nextval FROM DUAL"); + ResultSet srs = st.executeQuery("SELECT " + sequenceName + ".nextval FROM DUAL"); if (srs.next()) { return true; @@ -63,17 +65,29 @@ 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 + "'"; - ResultSet r = conn.createStatement().executeQuery(sql); - if (r.next()) - return r.getInt(1) > 0; - else - return false; + Statement st = conn.createStatement(); + try + { + ResultSet r = st.executeQuery(sql); + if (r.next()) + return r.getInt(1) > 0; + else + return false; + } + finally + { + st.close(); + } } @Override @@ -81,7 +95,9 @@ { try { - conn.createStatement().executeUpdate("SELECT 1 FROM " + tableName); + Statement st = conn.createStatement(); + st.executeUpdate("SELECT 1 FROM " + tableName); + st.close(); return true; } catch (SQLException e) @@ -98,10 +114,18 @@ { // use of oracle system view String sql = "SELECT COUNT(index_name) FROM all_indexes WHERE index_name='" + indexName + "'"; - ResultSet r = conn.createStatement().executeQuery(sql); - if (r.next()) - return r.getInt(1) > 0; - else - return false; + Statement st = conn.createStatement(); + ResultSet r = st.executeQuery(sql); + try + { + if (r.next()) + return r.getInt(1) > 0; + else + return false; + } + finally + { + st.close(); + } } } 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 09:41:41 UTC (rev 2458) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/init/StorageDBInitializer.java 2010-06-03 12:44:17 UTC (rev 2459) @@ -24,6 +24,7 @@ import java.io.IOException; import java.sql.Connection; import java.sql.SQLException; +import java.sql.Statement; /** * JCR Storage DB initializer. @@ -37,7 +38,7 @@ { protected final boolean multiDb; - + public StorageDBInitializer(String containerName, Connection connection, String scriptPath, boolean multiDb) throws IOException { @@ -55,7 +56,8 @@ "select * from JCR_" + MDB + "ITEM where ID='" + Constants.ROOT_PARENT_UUID + "' and PARENT_ID='" + Constants.ROOT_PARENT_UUID + "'"; - if (!connection.createStatement().executeQuery(select).next()) + Statement st = connection.createStatement(); + if (!st.executeQuery(select).next()) { String insert = "insert into JCR_" + MDB + "ITEM(ID, PARENT_ID, NAME, " + (multiDb ? "" : "CONTAINER_NAME, ") @@ -63,7 +65,8 @@ + Constants.ROOT_PARENT_UUID + "', '__root_parent', " + (multiDb ? "" : "'__root_parent_container', ") + "0, 0, 0, 0)"; - connection.createStatement().executeUpdate(insert); + st.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 09:41:41 UTC (rev 2458) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/cas/JDBCValueContentAddressStorageImpl.java 2010-06-03 12:44:17 UTC (rev 2459) @@ -29,6 +29,7 @@ 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; @@ -204,16 +205,17 @@ // check if table already exists if (!trs.next()) { + Statement st = conn.createStatement(); + // create table - 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))"); + 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))"); // create index on hash (CAS_ID) - conn.createStatement().executeUpdate( - "CREATE INDEX " + sqlVCASIDX + " ON " + tableName + "(CAS_ID, PROPERTY_ID, ORDER_NUM)"); + st.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); @@ -403,9 +405,10 @@ try { Connection con = dataSource.getConnection(); + PreparedStatement ps = null; try { - PreparedStatement ps = con.prepareStatement(sqlSelectRecord); + ps = con.prepareStatement(sqlSelectRecord); ps.setString(1, propertyId); ps.setInt(2, orderNum); ResultSet rs = ps.executeQuery(); @@ -422,6 +425,10 @@ } finally { + if (ps != null) + { + ps.close(); + } con.close(); } } @@ -439,10 +446,10 @@ try { Connection con = dataSource.getConnection(); + PreparedStatement ps = null; try { List<String> ids = new ArrayList<String>(); - PreparedStatement ps; if (ownOnly) { @@ -488,6 +495,10 @@ } finally { + if (ps != null) + { + ps.close(); + } con.close(); } } @@ -505,14 +516,19 @@ try { Connection con = dataSource.getConnection(); + PreparedStatement ps = null; try { - PreparedStatement ps = con.prepareStatement(sqlSelectSharingProps); + 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 09:41:41 UTC (rev 2458) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/jdbc/DBInitializer.java 2010-06-03 12:44:17 UTC (rev 2459) @@ -28,6 +28,7 @@ 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; @@ -324,9 +325,11 @@ } String sql = null; + Statement st = null; try { connection.setAutoCommit(false); + st = connection.createStatement(); for (String scr : scripts) { @@ -341,7 +344,7 @@ LOG.debug("Execute script: \n[" + sql + "]"); } - connection.createStatement().executeUpdate(sql); + st.executeUpdate(sql); } } @@ -379,6 +382,10 @@ { try { + if (st != null) + { + st.close(); + } connection.close(); } catch (SQLException e)

13 years, 11 months

1
0
0 / 0

exo-jcr SVN: r2458 - jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/util.

by do-not-reply＠jboss.org

Author: natasha.vakulenko Date: 2010-06-03 05:41:41 -0400 (Thu, 03 Jun 2010) New Revision: 2458 Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/util/VersionHistoryImporter.java Log: JCR-1390: Added Logging Information for indicating that a Node with its versionHistory import was successfully done or not. Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/util/VersionHistoryImporter.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/util/VersionHistoryImporter.java 2010-06-03 08:40:09 UTC (rev 2457) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/util/VersionHistoryImporter.java 2010-06-03 09:41:41 UTC (rev 2458) @@ -98,6 +98,16 @@ private final String versionHistory; /** + * Versionable node uuid. + */ + private String uuid; + + /** + * Versionable node path. + */ + private String path; + + /** * VersionHistoryImporter constructor. * * @param versionableNode - versionable node. @@ -130,53 +140,72 @@ */ public void doImport() throws RepositoryException, IOException { - String path = versionableNode.getVersionHistory().getParent().getPath(); + try + { + uuid = versionableNode.getUUID(); + path = versionableNode.getVersionHistory().getParent().getPath(); + LOG.info("Started: Import version history for node wiht path=" + path + " and UUID=" + uuid); - NodeData versionable = (NodeData)versionableNode.getData(); - // ----- VERSIONABLE properties ----- - // jcr:versionHistory - TransientPropertyData vh = - TransientPropertyData.createPropertyData(versionable, Constants.JCR_VERSIONHISTORY, PropertyType.REFERENCE, - false, new TransientValueData(new Identifier(versionHistory))); + NodeData versionable = (NodeData)versionableNode.getData(); + // ----- VERSIONABLE properties ----- + // jcr:versionHistory + TransientPropertyData vh = + TransientPropertyData.createPropertyData(versionable, Constants.JCR_VERSIONHISTORY, PropertyType.REFERENCE, + false, new TransientValueData(new Identifier(versionHistory))); - // jcr:baseVersion - TransientPropertyData bv = - TransientPropertyData.createPropertyData(versionable, Constants.JCR_BASEVERSION, PropertyType.REFERENCE, - false, new TransientValueData(new Identifier(baseVersionUuid))); + // jcr:baseVersion + TransientPropertyData bv = + TransientPropertyData.createPropertyData(versionable, Constants.JCR_BASEVERSION, PropertyType.REFERENCE, + false, new TransientValueData(new Identifier(baseVersionUuid))); - // jcr:predecessors - List<ValueData> values = new ArrayList<ValueData>(); - for (int i = 0; i < predecessors.length; i++) + // jcr:predecessors + List<ValueData> values = new ArrayList<ValueData>(); + for (int i = 0; i < predecessors.length; i++) + { + values.add(new TransientValueData(new Identifier(predecessors[i]))); + } + TransientPropertyData pd = + TransientPropertyData.createPropertyData(versionable, Constants.JCR_PREDECESSORS, PropertyType.REFERENCE, + true, values); + + PlainChangesLog changesLog = new PlainChangesLogImpl(); + RemoveVisitor rv = new RemoveVisitor(); + rv.visit((NodeData)((NodeImpl)versionableNode.getVersionHistory()).getData()); + changesLog.addAll(rv.getRemovedStates()); + changesLog.add(ItemState.createAddedState(vh)); + changesLog.add(ItemState.createAddedState(bv)); + changesLog.add(ItemState.createAddedState(pd)); + // remove version properties to avoid referential integrety check + PlainChangesLog changesLogDeltete = new PlainChangesLogImpl(); + + changesLogDeltete.add(ItemState.createDeletedState(((PropertyImpl)versionableNode + .getProperty("jcr:versionHistory")).getData())); + changesLogDeltete.add(ItemState.createDeletedState(((PropertyImpl)versionableNode + .getProperty("jcr:baseVersion")).getData())); + changesLogDeltete.add(ItemState.createDeletedState(((PropertyImpl)versionableNode + .getProperty("jcr:predecessors")).getData())); + dataKeeper.save(changesLogDeltete); + // remove version history + dataKeeper.save(changesLog); + userSession.save(); + // import new version history + userSession.getWorkspace().importXML(path, versionHistoryStream, 0); + userSession.save(); + + LOG.info("Completed: Import version history for node wiht path=" + path + " and UUID=" + uuid); + } + catch (RepositoryException exception) { - values.add(new TransientValueData(new Identifier(predecessors[i]))); + LOG.error("Failed: Import version history for node wiht path=" + path + " and UUID=" + uuid, exception); + throw new RepositoryException(exception); } - TransientPropertyData pd = - TransientPropertyData.createPropertyData(versionable, Constants.JCR_PREDECESSORS, PropertyType.REFERENCE, - true, values); - - PlainChangesLog changesLog = new PlainChangesLogImpl(); - RemoveVisitor rv = new RemoveVisitor(); - rv.visit((NodeData)((NodeImpl)versionableNode.getVersionHistory()).getData()); - changesLog.addAll(rv.getRemovedStates()); - changesLog.add(ItemState.createAddedState(vh)); - changesLog.add(ItemState.createAddedState(bv)); - changesLog.add(ItemState.createAddedState(pd)); - // remove version properties to avoid referential integrety check - PlainChangesLog changesLogDeltete = new PlainChangesLogImpl(); - - changesLogDeltete.add(ItemState.createDeletedState(((PropertyImpl)versionableNode - .getProperty("jcr:versionHistory")).getData())); - changesLogDeltete.add(ItemState.createDeletedState(((PropertyImpl)versionableNode.getProperty("jcr:baseVersion")) - .getData())); - changesLogDeltete.add(ItemState - .createDeletedState(((PropertyImpl)versionableNode.getProperty("jcr:predecessors")).getData())); - dataKeeper.save(changesLogDeltete); - // remove version history - dataKeeper.save(changesLog); - userSession.save(); - // import new version history - userSession.getWorkspace().importXML(path, versionHistoryStream, 0); - userSession.save(); + catch (IOException exception) + { + LOG.error("Failed: Import version history for node wiht path=" + path + " and UUID=" + uuid, exception); + IOException newException = new IOException(); + newException.initCause(exception); + throw newException; + } } /**

13 years, 11 months

1
0
0 / 0

exo-jcr SVN: r2457 - jcr/branches/1.12-SEC.

by do-not-reply＠jboss.org

Author: dkatayev Date: 2010-06-03 04:40:09 -0400 (Thu, 03 Jun 2010) New Revision: 2457 Modified: jcr/branches/1.12-SEC/pom.xml Log: EXOJCR-767 core version changed to 2.3-SEC-SNAPSHOT Modified: jcr/branches/1.12-SEC/pom.xml =================================================================== --- jcr/branches/1.12-SEC/pom.xml 2010-06-03 08:22:14 UTC (rev 2456) +++ jcr/branches/1.12-SEC/pom.xml 2010-06-03 08:40:09 UTC (rev 2457) @@ -43,7 +43,7 @@ <exo.product.name>exo-jcr</exo.product.name> <exo.product.specification>1.12</exo.product.specification> <org.exoplatform.kernel.version>2.2.2-GA-SNAPSHOT</org.exoplatform.kernel.version> - <org.exoplatform.core.version>2.3.2-GA-SNAPSHOT</org.exoplatform.core.version> + <org.exoplatform.core.version>2.3-SEC-SNAPSHOT</org.exoplatform.core.version> <org.exoplatform.ws.version>2.1.2-GA-SNAPSHOT</org.exoplatform.ws.version> <org.exoplatform.doc-style.version>1</org.exoplatform.doc-style.version> </properties>

13 years, 11 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

exo-jcr-commits June 2010