[exo-jcr-commits] exo-jcr SVN: r4050 - in jcr/trunk: applications/exo.jcr.applications.jboss and 12 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Thu Mar 3 10:04:31 EST 2011
Author: tolusha
Date: 2011-03-03 10:04:31 -0500 (Thu, 03 Mar 2011)
New Revision: 4050
Modified:
jcr/trunk/applications/exo.jcr.applications.jboss/pom.xml
jcr/trunk/applications/exo.jcr.applications.jetty/pom.xml
jcr/trunk/applications/exo.jcr.applications.jonas/pom.xml
jcr/trunk/applications/exo.jcr.applications.tomcat/pom.xml
jcr/trunk/exo.jcr.component.core/pom.xml
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/backup/rdbms/DBRestor.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCWorkspaceDataContainer.java
jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.sql
jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.sql
jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCConnectionTestBase.java
jcr/trunk/exo.jcr.component.ext/pom.xml
jcr/trunk/exo.jcr.component.ftp/pom.xml
jcr/trunk/exo.jcr.component.webdav/pom.xml
jcr/trunk/exo.jcr.framework.command/pom.xml
jcr/trunk/pom.xml
Log:
EXOJCR-1218: Problem of renaming folders in WebDav
Modified: jcr/trunk/applications/exo.jcr.applications.jboss/pom.xml
===================================================================
--- jcr/trunk/applications/exo.jcr.applications.jboss/pom.xml 2011-03-03 15:02:13 UTC (rev 4049)
+++ jcr/trunk/applications/exo.jcr.applications.jboss/pom.xml 2011-03-03 15:04:31 UTC (rev 4050)
@@ -46,7 +46,7 @@
</dependency>
<dependency>
- <groupId>hsqldb</groupId>
+ <groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<scope>runtime</scope>
</dependency>
Modified: jcr/trunk/applications/exo.jcr.applications.jetty/pom.xml
===================================================================
--- jcr/trunk/applications/exo.jcr.applications.jetty/pom.xml 2011-03-03 15:02:13 UTC (rev 4049)
+++ jcr/trunk/applications/exo.jcr.applications.jetty/pom.xml 2011-03-03 15:04:31 UTC (rev 4050)
@@ -39,7 +39,7 @@
<dependencies>
<dependency>
- <groupId>hsqldb</groupId>
+ <groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<scope>runtime</scope>
</dependency>
Modified: jcr/trunk/applications/exo.jcr.applications.jonas/pom.xml
===================================================================
--- jcr/trunk/applications/exo.jcr.applications.jonas/pom.xml 2011-03-03 15:02:13 UTC (rev 4049)
+++ jcr/trunk/applications/exo.jcr.applications.jonas/pom.xml 2011-03-03 15:04:31 UTC (rev 4050)
@@ -46,7 +46,7 @@
</dependency>
<dependency>
- <groupId>hsqldb</groupId>
+ <groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<scope>runtime</scope>
</dependency>
Modified: jcr/trunk/applications/exo.jcr.applications.tomcat/pom.xml
===================================================================
--- jcr/trunk/applications/exo.jcr.applications.tomcat/pom.xml 2011-03-03 15:02:13 UTC (rev 4049)
+++ jcr/trunk/applications/exo.jcr.applications.tomcat/pom.xml 2011-03-03 15:04:31 UTC (rev 4050)
@@ -40,7 +40,7 @@
</dependency>
<dependency>
- <groupId>hsqldb</groupId>
+ <groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<scope>runtime</scope>
</dependency>
Modified: jcr/trunk/exo.jcr.component.core/pom.xml
===================================================================
--- jcr/trunk/exo.jcr.component.core/pom.xml 2011-03-03 15:02:13 UTC (rev 4049)
+++ jcr/trunk/exo.jcr.component.core/pom.xml 2011-03-03 15:04:31 UTC (rev 4050)
@@ -224,7 +224,7 @@
</dependency>
<!-- ===== Databases JDBC support for tests ===== -->
<dependency>
- <groupId>hsqldb</groupId>
+ <groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<scope>test</scope>
</dependency>
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/backup/rdbms/DBRestor.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/backup/rdbms/DBRestor.java 2011-03-03 15:02:13 UTC (rev 4049)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/backup/rdbms/DBRestor.java 2011-03-03 15:04:31 UTC (rev 4050)
@@ -358,8 +358,6 @@
names += columnName.get(i) + (i == targetColumnCount - 1 ? "" : ",");
parameters += "?" + (i == targetColumnCount - 1 ? "" : ",");
}
- insertNode =
- jdbcConn.prepareStatement("INSERT INTO " + tableName + " (" + names + ") VALUES(" + parameters + ")");
// set data
outer : while (true)
@@ -401,6 +399,13 @@
stream = len == -1 ? null : spoolInputStream(contentReader, len);
}
+ if (insertNode == null)
+ {
+ insertNode =
+ jdbcConn.prepareStatement("INSERT INTO " + tableName + " (" + names + ") VALUES(" + parameters
+ + ")");
+ }
+
if (restoreRule.getSkipColumnIndex() != null && restoreRule.getSkipColumnIndex() == i)
{
targetIndex--;
@@ -517,10 +522,16 @@
insertNode.setNull(targetIndex + 1, columnType.get(i));
}
}
- insertNode.addBatch();
+ if (insertNode != null)
+ {
+ insertNode.addBatch();
+ }
}
- insertNode.executeBatch();
+ if (insertNode != null)
+ {
+ insertNode.executeBatch();
+ }
}
finally
{
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCWorkspaceDataContainer.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCWorkspaceDataContainer.java 2011-03-03 15:02:13 UTC (rev 4049)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCWorkspaceDataContainer.java 2011-03-03 15:04:31 UTC (rev 4050)
@@ -421,7 +421,9 @@
}
catch (RepositoryConfigurationException e)
{
- this.checkSNSNewConnection = DBConstants.DB_DIALECT_SYBASE.equals(this.dbDialect) ? false : true;
+ this.checkSNSNewConnection =
+ DBConstants.DB_DIALECT_SYBASE.equals(this.dbDialect)
+ || DBConstants.DB_DIALECT_HSQLDB.equals(this.dbDialect) ? false : true;
}
// ------------- Values swap config ------------------
Modified: jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.sql
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.sql 2011-03-03 15:02:13 UTC (rev 4049)
+++ jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.sql 2011-03-03 15:04:31 UTC (rev 4050)
@@ -19,7 +19,7 @@
CREATE UNIQUE INDEX JCR_IDX_MITEM_PARENT_NAME ON JCR_MITEM(I_CLASS, PARENT_ID, NAME, I_INDEX, VERSION DESC);
CREATE UNIQUE INDEX JCR_IDX_MITEM_PARENT_ID ON JCR_MITEM(I_CLASS, PARENT_ID, ID, VERSION DESC);
CREATE TABLE JCR_MVALUE(
- ID BIGINT generated by default as identity (START WITH 2, INCREMENT BY 1) NOT NULL,
+ ID BIGINT generated by default as identity (START WITH 2) NOT NULL,
DATA VARBINARY(65535),
ORDER_NUM INTEGER NOT NULL,
PROPERTY_ID VARCHAR(96) NOT NULL,
Modified: jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.sql
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.sql 2011-03-03 15:02:13 UTC (rev 4049)
+++ jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.sql 2011-03-03 15:04:31 UTC (rev 4050)
@@ -12,7 +12,7 @@
I_INDEX INTEGER NOT NULL,
N_ORDER_NUM INTEGER,
P_TYPE INTEGER,
- P_MULTIVALUED INTEGER,
+ P_MULTIVALUED BOOLEAN,
CONSTRAINT JCR_PK_SITEM PRIMARY KEY(ID),
CONSTRAINT JCR_FK_SITEM_PARENT FOREIGN KEY(PARENT_ID) REFERENCES JCR_SITEM(ID)
);
@@ -20,7 +20,7 @@
CREATE UNIQUE INDEX JCR_IDX_SITEM_PARENT_NAME ON JCR_SITEM(I_CLASS, CONTAINER_NAME, PARENT_ID, NAME, I_INDEX, VERSION DESC);
CREATE UNIQUE INDEX JCR_IDX_SITEM_PARENT_ID ON JCR_SITEM(I_CLASS, CONTAINER_NAME, PARENT_ID, ID, VERSION DESC);
CREATE TABLE JCR_SVALUE(
- ID BIGINT generated by default as identity (START WITH 2, INCREMENT BY 1) NOT NULL,
+ ID BIGINT generated by default as identity (START WITH 2) NOT NULL,
DATA VARBINARY(65535),
ORDER_NUM INTEGER NOT NULL,
PROPERTY_ID VARCHAR(96) NOT NULL,
Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCConnectionTestBase.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCConnectionTestBase.java 2011-03-03 15:02:13 UTC (rev 4049)
+++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCConnectionTestBase.java 2011-03-03 15:04:31 UTC (rev 4050)
@@ -21,7 +21,6 @@
import org.exoplatform.services.jcr.datamodel.NodeData;
import org.exoplatform.services.jcr.impl.Constants;
import org.exoplatform.services.jcr.impl.dataflow.TransientNodeData;
-import org.exoplatform.services.jcr.impl.storage.jdbc.init.StorageDBInitializer;
import java.io.ByteArrayInputStream;
import java.sql.Connection;
@@ -47,6 +46,7 @@
private Connection connect = null;
+ @Override
protected void tearDown() throws Exception
{
@@ -95,7 +95,7 @@
byte data[] = {5};
ByteArrayInputStream bas = new ByteArrayInputStream(data);
- jdbcConn.addValueData("C", 2, bas, 2, "J");
+ jdbcConn.addValueData("C", 2, bas, bas.available(), "J");
ResultSet rs =
connect.createStatement().executeQuery(
"select * from " + "JCR_" + tableType + "VALUE" + " where PROPERTY_ID='C'");
Modified: jcr/trunk/exo.jcr.component.ext/pom.xml
===================================================================
--- jcr/trunk/exo.jcr.component.ext/pom.xml 2011-03-03 15:02:13 UTC (rev 4049)
+++ jcr/trunk/exo.jcr.component.ext/pom.xml 2011-03-03 15:04:31 UTC (rev 4050)
@@ -133,7 +133,7 @@
<artifactId>commons-collections</artifactId>
</dependency>
<dependency>
- <groupId>hsqldb</groupId>
+ <groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<scope>test</scope>
</dependency>
Modified: jcr/trunk/exo.jcr.component.ftp/pom.xml
===================================================================
--- jcr/trunk/exo.jcr.component.ftp/pom.xml 2011-03-03 15:02:13 UTC (rev 4049)
+++ jcr/trunk/exo.jcr.component.ftp/pom.xml 2011-03-03 15:04:31 UTC (rev 4050)
@@ -80,7 +80,7 @@
<artifactId>picocontainer</artifactId>
</dependency>
<dependency>
- <groupId>hsqldb</groupId>
+ <groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<scope>test</scope>
</dependency>
Modified: jcr/trunk/exo.jcr.component.webdav/pom.xml
===================================================================
--- jcr/trunk/exo.jcr.component.webdav/pom.xml 2011-03-03 15:02:13 UTC (rev 4049)
+++ jcr/trunk/exo.jcr.component.webdav/pom.xml 2011-03-03 15:04:31 UTC (rev 4050)
@@ -95,7 +95,7 @@
<artifactId>slf4j-log4j12</artifactId>
</dependency>
<dependency>
- <groupId>hsqldb</groupId>
+ <groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<scope>test</scope>
</dependency>
Modified: jcr/trunk/exo.jcr.framework.command/pom.xml
===================================================================
--- jcr/trunk/exo.jcr.framework.command/pom.xml 2011-03-03 15:02:13 UTC (rev 4049)
+++ jcr/trunk/exo.jcr.framework.command/pom.xml 2011-03-03 15:04:31 UTC (rev 4050)
@@ -77,7 +77,7 @@
<artifactId>slf4j-log4j12</artifactId>
</dependency>
<dependency>
- <groupId>hsqldb</groupId>
+ <groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<scope>test</scope>
</dependency>
Modified: jcr/trunk/pom.xml
===================================================================
--- jcr/trunk/pom.xml 2011-03-03 15:02:13 UTC (rev 4049)
+++ jcr/trunk/pom.xml 2011-03-03 15:04:31 UTC (rev 4050)
@@ -339,9 +339,9 @@
<classifier>sources</classifier>
</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>
<groupId>org.jgroups</groupId>
More information about the exo-jcr-commits
mailing list