9:01 a.m.
Author: nfilotto
Date: 2010-01-14 10:01:28 -0500 (Thu, 14 Jan 2010)
New Revision: 1392
Added:
jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/nul
Modified:
jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/CacheableWorkspaceDataManager.java
jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/resources/conf/cluster/test-configuration.xml
jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/resources/conf/standalone/test-configuration.xml
Log:
EXOJCR-389: Find a way to configure Transaction timeout parameter from xml.
Added: jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/nul
===================================================================
--- jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/nul (rev
0)
+++ jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/nul 2010-01-14 15:01:28 UTC (rev
1392)
@@ -0,0 +1,70 @@
+13.01.2010 21:12:19 *ERROR* [main] ConfigurationUnmarshaller: In document
file:/eXo/java/eXoProjects/exo-jcr/jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/target/test-classes/conf/standalone/test-configuration.xml
at (208,7) :The string "--" is not permitted within comments.
(ConfigurationUnmarshaller.java, line 112)
+13.01.2010 21:12:19 *ERROR* [main] ConfigurationUnmarshaller: Got a sax exception when
doing XSD validation (ConfigurationUnmarshaller.java, line 168)
+13.01.2010 21:12:19 *ERROR* [main] ConfigurationManagerImpl: Cannot process the
configuration
file:/eXo/java/eXoProjects/exo-jcr/jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/target/test-classes/conf/standalone/test-configuration.xml
(ConfigurationManagerImpl.java, line 202)
+org.xml.sax.SAXParseException: The string "--" is not permitted within
comments.
+ at com.sun.org.apache.xerces.internal.parsers.DOMParser.parse(DOMParser.java:264)
+ at
com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderImpl.parse(DocumentBuilderImpl.java:292)
+ at javax.xml.parsers.DocumentBuilder.parse(DocumentBuilder.java:98)
+ at
org.exoplatform.container.configuration.ConfigurationUnmarshaller.unmarshall(ConfigurationUnmarshaller.java:219)
+ at
org.exoplatform.container.configuration.ConfigurationManagerImpl.addConfiguration(ConfigurationManagerImpl.java:173)
+ at
org.exoplatform.container.configuration.ConfigurationManagerImpl.addConfiguration(ConfigurationManagerImpl.java:140)
+ at org.exoplatform.container.StandaloneContainer.populate(StandaloneContainer.java:346)
+ at
org.exoplatform.container.StandaloneContainer.getInstance(StandaloneContainer.java:139)
+ at
org.exoplatform.container.StandaloneContainer.getInstance(StandaloneContainer.java:92)
+ at org.exoplatform.services.jcr.BaseStandaloneTest.setUp(BaseStandaloneTest.java:117)
+ at junit.framework.TestCase.runBare(TestCase.java:128)
+ at junit.framework.TestResult$1.protect(TestResult.java:106)
+ at junit.framework.TestResult.runProtected(TestResult.java:124)
+ at junit.framework.TestResult.run(TestResult.java:109)
+ at junit.framework.TestCase.run(TestCase.java:120)
+ at junit.framework.TestSuite.runTest(TestSuite.java:230)
+ at junit.framework.TestSuite.run(TestSuite.java:225)
+ at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
+ at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39)
+ at
sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)
+ at java.lang.reflect.Method.invoke(Method.java:592)
+ at org.apache.maven.surefire.junit.JUnitTestSet.execute(JUnitTestSet.java:213)
+ at
org.apache.maven.surefire.suite.AbstractDirectoryTestSuite.executeTestSet(AbstractDirectoryTestSuite.java:140)
+ at
org.apache.maven.surefire.suite.AbstractDirectoryTestSuite.execute(AbstractDirectoryTestSuite.java:127)
+ at org.apache.maven.surefire.Surefire.run(Surefire.java:177)
+ at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
+ at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39)
+ at
sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)
+ at java.lang.reflect.Method.invoke(Method.java:592)
+ at
org.apache.maven.surefire.booter.SurefireBooter.runSuitesInProcess(SurefireBooter.java:345)
+ at org.apache.maven.surefire.booter.SurefireBooter.main(SurefireBooter.java:1009)
+13.01.2010 21:19:56 *ERROR* [main] ConfigurationUnmarshaller: In document
file:/eXo/java/eXoProjects/exo-jcr/jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/target/test-classes/conf/standalone/test-configuration.xml
at (208,7) :The string "--" is not permitted within comments.
(ConfigurationUnmarshaller.java, line 112)
+13.01.2010 21:19:56 *ERROR* [main] ConfigurationUnmarshaller: Got a sax exception when
doing XSD validation (ConfigurationUnmarshaller.java, line 168)
+13.01.2010 21:19:56 *ERROR* [main] ConfigurationManagerImpl: Cannot process the
configuration
file:/eXo/java/eXoProjects/exo-jcr/jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/target/test-classes/conf/standalone/test-configuration.xml
(ConfigurationManagerImpl.java, line 202)
+org.xml.sax.SAXParseException: The string "--" is not permitted within
comments.
+ at com.sun.org.apache.xerces.internal.parsers.DOMParser.parse(DOMParser.java:264)
+ at
com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderImpl.parse(DocumentBuilderImpl.java:292)
+ at javax.xml.parsers.DocumentBuilder.parse(DocumentBuilder.java:98)
+ at
org.exoplatform.container.configuration.ConfigurationUnmarshaller.unmarshall(ConfigurationUnmarshaller.java:219)
+ at
org.exoplatform.container.configuration.ConfigurationManagerImpl.addConfiguration(ConfigurationManagerImpl.java:173)
+ at
org.exoplatform.container.configuration.ConfigurationManagerImpl.addConfiguration(ConfigurationManagerImpl.java:140)
+ at org.exoplatform.container.StandaloneContainer.populate(StandaloneContainer.java:346)
+ at
org.exoplatform.container.StandaloneContainer.getInstance(StandaloneContainer.java:139)
+ at
org.exoplatform.container.StandaloneContainer.getInstance(StandaloneContainer.java:92)
+ at org.exoplatform.services.jcr.BaseStandaloneTest.setUp(BaseStandaloneTest.java:117)
+ at junit.framework.TestCase.runBare(TestCase.java:128)
+ at junit.framework.TestResult$1.protect(TestResult.java:106)
+ at junit.framework.TestResult.runProtected(TestResult.java:124)
+ at junit.framework.TestResult.run(TestResult.java:109)
+ at junit.framework.TestCase.run(TestCase.java:120)
+ at junit.framework.TestSuite.runTest(TestSuite.java:230)
+ at junit.framework.TestSuite.run(TestSuite.java:225)
+ at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
+ at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39)
+ at
sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)
+ at java.lang.reflect.Method.invoke(Method.java:592)
+ at org.apache.maven.surefire.junit.JUnitTestSet.execute(JUnitTestSet.java:213)
+ at
org.apache.maven.surefire.suite.AbstractDirectoryTestSuite.executeTestSet(AbstractDirectoryTestSuite.java:140)
+ at
org.apache.maven.surefire.suite.AbstractDirectoryTestSuite.execute(AbstractDirectoryTestSuite.java:127)
+ at org.apache.maven.surefire.Surefire.run(Surefire.java:177)
+ at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
+ at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39)
+ at
sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)
+ at java.lang.reflect.Method.invoke(Method.java:592)
+ at
org.apache.maven.surefire.booter.SurefireBooter.runSuitesInProcess(SurefireBooter.java:345)
+ at org.apache.maven.surefire.booter.SurefireBooter.main(SurefireBooter.java:1009)
Modified:
jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/CacheableWorkspaceDataManager.java
===================================================================
---
jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/CacheableWorkspaceDataManager.java 2010-01-14
14:33:52 UTC (rev 1391)
+++
jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/CacheableWorkspaceDataManager.java 2010-01-14
15:01:28 UTC (rev 1392)
@@ -482,7 +482,6 @@
try
{
transactionManager.begin();
- transactionManager.setTransactionTimeout(20); // TODO manage it via the
configuration
cache.beginTransaction(); // TODO keep it into the cache impl
super.save(changesLog);
cache.commitTransaction();
Modified:
jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/resources/conf/cluster/test-configuration.xml
===================================================================
---
jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/resources/conf/cluster/test-configuration.xml 2010-01-14
14:33:52 UTC (rev 1391)
+++
jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/resources/conf/cluster/test-configuration.xml 2010-01-14
15:01:28 UTC (rev 1392)
@@ -204,6 +204,12 @@
<component>
<key>org.exoplatform.services.transaction.TransactionService</key>
<type>org.exoplatform.services.transaction.jbosscache.ArjunaTransactionService</type>
+ <init-params>
+ <value-param>
+ <name>timeout</name>
+ <value>20</value>
+ </value-param>
+ </init-params>
</component>
<!-- component>
Modified:
jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/resources/conf/standalone/test-configuration.xml
===================================================================
---
jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/resources/conf/standalone/test-configuration.xml 2010-01-14
14:33:52 UTC (rev 1391)
+++
jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/resources/conf/standalone/test-configuration.xml 2010-01-14
15:01:28 UTC (rev 1392)
@@ -203,6 +203,12 @@
<component>
<key>org.exoplatform.services.transaction.TransactionService</key>
<type>org.exoplatform.services.transaction.jbosscache.ArjunaTransactionService</type>
+ <init-params>
+ <value-param>
+ <name>timeout</name>
+ <value>20</value>
+ </value-param>
+ </init-params>
</component>
<!-- component>