exo-jcr SVN: r5106 - jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/clean/rdbms.
by do-not-reply＠jboss.org
Author: tolusha
Date: 2011-10-27 02:10:58 -0400 (Thu, 27 Oct 2011)
New Revision: 5106
Modified:
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/clean/rdbms/DBCleanService.java
Log:
EXOJCR-1585: fix unit test
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/clean/rdbms/DBCleanService.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/clean/rdbms/DBCleanService.java 2011-10-26 19:35:53 UTC (rev 5105)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/clean/rdbms/DBCleanService.java 2011-10-27 06:10:58 UTC (rev 5106)
@@ -747,8 +747,11 @@
rollbackScripts.add("ALTER TABLE JCR_" + isMultiDB + "REF" + OLD_OBJECT_SUFFIX + " RENAME TO JCR_" + isMultiDB
+ "REF");
+ rollbackScripts.add("ALTER TABLE JCR_" + isMultiDB + "ITEM ADD CONSTRAINT JCR_PK_" + isMultiDB
+ + "ITEM PRIMARY KEY(ID)");
+
rollbackScripts.add("ALTER TABLE JCR_" + isMultiDB + "VALUE ADD CONSTRAINT JCR_FK_" + isMultiDB
- + "VALUE_PROPERTY FOREIGN KEY(PROPERTY_ID) REFERENCES JCR_" + isMultiDB + "ITEM(ID");
+ + "VALUE_PROPERTY FOREIGN KEY(PROPERTY_ID) REFERENCES JCR_" + isMultiDB + "ITEM(ID)");
rollbackScripts.add("ALTER TABLE JCR_" + isMultiDB + "ITEM ADD CONSTRAINT JCR_FK_" + isMultiDB
+ "ITEM_PARENT FOREIGN KEY(PARENT_ID) REFERENCES JCR_" + isMultiDB + "ITEM(ID)");
@@ -756,9 +759,6 @@
rollbackScripts.add("ALTER TABLE JCR_" + isMultiDB + "CONTAINER ADD CONSTRAINT JCR_PK_" + isMultiDB
+ "CONTAINER PRIMARY KEY(VERSION)");
- rollbackScripts.add("ALTER TABLE JCR_" + isMultiDB + "ITEM ADD CONSTRAINT JCR_PK_" + isMultiDB
- + "ITEM PRIMARY KEY(ID)");
-
rollbackScripts.add("ALTER TABLE JCR_" + isMultiDB + "VALUE ADD CONSTRAINT JCR_PK_" + isMultiDB
+ "VALUE PRIMARY KEY(ID)");
14 years, 6 months
exo-jcr SVN: r5105 - jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation.
by do-not-reply＠jboss.org
Author: nfilotto
Date: 2011-10-26 15:35:53 -0400 (Wed, 26 Oct 2011)
New Revision: 5105
Modified:
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/CQJDBCWorkspaceDataContainer.java
Log:
EXOJCR-1608: Unable to start portal on Postgresql database with local-tx-datasource
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/CQJDBCWorkspaceDataContainer.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/CQJDBCWorkspaceDataContainer.java 2011-10-26 14:06:02 UTC (rev 5104)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/CQJDBCWorkspaceDataContainer.java 2011-10-26 19:35:53 UTC (rev 5105)
@@ -47,9 +47,7 @@
import java.io.IOException;
import javax.jcr.RepositoryException;
-import javax.naming.InitialContext;
import javax.naming.NamingException;
-import javax.sql.DataSource;
/**
* Created by The eXo Platform SAS.
@@ -136,17 +134,11 @@
}
else if (dbDialect == DBConstants.DB_DIALECT_PGSQL)
{
- this.connFactory = defaultConnectionFactory();
-
if (dbSourceName != null)
{
- DataSource ds = (DataSource)new InitialContext().lookup(dbSourceName);
- if (ds != null)
- this.connFactory =
- new PostgreConnectionFactory(ds, containerName, multiDb, valueStorageProvider, maxBufferSize,
- swapDirectory, swapCleaner);
- else
- throw new RepositoryException("Datasource '" + dbSourceName + "' is not bound in this context.");
+ this.connFactory =
+ new PostgreConnectionFactory(getDataSource(), containerName, multiDb, valueStorageProvider,
+ maxBufferSize, swapDirectory, swapCleaner);
}
else
this.connFactory =
14 years, 6 months
exo-jcr SVN: r5104 - jcr/trunk/exo.jcr.component.ext/src/test/resources/conf/standalone.
by do-not-reply＠jboss.org
Author: tolusha
Date: 2011-10-26 10:06:02 -0400 (Wed, 26 Oct 2011)
New Revision: 5104
Added:
jcr/trunk/exo.jcr.component.ext/src/test/resources/conf/standalone/test-configuration-backup-oracle.xml
Log:
EXOJCR-1585: add configuration for Oracle
Added: jcr/trunk/exo.jcr.component.ext/src/test/resources/conf/standalone/test-configuration-backup-oracle.xml
===================================================================
--- jcr/trunk/exo.jcr.component.ext/src/test/resources/conf/standalone/test-configuration-backup-oracle.xml (rev 0)
+++ jcr/trunk/exo.jcr.component.ext/src/test/resources/conf/standalone/test-configuration-backup-oracle.xml 2011-10-26 14:06:02 UTC (rev 5104)
@@ -0,0 +1,267 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+
+ Copyright (C) 2009 eXo Platform SAS.
+
+ This is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Lesser General Public License as
+ published by the Free Software Foundation; either version 2.1 of
+ the License, or (at your option) any later version.
+
+ This software is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this software; if not, write to the Free
+ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+
+-->
+<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd http://www.exoplatform.org/xml/ns/kernel_1_2.xsd"
+ xmlns="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd">
+
+ <component>
+ <key>org.exoplatform.services.log.LogConfigurationInitializer</key>
+ <type>org.exoplatform.services.log.LogConfigurationInitializer</type>
+ <init-params>
+ <value-param>
+ <name>logger</name>
+ <value>org.exoplatform.services.log.impl.BufferedLog4JLogger</value>
+ </value-param>
+ <value-param>
+ <name>configurator</name>
+ <value>org.exoplatform.services.log.impl.Log4JConfigurator</value>
+ </value-param>
+ <properties-param>
+ <name>properties</name>
+ <description>Log4J properties</description>
+ <property name="log4j.rootLogger" value="INFO, stdout, file" />
+
+ <property name="log4j.appender.stdout" value="org.apache.log4j.ConsoleAppender" />
+ <property name="log4j.appender.stdout.threshold" value="DEBUG" />
+
+ <property name="log4j.appender.stdout.layout" value="org.apache.log4j.PatternLayout" />
+ <property name="log4j.appender.stdout.layout.ConversionPattern" value="%d{dd.MM.yyyy HH:mm:ss} *%-5p* [%t] %c{1}: %m (%F, line %L) %n" />
+
+ <property name="log4j.appender.file" value="org.apache.log4j.FileAppender" />
+ <property name="log4j.appender.file.File" value="target/jcr.log" />
+
+ <property name="log4j.appender.file.layout" value="org.apache.log4j.PatternLayout" />
+ <property name="log4j.appender.file.layout.ConversionPattern" value="%d{dd.MM.yyyy HH:mm:ss} *%-5p* [%t] %c{1}: %m (%F, line %L) %n" />
+
+ <!-- property name="log4j.category.ext.BackupScheduler" value="DEBUG"/>
+ <property name="log4j.category.ext.BackupManagerImpl" value="DEBUG"/ -->
+ <property name="log4j.category.jcr.ext.RestRepositoryService" value="DEBUG"/>
+
+ <!-- property name="log4j.category.org.exoplatform.services.jcr.ext.script.groovy.JcrGroovyResourceLoader" value="DEBUG" / -->
+
+ </properties-param>
+ </init-params>
+ </component>
+
+ <component>
+ <key>org.exoplatform.services.jcr.RepositoryService</key>
+ <type>org.exoplatform.services.jcr.impl.RepositoryServiceImpl</type>
+ <component-plugins>
+ <component-plugin>
+ <name>add.namespaces</name>
+ <set-method>addPlugin</set-method>
+ <type>org.exoplatform.services.jcr.impl.AddNamespacesPlugin</type>
+ <init-params>
+ <properties-param>
+ <name>namespaces</name>
+ <property name="dc" value="http://purl.org/dc/elements/1.1/" />
+ </properties-param>
+ </init-params>
+ </component-plugin>
+ <component-plugin>
+ <name>add.nodeType</name>
+ <set-method>addPlugin</set-method>
+ <type>org.exoplatform.services.jcr.impl.AddNodeTypePlugin</type>
+ <init-params>
+ <values-param>
+ <name>autoCreatedInNewRepository</name>
+ <description>Node types configuration file</description>
+ <value>jar:/conf/ext-nodetypes-config.xml</value>
+ </values-param>
+ </init-params>
+ </component-plugin>
+ </component-plugins>
+ </component>
+
+ <component>
+ <key>org.exoplatform.services.jcr.config.RepositoryServiceConfiguration</key>
+ <type>org.exoplatform.services.jcr.impl.config.RepositoryServiceConfigurationImpl</type>
+ <init-params>
+ <value-param>
+ <name>conf-path</name>
+ <description>JCR configuration file</description>
+ <value>jar:/conf/standalone/test-jcr-ext-config-backup.xml</value>
+ </value-param>
+ <properties-param>
+ <name>working-conf</name>
+ <description>working-conf</description>
+ <property name="persister-class-name"
+ value="org.exoplatform.services.jcr.impl.config.JDBCConfigurationPersister" />
+ <property name="source-name" value="jdbcjcr" />
+ </properties-param>
+ </init-params>
+ </component>
+
+ <component>
+ <type>org.exoplatform.services.jcr.ext.repository.RestRepositoryService</type>
+ </component>
+
+ <!-- backup -->
+ <component>
+ <key>org.exoplatform.services.jcr.ext.backup.BackupManager</key>
+ <type>org.exoplatform.services.jcr.ext.backup.impl.BackupManagerImpl</type>
+ <init-params>
+ <properties-param>
+ <name>backup-properties</name>
+ <property name="default-incremental-job-period" value="3600" />
+ <property name="full-backup-type" value="org.exoplatform.services.jcr.ext.backup.impl.fs.FullBackupJob" />
+ <property name="incremental-backup-type" value="org.exoplatform.services.jcr.ext.backup.impl.fs.IncrementalBackupJob" />
+ <property name="backup-dir" value="target/backup" />
+ </properties-param>
+ </init-params>
+ </component>
+
+ <!-- HTTPBackupAgent -->
+ <component>
+ <type>org.exoplatform.services.jcr.ext.backup.server.HTTPBackupAgent</type>
+ </component>
+
+ <component>
+ <type>org.exoplatform.services.jcr.ext.app.ThreadLocalSessionProviderService</type>
+ </component>
+
+ <component>
+ <key>org.exoplatform.services.security.Authenticator</key>
+ <type>org.exoplatform.services.organization.auth.OrganizationAuthenticatorImpl</type>
+ </component>
+
+ <component>
+ <type>org.exoplatform.services.jcr.ext.resource.NodeRepresentationService</type>
+ </component>
+
+ <component>
+ <type>org.exoplatform.services.jcr.ext.resource.XMLViewNodeRepresentationRenderer</type>
+ </component>
+
+ <component>
+ <type>org.exoplatform.services.jcr.ext.resource.jcr.Handler</type>
+ </component>
+
+ <component>
+ <type>org.exoplatform.services.organization.impl.mock.DummyOrganizationService</type>
+ </component>
+
+ <component>
+ <key>org.exoplatform.services.security.Authenticator</key>
+ <type>org.exoplatform.services.organization.auth.OrganizationAuthenticatorImpl</type>
+ </component>
+
+ <component>
+ <key>org.exoplatform.services.jcr.ext.distribution.DataDistributionManager</key>
+ <type>org.exoplatform.services.jcr.ext.distribution.impl.DataDistributionManagerImpl</type>
+ </component>
+
+ <component>
+ <key>org.exoplatform.services.jcr.ext.hierarchy.NodeHierarchyCreator</key>
+ <type>org.exoplatform.services.jcr.ext.hierarchy.impl.NodeHierarchyCreatorImpl</type>
+ <init-params>
+ <value-param>
+ <name>auto-migrate</name>
+ <value>false</value>
+ </value-param>
+ </init-params>
+ </component>
+
+ <external-component-plugins>
+ <target-component>org.exoplatform.services.naming.InitialContextInitializer</target-component>
+ <component-plugin>
+ <name>bind.datasource</name>
+ <set-method>addPlugin</set-method>
+ <type>org.exoplatform.services.naming.BindReferencePlugin</type>
+ <init-params>
+ <value-param>
+ <name>bind-name</name>
+ <value>jdbcjcr</value>
+ </value-param>
+ <value-param>
+ <name>class-name</name>
+ <value>javax.sql.DataSource</value>
+ </value-param>
+ <value-param>
+ <name>factory</name>
+ <value>org.apache.commons.dbcp.BasicDataSourceFactory</value>
+ </value-param>
+ <properties-param>
+ <name>ref-addresses</name>
+ <description>ref-addresses</description>
+ <property name="driverClassName" value="oracle.jdbc.OracleDriver" />
+ <property name="url" value="jdbc:oracle:thin:@v06.storm.exoplatform.com.ua:1521:orclvm" />
+ <property name="username" value="exoperf" />
+ <property name="password" value="exo12321" />
+ </properties-param>
+ </init-params>
+ </component-plugin>
+ <component-plugin>
+ <name>bind.datasource</name>
+ <set-method>addPlugin</set-method>
+ <type>org.exoplatform.services.naming.BindReferencePlugin</type>
+ <init-params>
+ <value-param>
+ <name>bind-name</name>
+ <value>jdbcjcr1</value>
+ </value-param>
+ <value-param>
+ <name>class-name</name>
+ <value>javax.sql.DataSource</value>
+ </value-param>
+ <value-param>
+ <name>factory</name>
+ <value>org.apache.commons.dbcp.BasicDataSourceFactory</value>
+ </value-param>
+ <properties-param>
+ <name>ref-addresses</name>
+ <description>ref-addresses</description>
+ <property name="driverClassName" value="oracle.jdbc.OracleDriver" />
+ <property name="url" value="jdbc:oracle:thin:@v06.storm.exoplatform.com.ua:1521:orclvm" />
+ <property name="username" value="exoperf1" />
+ <property name="password" value="exo12321" />
+ </properties-param>
+ </init-params>
+ </component-plugin>
+ <component-plugin>
+ <name>bind.datasource</name>
+ <set-method>addPlugin</set-method>
+ <type>org.exoplatform.services.naming.BindReferencePlugin</type>
+ <init-params>
+ <value-param>
+ <name>bind-name</name>
+ <value>jdbcjcr2</value>
+ </value-param>
+ <value-param>
+ <name>class-name</name>
+ <value>javax.sql.DataSource</value>
+ </value-param>
+ <value-param>
+ <name>factory</name>
+ <value>org.apache.commons.dbcp.BasicDataSourceFactory</value>
+ </value-param>
+ <properties-param>
+ <name>ref-addresses</name>
+ <description>ref-addresses</description>
+ <property name="driverClassName" value="oracle.jdbc.OracleDriver" />
+ <property name="url" value="jdbc:oracle:thin:@v06.storm.exoplatform.com.ua:1521:orclvm" />
+ <property name="username" value="exoperf2" />
+ <property name="password" value="exo12321" />
+ </properties-param>
+ </init-params>
+ </component-plugin>
+ </external-component-plugins>
+</configuration>
14 years, 6 months
exo-jcr SVN: r5103 - in jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl: util/jdbc and 1 other directory.
by do-not-reply＠jboss.org
Author: tolusha
Date: 2011-10-26 10:05:46 -0400 (Wed, 26 Oct 2011)
New Revision: 5103
Modified:
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/clean/rdbms/DBCleanService.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/clean/rdbms/DBCleaner.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/jdbc/DBInitializerHelper.java
Log:
EXOJCR-1585: adopt test for Oracle DB
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/clean/rdbms/DBCleanService.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/clean/rdbms/DBCleanService.java 2011-10-26 13:43:39 UTC (rev 5102)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/clean/rdbms/DBCleanService.java 2011-10-26 14:05:46 UTC (rev 5103)
@@ -352,7 +352,7 @@
addScript.add("ALTER TABLE JCR_" + multiDb + "VALUE ADD CONSTRAINT JCR_FK_" + multiDb
+ "VALUE_PROPERTY FOREIGN KEY(PROPERTY_ID) REFERENCES JCR_" + multiDb + "ITEM(ID)");
- addScript.add(DBInitializerHelper.getObjectScript("JCR_IDX_" + multiDb + "ITEM_PARENT", isMultiDB, dialect));
+ addScript.add(DBInitializerHelper.getObjectScript("JCR_IDX_" + multiDb + "ITEM_PARENT ", isMultiDB, dialect));
addScript.add(DBInitializerHelper.getObjectScript("JCR_IDX_" + multiDb + "ITEM_PARENT_NAME", isMultiDB,
dialect));
addScript
@@ -364,10 +364,6 @@
return addScript;
}
- constraintName = validateConstraintName("JCR_FK_" + multiDb + "ITEM_PARENT", dialect);
- constraint = "CONSTRAINT " + constraintName + " FOREIGN KEY(PARENT_ID) REFERENCES JCR_" + multiDb + "ITEM(ID)";
- addScript.add("ALTER TABLE JCR_" + multiDb + "ITEM ADD " + constraint);
-
if (dialect.equals(DBConstants.DB_DIALECT_MYSQL) || dialect.equals(DBConstants.DB_DIALECT_MYSQL))
{
constraintName = validateConstraintName("JCR_FK_" + multiDb + "VALUE_PROPERTY", dialect);
@@ -391,7 +387,6 @@
"CONSTRAINT " + constraintName + " FOREIGN KEY(PROPERTY_ID) REFERENCES JCR_" + multiDb + "ITEM(ID)";
addScript.add("ALTER TABLE JCR_" + multiDb + "VALUE ADD " + constraint);
-
constraintName = validateConstraintName("JCR_PK_" + multiDb + "REF", dialect);
constraint = "CONSTRAINT " + constraintName + " PRIMARY KEY(NODE_ID, PROPERTY_ID, ORDER_NUM)";
addScript.add("ALTER TABLE JCR_" + multiDb + "REF ADD " + constraint);
@@ -401,7 +396,7 @@
addScript.add("ALTER TABLE JCR_" + multiDb + "CONTAINER ADD " + constraint);
addScript.add(DBInitializerHelper.getObjectScript("JCR_IDX_" + multiDb + "ITEM_PARENT_FK", isMultiDB, dialect));
- addScript.add(DBInitializerHelper.getObjectScript("JCR_IDX_" + multiDb + "ITEM_PARENT", isMultiDB, dialect));
+ addScript.add(DBInitializerHelper.getObjectScript("JCR_IDX_" + multiDb + "ITEM_PARENT ", isMultiDB, dialect));
addScript.add(DBInitializerHelper.getObjectScript("JCR_IDX_" + multiDb + "ITEM_PARENT_NAME", isMultiDB, dialect));
addScript.add(DBInitializerHelper.getObjectScript("JCR_IDX_" + multiDb + "ITEM_PARENT_ID", isMultiDB, dialect));
addScript
@@ -409,6 +404,10 @@
addScript.add(DBInitializerHelper.getObjectScript("JCR_IDX_" + multiDb + "REF_PROPERTY", isMultiDB, dialect));
}
+ constraintName = validateConstraintName("JCR_FK_" + multiDb + "ITEM_PARENT", dialect);
+ constraint = "CONSTRAINT " + constraintName + " FOREIGN KEY(PARENT_ID) REFERENCES JCR_" + multiDb + "ITEM(ID)";
+ addScript.add("ALTER TABLE JCR_" + multiDb + "ITEM ADD " + constraint);
+
return addScript;
}
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/clean/rdbms/DBCleaner.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/clean/rdbms/DBCleaner.java 2011-10-26 13:43:39 UTC (rev 5102)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/clean/rdbms/DBCleaner.java 2011-10-26 14:05:46 UTC (rev 5103)
@@ -153,7 +153,7 @@
*/
public void executeCleanScripts() throws SQLException
{
- executeScripts(cleanScripts, false);
+ executeScripts(cleanScripts);
if (dbCleanHelper != null)
{
@@ -169,7 +169,7 @@
*/
public void executeRollbackScripts() throws SQLException
{
- executeScripts(rollbackScripts, true);
+ executeScripts(rollbackScripts);
}
/**
@@ -180,7 +180,7 @@
*/
public void executeCommitScripts() throws SQLException
{
- executeScripts(commitScripts, false);
+ executeScripts(commitScripts);
}
/**
@@ -193,7 +193,7 @@
* @throws SQLException
* if any exception occurred
*/
- protected void executeScripts(List<String> scripts, boolean isSkipSQLExceprion) throws SQLException
+ protected void executeScripts(List<String> scripts) throws SQLException
{
SecurityManager security = System.getSecurityManager();
if (security != null)
@@ -213,23 +213,8 @@
{
LOG.debug("Execute script: \n[" + sql + "]");
}
-
- try
- {
- executeQuery(st, sql);
- }
- catch (SQLException e)
- {
- if (isSkipSQLExceprion)
- {
- LOG.warn("Execute script fail: \n[" + sql + "]");
- continue;
- }
- else
- {
- throw e;
- }
- }
+
+ executeQuery(st, sql);
}
}
}
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/jdbc/DBInitializerHelper.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/jdbc/DBInitializerHelper.java 2011-10-26 13:43:39 UTC (rev 5102)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/jdbc/DBInitializerHelper.java 2011-10-26 14:05:46 UTC (rev 5103)
@@ -288,15 +288,27 @@
throw new RepositoryConfigurationException("Can not read script file " + scriptsPath, e);
}
+ String sql = null;
for (String query : DBInitializerHelper.scripts(script))
{
String q = DBInitializerHelper.cleanWhitespaces(query);
if (q.contains(objectName))
{
- return q;
+ if (sql != null)
+ {
+ throw new RepositoryConfigurationException("Can't find unique script for object creation. Object name: "
+ + objectName);
+ }
+
+ sql = q;
}
}
- return null;
+ if (sql != null)
+ {
+ return sql;
+ }
+
+ throw new RepositoryConfigurationException("Script for object creation is not found. Object name: " + objectName);
}
}
14 years, 6 months
exo-jcr SVN: r5102 - kernel/branches/2.2.x/patch/2.2.11-GA/KER-178.
by do-not-reply＠jboss.org
Author: nfilotto
Date: 2011-10-26 09:43:39 -0400 (Wed, 26 Oct 2011)
New Revision: 5102
Modified:
kernel/branches/2.2.x/patch/2.2.11-GA/KER-178/KER-178.patch
Log:
KER-178: Fix completed
Modified: kernel/branches/2.2.x/patch/2.2.11-GA/KER-178/KER-178.patch
===================================================================
--- kernel/branches/2.2.x/patch/2.2.11-GA/KER-178/KER-178.patch 2011-10-26 13:24:12 UTC (rev 5101)
+++ kernel/branches/2.2.x/patch/2.2.11-GA/KER-178/KER-178.patch 2011-10-26 13:43:39 UTC (rev 5102)
@@ -1,6 +1,6 @@
Index: exo.kernel.commons/src/main/java/org/exoplatform/commons/utils/Tools.java
===================================================================
---- exo.kernel.commons/src/main/java/org/exoplatform/commons/utils/Tools.java (revision 4792)
+--- exo.kernel.commons/src/main/java/org/exoplatform/commons/utils/Tools.java (revision 5100)
+++ exo.kernel.commons/src/main/java/org/exoplatform/commons/utils/Tools.java (working copy)
@@ -23,6 +23,7 @@
import java.util.Map;
@@ -24,7 +24,7 @@
* Instantiates a {@link HashSet} object and fills it with the provided element array.
*
* @param elements the list of elements to add
-@@ -155,4 +160,34 @@
+@@ -155,4 +160,35 @@
String suffix = s.substring(s.length() - end.length());
return suffix.equalsIgnoreCase(end);
}
@@ -47,6 +47,7 @@
+ {
+ synchronized (TimeZone.class)
+ {
++ tz = TIME_ZONES.get(ID);
+ if (tz == null)
+ {
+ tz = TimeZone.getTimeZone(ID);
@@ -61,14 +62,14 @@
}
Index: exo.kernel.commons/src/main/java/org/exoplatform/commons/utils/ISO8601ASF.java
===================================================================
---- exo.kernel.commons/src/main/java/org/exoplatform/commons/utils/ISO8601ASF.java (revision 4792)
+--- exo.kernel.commons/src/main/java/org/exoplatform/commons/utils/ISO8601ASF.java (revision 5100)
+++ exo.kernel.commons/src/main/java/org/exoplatform/commons/utils/ISO8601ASF.java (working copy)
@@ -187,7 +187,7 @@
- return null;
- }
-
-- TimeZone tz = TimeZone.getTimeZone(tzID);
-+ TimeZone tz = Tools.getTimeZone(tzID);
- // verify id of returned time zone (getTimeZone defaults to "GMT")
- if (!tz.getID().equals(tzID))
- {
+ return null;
+ }
+
+- TimeZone tz = TimeZone.getTimeZone(tzID);
++ TimeZone tz = Tools.getTimeZone(tzID);
+ // verify id of returned time zone (getTimeZone defaults to "GMT")
+ if (!tz.getID().equals(tzID))
+ {
14 years, 6 months
exo-jcr SVN: r5101 - kernel/trunk/exo.kernel.commons/src/main/java/org/exoplatform/commons/utils.
by do-not-reply＠jboss.org
Author: nfilotto
Date: 2011-10-26 09:24:12 -0400 (Wed, 26 Oct 2011)
New Revision: 5101
Modified:
kernel/trunk/exo.kernel.commons/src/main/java/org/exoplatform/commons/utils/Tools.java
Log:
EXOJCR-1606: The code of Tools.getTimeZone(String) has been fixed
Modified: kernel/trunk/exo.kernel.commons/src/main/java/org/exoplatform/commons/utils/Tools.java
===================================================================
--- kernel/trunk/exo.kernel.commons/src/main/java/org/exoplatform/commons/utils/Tools.java 2011-10-26 13:02:11 UTC (rev 5100)
+++ kernel/trunk/exo.kernel.commons/src/main/java/org/exoplatform/commons/utils/Tools.java 2011-10-26 13:24:12 UTC (rev 5101)
@@ -179,6 +179,7 @@
{
synchronized (TimeZone.class)
{
+ tz = TIME_ZONES.get(ID);
if (tz == null)
{
tz = TimeZone.getTimeZone(ID);
14 years, 6 months
exo-jcr SVN: r5100 - jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db.
by do-not-reply＠jboss.org
Author: nfilotto
Date: 2011-10-26 09:02:11 -0400 (Wed, 26 Oct 2011)
New Revision: 5100
Modified:
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db/DB2ConnectionFactory.java
Log:
EXOJCR-1579: Fixed bug that we face when the major version is 9 and the minor version is 7 such that we need to extract the maintenance version to know if the RDBMS indexing is enabled or not + Added some debug messages to have a better understanding of what's going on in case we face the bug once again
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db/DB2ConnectionFactory.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db/DB2ConnectionFactory.java 2011-10-26 12:55:09 UTC (rev 5099)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db/DB2ConnectionFactory.java 2011-10-26 13:02:11 UTC (rev 5100)
@@ -149,23 +149,54 @@
{
con = getJdbcConnection();
DatabaseMetaData metaData = con.getMetaData();
+ if (log.isDebugEnabled())
+ {
+ log.debug("DB Major version = " + metaData.getDatabaseMajorVersion() + ", DB Minor version = "
+ + metaData.getDatabaseMinorVersion() + ", DB Product version = "
+ + metaData.getDatabaseProductVersion());
+ }
if (metaData.getDatabaseMajorVersion() > 9)
{
+ if (log.isDebugEnabled())
+ {
+ log.debug("RDBMS indexing enabled as the major version is greater than 9.");
+ }
isReindexingSupport = true;
}
else if (metaData.getDatabaseMajorVersion() == 9 && metaData.getDatabaseMinorVersion() > 7)
{
+ if (log.isDebugEnabled())
+ {
+ log.debug("RDBMS indexing enabled as the major version is 9 and the minor version is greater than 7.");
+ }
isReindexingSupport = true;
}
else if (metaData.getDatabaseMajorVersion() == 9 && metaData.getDatabaseMinorVersion() == 7)
{
// returned string like 'SQL09074'
- char maintenanceVersion =
- metaData.getDatabaseProductVersion().charAt(metaData.getDatabaseProductVersion().length() - 1);
- isReindexingSupport = new Integer(maintenanceVersion) >= 2;
+ String value = metaData.getDatabaseProductVersion();
+ int maintenanceVersion = Integer.parseInt(value.substring(value.length() - 1));
+ isReindexingSupport = maintenanceVersion >= 2;
+ if (log.isDebugEnabled())
+ {
+ if (isReindexingSupport)
+ {
+ log.debug("RDBMS indexing enabled as the major version is 9, the minor version is 7 and the maintenance version is greater or equals to 2 knowing that the extracted value is "
+ + maintenanceVersion + ".");
+ }
+ else
+ {
+ log.debug("RDBMS indexing disabled as the major version is 9, the minor version is 7 and the maintenance version is lower than 2 knowing that the extracted value is "
+ + maintenanceVersion + ".");
+ }
+ }
}
else
{
+ if (log.isDebugEnabled())
+ {
+ log.debug("RDBMS indexing disabled as the major version is lower than 9 or the minor version is lower than 7.");
+ }
isReindexingSupport = false;
}
}
14 years, 6 months
exo-jcr SVN: r5099 - in jcr/trunk/exo.jcr.component.ext: src/test/java/org/exoplatform/services/jcr/ext/backup/server and 1 other directory.
by do-not-reply＠jboss.org
Author: tolusha
Date: 2011-10-26 08:55:09 -0400 (Wed, 26 Oct 2011)
New Revision: 5099
Modified:
jcr/trunk/exo.jcr.component.ext/pom.xml
jcr/trunk/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/backup/server/HTTPBackupAgentTest.java
Log:
EXOJCR-1585: fix test
Modified: jcr/trunk/exo.jcr.component.ext/pom.xml
===================================================================
--- jcr/trunk/exo.jcr.component.ext/pom.xml 2011-10-26 12:53:22 UTC (rev 5098)
+++ jcr/trunk/exo.jcr.component.ext/pom.xml 2011-10-26 12:55:09 UTC (rev 5099)
@@ -196,7 +196,7 @@
<exclude>**/backup/BaseRDBMSBackupTest.java</exclude>
<exclude>**/backup/TestBackupScheduler.java</exclude>
<exclude>**/backup/TestBackupRestart.java</exclude>
- <exclude>**/backup/load/TestLoadBackup.java*</exclude>
+ <exclude>**/backup/usecase/TestLoadBackup.java*</exclude>
<exclude>**/replication/**</exclude>
<exclude>**/repository/creation/cluster/**</exclude>
</excludes>
Modified: jcr/trunk/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/backup/server/HTTPBackupAgentTest.java
===================================================================
--- jcr/trunk/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/backup/server/HTTPBackupAgentTest.java 2011-10-26 12:53:22 UTC (rev 5098)
+++ jcr/trunk/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/backup/server/HTTPBackupAgentTest.java 2011-10-26 12:55:09 UTC (rev 5099)
@@ -251,10 +251,9 @@
ShortInfoList infoList = (ShortInfoList) getObject(ShortInfoList.class, responseWriter.getBody());
List<ShortInfo> list = new ArrayList<ShortInfo>(infoList.getBackups());
- assertEquals(1, list.size());
+ ShortInfo info = getBackupInfo(list);
+ assertNotNull(info);
- ShortInfo info = list.get(0);
-
assertNotNull(info);
assertEquals(BackupManager.FULL_AND_INCREMENTAL, info.getBackupType().intValue());
assertNotNull(info.getStartedTime());
@@ -282,11 +281,9 @@
ShortInfoList infoList = (ShortInfoList) getObject(ShortInfoList.class, responseWriter.getBody());
List<ShortInfo> list = new ArrayList<ShortInfo>(infoList.getBackups());
- assertEquals(1, list.size());
-
- ShortInfo info = list.get(0);
-
+ ShortInfo info = getBackupInfo(list);
assertNotNull(info);
+
assertEquals(BackupManager.FULL_AND_INCREMENTAL, info.getBackupType().intValue());
assertNotNull(info.getStartedTime());
assertNotNull(info.getFinishedTime());
@@ -314,11 +311,9 @@
ShortInfoList infoList = (ShortInfoList) getObject(ShortInfoList.class, responseWriter.getBody());
List<ShortInfo> list = new ArrayList<ShortInfo>(infoList.getBackups());
- assertEquals(1, list.size());
-
- ShortInfo info = list.get(0);
-
+ ShortInfo info = getBackupInfo(list);
assertNotNull(info);
+
assertEquals(BackupManager.FULL_AND_INCREMENTAL, info.getBackupType().intValue());
assertNotNull(info.getStartedTime());
assertNotNull(info.getFinishedTime());
@@ -345,11 +340,9 @@
ShortInfoList infoList = (ShortInfoList) getObject(ShortInfoList.class, responseWriter.getBody());
List<ShortInfo> list = new ArrayList<ShortInfo>(infoList.getBackups());
- assertEquals(1, list.size());
-
- ShortInfo info = list.get(0);
-
+ ShortInfo info = getBackupInfo(list);
assertNotNull(info);
+
assertEquals(BackupManager.FULL_AND_INCREMENTAL, info.getBackupType().intValue());
assertNotNull(info.getStartedTime());
assertNotNull(info.getFinishedTime());
@@ -375,11 +368,9 @@
ShortInfoList infoList = (ShortInfoList) getObject(ShortInfoList.class, responseWriter.getBody());
List<ShortInfo> list = new ArrayList<ShortInfo>(infoList.getBackups());
- assertEquals(1, list.size());
-
- ShortInfo info = list.get(0);
-
+ ShortInfo info = getBackupInfo(list);
assertNotNull(info);
+
assertEquals(BackupManager.FULL_AND_INCREMENTAL, info.getBackupType().intValue());
assertNotNull(info.getStartedTime());
assertNotNull(info.getFinishedTime());
@@ -406,11 +397,9 @@
ShortInfoList infoList = (ShortInfoList) getObject(ShortInfoList.class, responseWriter.getBody());
List<ShortInfo> list = new ArrayList<ShortInfo>(infoList.getBackups());
- assertEquals(1, list.size());
-
- ShortInfo info = list.get(0);
-
+ ShortInfo info = getBackupInfo(list);
assertNotNull(info);
+
assertEquals(BackupManager.FULL_AND_INCREMENTAL, info.getBackupType().intValue());
assertNotNull(info.getStartedTime());
assertNotNull(info.getFinishedTime());
@@ -441,10 +430,9 @@
ShortInfoList infoList = (ShortInfoList) getObject(ShortInfoList.class, responseWriter.getBody());
List<ShortInfo> list = new ArrayList<ShortInfo>(infoList.getBackups());
- assertEquals(1, list.size());
+ ShortInfo info = getBackupInfo(list);
+ assertNotNull(info);
- ShortInfo info = list.get(0);
-
assertEquals(info.getRepositoryName(), "db6");
assertEquals(info.getWorkspaceName(), "ws2");
@@ -497,10 +485,9 @@
ShortInfoList infoList = (ShortInfoList) getObject(ShortInfoList.class, responseWriter.getBody());
List<ShortInfo> list = new ArrayList<ShortInfo>(infoList.getBackups());
- assertEquals(1, list.size());
+ ShortInfo info = getBackupInfo(list);
+ assertNotNull(info);
- ShortInfo info = list.get(0);
-
assertEquals(info.getRepositoryName(), "db6");
id = info.getBackupId();
@@ -552,10 +539,9 @@
ShortInfoList infoList = (ShortInfoList) getObject(ShortInfoList.class, responseWriter.getBody());
List<ShortInfo> list = new ArrayList<ShortInfo>(infoList.getBackups());
- assertEquals(1, list.size());
+ ShortInfo info = getBackupInfo(list);
+ assertNotNull(info);
- ShortInfo info = list.get(0);
-
assertEquals(info.getRepositoryName(), "db6");
assertEquals(info.getWorkspaceName(), "ws2");
@@ -595,10 +581,9 @@
ShortInfoList infoList = (ShortInfoList) getObject(ShortInfoList.class, responseWriter.getBody());
List<ShortInfo> list = new ArrayList<ShortInfo>(infoList.getBackups());
- assertEquals(1, list.size());
+ ShortInfo info = getBackupInfo(list);
+ assertNotNull(info);
- ShortInfo info = list.get(0);
-
assertEquals(info.getRepositoryName(), "db6");
id = info.getBackupId();
@@ -634,11 +619,9 @@
ShortInfoList infoList = (ShortInfoList) getObject(ShortInfoList.class, responseWriter.getBody());
List<ShortInfo> list = new ArrayList<ShortInfo>(infoList.getBackups());
- assertEquals(1, list.size());
-
- ShortInfo info = list.get(0);
-
+ ShortInfo info = getBackupInfo(list);
assertNotNull(info);
+
assertEquals(BackupManager.FULL_AND_INCREMENTAL, info.getBackupType().intValue());
assertNotNull(info.getStartedTime());
assertNotNull(info.getFinishedTime());
@@ -665,11 +648,9 @@
ShortInfoList infoList = (ShortInfoList) getObject(ShortInfoList.class, responseWriter.getBody());
List<ShortInfo> list = new ArrayList<ShortInfo>(infoList.getBackups());
- assertEquals(1, list.size());
-
- ShortInfo info = list.get(0);
-
+ ShortInfo info = getBackupInfo(list);
assertNotNull(info);
+
assertEquals(BackupManager.FULL_AND_INCREMENTAL, info.getBackupType().intValue());
assertNotNull(info.getStartedTime());
assertNotNull(info.getFinishedTime());
@@ -990,10 +971,9 @@
ShortInfoList infoList = (ShortInfoList) getObject(ShortInfoList.class, responseWriter.getBody());
List<ShortInfo> list = new ArrayList<ShortInfo>(infoList.getBackups());
- assertEquals(1, list.size());
+ ShortInfo info = getBackupInfo(list);
+ assertNotNull(info);
- ShortInfo info = list.get(0);
-
assertEquals(info.getRepositoryName(), "db6");
assertEquals(info.getWorkspaceName(), "ws2");
@@ -1874,10 +1854,9 @@
ShortInfoList infoList = (ShortInfoList) getObject(ShortInfoList.class, responseWriter.getBody());
List<ShortInfo> list = new ArrayList<ShortInfo>(infoList.getBackups());
- assertEquals(1, list.size());
+ ShortInfo info = getBackupInfo(list);
+ assertNotNull(info);
- ShortInfo info = list.get(0);
-
assertEquals(info.getRepositoryName(), "db6");
id = info.getBackupId();
@@ -2043,10 +2022,9 @@
ShortInfoList infoList = (ShortInfoList) getObject(ShortInfoList.class, responseWriter.getBody());
List<ShortInfo> list = new ArrayList<ShortInfo>(infoList.getBackups());
- assertEquals(1, list.size());
+ ShortInfo info = getBackupInfo(list);
+ assertNotNull(info);
- ShortInfo info = list.get(0);
-
assertEquals(info.getRepositoryName(), "db6");
id = info.getBackupId();
@@ -2179,10 +2157,9 @@
ShortInfoList infoList = (ShortInfoList) getObject(ShortInfoList.class, responseWriter.getBody());
List<ShortInfo> list = new ArrayList<ShortInfo>(infoList.getBackups());
- assertEquals(1, list.size());
+ ShortInfo info = getBackupInfo(list);
+ assertNotNull(info);
- ShortInfo info = list.get(0);
-
assertEquals(info.getRepositoryName(), "db6");
id = info.getBackupId();
@@ -2316,10 +2293,9 @@
ShortInfoList infoList = (ShortInfoList) getObject(ShortInfoList.class, responseWriter.getBody());
List<ShortInfo> list = new ArrayList<ShortInfo>(infoList.getBackups());
- assertEquals(1, list.size());
+ ShortInfo info = getBackupInfo(list);
+ assertNotNull(info);
- ShortInfo info = list.get(0);
-
assertEquals(info.getRepositoryName(), "db6");
id = info.getBackupId();
@@ -2408,10 +2384,9 @@
ShortInfoList infoList = (ShortInfoList) getObject(ShortInfoList.class, responseWriter.getBody());
List<ShortInfo> list = new ArrayList<ShortInfo>(infoList.getBackups());
- assertEquals(1, list.size());
+ ShortInfo info = getBackupInfo(list);
+ assertNotNull(info);
- ShortInfo info = list.get(0);
-
assertEquals(info.getRepositoryName(), "db6");
id = info.getBackupId();
@@ -2501,10 +2476,9 @@
ShortInfoList infoList = (ShortInfoList) getObject(ShortInfoList.class, responseWriter.getBody());
List<ShortInfo> list = new ArrayList<ShortInfo>(infoList.getBackups());
- assertEquals(1, list.size());
+ ShortInfo info = getBackupInfo(list);
+ assertNotNull(info);
- ShortInfo info = list.get(0);
-
assertEquals(info.getRepositoryName(), "db6");
id = info.getBackupId();
@@ -2648,10 +2622,9 @@
ShortInfoList infoList = (ShortInfoList) getObject(ShortInfoList.class, responseWriter.getBody());
List<ShortInfo> list = new ArrayList<ShortInfo>(infoList.getBackups());
- assertEquals(1, list.size());
+ ShortInfo info = getBackupInfo(list);
+ assertNotNull(info);
- ShortInfo info = list.get(0);
-
assertEquals(info.getRepositoryName(), "db6");
id = info.getBackupId();
@@ -2795,10 +2768,9 @@
ShortInfoList infoList = (ShortInfoList) getObject(ShortInfoList.class, responseWriter.getBody());
List<ShortInfo> list = new ArrayList<ShortInfo>(infoList.getBackups());
- assertEquals(1, list.size());
+ ShortInfo info = getBackupInfo(list);
+ assertNotNull(info);
- ShortInfo info = list.get(0);
-
assertEquals(info.getRepositoryName(), "db6");
id = info.getBackupId();
@@ -2896,10 +2868,9 @@
ShortInfoList infoList = (ShortInfoList) getObject(ShortInfoList.class, responseWriter.getBody());
List<ShortInfo> list = new ArrayList<ShortInfo>(infoList.getBackups());
- assertEquals(1, list.size());
+ ShortInfo info = getBackupInfo(list);
+ assertNotNull(info);
- ShortInfo info = list.get(0);
-
assertEquals(info.getRepositoryName(), "db6");
id = info.getBackupId();
@@ -3161,4 +3132,17 @@
}
}
}
+
+ private ShortInfo getBackupInfo(List<ShortInfo> list)
+ {
+ for (ShortInfo info : list)
+ {
+ if (info.getRepositoryName().equals("db6"))
+ {
+ return info;
+ }
+ }
+
+ return null;
+ }
}
14 years, 6 months
exo-jcr SVN: r5098 - in jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc: optimisation/db and 1 other directory.
by do-not-reply＠jboss.org
Author: tolusha
Date: 2011-10-26 08:53:22 -0400 (Wed, 26 Oct 2011)
New Revision: 5098
Modified:
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/MultiDbJDBCConnection.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/SingleDbJDBCConnection.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db/MultiDbJDBCConnection.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db/SingleDbJDBCConnection.java
Log:
EXOJCR-1590: small fix
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/MultiDbJDBCConnection.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/MultiDbJDBCConnection.java 2011-10-26 12:17:42 UTC (rev 5097)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/MultiDbJDBCConnection.java 2011-10-26 12:53:22 UTC (rev 5098)
@@ -556,7 +556,6 @@
/**
* {@inheritDoc}
*/
- @Override
protected void deleteLockProperties() throws SQLException
{
PreparedStatement removeValuesStatement = null;
@@ -567,14 +566,10 @@
removeValuesStatement =
dbConnection
.prepareStatement("DELETE FROM JCR_MVALUE WHERE PROPERTY_ID IN (SELECT ID FROM JCR_MITEM WHERE NAME = '[http://www.jcp.org/jcr/1.0]lockIsDeep' OR NAME = '[http://www.jcp.org/jcr/1.0]lockOwner')");
- removeValuesStatement.setString(1, Constants.JCR_LOCKISDEEP.getAsString());
- removeValuesStatement.setString(2, Constants.JCR_LOCKOWNER.getAsString());
removeItemsStatement =
dbConnection
.prepareStatement("DELETE FROM JCR_MITEM WHERE NAME = '[http://www.jcp.org/jcr/1.0]lockIsDeep' OR NAME = '[http://www.jcp.org/jcr/1.0]lockOwner'");
- removeItemsStatement.setString(1, Constants.JCR_LOCKISDEEP.getAsString());
- removeItemsStatement.setString(2, Constants.JCR_LOCKOWNER.getAsString());
removeValuesStatement.executeUpdate();
removeItemsStatement.executeUpdate();
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/SingleDbJDBCConnection.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/SingleDbJDBCConnection.java 2011-10-26 12:17:42 UTC (rev 5097)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/SingleDbJDBCConnection.java 2011-10-26 12:53:22 UTC (rev 5098)
@@ -578,7 +578,6 @@
/**
* {@inheritDoc}
*/
- @Override
protected void deleteLockProperties() throws SQLException
{
PreparedStatement removeValuesStatement = null;
@@ -590,15 +589,11 @@
dbConnection
.prepareStatement("DELETE FROM JCR_SVALUE WHERE PROPERTY_ID IN (SELECT ID FROM JCR_SITEM WHERE CONTAINER_NAME = ? AND (NAME = '[http://www.jcp.org/jcr/1.0]lockIsDeep' OR NAME = '[http://www.jcp.org/jcr/1.0]lockOwner'))");
removeValuesStatement.setString(1, containerName);
- removeValuesStatement.setString(2, Constants.JCR_LOCKISDEEP.getAsString());
- removeValuesStatement.setString(3, Constants.JCR_LOCKOWNER.getAsString());
removeItemsStatement =
dbConnection
.prepareStatement("DELETE FROM JCR_SITEM WHERE CONTAINER_NAME = ? AND (NAME = '[http://www.jcp.org/jcr/1.0]lockIsDeep' OR NAME = '[http://www.jcp.org/jcr/1.0]lockOwner')");
removeItemsStatement.setString(1, containerName);
- removeItemsStatement.setString(2, Constants.JCR_LOCKISDEEP.getAsString());
- removeItemsStatement.setString(3, Constants.JCR_LOCKOWNER.getAsString());
removeValuesStatement.executeUpdate();
removeItemsStatement.executeUpdate();
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db/MultiDbJDBCConnection.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db/MultiDbJDBCConnection.java 2011-10-26 12:17:42 UTC (rev 5097)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db/MultiDbJDBCConnection.java 2011-10-26 12:53:22 UTC (rev 5098)
@@ -1033,7 +1033,6 @@
/**
* {@inheritDoc}
*/
- @Override
protected void deleteLockProperties() throws SQLException
{
PreparedStatement removeValuesStatement = null;
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db/SingleDbJDBCConnection.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db/SingleDbJDBCConnection.java 2011-10-26 12:17:42 UTC (rev 5097)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db/SingleDbJDBCConnection.java 2011-10-26 12:53:22 UTC (rev 5098)
@@ -951,7 +951,6 @@
/**
* {@inheritDoc}
*/
- @Override
protected void deleteLockProperties() throws SQLException
{
PreparedStatement removeValuesStatement = null;
14 years, 6 months
exo-jcr SVN: r5097 - jcr/trunk/exo.jcr.component.ext/src/test/resources/conf/standalone.
by do-not-reply＠jboss.org
Author: tolusha
Date: 2011-10-26 08:17:42 -0400 (Wed, 26 Oct 2011)
New Revision: 5097
Added:
jcr/trunk/exo.jcr.component.ext/src/test/resources/conf/standalone/test-configuration-backup-db2.xml
Log:
EXOJCR-1585: add configuration for DB2
Added: jcr/trunk/exo.jcr.component.ext/src/test/resources/conf/standalone/test-configuration-backup-db2.xml
===================================================================
--- jcr/trunk/exo.jcr.component.ext/src/test/resources/conf/standalone/test-configuration-backup-db2.xml (rev 0)
+++ jcr/trunk/exo.jcr.component.ext/src/test/resources/conf/standalone/test-configuration-backup-db2.xml 2011-10-26 12:17:42 UTC (rev 5097)
@@ -0,0 +1,267 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+
+ Copyright (C) 2009 eXo Platform SAS.
+
+ This is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Lesser General Public License as
+ published by the Free Software Foundation; either version 2.1 of
+ the License, or (at your option) any later version.
+
+ This software is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this software; if not, write to the Free
+ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+
+-->
+<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd http://www.exoplatform.org/xml/ns/kernel_1_2.xsd"
+ xmlns="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd">
+
+ <component>
+ <key>org.exoplatform.services.log.LogConfigurationInitializer</key>
+ <type>org.exoplatform.services.log.LogConfigurationInitializer</type>
+ <init-params>
+ <value-param>
+ <name>logger</name>
+ <value>org.exoplatform.services.log.impl.BufferedLog4JLogger</value>
+ </value-param>
+ <value-param>
+ <name>configurator</name>
+ <value>org.exoplatform.services.log.impl.Log4JConfigurator</value>
+ </value-param>
+ <properties-param>
+ <name>properties</name>
+ <description>Log4J properties</description>
+ <property name="log4j.rootLogger" value="INFO, stdout, file" />
+
+ <property name="log4j.appender.stdout" value="org.apache.log4j.ConsoleAppender" />
+ <property name="log4j.appender.stdout.threshold" value="DEBUG" />
+
+ <property name="log4j.appender.stdout.layout" value="org.apache.log4j.PatternLayout" />
+ <property name="log4j.appender.stdout.layout.ConversionPattern" value="%d{dd.MM.yyyy HH:mm:ss} *%-5p* [%t] %c{1}: %m (%F, line %L) %n" />
+
+ <property name="log4j.appender.file" value="org.apache.log4j.FileAppender" />
+ <property name="log4j.appender.file.File" value="target/jcr.log" />
+
+ <property name="log4j.appender.file.layout" value="org.apache.log4j.PatternLayout" />
+ <property name="log4j.appender.file.layout.ConversionPattern" value="%d{dd.MM.yyyy HH:mm:ss} *%-5p* [%t] %c{1}: %m (%F, line %L) %n" />
+
+ <!-- property name="log4j.category.ext.BackupScheduler" value="DEBUG"/>
+ <property name="log4j.category.ext.BackupManagerImpl" value="DEBUG"/ -->
+ <property name="log4j.category.jcr.ext.RestRepositoryService" value="DEBUG"/>
+
+ <!-- property name="log4j.category.org.exoplatform.services.jcr.ext.script.groovy.JcrGroovyResourceLoader" value="DEBUG" / -->
+
+ </properties-param>
+ </init-params>
+ </component>
+
+ <component>
+ <key>org.exoplatform.services.jcr.RepositoryService</key>
+ <type>org.exoplatform.services.jcr.impl.RepositoryServiceImpl</type>
+ <component-plugins>
+ <component-plugin>
+ <name>add.namespaces</name>
+ <set-method>addPlugin</set-method>
+ <type>org.exoplatform.services.jcr.impl.AddNamespacesPlugin</type>
+ <init-params>
+ <properties-param>
+ <name>namespaces</name>
+ <property name="dc" value="http://purl.org/dc/elements/1.1/" />
+ </properties-param>
+ </init-params>
+ </component-plugin>
+ <component-plugin>
+ <name>add.nodeType</name>
+ <set-method>addPlugin</set-method>
+ <type>org.exoplatform.services.jcr.impl.AddNodeTypePlugin</type>
+ <init-params>
+ <values-param>
+ <name>autoCreatedInNewRepository</name>
+ <description>Node types configuration file</description>
+ <value>jar:/conf/ext-nodetypes-config.xml</value>
+ </values-param>
+ </init-params>
+ </component-plugin>
+ </component-plugins>
+ </component>
+
+ <component>
+ <key>org.exoplatform.services.jcr.config.RepositoryServiceConfiguration</key>
+ <type>org.exoplatform.services.jcr.impl.config.RepositoryServiceConfigurationImpl</type>
+ <init-params>
+ <value-param>
+ <name>conf-path</name>
+ <description>JCR configuration file</description>
+ <value>jar:/conf/standalone/test-jcr-ext-config-backup.xml</value>
+ </value-param>
+ <properties-param>
+ <name>working-conf</name>
+ <description>working-conf</description>
+ <property name="persister-class-name"
+ value="org.exoplatform.services.jcr.impl.config.JDBCConfigurationPersister" />
+ <property name="source-name" value="jdbcjcr" />
+ </properties-param>
+ </init-params>
+ </component>
+
+ <component>
+ <type>org.exoplatform.services.jcr.ext.repository.RestRepositoryService</type>
+ </component>
+
+ <!-- backup -->
+ <component>
+ <key>org.exoplatform.services.jcr.ext.backup.BackupManager</key>
+ <type>org.exoplatform.services.jcr.ext.backup.impl.BackupManagerImpl</type>
+ <init-params>
+ <properties-param>
+ <name>backup-properties</name>
+ <property name="default-incremental-job-period" value="3600" />
+ <property name="full-backup-type" value="org.exoplatform.services.jcr.ext.backup.impl.fs.FullBackupJob" />
+ <property name="incremental-backup-type" value="org.exoplatform.services.jcr.ext.backup.impl.fs.IncrementalBackupJob" />
+ <property name="backup-dir" value="target/backup" />
+ </properties-param>
+ </init-params>
+ </component>
+
+ <!-- HTTPBackupAgent -->
+ <component>
+ <type>org.exoplatform.services.jcr.ext.backup.server.HTTPBackupAgent</type>
+ </component>
+
+ <component>
+ <type>org.exoplatform.services.jcr.ext.app.ThreadLocalSessionProviderService</type>
+ </component>
+
+ <component>
+ <key>org.exoplatform.services.security.Authenticator</key>
+ <type>org.exoplatform.services.organization.auth.OrganizationAuthenticatorImpl</type>
+ </component>
+
+ <component>
+ <type>org.exoplatform.services.jcr.ext.resource.NodeRepresentationService</type>
+ </component>
+
+ <component>
+ <type>org.exoplatform.services.jcr.ext.resource.XMLViewNodeRepresentationRenderer</type>
+ </component>
+
+ <component>
+ <type>org.exoplatform.services.jcr.ext.resource.jcr.Handler</type>
+ </component>
+
+ <component>
+ <type>org.exoplatform.services.organization.impl.mock.DummyOrganizationService</type>
+ </component>
+
+ <component>
+ <key>org.exoplatform.services.security.Authenticator</key>
+ <type>org.exoplatform.services.organization.auth.OrganizationAuthenticatorImpl</type>
+ </component>
+
+ <component>
+ <key>org.exoplatform.services.jcr.ext.distribution.DataDistributionManager</key>
+ <type>org.exoplatform.services.jcr.ext.distribution.impl.DataDistributionManagerImpl</type>
+ </component>
+
+ <component>
+ <key>org.exoplatform.services.jcr.ext.hierarchy.NodeHierarchyCreator</key>
+ <type>org.exoplatform.services.jcr.ext.hierarchy.impl.NodeHierarchyCreatorImpl</type>
+ <init-params>
+ <value-param>
+ <name>auto-migrate</name>
+ <value>false</value>
+ </value-param>
+ </init-params>
+ </component>
+
+ <external-component-plugins>
+ <target-component>org.exoplatform.services.naming.InitialContextInitializer</target-component>
+ <component-plugin>
+ <name>bind.datasource</name>
+ <set-method>addPlugin</set-method>
+ <type>org.exoplatform.services.naming.BindReferencePlugin</type>
+ <init-params>
+ <value-param>
+ <name>bind-name</name>
+ <value>jdbcjcr</value>
+ </value-param>
+ <value-param>
+ <name>class-name</name>
+ <value>javax.sql.DataSource</value>
+ </value-param>
+ <value-param>
+ <name>factory</name>
+ <value>org.apache.commons.dbcp.BasicDataSourceFactory</value>
+ </value-param>
+ <properties-param>
+ <name>ref-addresses</name>
+ <description>ref-addresses</description>
+ <property name="driverClassName" value="com.ibm.db2.jcc.DB2Driver" />
+ <property name="url" value="jdbc:db2://dbs-jcr.exoplatform.com.ua:50002/db1" />
+ <property name="username" value="db2inst1" />
+ <property name="password" value="eXoAdmin" />
+ </properties-param>
+ </init-params>
+ </component-plugin>
+ <component-plugin>
+ <name>bind.datasource</name>
+ <set-method>addPlugin</set-method>
+ <type>org.exoplatform.services.naming.BindReferencePlugin</type>
+ <init-params>
+ <value-param>
+ <name>bind-name</name>
+ <value>jdbcjcr1</value>
+ </value-param>
+ <value-param>
+ <name>class-name</name>
+ <value>javax.sql.DataSource</value>
+ </value-param>
+ <value-param>
+ <name>factory</name>
+ <value>org.apache.commons.dbcp.BasicDataSourceFactory</value>
+ </value-param>
+ <properties-param>
+ <name>ref-addresses</name>
+ <description>ref-addresses</description>
+ <property name="driverClassName" value="com.ibm.db2.jcc.DB2Driver" />
+ <property name="url" value="jdbc:db2://dbs-jcr.exoplatform.com.ua:50002/db2_ws" />
+ <property name="username" value="db2inst1" />
+ <property name="password" value="eXoAdmin" />
+ </properties-param>
+ </init-params>
+ </component-plugin>
+ <component-plugin>
+ <name>bind.datasource</name>
+ <set-method>addPlugin</set-method>
+ <type>org.exoplatform.services.naming.BindReferencePlugin</type>
+ <init-params>
+ <value-param>
+ <name>bind-name</name>
+ <value>jdbcjcr2</value>
+ </value-param>
+ <value-param>
+ <name>class-name</name>
+ <value>javax.sql.DataSource</value>
+ </value-param>
+ <value-param>
+ <name>factory</name>
+ <value>org.apache.commons.dbcp.BasicDataSourceFactory</value>
+ </value-param>
+ <properties-param>
+ <name>ref-addresses</name>
+ <description>ref-addresses</description>
+ <property name="driverClassName" value="com.ibm.db2.jcc.DB2Driver" />
+ <property name="url" value="jdbc:db2://dbs-jcr.exoplatform.com.ua:50002/db2_ws1" />
+ <property name="username" value="db2inst1" />
+ <property name="password" value="eXoAdmin" />
+ </properties-param>
+ </init-params>
+ </component-plugin>
+ </external-component-plugins>
+</configuration>
14 years, 6 months