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

exo-jcr SVN: r1748 - jcr/trunk/exo.jcr.component.ext/src/test/resources/conf/standalone.

by do-not-reply＠jboss.org

Author: sergiykarpenko Date: 2010-02-10 05:02:16 -0500 (Wed, 10 Feb 2010) New Revision: 1748 Modified: jcr/trunk/exo.jcr.component.ext/src/test/resources/conf/standalone/test-jcr-ext-config-replication.xml jcr/trunk/exo.jcr.component.ext/src/test/resources/conf/standalone/test-jcr-ext-config.xml Log: EXOJCR-488: EXT .JDBCWorkspaceDataContainer changed to .optimisation.CQJDBCWorkspaceDataContainer Modified: jcr/trunk/exo.jcr.component.ext/src/test/resources/conf/standalone/test-jcr-ext-config-replication.xml =================================================================== --- jcr/trunk/exo.jcr.component.ext/src/test/resources/conf/standalone/test-jcr-ext-config-replication.xml 2010-02-10 09:52:28 UTC (rev 1747) +++ jcr/trunk/exo.jcr.component.ext/src/test/resources/conf/standalone/test-jcr-ext-config-replication.xml 2010-02-10 10:02:16 UTC (rev 1748) @@ -1,204 +1,204 @@ - - - -<repository-service default-repository="db1"> - <repositories> - - <repository name="db1" system-workspace="ws" default-workspace="ws"> - <security-domain>exo-domain</security-domain> - <access-control>optional</access-control> - - <authentication-policy>org.exoplatform.services.jcr.impl.core.access.JAASAuthenticator</authentication-policy> - <workspaces> - <workspace name="ws" auto-init-root-nodetype="nt:unstructured" auto-init-permissions="any read;*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove"> - <container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer"> - <properties> - <property name="source-name" value="jdbcjcr2" /> - <property name="dialect" value="generic" /> - <property name="multi-db" value="true" /> - <property name="update-storage" value="true" /> - <property name="max-buffer-size" value="200k" /> - <property name="swap-directory" value="target/temp1/swap/ws" /> - </properties> - <value-storages> - <value-storage id="Storage #1" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> - <properties> - <property name="path" value="target/temp1/values/ws" /> - </properties> - <filters> - <filter property-type="Binary" min-value-size="100000" /> - </filters> - </value-storage> - </value-storages> - </container> - <cache enabled="true"> - <properties> - <property name="max-size" value="1000" /> - <property name="live-time" value="1800" /> - </properties> - </cache> - <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> - <properties> - <property name="index-dir" value="target/temp1/index" /> - </properties> - </query-handler> - </workspace> - </workspaces> - </repository> - - <repository name="db2" system-workspace="ws" default-workspace="ws"> - <security-domain>exo-domain</security-domain> - <access-control>optional</access-control> - - <authentication-policy>org.exoplatform.services.jcr.impl.core.access.JAASAuthenticator</authentication-policy> - <workspaces> - <workspace name="ws" auto-init-root-nodetype="nt:unstructured" auto-init-permissions="any read;*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove"> - <container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer"> - <properties> - <property name="source-name" value="jdbcjcr1" /> - <property name="dialect" value="generic" /> - <property name="multi-db" value="true" /> - <property name="update-storage" value="true" /> - <property name="max-buffer-size" value="204800" /> - <property name="swap-directory" value="target/temp2/swap/ws" /> - </properties> - <value-storages> - <value-storage id="Storage #1" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> - <properties> - <property name="path" value="target/temp2/values/ws" /> - </properties> - <filters> - <filter property-type="Binary" min-value-size="100000" /> - </filters> - </value-storage> - </value-storages> - </container> - <cache enabled="true"> - <properties> - <property name="max-size" value="1000" /> - <property name="live-time" value="1800" /> - </properties> - </cache> - <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> - <properties> - <property name="index-dir" value="target/temp2/index" /> - </properties> - </query-handler> - </workspace> - </workspaces> - </repository> - - </repositories> -</repository-service> - - - - - + + +<repository-service default-repository="db1"> + <repositories> + + <repository name="db1" system-workspace="ws" default-workspace="ws"> + <security-domain>exo-domain</security-domain> + <access-control>optional</access-control> + + <authentication-policy>org.exoplatform.services.jcr.impl.core.access.JAASAuthenticator</authentication-policy> + <workspaces> + <workspace name="ws" auto-init-root-nodetype="nt:unstructured" auto-init-permissions="any read;*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove"> + <container class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer"> + <properties> + <property name="source-name" value="jdbcjcr2" /> + <property name="dialect" value="generic" /> + <property name="multi-db" value="true" /> + <property name="update-storage" value="true" /> + <property name="max-buffer-size" value="200k" /> + <property name="swap-directory" value="target/temp1/swap/ws" /> + </properties> + <value-storages> + <value-storage id="Storage #1" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> + <properties> + <property name="path" value="target/temp1/values/ws" /> + </properties> + <filters> + <filter property-type="Binary" min-value-size="100000" /> + </filters> + </value-storage> + </value-storages> + </container> + <cache enabled="true"> + <properties> + <property name="max-size" value="1000" /> + <property name="live-time" value="1800" /> + </properties> + </cache> + <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> + <properties> + <property name="index-dir" value="target/temp1/index" /> + </properties> + </query-handler> + </workspace> + </workspaces> + </repository> + + <repository name="db2" system-workspace="ws" default-workspace="ws"> + <security-domain>exo-domain</security-domain> + <access-control>optional</access-control> + + <authentication-policy>org.exoplatform.services.jcr.impl.core.access.JAASAuthenticator</authentication-policy> + <workspaces> + <workspace name="ws" auto-init-root-nodetype="nt:unstructured" auto-init-permissions="any read;*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove"> + <container class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer"> + <properties> + <property name="source-name" value="jdbcjcr1" /> + <property name="dialect" value="generic" /> + <property name="multi-db" value="true" /> + <property name="update-storage" value="true" /> + <property name="max-buffer-size" value="204800" /> + <property name="swap-directory" value="target/temp2/swap/ws" /> + </properties> + <value-storages> + <value-storage id="Storage #1" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> + <properties> + <property name="path" value="target/temp2/values/ws" /> + </properties> + <filters> + <filter property-type="Binary" min-value-size="100000" /> + </filters> + </value-storage> + </value-storages> + </container> + <cache enabled="true"> + <properties> + <property name="max-size" value="1000" /> + <property name="live-time" value="1800" /> + </properties> + </cache> + <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> + <properties> + <property name="index-dir" value="target/temp2/index" /> + </properties> + </query-handler> + </workspace> + </workspaces> + </repository> + + </repositories> +</repository-service> + + + + + \ No newline at end of file Modified: jcr/trunk/exo.jcr.component.ext/src/test/resources/conf/standalone/test-jcr-ext-config.xml =================================================================== --- jcr/trunk/exo.jcr.component.ext/src/test/resources/conf/standalone/test-jcr-ext-config.xml 2010-02-10 09:52:28 UTC (rev 1747) +++ jcr/trunk/exo.jcr.component.ext/src/test/resources/conf/standalone/test-jcr-ext-config.xml 2010-02-10 10:02:16 UTC (rev 1748) @@ -27,7 +27,7 @@ <workspaces> <workspace name="ws">  - <container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer"> + <container class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer"> <properties> <property name="source-name" value="jdbcjcr" /> <property name="dialect" value="hsqldb" /> @@ -43,14 +43,14 @@ <property name="live-time" value="1h" /> </properties> </cache> - <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> - <properties> - <property name="index-dir" value="target/temp/index/ws" /> - </properties> - </query-handler> + <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> + <properties> + <property name="index-dir" value="target/temp/index/ws" /> + </properties> + </query-handler> </workspace> <workspace name="ws1"> - <container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer"> + <container class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer"> <properties> <property name="source-name" value="jdbcjcr1" /> <property name="dialect" value="hsqldb" /> @@ -66,14 +66,14 @@ <property name="live-time" value="1h" /> </properties> </cache> - <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> - <properties> - <property name="index-dir" value="target/temp/index/ws1" /> - </properties> + <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> + <properties> + <property name="index-dir" value="target/temp/index/ws1" /> + </properties> </query-handler> </workspace> <workspace name="ws2" auto-init-root-nodetype="nt:unstructured"> - <container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer"> + <container class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer"> <properties> <property name="source-name" value="jdbcjcr2" /> <property name="dialect" value="hsqldb" /> @@ -89,14 +89,14 @@ <property name="live-time" value="1h" /> </properties> </cache> - <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> - <properties> - <property name="index-dir" value="target/temp/index/ws2" /> - </properties> - </query-handler> + <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> + <properties> + <property name="index-dir" value="target/temp/index/ws2" /> + </properties> + </query-handler> </workspace> <workspace name="ws3" auto-init-root-nodetype="nt:unstructured"> - <container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer"> + <container class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer"> <properties> <property name="source-name" value="jdbcjcr3" /> <property name="dialect" value="hsqldb" /> @@ -119,7 +119,7 @@ </query-handler> </workspace> <workspace name="ws4" auto-init-root-nodetype="nt:unstructured"> - <container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer"> + <container class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer"> <properties> <property name="source-name" value="jdbcjcr4" /> <property name="dialect" value="hsqldb" /> @@ -140,280 +140,280 @@ <property name="index-dir" value="target/temp/index/ws4" /> </properties> </query-handler> - </workspace> - <workspace name="ws5" auto-init-root-nodetype="nt:unstructured"> - <container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer"> - <properties> - <property name="source-name" value="jdbcjcr5" /> - <property name="dialect" value="hsqldb" /> - <property name="multi-db" value="true" /> - <property name="update-storage" value="true" /> - <property name="max-buffer-size" value="200k" /> - <property name="swap-directory" value="target/temp/swap/ws5" /> - </properties> - </container> - <cache enabled="true"> - <properties> - <property name="max-size" value="5k" /> - <property name="live-time" value="1h" /> - </properties> - </cache> - <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> - <properties> - <property name="index-dir" value="target/temp/index/ws5" /> - </properties> - </query-handler> </workspace> + <workspace name="ws5" auto-init-root-nodetype="nt:unstructured"> + <container class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer"> + <properties> + <property name="source-name" value="jdbcjcr5" /> + <property name="dialect" value="hsqldb" /> + <property name="multi-db" value="true" /> + <property name="update-storage" value="true" /> + <property name="max-buffer-size" value="200k" /> + <property name="swap-directory" value="target/temp/swap/ws5" /> + </properties> + </container> + <cache enabled="true"> + <properties> + <property name="max-size" value="5k" /> + <property name="live-time" value="1h" /> + </properties> + </cache> + <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> + <properties> + <property name="index-dir" value="target/temp/index/ws5" /> + </properties> + </query-handler> + </workspace> </workspaces> - </repository> - <repository name="db2" system-workspace="ws" default-workspace="ws"> - <security-domain>exo-domain</security-domain> - <access-control>optional</access-control> - <authentication-policy>org.exoplatform.services.jcr.impl.core.access.JAASAuthenticator</authentication-policy> - <workspaces> - <workspace name="ws"> -  - <container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer"> - <properties> - <property name="source-name" value="jdbcjcr19" /> - <property name="dialect" value="hsqldb" /> - <property name="multi-db" value="true" /> - <property name="update-storage" value="true" /> - <property name="max-buffer-size" value="200k" /> - <property name="swap-directory" value="target/temp2/swap/ws" /> - </properties> - </container> - <cache enabled="true"> - <properties> - <property name="max-size" value="5k" /> - <property name="live-time" value="1h" /> - </properties> - </cache> - <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> - <properties> - <property name="index-dir" value="target/temp2/index/ws" /> - </properties> - </query-handler> - </workspace> - </workspaces> - </repository> - <repository name="db3" system-workspace="ws" default-workspace="ws"> - <security-domain>exo-domain</security-domain> - <access-control>optional</access-control> - <authentication-policy>org.exoplatform.services.jcr.impl.core.access.JAASAuthenticator</authentication-policy> - <workspaces> - <workspace name="ws"> -  - <container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer"> - <properties> - <property name="source-name" value="jdbcjcr77" /> - <property name="dialect" value="hsqldb" /> - <property name="multi-db" value="false" /> - <property name="update-storage" value="true" /> - <property name="max-buffer-size" value="200k" /> - <property name="swap-directory" value="target/temp/swap/db3_ws" /> - </properties> - </container> - <cache enabled="true"> - <properties> - <property name="max-size" value="5k" /> - <property name="live-time" value="1h" /> - </properties> - </cache> - <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> - <properties> - <property name="index-dir" value="target/temp/index/db3_ws" /> - </properties> - </query-handler> - </workspace> - </workspaces> - </repository> - <repository name="db4" system-workspace="ws" default-workspace="ws"> - <security-domain>exo-domain</security-domain> - <access-control>optional</access-control> - <authentication-policy>org.exoplatform.services.jcr.impl.core.access.JAASAuthenticator</authentication-policy> - <workspaces> - <workspace name="ws"> -  - <container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer"> - <properties> - <property name="source-name" value="jdbcjcr20" /> - <property name="dialect" value="hsqldb" /> - <property name="multi-db" value="true" /> - <property name="update-storage" value="true" /> - <property name="max-buffer-size" value="200k" /> - <property name="swap-directory" value="target/temp/swap/db4_ws" /> - </properties> - </container> - <cache enabled="true"> - <properties> - <property name="max-size" value="5k" /> - <property name="live-time" value="1h" /> - </properties> - </cache> - <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> - <properties> - <property name="index-dir" value="target/temp/index/db4_ws" /> - </properties> - </query-handler> - </workspace> - <workspace name="ws1"> -  - <container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer"> - <properties> - <property name="source-name" value="jdbcjcr22" /> - <property name="dialect" value="hsqldb" /> - <property name="multi-db" value="true" /> - <property name="update-storage" value="true" /> - <property name="max-buffer-size" value="200k" /> - <property name="swap-directory" value="target/temp/swap/db4_ws1" /> - </properties> - </container> - <cache enabled="true"> - <properties> - <property name="max-size" value="5k" /> - <property name="live-time" value="1h" /> - </properties> - </cache> - <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> - <properties> - <property name="index-dir" value="target/temp/index/db4_ws1" /> - </properties> - </query-handler> - </workspace> - </workspaces> - </repository> - <repository name="db5" system-workspace="ws" default-workspace="ws"> - <security-domain>exo-domain</security-domain> - <access-control>optional</access-control> - <authentication-policy>org.exoplatform.services.jcr.impl.core.access.JAASAuthenticator</authentication-policy> - <workspaces> - <workspace name="ws"> -  - <container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer"> - <properties> - <property name="source-name" value="jdbcjcr21" /> - <property name="dialect" value="hsqldb" /> - <property name="multi-db" value="true" /> - <property name="update-storage" value="true" /> - <property name="max-buffer-size" value="200k" /> - <property name="swap-directory" value="target/temp/swap/db5_ws" /> - </properties> - </container> - <cache enabled="true"> - <properties> - <property name="max-size" value="5k" /> - <property name="live-time" value="1h" /> - </properties> - </cache> - <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> - <properties> - <property name="index-dir" value="target/temp/index/db5_ws" /> - </properties> - </query-handler> - </workspace> - <workspace name="ws1"> -  - <container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer"> - <properties> - <property name="source-name" value="jdbcjcr23" /> - <property name="dialect" value="hsqldb" /> - <property name="multi-db" value="true" /> - <property name="update-storage" value="true" /> - <property name="max-buffer-size" value="200k" /> - <property name="swap-directory" value="target/temp/swap/db5_ws1" /> - </properties> - </container> - <cache enabled="true"> - <properties> - <property name="max-size" value="5k" /> - <property name="live-time" value="1h" /> - </properties> - </cache> - <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> - <properties> - <property name="index-dir" value="target/temp/index/db5_ws1" /> - </properties> - </query-handler> - </workspace> - </workspaces> - </repository> - <repository name="db6" system-workspace="ws" default-workspace="ws"> - <security-domain>exo-domain</security-domain> - <access-control>optional</access-control> - <authentication-policy>org.exoplatform.services.jcr.impl.core.access.JAASAuthenticator</authentication-policy> - <workspaces> - <workspace name="ws"> -  - <container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer"> - <properties> - <property name="source-name" value="jdbcjcr24" /> - <property name="dialect" value="hsqldb" /> - <property name="multi-db" value="false" /> - <property name="update-storage" value="true" /> - <property name="max-buffer-size" value="200k" /> - <property name="swap-directory" value="target/temp/swap/db6_ws" /> - </properties> - </container> - <cache enabled="true"> - <properties> - <property name="max-size" value="5k" /> - <property name="live-time" value="1h" /> - </properties> - </cache> - <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> - <properties> - <property name="index-dir" value="target/temp/index/db6_ws" /> - </properties> - </query-handler> - </workspace> - <workspace name="ws1"> - <container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer"> - <properties> - <property name="source-name" value="jdbcjcr24" /> - <property name="dialect" value="hsqldb" /> - <property name="multi-db" value="false" /> - <property name="update-storage" value="true" /> - <property name="max-buffer-size" value="200k" /> - <property name="swap-directory" value="target/temp/swap/db6_ws1" /> - </properties> - </container> - <cache enabled="true"> - <properties> - <property name="max-size" value="5k" /> - <property name="live-time" value="1h" /> - </properties> - </cache> - <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> - <properties> - <property name="index-dir" value="target/temp/index/db6_ws1" /> - </properties> - </query-handler> - </workspace> - <workspace name="ws2"> - <container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer"> - <properties> - <property name="source-name" value="jdbcjcr24" /> - <property name="dialect" value="hsqldb" /> - <property name="multi-db" value="false" /> - <property name="update-storage" value="true" /> - <property name="max-buffer-size" value="200k" /> - <property name="swap-directory" value="target/temp/swap/db6_ws2" /> - </properties> - </container> - <cache enabled="true"> - <properties> - <property name="max-size" value="5k" /> - <property name="live-time" value="1h" /> - </properties> - </cache> - <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> - <properties> - <property name="index-dir" value="target/temp/index/db6_ws2" /> - </properties> - </query-handler> - </workspace> - </workspaces> - </repository> - </repositories> -</repository-service> + </repository> + <repository name="db2" system-workspace="ws" default-workspace="ws"> + <security-domain>exo-domain</security-domain> + <access-control>optional</access-control> + <authentication-policy>org.exoplatform.services.jcr.impl.core.access.JAASAuthenticator</authentication-policy> + <workspaces> + <workspace name="ws"> +  + <container class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer"> + <properties> + <property name="source-name" value="jdbcjcr19" /> + <property name="dialect" value="hsqldb" /> + <property name="multi-db" value="true" /> + <property name="update-storage" value="true" /> + <property name="max-buffer-size" value="200k" /> + <property name="swap-directory" value="target/temp2/swap/ws" /> + </properties> + </container> + <cache enabled="true"> + <properties> + <property name="max-size" value="5k" /> + <property name="live-time" value="1h" /> + </properties> + </cache> + <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> + <properties> + <property name="index-dir" value="target/temp2/index/ws" /> + </properties> + </query-handler> + </workspace> + </workspaces> + </repository> + <repository name="db3" system-workspace="ws" default-workspace="ws"> + <security-domain>exo-domain</security-domain> + <access-control>optional</access-control> + <authentication-policy>org.exoplatform.services.jcr.impl.core.access.JAASAuthenticator</authentication-policy> + <workspaces> + <workspace name="ws"> +  + <container class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer"> + <properties> + <property name="source-name" value="jdbcjcr77" /> + <property name="dialect" value="hsqldb" /> + <property name="multi-db" value="false" /> + <property name="update-storage" value="true" /> + <property name="max-buffer-size" value="200k" /> + <property name="swap-directory" value="target/temp/swap/db3_ws" /> + </properties> + </container> + <cache enabled="true"> + <properties> + <property name="max-size" value="5k" /> + <property name="live-time" value="1h" /> + </properties> + </cache> + <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> + <properties> + <property name="index-dir" value="target/temp/index/db3_ws" /> + </properties> + </query-handler> + </workspace> + </workspaces> + </repository> + <repository name="db4" system-workspace="ws" default-workspace="ws"> + <security-domain>exo-domain</security-domain> + <access-control>optional</access-control> + <authentication-policy>org.exoplatform.services.jcr.impl.core.access.JAASAuthenticator</authentication-policy> + <workspaces> + <workspace name="ws"> +  + <container class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer"> + <properties> + <property name="source-name" value="jdbcjcr20" /> + <property name="dialect" value="hsqldb" /> + <property name="multi-db" value="true" /> + <property name="update-storage" value="true" /> + <property name="max-buffer-size" value="200k" /> + <property name="swap-directory" value="target/temp/swap/db4_ws" /> + </properties> + </container> + <cache enabled="true"> + <properties> + <property name="max-size" value="5k" /> + <property name="live-time" value="1h" /> + </properties> + </cache> + <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> + <properties> + <property name="index-dir" value="target/temp/index/db4_ws" /> + </properties> + </query-handler> + </workspace> + <workspace name="ws1"> +  + <container class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer"> + <properties> + <property name="source-name" value="jdbcjcr22" /> + <property name="dialect" value="hsqldb" /> + <property name="multi-db" value="true" /> + <property name="update-storage" value="true" /> + <property name="max-buffer-size" value="200k" /> + <property name="swap-directory" value="target/temp/swap/db4_ws1" /> + </properties> + </container> + <cache enabled="true"> + <properties> + <property name="max-size" value="5k" /> + <property name="live-time" value="1h" /> + </properties> + </cache> + <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> + <properties> + <property name="index-dir" value="target/temp/index/db4_ws1" /> + </properties> + </query-handler> + </workspace> + </workspaces> + </repository> + <repository name="db5" system-workspace="ws" default-workspace="ws"> + <security-domain>exo-domain</security-domain> + <access-control>optional</access-control> + <authentication-policy>org.exoplatform.services.jcr.impl.core.access.JAASAuthenticator</authentication-policy> + <workspaces> + <workspace name="ws"> +  + <container class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer"> + <properties> + <property name="source-name" value="jdbcjcr21" /> + <property name="dialect" value="hsqldb" /> + <property name="multi-db" value="true" /> + <property name="update-storage" value="true" /> + <property name="max-buffer-size" value="200k" /> + <property name="swap-directory" value="target/temp/swap/db5_ws" /> + </properties> + </container> + <cache enabled="true"> + <properties> + <property name="max-size" value="5k" /> + <property name="live-time" value="1h" /> + </properties> + </cache> + <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> + <properties> + <property name="index-dir" value="target/temp/index/db5_ws" /> + </properties> + </query-handler> + </workspace> + <workspace name="ws1"> +  + <container class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer"> + <properties> + <property name="source-name" value="jdbcjcr23" /> + <property name="dialect" value="hsqldb" /> + <property name="multi-db" value="true" /> + <property name="update-storage" value="true" /> + <property name="max-buffer-size" value="200k" /> + <property name="swap-directory" value="target/temp/swap/db5_ws1" /> + </properties> + </container> + <cache enabled="true"> + <properties> + <property name="max-size" value="5k" /> + <property name="live-time" value="1h" /> + </properties> + </cache> + <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> + <properties> + <property name="index-dir" value="target/temp/index/db5_ws1" /> + </properties> + </query-handler> + </workspace> + </workspaces> + </repository> + <repository name="db6" system-workspace="ws" default-workspace="ws"> + <security-domain>exo-domain</security-domain> + <access-control>optional</access-control> + <authentication-policy>org.exoplatform.services.jcr.impl.core.access.JAASAuthenticator</authentication-policy> + <workspaces> + <workspace name="ws"> +  + <container class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer"> + <properties> + <property name="source-name" value="jdbcjcr24" /> + <property name="dialect" value="hsqldb" /> + <property name="multi-db" value="false" /> + <property name="update-storage" value="true" /> + <property name="max-buffer-size" value="200k" /> + <property name="swap-directory" value="target/temp/swap/db6_ws" /> + </properties> + </container> + <cache enabled="true"> + <properties> + <property name="max-size" value="5k" /> + <property name="live-time" value="1h" /> + </properties> + </cache> + <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> + <properties> + <property name="index-dir" value="target/temp/index/db6_ws" /> + </properties> + </query-handler> + </workspace> + <workspace name="ws1"> + <container class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer"> + <properties> + <property name="source-name" value="jdbcjcr24" /> + <property name="dialect" value="hsqldb" /> + <property name="multi-db" value="false" /> + <property name="update-storage" value="true" /> + <property name="max-buffer-size" value="200k" /> + <property name="swap-directory" value="target/temp/swap/db6_ws1" /> + </properties> + </container> + <cache enabled="true"> + <properties> + <property name="max-size" value="5k" /> + <property name="live-time" value="1h" /> + </properties> + </cache> + <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> + <properties> + <property name="index-dir" value="target/temp/index/db6_ws1" /> + </properties> + </query-handler> + </workspace> + <workspace name="ws2"> + <container class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer"> + <properties> + <property name="source-name" value="jdbcjcr24" /> + <property name="dialect" value="hsqldb" /> + <property name="multi-db" value="false" /> + <property name="update-storage" value="true" /> + <property name="max-buffer-size" value="200k" /> + <property name="swap-directory" value="target/temp/swap/db6_ws2" /> + </properties> + </container> + <cache enabled="true"> + <properties> + <property name="max-size" value="5k" /> + <property name="live-time" value="1h" /> + </properties> + </cache> + <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> + <properties> + <property name="index-dir" value="target/temp/index/db6_ws2" /> + </properties> + </query-handler> + </workspace> + </workspaces> + </repository> + </repositories> +</repository-service>

14 years, 5 months

1
0
0 / 0

exo-jcr SVN: r1747 - in jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone: cluster and 1 other directory.

by do-not-reply＠jboss.org

Author: sergiykarpenko Date: 2010-02-10 04:52:28 -0500 (Wed, 10 Feb 2010) New Revision: 1747 Modified: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jcr-config.xml jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/sql-benchmark-jcr-config.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-488: .JDBCWorkspaceDataContainer changed to .optimisation.CQJDBCWorkspaceDataContainer Modified: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jcr-config.xml =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jcr-config.xml 2010-02-09 18:22:41 UTC (rev 1746) +++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jcr-config.xml 2010-02-10 09:52:28 UTC (rev 1747) @@ -20,7 +20,7 @@ <workspaces> <workspace name="ws">  - <container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer"> + <container class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer"> <properties> <property name="source-name" value="jdbcjcr" /> <property name="multi-db" value="true" /> @@ -86,7 +86,7 @@ </workspace> <workspace name="ws1"> - <container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer"> + <container class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer"> <properties> <property name="source-name" value="jdbcjcr1" /> <property name="multi-db" value="true" /> @@ -157,7 +157,7 @@ </workspace> <workspace name="ws2" lazy-read-threshold="1"> - <container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer"> + <container class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer"> <properties> <property name="source-name" value="jdbcjcr2" /> <property name="multi-db" value="true" /> @@ -229,7 +229,7 @@ <workspace name="ws3">  - <container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer"> + <container class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer"> <properties> <property name="source-name" value="jdbcjcr3" /> <property name="multi-db" value="true" /> @@ -325,7 +325,7 @@ <workspaces> <workspace name="ws">  - <container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer"> + <container class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer"> <properties> <property name="source-name" value="jdbcjcrtck" /> <property name="multi-db" value="true" /> @@ -403,7 +403,7 @@ </workspace> <workspace name="ws1"> - <container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer"> + <container class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer"> <properties> <property name="source-name" value="jdbcjcr1tck" /> <property name="multi-db" value="true" /> @@ -479,7 +479,7 @@ </workspace> <workspace name="ws2"> - <container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer"> + <container class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer"> <properties> <property name="source-name" value="jdbcjcr2tck" /> <property name="multi-db" value="true" /> Modified: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/sql-benchmark-jcr-config.xml =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/sql-benchmark-jcr-config.xml 2010-02-09 18:22:41 UTC (rev 1746) +++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/sql-benchmark-jcr-config.xml 2010-02-10 09:52:28 UTC (rev 1747) @@ -8,7 +8,7 @@ <workspaces> <workspace name="system"> <container - class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer"> + class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer"> <properties> <property name="source-name" value="jdbcexo" /> <property name="dialect" value="MySQL" /> @@ -65,7 +65,7 @@ </workspace> <workspace name="collaboration"> <container - class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer"> + class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer"> <properties> <property name="source-name" value="jdbcexo" /> <property name="dialect" value="MySQL" /> @@ -122,7 +122,7 @@ </workspace> <workspace name="backup"> <container - class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer"> + class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer"> <properties> <property name="source-name" value="jdbcexo" /> <property name="dialect" value="MySQL" /> @@ -180,7 +180,7 @@ <workspace name="gadgets">  <container - class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer"> + class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer"> <properties> <property name="source-name" value="jdbcexo" /> <property name="dialect" value="MySQL" /> @@ -357,7 +357,7 @@ </workspace> <workspace name="backup"> <container - class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer"> + class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer"> <properties> <property name="source-name" value="jdbcexo" /> <property name="dialect" value="MySQL" /> @@ -415,7 +415,7 @@ <workspace name="gadgets">  <container - class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer"> + class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer"> <properties> <property name="source-name" value="jdbcexo" /> <property name="dialect" value="MySQL" /> 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-02-09 18:22:41 UTC (rev 1746) +++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-jcr-config-sjdbc.xml 2010-02-10 09:52:28 UTC (rev 1747) @@ -29,7 +29,7 @@ <authentication-policy>org.exoplatform.services.jcr.impl.core.access.JAASAuthenticator</authentication-policy> <workspaces> <workspace name="ws"> - <container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer"> + <container class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer"> <properties> <property name="source-name" value="jdbcjcr" /> <property name="multi-db" value="false" /> @@ -75,7 +75,7 @@ </workspace> <workspace name="ws1"> - <container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer"> + <container class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer"> <properties> <property name="source-name" value="jdbcjcr" /> <property name="multi-db" value="false" /> @@ -119,7 +119,7 @@ </workspace> <workspace name="ws2"> - <container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer"> + <container class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer"> <properties> <property name="source-name" value="jdbcjcr" /> <property name="multi-db" value="false" /> @@ -164,7 +164,7 @@ <workspace name="ws3">  - <container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer"> + <container class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer"> <properties> <property name="source-name" value="jdbcjcr" /> <property name="multi-db" value="false" /> @@ -232,7 +232,7 @@ <authentication-policy>org.exoplatform.services.jcr.impl.core.access.JAASAuthenticator</authentication-policy> <workspaces> <workspace name="ws"> - <container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer"> + <container class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer"> <properties> <property name="source-name" value="jdbcjcrtck" /> <property name="multi-db" value="false" /> @@ -287,7 +287,7 @@ </workspace> <workspace name="ws1"> - <container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer"> + <container class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer"> <properties> <property name="source-name" value="jdbcjcrtck" /> <property name="multi-db" value="false" /> @@ -333,7 +333,7 @@ </workspace> <workspace name="ws2"> - <container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer"> + <container class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer"> <properties> <property name="source-name" value="jdbcjcrtck" /> <property name="multi-db" value="false" /> 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-02-09 18:22:41 UTC (rev 1746) +++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-jcr-config.xml 2010-02-10 09:52:28 UTC (rev 1747) @@ -30,7 +30,7 @@ <workspaces> <workspace name="ws">  - <container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer"> + <container class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer"> <properties> <property name="source-name" value="jdbcjcr" /> <property name="multi-db" value="true" /> @@ -94,7 +94,7 @@ </workspace> <workspace name="ws1"> - <container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer"> + <container class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer"> <properties> <property name="source-name" value="jdbcjcr1" /> <property name="multi-db" value="true" /> @@ -146,7 +146,7 @@ </workspace> <workspace name="ws2" lazy-read-threshold="1"> - <container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer"> + <container class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer"> <properties> <property name="source-name" value="jdbcjcr2" /> <property name="multi-db" value="true" /> @@ -200,7 +200,7 @@ <workspace name="ws3">  <container - class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer"> + class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer"> <properties> <property name="source-name" value="jdbcjcr3" /> <property name="multi-db" value="true" /> @@ -292,7 +292,7 @@ <workspaces> <workspace name="ws">  - <container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer"> + <container class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer"> <properties> <property name="source-name" value="jdbcjcrtck" /> <property name="multi-db" value="true" /> @@ -351,7 +351,7 @@ </workspace> <workspace name="ws1"> - <container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer"> + <container class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer"> <properties> <property name="source-name" value="jdbcjcr1tck" /> <property name="multi-db" value="true" /> @@ -409,7 +409,7 @@ </workspace> <workspace name="ws2"> - <container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer"> + <container class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer"> <properties> <property name="source-name" value="jdbcjcr2tck" /> <property name="multi-db" value="true" />

14 years, 5 months

1
0
0 / 0

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

by do-not-reply＠jboss.org

Author: nfilotto Date: 2010-02-09 13:22:41 -0500 (Tue, 09 Feb 2010) New Revision: 1746 Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/NodeImpl.java Log: EXOJCR-305: The Peter's recommendations have been applied 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-02-09 17:27:31 UTC (rev 1745) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/NodeImpl.java 2010-02-09 18:22:41 UTC (rev 1746) @@ -1355,23 +1355,23 @@ { checkValid(); - return isLocked(this); + return isLocked((NodeData)this.getData()); } /** * Checks if a given node is locked only if the node is not new otherwise, we check the first * ancestor that is not new - * @param node the node to check + * @param data the data of the node to check * @return <code>true</code> if the node is locked, <code>false</code> otherwise * @throws RepositoryException if an error occurs */ - private boolean isLocked(NodeImpl node) throws RepositoryException + private boolean isLocked(NodeData data) throws RepositoryException { - if (dataManager.isNew(node.getInternalIdentifier())) + if (dataManager.isNew(data.getIdentifier())) { // The node is new, so we will check directly its parent instead - NodeImpl parent = node.getParent(); - if (parent == null) + NodeData parentData = (NodeData)dataManager.getItemData(data.getParentIdentifier()); + if (parentData == null) { // The node is the root node and is new, so we consider it as unlocked return false; @@ -1379,13 +1379,13 @@ else { // the node has a parent that we need to test - return isLocked(parent); + return isLocked(parentData); } } else { // The node already exists so we need to check if it is locked - return session.getLockManager().isLocked((NodeData)node.getData()); + return session.getLockManager().isLocked(data); } }

14 years, 5 months

1
0
0 / 0

exo-jcr SVN: r1745 - jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache.

by do-not-reply＠jboss.org

Author: nfilotto Date: 2010-02-09 12:27:31 -0500 (Tue, 09 Feb 2010) New Revision: 1745 Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache/CacheableLockManagerImpl.java Log: EXOJCR-467: Add return instructions to avoid NPE Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache/CacheableLockManagerImpl.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache/CacheableLockManagerImpl.java 2010-02-09 16:27:22 UTC (rev 1744) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache/CacheableLockManagerImpl.java 2010-02-09 17:27:31 UTC (rev 1745) @@ -366,11 +366,13 @@ if (clm == null) { log.error("The CacheLoaderManager cannot be found"); + return; } CacheLoader currentCL = clm.getCacheLoader(); if (currentCL == null) { log.error("The CacheLoader cannot be found"); + return; } ControllerCacheLoader ccl = new ControllerCacheLoader(currentCL);

14 years, 5 months

1
0
0 / 0

exo-jcr SVN: r1744 - in jcr/trunk/exo.jcr.component.webdav/src: main/java/org/exoplatform/services/jcr/webdav/command and 1 other directories.

by do-not-reply＠jboss.org

Author: dkatayev Date: 2010-02-09 11:27:22 -0500 (Tue, 09 Feb 2010) New Revision: 1744 Modified: jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/WebDavServiceImpl.java jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/MkColCommand.java jcr/trunk/exo.jcr.component.webdav/src/test/java/org/exoplatform/services/jcr/webdav/command/TestMkCol.java Log: EXOJCR-471 MKCOL bug fixed Modified: jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/WebDavServiceImpl.java =================================================================== --- jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/WebDavServiceImpl.java 2010-02-09 15:36:28 UTC (rev 1743) +++ jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/WebDavServiceImpl.java 2010-02-09 16:27:22 UTC (rev 1744) @@ -393,12 +393,12 @@ else { Session session = session(repoName, workspaceName(repoPath), null); - String uri = serverURI + "/" + srcWorkspace; - Response prpfind = new PropFindCommand().propfind(session, destNodePath, body, depth.getIntValue(), uri); - if (prpfind.getStatus() != HTTPStatus.NOT_FOUND) + + if (session.getRootNode().hasNode(TextUtil.relativizePath(repoPath))) { return Response.status(HTTPStatus.PRECON_FAILED).entity("Not Found").build(); } + } if (depth.getStringValue().equalsIgnoreCase("infinity")) @@ -524,7 +524,8 @@ int dash = token.indexOf("-"); if (dash == -1) { - return Response.status(HTTPStatus.REQUESTED_RANGE_NOT_SATISFIABLE).entity("Requested Range Not Satisfiable").build(); + return Response.status(HTTPStatus.REQUESTED_RANGE_NOT_SATISFIABLE).entity( + "Requested Range Not Satisfiable").build(); } else if (dash == 0) { Modified: jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/MkColCommand.java =================================================================== --- jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/MkColCommand.java 2010-02-09 15:36:28 UTC (rev 1743) +++ jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/MkColCommand.java 2010-02-09 16:27:22 UTC (rev 1744) @@ -81,14 +81,24 @@ try { nullResourceLocks.checkLock(session, path, tokens); - node = session.getRootNode().addNode(TextUtil.relativizePath(path), nodeType); - if (mixinTypes != null) + try { - addMixins(node, mixinTypes); + node = session.getRootNode().getNode(TextUtil.relativizePath(path)); + return Response.status(HTTPStatus.METHOD_NOT_ALLOWED).entity( + "MKCOL can only be executed on a deleted/non-existent resource").build(); } - session.save(); + catch (PathNotFoundException e) + { + node = session.getRootNode().addNode(TextUtil.relativizePath(path), nodeType); + if (mixinTypes != null) + { + addMixins(node, mixinTypes); + } + session.save(); + } + } catch (ItemExistsException exc) { Modified: jcr/trunk/exo.jcr.component.webdav/src/test/java/org/exoplatform/services/jcr/webdav/command/TestMkCol.java =================================================================== --- jcr/trunk/exo.jcr.component.webdav/src/test/java/org/exoplatform/services/jcr/webdav/command/TestMkCol.java 2010-02-09 15:36:28 UTC (rev 1743) +++ jcr/trunk/exo.jcr.component.webdav/src/test/java/org/exoplatform/services/jcr/webdav/command/TestMkCol.java 2010-02-09 16:27:22 UTC (rev 1744) @@ -57,6 +57,17 @@ Node folderNode = session.getRootNode().getNode(TextUtil.relativizePath(folder)); assertTrue(folderNode.hasNode(TextUtil.relativizePath(file))); } + + + public void testExistentMkCol() throws Exception + { + String folder = TestUtils.getFolderName(); + ContainerResponse response = service(WebDAVMethods.MKCOL, getPathWS() + folder, "", null, null); + assertEquals(HTTPStatus.CREATED, response.getStatus()); + + response = service(WebDAVMethods.MKCOL, getPathWS() + folder, "", null, null); + assertEquals(HTTPStatus.METHOD_NOT_ALLOWED, response.getStatus()); + } @Override protected String getRepositoryName()

14 years, 5 months

1
0
0 / 0

exo-jcr SVN: r1743 - jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene.

by do-not-reply＠jboss.org

Author: skabashnyuk Date: 2010-02-09 10:36:28 -0500 (Tue, 09 Feb 2010) New Revision: 1743 Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/CachingMultiIndexReader.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/DescendantSelfAxisQuery.java Log: EXOJCR-395 : fix id equals Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/CachingMultiIndexReader.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/CachingMultiIndexReader.java 2010-02-09 15:17:19 UTC (rev 1742) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/CachingMultiIndexReader.java 2010-02-09 15:36:28 UTC (rev 1743) @@ -102,7 +102,7 @@ public DocId getParentDocId(int n) throws IOException { int i = readerIndex(n); DocId result = DocId.NULL; - if(i > -1 && starts[i] > -1 && (n - starts[i]) > -1) { + if(i >= 0 && starts[i] >= 0 && (n - starts[i]) >= 0) { DocId id = subReaders[i].getParent(n - starts[i]); result = id.applyOffset(starts[i]); } Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/DescendantSelfAxisQuery.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/DescendantSelfAxisQuery.java 2010-02-09 15:17:19 UTC (rev 1742) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/DescendantSelfAxisQuery.java 2010-02-09 15:36:28 UTC (rev 1743) @@ -567,7 +567,7 @@ boolean valid = false; for (int i = 0; i < pDocs.length; i++) { int pDoci = pDocs[i]; - if (pDoci > 0 && pDoci <= contextHits.size() && ancestorCount >= minLevels && contextHits.get(pDoci)) { + if (pDoci >= 0 && pDoci <= contextHits.size() && ancestorCount >= minLevels && contextHits.get(pDoci)) { valid = true; break; }

14 years, 5 months

1
0
0 / 0

exo-jcr SVN: r1742 - jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene.

by do-not-reply＠jboss.org

Author: skabashnyuk Date: 2010-02-09 10:17:19 -0500 (Tue, 09 Feb 2010) New Revision: 1742 Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/DescendantSelfAxisQuery.java Log: EXOJCR-395 : fix "||" Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/DescendantSelfAxisQuery.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/DescendantSelfAxisQuery.java 2010-02-09 15:16:54 UTC (rev 1741) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/DescendantSelfAxisQuery.java 2010-02-09 15:17:19 UTC (rev 1742) @@ -554,7 +554,7 @@ // check if doc is a descendant of one of the context nodes pDocs = hResolver.getParents(doc, pDocs); - if (pDocs.length == 0 || pDocs[0] > 0) { + if (pDocs.length == 0 || pDocs[0] < 0) { return false; }

14 years, 5 months

1
0
0 / 0

exo-jcr SVN: r1741 - jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene.

by do-not-reply＠jboss.org

Author: skabashnyuk Date: 2010-02-09 10:16:54 -0500 (Tue, 09 Feb 2010) New Revision: 1741 Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/DescendantSelfAxisQuery.java Log: EXOJCR-395 : fix "||" Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/DescendantSelfAxisQuery.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/DescendantSelfAxisQuery.java 2010-02-09 14:52:17 UTC (rev 1740) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/DescendantSelfAxisQuery.java 2010-02-09 15:16:54 UTC (rev 1741) @@ -554,7 +554,7 @@ // check if doc is a descendant of one of the context nodes pDocs = hResolver.getParents(doc, pDocs); - if (pDocs.length == 0 && pDocs[0] > 0) { + if (pDocs.length == 0 || pDocs[0] > 0) { return false; }

14 years, 5 months

1
0
0 / 0

exo-jcr SVN: r1740 - jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene.

by do-not-reply＠jboss.org

Author: skabashnyuk Date: 2010-02-09 09:52:17 -0500 (Tue, 09 Feb 2010) New Revision: 1740 Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/CachingMultiIndexReader.java Log: EXOJCR-395 : check index position Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/CachingMultiIndexReader.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/CachingMultiIndexReader.java 2010-02-09 14:10:35 UTC (rev 1739) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/CachingMultiIndexReader.java 2010-02-09 14:52:17 UTC (rev 1740) @@ -101,8 +101,12 @@ */ public DocId getParentDocId(int n) throws IOException { int i = readerIndex(n); - DocId id = subReaders[i].getParent(n - starts[i]); - return id.applyOffset(starts[i]); + DocId result = DocId.NULL; + if(i > -1 && starts[i] > -1 && (n - starts[i]) > -1) { + DocId id = subReaders[i].getParent(n - starts[i]); + result = id.applyOffset(starts[i]); + } + return result; } /**

14 years, 5 months

1
0
0 / 0

exo-jcr SVN: r1739 - jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/cluster/functional.

by do-not-reply＠jboss.org

Author: skabashnyuk Date: 2010-02-09 09:10:35 -0500 (Tue, 09 Feb 2010) New Revision: 1739 Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/cluster/functional/TestEditedParentSearch.java Log: EXOJCR-395 : add warn Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/cluster/functional/TestEditedParentSearch.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/cluster/functional/TestEditedParentSearch.java 2010-02-09 14:08:57 UTC (rev 1738) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/cluster/functional/TestEditedParentSearch.java 2010-02-09 14:10:35 UTC (rev 1739) @@ -157,7 +157,14 @@ long start = System.currentTimeMillis(); QueryResult res = q.execute(); long sqlsize = res.getNodes().getSize(); - log.info("size=" + sqlsize + " time=" + (System.currentTimeMillis() - start)); + if (sqlsize == MAX_NODES_COUNT) + { + log.info("size=" + sqlsize + " time=" + (System.currentTimeMillis() - start)); + } + else + { + log.warn("!!!!!!!!!!! size=" + sqlsize + " time=" + (System.currentTimeMillis() - start)); + } } }

14 years, 5 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

exo-jcr-commits February 2010