[exo-jcr-commits] exo-jcr SVN: r2092 - in jcr/trunk/exo.jcr.component.core: src/test/resources/conf/standalone and 1 other directory.

[do-not-reply at jboss.org]

Author: sergiykarpenko
Date: 2010-03-22 08:17:37 -0400 (Mon, 22 Mar 2010)
New Revision: 2092

Modified:
   jcr/trunk/exo.jcr.component.core/pom.xml
   jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-configuration-sjdbc.xml
   jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-jcr-config-sjdbc.xml
   jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-jcr-config.xml
Log:
EXOJCR-598: xmls reverted

Modified: jcr/trunk/exo.jcr.component.core/pom.xml
===================================================================
--- jcr/trunk/exo.jcr.component.core/pom.xml	2010-03-22 12:11:01 UTC (rev 2091)
+++ jcr/trunk/exo.jcr.component.core/pom.xml	2010-03-22 12:17:37 UTC (rev 2092)
@@ -31,8 +31,7 @@
    <name>eXo JCR :: Component :: Core Service</name>
    <description>eXo JCR Service core component</description>
    <properties>
-      <!--jcr.test.configuration.file>/conf/standalone/test-configuration.xml</jcr.test.configuration.file-->
-      <jcr.test.configuration.file>/conf/standalone/test-configuration-sjdbc.xml</jcr.test.configuration.file>
+      <jcr.test.configuration.file>/conf/standalone/test-configuration.xml</jcr.test.configuration.file>
    </properties>
    <dependencies>
       <dependency>
@@ -215,7 +214,7 @@
          <scope>test</scope>
       </dependency>
       <!-- For Oracle 10g support (local-jcr repository) -->
-      <dependency>
+      <!-- dependency>
          <groupId>ojdbc</groupId>
          <artifactId>ojdbc</artifactId>
          <version>14</version>
@@ -226,7 +225,7 @@
          <artifactId>orai18n</artifactId>
          <version>14</version>
          <scope>test</scope>
-      </dependency>
+      </dependency -->
       <!-- For IBM DB2 support (local-jcr repository) -->
       <!-- dependency>
          <groupId>com.ibm.db2</groupId>
@@ -359,11 +358,11 @@
                   <property>
                      <name>emma.coverage.out.file</name>
                      <value>target/emma/coverage.ec</value>
-                  </property>
-            <!-- Uncomment the line below if you want to enable the statistics -->
-            <!--property>
-                <name>JDBCWorkspaceDataContainer.statistics.enabled</name>
-                <value>true</value>
+                  </property>
+            <!-- Uncomment the line below if you want to enable the statistics -->
+            <!--property>
+                <name>JDBCWorkspaceDataContainer.statistics.enabled</name>
+                <value>true</value>
             </property-->
                </systemProperties>
                <includes>
@@ -549,11 +548,11 @@
                               org.apache.jackrabbit.test.api.nodetype.PredefinedNodeTypeTest#testVersionable
                               org.apache.jackrabbit.test.api.nodetype.PredefinedNodeTypeTest#testVersion
                               org.apache.jackrabbit.test.api.NamespaceRegistryTest#testRegisterNamespace</value>
-                        </property>
-                     <!-- Uncomment the line below if you want to enable the statistics -->
-                     <!--property>
-                     <name>JDBCWorkspaceDataContainer.statistics.enabled</name>
-                     <value>true</value>
+                        </property>
+                     <!-- Uncomment the line below if you want to enable the statistics -->
+                     <!--property>
+                     <name>JDBCWorkspaceDataContainer.statistics.enabled</name>
+                     <value>true</value>
                      </property-->
                      </systemProperties>
                      <includes>
@@ -621,11 +620,11 @@
                               org.apache.jackrabbit.test.api.nodetype.PredefinedNodeTypeTest#testVersionable
                               org.apache.jackrabbit.test.api.nodetype.PredefinedNodeTypeTest#testVersion
                               org.apache.jackrabbit.test.api.NamespaceRegistryTest#testRegisterNamespace</value>
-                        </property>
-                     <!-- Uncomment the line below if you want to enable the statistics -->
-                     <!--property>
-                     <name>JDBCWorkspaceDataContainer.statistics.enabled</name>
-                     <value>true</value>
+                        </property>
+                     <!-- Uncomment the line below if you want to enable the statistics -->
+                     <!--property>
+                     <name>JDBCWorkspaceDataContainer.statistics.enabled</name>
+                     <value>true</value>
                      </property-->
                      </systemProperties>
                      <includes>
@@ -699,11 +698,11 @@
                         <property>
                            <name>jcr.test.configuration.file</name>
                            <value>${jcr.test.configuration.file}</value>
-                        </property>
-                        <!-- Uncomment the line below if you want to enable the statistics -->
-                        <!--property>
-                        <name>JDBCWorkspaceDataContainer.statistics.enabled</name>
-                        <value>true</value>
+                        </property>
+                        <!-- Uncomment the line below if you want to enable the statistics -->
+                        <!--property>
+                        <name>JDBCWorkspaceDataContainer.statistics.enabled</name>
+                        <value>true</value>
                         </property-->
                      </systemProperties>
                      <includes>

Modified: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-configuration-sjdbc.xml
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-configuration-sjdbc.xml	2010-03-22 12:11:01 UTC (rev 2091)
+++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-configuration-sjdbc.xml	2010-03-22 12:17:37 UTC (rev 2092)
@@ -244,13 +244,10 @@
         <properties-param>
           <name>ref-addresses</name>
           <description>ref-addresses</description>
-          <property name="driverClassName" value="oracle.jdbc.OracleDriver" />
-          <property name="url" value="jdbc:oracle:thin:@db2.exoua-int:1521:orclvm" />
-          <property name="username" value="exoperf" />
-          <property name="password" value="exo12321" />
-          <property name="maxActive" value="600" />
-          <property name="maxIdle" value="50" />
-          <property name="initialSize" value="5" />
+          <property name="driverClassName" value="org.hsqldb.jdbcDriver"/>
+          <property name="url" value="jdbc:hsqldb:file:target/temp/data/portal"/>
+          <property name="username" value="sa"/>
+          <property name="password" value=""/>
         </properties-param>
       </init-params>
     </component-plugin>

Modified: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-jcr-config-sjdbc.xml
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-jcr-config-sjdbc.xml	2010-03-22 12:11:01 UTC (rev 2091)
+++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-jcr-config-sjdbc.xml	2010-03-22 12:17:37 UTC (rev 2092)
@@ -38,7 +38,6 @@
                      <property name="update-storage" value="false" />
                      <property name="max-buffer-size" value="200k" />
                      <property name="swap-directory" value="target/temp/swap/ws" />
-                     <property name="force.query.hints" value="true" />
                   </properties>
                   <value-storages>
                      <value-storage id="ws" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage">

Modified: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-jcr-config.xml
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-jcr-config.xml	2010-03-22 12:11:01 UTC (rev 2091)
+++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-jcr-config.xml	2010-03-22 12:17:37 UTC (rev 2092)
@@ -36,7 +36,6 @@
                      <property name="dialect" value="auto" />
                      <property name="multi-db" value="true" />
                      <property name="update-storage" value="false" />
-
                      <property name="max-buffer-size" value="200k" />
                      <property name="swap-directory" value="target/temp/swap/ws" />
                   </properties>