November 2009 - exo-jcr-commits - Jboss List Archives

exo-jcr SVN: r678 - in ws/trunk: exo.ws.commons and 6 other directories.

by do-not-reply＠jboss.org

Author: dkatayev Date: 2009-11-16 05:31:28 -0500 (Mon, 16 Nov 2009) New Revision: 678 Modified: ws/trunk/exo.ws.commons/pom.xml ws/trunk/exo.ws.frameworks.json/pom.xml ws/trunk/exo.ws.frameworks.servlet/pom.xml ws/trunk/exo.ws.rest.core/pom.xml ws/trunk/exo.ws.rest.ext/pom.xml ws/trunk/exo.ws.testframework/pom.xml ws/trunk/packaging/module/pom.xml ws/trunk/pom.xml Log: EXOJCR-234 - version reverted to 2.1.0-Beta03-SNAPSHOT Modified: ws/trunk/exo.ws.commons/pom.xml =================================================================== --- ws/trunk/exo.ws.commons/pom.xml 2009-11-16 10:27:51 UTC (rev 677) +++ ws/trunk/exo.ws.commons/pom.xml 2009-11-16 10:31:28 UTC (rev 678) @@ -25,7 +25,7 @@ <parent> <groupId>org.exoplatform.ws</groupId> <artifactId>ws-parent</artifactId> - <version>2.1.0-Beta04-SNAPSHOT</version> + <version>2.1.0-Beta03-SNAPSHOT</version> </parent> <artifactId>exo.ws.commons</artifactId> Modified: ws/trunk/exo.ws.frameworks.json/pom.xml =================================================================== --- ws/trunk/exo.ws.frameworks.json/pom.xml 2009-11-16 10:27:51 UTC (rev 677) +++ ws/trunk/exo.ws.frameworks.json/pom.xml 2009-11-16 10:31:28 UTC (rev 678) @@ -25,7 +25,7 @@ <parent> <groupId>org.exoplatform.ws</groupId> <artifactId>ws-parent</artifactId> - <version>2.1.0-Beta04-SNAPSHOT</version> + <version>2.1.0-Beta03-SNAPSHOT</version> </parent> <artifactId>exo.ws.frameworks.json</artifactId> Modified: ws/trunk/exo.ws.frameworks.servlet/pom.xml =================================================================== --- ws/trunk/exo.ws.frameworks.servlet/pom.xml 2009-11-16 10:27:51 UTC (rev 677) +++ ws/trunk/exo.ws.frameworks.servlet/pom.xml 2009-11-16 10:31:28 UTC (rev 678) @@ -25,7 +25,7 @@ <parent> <groupId>org.exoplatform.ws</groupId> <artifactId>ws-parent</artifactId> - <version>2.1.0-Beta04-SNAPSHOT</version> + <version>2.1.0-Beta03-SNAPSHOT</version> </parent> <artifactId>exo.ws.frameworks.servlet</artifactId> Modified: ws/trunk/exo.ws.rest.core/pom.xml =================================================================== --- ws/trunk/exo.ws.rest.core/pom.xml 2009-11-16 10:27:51 UTC (rev 677) +++ ws/trunk/exo.ws.rest.core/pom.xml 2009-11-16 10:31:28 UTC (rev 678) @@ -25,7 +25,7 @@ <parent> <groupId>org.exoplatform.ws</groupId> <artifactId>ws-parent</artifactId> - <version>2.1.0-Beta04-SNAPSHOT</version> + <version>2.1.0-Beta03-SNAPSHOT</version> </parent> <artifactId>exo.ws.rest.core</artifactId> Modified: ws/trunk/exo.ws.rest.ext/pom.xml =================================================================== --- ws/trunk/exo.ws.rest.ext/pom.xml 2009-11-16 10:27:51 UTC (rev 677) +++ ws/trunk/exo.ws.rest.ext/pom.xml 2009-11-16 10:31:28 UTC (rev 678) @@ -25,7 +25,7 @@ <parent> <groupId>org.exoplatform.ws</groupId> <artifactId>ws-parent</artifactId> - <version>2.1.0-Beta04-SNAPSHOT</version> + <version>2.1.0-Beta03-SNAPSHOT</version> </parent> <artifactId>exo.ws.rest.ext</artifactId> Modified: ws/trunk/exo.ws.testframework/pom.xml =================================================================== --- ws/trunk/exo.ws.testframework/pom.xml 2009-11-16 10:27:51 UTC (rev 677) +++ ws/trunk/exo.ws.testframework/pom.xml 2009-11-16 10:31:28 UTC (rev 678) @@ -25,7 +25,7 @@ <parent> <groupId>org.exoplatform.ws</groupId> <artifactId>ws-parent</artifactId> - <version>2.1.0-Beta04-SNAPSHOT</version> + <version>2.1.0-Beta03-SNAPSHOT</version> </parent> <artifactId>exo.ws.testframework</artifactId> Modified: ws/trunk/packaging/module/pom.xml =================================================================== --- ws/trunk/packaging/module/pom.xml 2009-11-16 10:27:51 UTC (rev 677) +++ ws/trunk/packaging/module/pom.xml 2009-11-16 10:31:28 UTC (rev 678) @@ -2,7 +2,7 @@ <parent> <groupId>org.exoplatform.ws</groupId> <artifactId>ws-parent</artifactId> - <version>2.1.0-Beta04-SNAPSHOT</version> + <version>2.1.0-Beta03-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: ws/trunk/pom.xml =================================================================== --- ws/trunk/pom.xml 2009-11-16 10:27:51 UTC (rev 677) +++ ws/trunk/pom.xml 2009-11-16 10:31:28 UTC (rev 678) @@ -25,12 +25,12 @@ <parent> <groupId>org.exoplatform</groupId> <artifactId>foundation-parent</artifactId> - <version>3</version> + <version>3-SNAPSHOT</version> </parent> <groupId>org.exoplatform.ws</groupId> <artifactId>ws-parent</artifactId> - <version>2.1.0-Beta04-SNAPSHOT</version> + <version>2.1.0-Beta03-SNAPSHOT</version> <packaging>pom</packaging> <name>eXo WS</name> @@ -45,8 +45,8 @@ <exo.product.name>exo-ws</exo.product.name> <exo.product.specification>2.1</exo.product.specification> - <org.exoplatform.kernel.version>2.2.0-Beta03</org.exoplatform.kernel.version> - <org.exoplatform.core.version>2.3.0-Beta03</org.exoplatform.core.version> + <org.exoplatform.kernel.version>2.2.0-Beta03-SNAPSHOT</org.exoplatform.kernel.version> + <org.exoplatform.core.version>2.3.0-Beta03-SNAPSHOT</org.exoplatform.core.version> <exo.test.includes>*Test*</exo.test.includes> </properties>

16 years, 8 months

1
0
0 / 0

exo-jcr SVN: r677 - core/tags.

by do-not-reply＠jboss.org

Author: dkatayev Date: 2009-11-16 05:27:51 -0500 (Mon, 16 Nov 2009) New Revision: 677 Removed: core/tags/2.3.0-Beta03/ Log: EXOJCR-234 2.3.0-Beta03 tag removed

16 years, 8 months

1
0
0 / 0

exo-jcr SVN: r676 - in core/trunk: exo.core.component.database and 10 other directories.

by do-not-reply＠jboss.org

Author: dkatayev Date: 2009-11-16 05:23:32 -0500 (Mon, 16 Nov 2009) New Revision: 676 Modified: core/trunk/exo.core.component.database/pom.xml core/trunk/exo.core.component.document/pom.xml core/trunk/exo.core.component.ldap/pom.xml core/trunk/exo.core.component.organization.api/pom.xml core/trunk/exo.core.component.organization.jdbc/pom.xml core/trunk/exo.core.component.organization.ldap/pom.xml core/trunk/exo.core.component.script.groovy/pom.xml core/trunk/exo.core.component.security.core/pom.xml core/trunk/exo.core.component.web.css/pom.xml core/trunk/exo.core.component.xml-processing/pom.xml core/trunk/packaging/module/pom.xml core/trunk/pom.xml Log: EXOJCR-234 - version reverted to 2.3.0-Beta03-SNAPSHOT Modified: core/trunk/exo.core.component.database/pom.xml =================================================================== --- core/trunk/exo.core.component.database/pom.xml 2009-11-16 10:15:09 UTC (rev 675) +++ core/trunk/exo.core.component.database/pom.xml 2009-11-16 10:23:32 UTC (rev 676) @@ -25,7 +25,7 @@ <parent> <groupId>org.exoplatform.core</groupId> <artifactId>core-parent</artifactId> - <version>2.3.0-Beta04-SNAPSHOT</version> + <version>2.3.0-Beta03-SNAPSHOT</version> </parent> <artifactId>exo.core.component.database</artifactId> Modified: core/trunk/exo.core.component.document/pom.xml =================================================================== --- core/trunk/exo.core.component.document/pom.xml 2009-11-16 10:15:09 UTC (rev 675) +++ core/trunk/exo.core.component.document/pom.xml 2009-11-16 10:23:32 UTC (rev 676) @@ -25,7 +25,7 @@ <parent> <groupId>org.exoplatform.core</groupId> <artifactId>core-parent</artifactId> - <version>2.3.0-Beta04-SNAPSHOT</version> + <version>2.3.0-Beta03-SNAPSHOT</version> </parent> <artifactId>exo.core.component.document</artifactId> Modified: core/trunk/exo.core.component.ldap/pom.xml =================================================================== --- core/trunk/exo.core.component.ldap/pom.xml 2009-11-16 10:15:09 UTC (rev 675) +++ core/trunk/exo.core.component.ldap/pom.xml 2009-11-16 10:23:32 UTC (rev 676) @@ -25,7 +25,7 @@ <parent> <groupId>org.exoplatform.core</groupId> <artifactId>core-parent</artifactId> - <version>2.3.0-Beta04-SNAPSHOT</version> + <version>2.3.0-Beta03-SNAPSHOT</version> </parent> <artifactId>exo.core.component.ldap</artifactId> Modified: core/trunk/exo.core.component.organization.api/pom.xml =================================================================== --- core/trunk/exo.core.component.organization.api/pom.xml 2009-11-16 10:15:09 UTC (rev 675) +++ core/trunk/exo.core.component.organization.api/pom.xml 2009-11-16 10:23:32 UTC (rev 676) @@ -25,7 +25,7 @@ <parent> <groupId>org.exoplatform.core</groupId> <artifactId>core-parent</artifactId> - <version>2.3.0-Beta04-SNAPSHOT</version> + <version>2.3.0-Beta03-SNAPSHOT</version> </parent> <artifactId>exo.core.component.organization.api</artifactId> Modified: core/trunk/exo.core.component.organization.jdbc/pom.xml =================================================================== --- core/trunk/exo.core.component.organization.jdbc/pom.xml 2009-11-16 10:15:09 UTC (rev 675) +++ core/trunk/exo.core.component.organization.jdbc/pom.xml 2009-11-16 10:23:32 UTC (rev 676) @@ -25,7 +25,7 @@ <parent> <groupId>org.exoplatform.core</groupId> <artifactId>core-parent</artifactId> - <version>2.3.0-Beta04-SNAPSHOT</version> + <version>2.3.0-Beta03-SNAPSHOT</version> </parent> <artifactId>exo.core.component.organization.jdbc</artifactId> Modified: core/trunk/exo.core.component.organization.ldap/pom.xml =================================================================== --- core/trunk/exo.core.component.organization.ldap/pom.xml 2009-11-16 10:15:09 UTC (rev 675) +++ core/trunk/exo.core.component.organization.ldap/pom.xml 2009-11-16 10:23:32 UTC (rev 676) @@ -25,7 +25,7 @@ <parent> <groupId>org.exoplatform.core</groupId> <artifactId>core-parent</artifactId> - <version>2.3.0-Beta04-SNAPSHOT</version> + <version>2.3.0-Beta03-SNAPSHOT</version> </parent> <artifactId>exo.core.component.organization.ldap</artifactId> Modified: core/trunk/exo.core.component.script.groovy/pom.xml =================================================================== --- core/trunk/exo.core.component.script.groovy/pom.xml 2009-11-16 10:15:09 UTC (rev 675) +++ core/trunk/exo.core.component.script.groovy/pom.xml 2009-11-16 10:23:32 UTC (rev 676) @@ -25,7 +25,7 @@ <parent> <groupId>org.exoplatform.core</groupId> <artifactId>core-parent</artifactId> - <version>2.3.0-Beta04-SNAPSHOT</version> + <version>2.3.0-Beta03-SNAPSHOT</version> </parent> <artifactId>exo.core.component.script.groovy</artifactId> Modified: core/trunk/exo.core.component.security.core/pom.xml =================================================================== --- core/trunk/exo.core.component.security.core/pom.xml 2009-11-16 10:15:09 UTC (rev 675) +++ core/trunk/exo.core.component.security.core/pom.xml 2009-11-16 10:23:32 UTC (rev 676) @@ -25,7 +25,7 @@ <parent> <groupId>org.exoplatform.core</groupId> <artifactId>core-parent</artifactId> - <version>2.3.0-Beta04-SNAPSHOT</version> + <version>2.3.0-Beta03-SNAPSHOT</version> </parent> <artifactId>exo.core.component.security.core</artifactId> Modified: core/trunk/exo.core.component.web.css/pom.xml =================================================================== --- core/trunk/exo.core.component.web.css/pom.xml 2009-11-16 10:15:09 UTC (rev 675) +++ core/trunk/exo.core.component.web.css/pom.xml 2009-11-16 10:23:32 UTC (rev 676) @@ -25,7 +25,7 @@ <parent> <groupId>org.exoplatform.core</groupId> <artifactId>core-parent</artifactId> - <version>2.3.0-Beta04-SNAPSHOT</version> + <version>2.3.0-Beta03-SNAPSHOT</version> </parent> <artifactId>exo.core.component.web.css</artifactId> Modified: core/trunk/exo.core.component.xml-processing/pom.xml =================================================================== --- core/trunk/exo.core.component.xml-processing/pom.xml 2009-11-16 10:15:09 UTC (rev 675) +++ core/trunk/exo.core.component.xml-processing/pom.xml 2009-11-16 10:23:32 UTC (rev 676) @@ -25,7 +25,7 @@ <parent> <groupId>org.exoplatform.core</groupId> <artifactId>core-parent</artifactId> - <version>2.3.0-Beta04-SNAPSHOT</version> + <version>2.3.0-Beta03-SNAPSHOT</version> </parent> <artifactId>exo.core.component.xml-processing</artifactId> Modified: core/trunk/packaging/module/pom.xml =================================================================== --- core/trunk/packaging/module/pom.xml 2009-11-16 10:15:09 UTC (rev 675) +++ core/trunk/packaging/module/pom.xml 2009-11-16 10:23:32 UTC (rev 676) @@ -2,7 +2,7 @@ <parent> <groupId>org.exoplatform.core</groupId> <artifactId>core-parent</artifactId> - <version>2.3.0-Beta04-SNAPSHOT</version> + <version>2.3.0-Beta03-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -17,13 +17,13 @@  <dependencies> - <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.database</artifactId><version>2.3.0-Beta04-SNAPSHOT</version></dependency> - <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.document</artifactId><version>2.3.0-Beta04-SNAPSHOT</version></dependency> - <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.organization.api</artifactId><version>2.3.0-Beta04-SNAPSHOT</version></dependency> - <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.organization.ldap</artifactId><version>2.3.0-Beta04-SNAPSHOT</version></dependency> - <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.security.core</artifactId><version>2.3.0-Beta04-SNAPSHOT</version></dependency> - <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.xml-processing</artifactId><version>2.3.0-Beta04-SNAPSHOT</version></dependency> - <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.script.groovy</artifactId><version>2.3.0-Beta04-SNAPSHOT</version></dependency> + <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.database</artifactId><version>2.3.0-Beta03-SNAPSHOT</version></dependency> + <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.document</artifactId><version>2.3.0-Beta03-SNAPSHOT</version></dependency> + <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.organization.api</artifactId><version>2.3.0-Beta03-SNAPSHOT</version></dependency> + <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.organization.ldap</artifactId><version>2.3.0-Beta03-SNAPSHOT</version></dependency> + <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.security.core</artifactId><version>2.3.0-Beta03-SNAPSHOT</version></dependency> + <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.xml-processing</artifactId><version>2.3.0-Beta03-SNAPSHOT</version></dependency> + <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.script.groovy</artifactId><version>2.3.0-Beta03-SNAPSHOT</version></dependency> </dependencies> <build> Modified: core/trunk/pom.xml =================================================================== --- core/trunk/pom.xml 2009-11-16 10:15:09 UTC (rev 675) +++ core/trunk/pom.xml 2009-11-16 10:23:32 UTC (rev 676) @@ -24,12 +24,12 @@ <parent> <groupId>org.exoplatform</groupId> <artifactId>foundation-parent</artifactId> - <version>3</version> + <version>3-SNAPSHOT</version> </parent> <groupId>org.exoplatform.core</groupId> <artifactId>core-parent</artifactId> - <version>2.3.0-Beta04-SNAPSHOT</version> + <version>2.3.0-Beta03-SNAPSHOT</version> <packaging>pom</packaging> <name>eXo Core</name> @@ -38,7 +38,7 @@ <exo.product.name>exo-core</exo.product.name> <exo.product.specification>2.3</exo.product.specification> - <org.exoplatform.kernel.version>2.2.0-Beta03</org.exoplatform.kernel.version> + <org.exoplatform.kernel.version>2.2.0-Beta03-SNAPSHOT</org.exoplatform.kernel.version> <exo.test.includes>*Test*</exo.test.includes> </properties>

16 years, 8 months

1
0
0 / 0

exo-jcr SVN: r675 - kernel/tags.

by do-not-reply＠jboss.org

Author: dkatayev Date: 2009-11-16 05:15:09 -0500 (Mon, 16 Nov 2009) New Revision: 675 Removed: kernel/tags/2.2.0-Beta03/ Log: EXOJCR-234 2.2.0-Beta03 tag removed

16 years, 8 months

1
0
0 / 0

exo-jcr SVN: r674 - in kernel/trunk: exo.kernel.commons and 6 other directories.

by do-not-reply＠jboss.org

Author: dkatayev Date: 2009-11-16 05:14:06 -0500 (Mon, 16 Nov 2009) New Revision: 674 Modified: kernel/trunk/exo.kernel.commons/pom.xml kernel/trunk/exo.kernel.component.cache/pom.xml kernel/trunk/exo.kernel.component.command/pom.xml kernel/trunk/exo.kernel.component.common/pom.xml kernel/trunk/exo.kernel.component.remote/pom.xml kernel/trunk/exo.kernel.container/pom.xml kernel/trunk/packaging/module/pom.xml kernel/trunk/pom.xml Log: EXOJCR-234 - version reverted to 2.2.0-Beta03-SNAPSHOT Modified: kernel/trunk/exo.kernel.commons/pom.xml =================================================================== --- kernel/trunk/exo.kernel.commons/pom.xml 2009-11-16 10:13:42 UTC (rev 673) +++ kernel/trunk/exo.kernel.commons/pom.xml 2009-11-16 10:14:06 UTC (rev 674) @@ -25,7 +25,7 @@ <parent> <groupId>org.exoplatform.kernel</groupId> <artifactId>kernel-parent</artifactId> - <version>2.2.0-Beta04-SNAPSHOT</version> + <version>2.2.0-Beta03-SNAPSHOT</version> </parent> <artifactId>exo.kernel.commons</artifactId> Modified: kernel/trunk/exo.kernel.component.cache/pom.xml =================================================================== --- kernel/trunk/exo.kernel.component.cache/pom.xml 2009-11-16 10:13:42 UTC (rev 673) +++ kernel/trunk/exo.kernel.component.cache/pom.xml 2009-11-16 10:14:06 UTC (rev 674) @@ -25,7 +25,7 @@ <parent> <groupId>org.exoplatform.kernel</groupId> <artifactId>kernel-parent</artifactId> - <version>2.2.0-Beta04-SNAPSHOT</version> + <version>2.2.0-Beta03-SNAPSHOT</version> </parent> <artifactId>exo.kernel.component.cache</artifactId> Modified: kernel/trunk/exo.kernel.component.command/pom.xml =================================================================== --- kernel/trunk/exo.kernel.component.command/pom.xml 2009-11-16 10:13:42 UTC (rev 673) +++ kernel/trunk/exo.kernel.component.command/pom.xml 2009-11-16 10:14:06 UTC (rev 674) @@ -25,7 +25,7 @@ <parent> <groupId>org.exoplatform.kernel</groupId> <artifactId>kernel-parent</artifactId> - <version>2.2.0-Beta04-SNAPSHOT</version> + <version>2.2.0-Beta03-SNAPSHOT</version> </parent> <artifactId>exo.kernel.component.command</artifactId> Modified: kernel/trunk/exo.kernel.component.common/pom.xml =================================================================== --- kernel/trunk/exo.kernel.component.common/pom.xml 2009-11-16 10:13:42 UTC (rev 673) +++ kernel/trunk/exo.kernel.component.common/pom.xml 2009-11-16 10:14:06 UTC (rev 674) @@ -25,7 +25,7 @@ <parent> <groupId>org.exoplatform.kernel</groupId> <artifactId>kernel-parent</artifactId> - <version>2.2.0-Beta04-SNAPSHOT</version> + <version>2.2.0-Beta03-SNAPSHOT</version> </parent> <artifactId>exo.kernel.component.common</artifactId> Modified: kernel/trunk/exo.kernel.component.remote/pom.xml =================================================================== --- kernel/trunk/exo.kernel.component.remote/pom.xml 2009-11-16 10:13:42 UTC (rev 673) +++ kernel/trunk/exo.kernel.component.remote/pom.xml 2009-11-16 10:14:06 UTC (rev 674) @@ -25,7 +25,7 @@ <parent> <groupId>org.exoplatform.kernel</groupId> <artifactId>kernel-parent</artifactId> - <version>2.2.0-Beta04-SNAPSHOT</version> + <version>2.2.0-Beta03-SNAPSHOT</version> </parent> <artifactId>exo.kernel.component.remote</artifactId> Modified: kernel/trunk/exo.kernel.container/pom.xml =================================================================== --- kernel/trunk/exo.kernel.container/pom.xml 2009-11-16 10:13:42 UTC (rev 673) +++ kernel/trunk/exo.kernel.container/pom.xml 2009-11-16 10:14:06 UTC (rev 674) @@ -25,7 +25,7 @@ <parent> <groupId>org.exoplatform.kernel</groupId> <artifactId>kernel-parent</artifactId> - <version>2.2.0-Beta04-SNAPSHOT</version> + <version>2.2.0-Beta03-SNAPSHOT</version> </parent> <artifactId>exo.kernel.container</artifactId> Modified: kernel/trunk/packaging/module/pom.xml =================================================================== --- kernel/trunk/packaging/module/pom.xml 2009-11-16 10:13:42 UTC (rev 673) +++ kernel/trunk/packaging/module/pom.xml 2009-11-16 10:14:06 UTC (rev 674) @@ -2,7 +2,7 @@ <parent> <groupId>org.exoplatform.kernel</groupId> <artifactId>kernel-parent</artifactId> - <version>2.2.0-Beta04-SNAPSHOT</version> + <version>2.2.0-Beta03-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: kernel/trunk/pom.xml =================================================================== --- kernel/trunk/pom.xml 2009-11-16 10:13:42 UTC (rev 673) +++ kernel/trunk/pom.xml 2009-11-16 10:14:06 UTC (rev 674) @@ -25,12 +25,12 @@ <parent> <groupId>org.exoplatform</groupId> <artifactId>foundation-parent</artifactId> - <version>3</version> + <version>3-SNAPSHOT</version> </parent> <groupId>org.exoplatform.kernel</groupId> <artifactId>kernel-parent</artifactId> - <version>2.2.0-Beta04-SNAPSHOT</version> + <version>2.2.0-Beta03-SNAPSHOT</version> <packaging>pom</packaging> <name>eXo Kernel</name>

16 years, 8 months

1
0
0 / 0

exo-jcr SVN: r673 - in jcr/branches/1.12.0-JBC/component/core/src: main/java/org/exoplatform/services/jcr/impl/core/query and 2 other directories.

by do-not-reply＠jboss.org

Author: sergiykarpenko Date: 2009-11-16 05:13:42 -0500 (Mon, 16 Nov 2009) New Revision: 673 Removed: jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/core/query/SearchManagerImpl.java Modified: jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/RepositoryContainer.java jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/core/query/SearchManager.java jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/core/query/SystemSearchManager.java jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/core/query/cacheloader/IndexerCacheLoader.java jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache/IndexerCacheLoaderRuntimeTest.java jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache/IndexerCacheLoaderTest.java Log: EXOJCR-202: SearchManager interface removed Modified: jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/RepositoryContainer.java =================================================================== --- jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/RepositoryContainer.java 2009-11-16 10:07:27 UTC (rev 672) +++ jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/RepositoryContainer.java 2009-11-16 10:13:42 UTC (rev 673) @@ -48,6 +48,7 @@ import org.exoplatform.services.jcr.impl.core.query.QueryManagerFactory; import org.exoplatform.services.jcr.impl.core.query.RepositoryIndexSearcherHolder; import org.exoplatform.services.jcr.impl.core.query.SearchManager; +import org.exoplatform.services.jcr.impl.core.query.SearchManager; import org.exoplatform.services.jcr.impl.core.value.ValueFactoryImpl; import org.exoplatform.services.jcr.impl.dataflow.persistent.JBossCacheWorkspaceDataManager; import org.exoplatform.services.jcr.impl.dataflow.persistent.LocalWorkspaceDataManagerStub; @@ -209,6 +210,16 @@ workspaceContainer.registerComponentImplementation(StandaloneStoragePluginProvider.class); + //TODO remove it + if (wsConfig.getQueryHandler() != null) + { + workspaceContainer.registerComponentImplementation(SearchManager.class); + + workspaceContainer.registerComponentImplementation(QueryManager.class); + workspaceContainer.registerComponentImplementation(QueryManagerFactory.class); + workspaceContainer.registerComponentInstance(wsConfig.getQueryHandler()); + } + try { Class<?> containerType = Class.forName(wsConfig.getContainer().getType()); @@ -227,22 +238,22 @@ // cache type // TODO remove cache -// try -// { -// String className = wsConfig.getCache().getType(); -// if (className != null && className.length() > 0) -// { -// workspaceContainer.registerComponentImplementation(Class.forName(className)); -// } -// else -// workspaceContainer.registerComponentImplementation(LinkedWorkspaceStorageCacheImpl.class); -// } -// catch (ClassNotFoundException e) -// { -// log.warn("Workspace cache class not found " + wsConfig.getCache().getType() -// + ", will use default. Error : " + e); -// workspaceContainer.registerComponentImplementation(LinkedWorkspaceStorageCacheImpl.class); -// } + // try + // { + // String className = wsConfig.getCache().getType(); + // if (className != null && className.length() > 0) + // { + // workspaceContainer.registerComponentImplementation(Class.forName(className)); + // } + // else + // workspaceContainer.registerComponentImplementation(LinkedWorkspaceStorageCacheImpl.class); + // } + // catch (ClassNotFoundException e) + // { + // log.warn("Workspace cache class not found " + wsConfig.getCache().getType() + // + ", will use default. Error : " + e); + // workspaceContainer.registerComponentImplementation(LinkedWorkspaceStorageCacheImpl.class); + // } workspaceContainer.registerComponentImplementation(JBossCacheWorkspaceDataManager.class); workspaceContainer.registerComponentImplementation(LocalWorkspaceDataManagerStub.class); @@ -268,14 +279,14 @@ // Query handler if (wsConfig.getQueryHandler() != null) { -// workspaceContainer.registerComponentImplementation(SearchManager.class); -// workspaceContainer.registerComponentImplementation(QueryManager.class); -// workspaceContainer.registerComponentImplementation(QueryManagerFactory.class); -// workspaceContainer.registerComponentInstance(wsConfig.getQueryHandler()); -// TODO if (isSystem) -// { -// workspaceContainer.registerComponentImplementation(SystemSearchManager.class); -// } + workspaceContainer.registerComponentImplementation(SearchManager.class); + workspaceContainer.registerComponentImplementation(QueryManager.class); + workspaceContainer.registerComponentImplementation(QueryManagerFactory.class); + workspaceContainer.registerComponentInstance(wsConfig.getQueryHandler()); + // TODO if (isSystem) + // { + // workspaceContainer.registerComponentImplementation(SystemSearchManager.class); + // } } // access manager @@ -437,9 +448,9 @@ // } } -// TODO SystemSearchManagerHolder searchManager = -// (SystemSearchManagerHolder)this.getComponentInstanceOfType(SystemSearchManagerHolder.class); - + // TODO SystemSearchManagerHolder searchManager = + // (SystemSearchManagerHolder)this.getComponentInstanceOfType(SystemSearchManagerHolder.class); + // if (searchManager != null) // { // typeManager.addQueryHandler(searchManager.get().getHandler()); @@ -508,13 +519,13 @@ String systemWsname = config.getSystemWorkspaceName(); WorkspaceEntry systemWsEntry = getWorkspaceEntry(systemWsname); -// TODO if (systemWsEntry != null && systemWsEntry.getQueryHandler() != null) -// { -// SystemSearchManager systemSearchManager = -// (SystemSearchManager)getWorkspaceContainer(systemWsname).getComponentInstanceOfType( -// SystemSearchManager.class); -// registerComponentInstance(new SystemSearchManagerHolder(systemSearchManager)); -// } + // TODO if (systemWsEntry != null && systemWsEntry.getQueryHandler() != null) + // { + // SystemSearchManager systemSearchManager = + // (SystemSearchManager)getWorkspaceContainer(systemWsname).getComponentInstanceOfType( + // SystemSearchManager.class); + // registerComponentInstance(new SystemSearchManagerHolder(systemSearchManager)); + // } try { Modified: jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/core/query/SearchManager.java =================================================================== --- jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/core/query/SearchManager.java 2009-11-16 10:07:27 UTC (rev 672) +++ jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/core/query/SearchManager.java 2009-11-16 10:13:42 UTC (rev 673) @@ -1,104 +1,883 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.exoplatform.services.jcr.impl.core.query; - -import org.exoplatform.services.jcr.datamodel.InternalQName; -import org.exoplatform.services.jcr.impl.core.SessionDataManager; -import org.exoplatform.services.jcr.impl.core.SessionImpl; - -import java.io.IOException; -import java.util.Set; - -import javax.jcr.Node; -import javax.jcr.RepositoryException; -import javax.jcr.query.InvalidQueryException; -import javax.jcr.query.Query; - -/** - * Acts as a global entry point to execute queries and index nodes. - */ -public interface SearchManager -{ - /** - * Creates a query object from a node that can be executed on the workspace. - * - * @param session - * the session of the user executing the query. - * @param itemMgr - * the item manager of the user executing the query. Needed to - * return <code>Node</code> instances in the result set. - * @param node - * a node of type nt:query. - * @return a <code>Query</code> instance to execute. - * @throws InvalidQueryException - * if <code>absPath</code> is not a valid persisted query (that - * is, a node of type nt:query) - * @throws RepositoryException - * if any other error occurs. - */ - Query createQuery(SessionImpl session, SessionDataManager sessionDataManager, Node node) - throws InvalidQueryException, RepositoryException; - - /** - * Creates a query object that can be executed on the workspace. - * - * @param session - * the session of the user executing the query. - * @param itemMgr - * the item manager of the user executing the query. Needed to - * return <code>Node</code> instances in the result set. - * @param statement - * the actual query statement. - * @param language - * the syntax of the query statement. - * @return a <code>Query</code> instance to execute. - * @throws InvalidQueryException - * if the query is malformed or the <code>language</code> is - * unknown. - * @throws RepositoryException - * if any other error occurs. - */ - Query createQuery(SessionImpl session, SessionDataManager sessionDataManager, String statement, String language) - throws InvalidQueryException, RepositoryException; - - Set<String> getFieldNames() throws IndexException; - - QueryHandler getHandler(); - - Set<String> getNodesByNodeType(final InternalQName nodeType) throws RepositoryException; - - /** - * Return set of uuid of nodes. Contains in names prefixes mapped to the - * given uri - * - * @param prefix - * @return - * @throws RepositoryException - */ - Set<String> getNodesByUri(final String uri) throws RepositoryException; - - /** - * Update Index storege for next uuid lists. - * - * @param removedNodes - removed nodes uuid set - * @param addedNodes - added nodes uuid set - * @throws RepositoryException - * @throws IOException - */ - public void updateIndex(Set<String> removedNodes, Set<String> addedNodes) throws RepositoryException, IOException; - -} +/* + * Copyright (C) 2003-2009 eXo Platform SAS. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License + * as published by the Free Software Foundation; either version 3 + * of the License, or (at your option) any later version. + * + * This program 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see<http://www.gnu.org/licenses/>. + */ +package org.exoplatform.services.jcr.impl.core.query; + +import org.apache.lucene.index.IndexReader; +import org.apache.lucene.index.Term; +import org.apache.lucene.search.BooleanQuery; +import org.apache.lucene.search.WildcardQuery; +import org.apache.lucene.search.BooleanClause.Occur; +import org.exoplatform.container.configuration.ConfigurationManager; +import org.exoplatform.services.document.DocumentReaderService; +import org.exoplatform.services.jcr.config.QueryHandlerEntry; +import org.exoplatform.services.jcr.config.QueryHandlerParams; +import org.exoplatform.services.jcr.config.RepositoryConfigurationException; +import org.exoplatform.services.jcr.core.nodetype.NodeTypeDataManager; +import org.exoplatform.services.jcr.dataflow.ItemDataConsumer; +import org.exoplatform.services.jcr.dataflow.ItemState; +import org.exoplatform.services.jcr.dataflow.ItemStateChangesLog; +import org.exoplatform.services.jcr.dataflow.persistent.MandatoryItemsPersistenceListener; +import org.exoplatform.services.jcr.datamodel.InternalQName; +import org.exoplatform.services.jcr.datamodel.ItemData; +import org.exoplatform.services.jcr.datamodel.NodeData; +import org.exoplatform.services.jcr.datamodel.PropertyData; +import org.exoplatform.services.jcr.datamodel.QPath; +import org.exoplatform.services.jcr.datamodel.ValueData; +import org.exoplatform.services.jcr.impl.Constants; +import org.exoplatform.services.jcr.impl.core.LocationFactory; +import org.exoplatform.services.jcr.impl.core.NamespaceRegistryImpl; +import org.exoplatform.services.jcr.impl.core.SessionDataManager; +import org.exoplatform.services.jcr.impl.core.SessionImpl; +import org.exoplatform.services.jcr.impl.core.query.lucene.FieldNames; +import org.exoplatform.services.jcr.impl.core.query.lucene.LuceneVirtualTableResolver; +import org.exoplatform.services.jcr.impl.core.query.lucene.QueryHits; +import org.exoplatform.services.jcr.impl.core.query.lucene.ScoreNode; +import org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex; +import org.exoplatform.services.jcr.impl.core.value.NameValue; +import org.exoplatform.services.jcr.impl.core.value.PathValue; +import org.exoplatform.services.jcr.impl.core.value.ValueFactoryImpl; +import org.exoplatform.services.jcr.impl.dataflow.AbstractValueData; +import org.exoplatform.services.jcr.impl.dataflow.persistent.WorkspacePersistentDataManager; +import org.exoplatform.services.log.ExoLogger; +import org.exoplatform.services.log.Log; +import org.jboss.cache.factories.annotations.NonVolatile; +import org.picocontainer.Startable; + +import java.io.IOException; +import java.lang.reflect.Constructor; +import java.lang.reflect.InvocationTargetException; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.NoSuchElementException; +import java.util.Set; +import java.util.StringTokenizer; + +import javax.jcr.Node; +import javax.jcr.PropertyType; +import javax.jcr.RepositoryException; +import javax.jcr.Value; +import javax.jcr.query.InvalidQueryException; +import javax.jcr.query.Query; + +/** + * Created by The eXo Platform SAS. + * + * <br/>Date: + * + * @author <a href="karpenko.sergiy(a)gmail.com">Karpenko Sergiy</a> + * @version $Id$ + */ +@NonVolatile +public class SearchManager implements Startable, MandatoryItemsPersistenceListener +{ + + /** + * Logger instance for this class + */ + private static final Log log = ExoLogger.getLogger(SearchManager.class); + + protected final QueryHandlerEntry config; + + /** + * Text extractor for extracting text content of binary properties. + */ + protected final DocumentReaderService extractor; + + /** + * QueryHandler where query execution is delegated to + */ + protected QueryHandler handler; + + /** + * The shared item state manager instance for the workspace. + */ + protected final ItemDataConsumer itemMgr; + + /** + * The namespace registry of the repository. + */ + protected final NamespaceRegistryImpl nsReg; + + /** + * The node type registry. + */ + protected final NodeTypeDataManager nodeTypeDataManager; + + /** + * QueryHandler of the parent search manager or <code>null</code> if there + * is none. + */ + protected final SearchManager parentSearchManager; + + // protected QPath indexingRoot; + // + // protected List<QPath> excludedPaths = new ArrayList<QPath>(); + + protected IndexingTree indexingTree; + + private final ConfigurationManager cfm; + + protected LuceneVirtualTableResolver virtualTableResolver; + + /** + * Creates a new <code>SearchManager</code>. + * + * @param config + * the search configuration. + * @param nsReg + * the namespace registry. + * @param ntReg + * the node type registry. + * @param itemMgr + * the shared item state manager. + * @param rootNodeId + * the id of the root node. + * @param parentMgr + * the parent search manager or <code>null</code> if there is no + * parent search manager. + * @param excludedNodeId + * id of the node that should be excluded from indexing. Any + * descendant of that node will also be excluded from indexing. + * @throws RepositoryException + * if the search manager cannot be initialized + * @throws RepositoryConfigurationException + */ + public SearchManager(QueryHandlerEntry config, NamespaceRegistryImpl nsReg, NodeTypeDataManager ntReg, + WorkspacePersistentDataManager itemMgr, SystemSearchManagerHolder parentSearchManager, + DocumentReaderService extractor, ConfigurationManager cfm, final RepositoryIndexSearcherHolder indexSearcherHolder) + throws RepositoryException, RepositoryConfigurationException + { + + this.extractor = extractor; + indexSearcherHolder.addIndexSearcher(this); + this.config = config; + this.nodeTypeDataManager = ntReg; + this.nsReg = nsReg; + this.itemMgr = itemMgr; + this.cfm = cfm; + this.virtualTableResolver = new LuceneVirtualTableResolver(nodeTypeDataManager, nsReg); + this.parentSearchManager = parentSearchManager != null ? parentSearchManager.get() : null; + itemMgr.addItemPersistenceListener(this); + } + + /** + * Creates a query object from a node that can be executed on the workspace. + * + * @param session + * the session of the user executing the query. + * @param itemMgr + * the item manager of the user executing the query. Needed to + * return <code>Node</code> instances in the result set. + * @param node + * a node of type nt:query. + * @return a <code>Query</code> instance to execute. + * @throws InvalidQueryException + * if <code>absPath</code> is not a valid persisted query (that + * is, a node of type nt:query) + * @throws RepositoryException + * if any other error occurs. + */ + public Query createQuery(SessionImpl session, SessionDataManager sessionDataManager, Node node) + throws InvalidQueryException, RepositoryException + { + AbstractQueryImpl query = createQueryInstance(); + query.init(session, sessionDataManager, handler, node); + return query; + } + + /** + * Creates a query object that can be executed on the workspace. + * + * @param session + * the session of the user executing the query. + * @param itemMgr + * the item manager of the user executing the query. Needed to + * return <code>Node</code> instances in the result set. + * @param statement + * the actual query statement. + * @param language + * the syntax of the query statement. + * @return a <code>Query</code> instance to execute. + * @throws InvalidQueryException + * if the query is malformed or the <code>language</code> is + * unknown. + * @throws RepositoryException + * if any other error occurs. + */ + public Query createQuery(SessionImpl session, SessionDataManager sessionDataManager, String statement, + String language) throws InvalidQueryException, RepositoryException + { + AbstractQueryImpl query = createQueryInstance(); + query.init(session, sessionDataManager, handler, statement, language); + return query; + } + + /** + * just for test use only + */ + public QueryHandler getHandler() + { + + return handler; + } + + public void onSaveItems(ItemStateChangesLog changesLog) + { + if (handler == null) + return; + + long time = System.currentTimeMillis(); + + // nodes that need to be removed from the index. + final Set<String> removedNodes = new HashSet<String>(); + // nodes that need to be added to the index. + final Set<String> addedNodes = new HashSet<String>(); + + final Map<String, List<ItemState>> updatedNodes = new HashMap<String, List<ItemState>>(); + + for (Iterator<ItemState> iter = changesLog.getAllStates().iterator(); iter.hasNext();) + { + ItemState itemState = iter.next(); + + if (!indexingTree.isExcluded(itemState)) + { + String uuid = + itemState.isNode() ? itemState.getData().getIdentifier() : itemState.getData().getParentIdentifier(); + + if (itemState.isAdded()) + { + if (itemState.isNode()) + { + addedNodes.add(uuid); + } + else + { + if (!addedNodes.contains(uuid)) + { + createNewOrAdd(uuid, itemState, updatedNodes); + } + } + } + else if (itemState.isRenamed()) + { + if (itemState.isNode()) + { + addedNodes.add(uuid); + } + else + { + createNewOrAdd(uuid, itemState, updatedNodes); + } + } + else if (itemState.isUpdated()) + { + createNewOrAdd(uuid, itemState, updatedNodes); + } + else if (itemState.isMixinChanged()) + { + createNewOrAdd(uuid, itemState, updatedNodes); + } + else if (itemState.isDeleted()) + { + if (itemState.isNode()) + { + if (addedNodes.contains(uuid)) + { + addedNodes.remove(uuid); + removedNodes.remove(uuid); + } + else + { + removedNodes.add(uuid); + } + // remove all changes after node remove + updatedNodes.remove(uuid); + } + else + { + if (!removedNodes.contains(uuid) && !addedNodes.contains(uuid)) + { + createNewOrAdd(uuid, itemState, updatedNodes); + } + } + } + } + } + // TODO make quick changes + for (String uuid : updatedNodes.keySet()) + { + removedNodes.add(uuid); + addedNodes.add(uuid); + } + + try + { + updateIndex(removedNodes, addedNodes); + } + catch (RepositoryException e) + { + log.error("Error indexing changes " + e, e); + } + catch (IOException e) + { + log.error("Error indexing changes " + e, e); + try + { + handler.logErrorChanges(removedNodes, addedNodes); + } + catch (IOException ioe) + { + log.warn("Exception occure when errorLog writed. Error log is not complete. " + ioe, ioe); + } + } + + if (log.isDebugEnabled()) + { + log.debug("onEvent: indexing finished in " + String.valueOf(System.currentTimeMillis() - time) + " ms."); + } + + } + + /** + * {@inheritDoc} + */ + public void updateIndex(final Set<String> removedNodes, final Set<String> addedNodes) throws RepositoryException, + IOException + { + if (handler != null) + { + Iterator<NodeData> addedStates = new Iterator<NodeData>() + { + private final Iterator<String> iter = addedNodes.iterator(); + + public boolean hasNext() + { + return iter.hasNext(); + } + + public NodeData next() + { + + // cycle till find a next or meet the end of set + do + { + String id = iter.next(); + try + { + ItemData item = itemMgr.getItemData(id); + if (item != null) + { + if (item.isNode()) + return (NodeData)item; // return node + else + log.warn("Node not found, but property " + id + ", " + item.getQPath().getAsString() + + " found. "); + } + else + log.warn("Unable to index node with id " + id + ", node does not exist."); + + } + catch (RepositoryException e) + { + log.error("Can't read next node data " + id, e); + } + } + while (iter.hasNext()); // get next if error or node not found + + return null; // we met the end of iterator set + } + + public void remove() + { + throw new UnsupportedOperationException(); + } + }; + + Iterator<String> removedIds = new Iterator<String>() + { + private final Iterator<String> iter = removedNodes.iterator(); + + public boolean hasNext() + { + return iter.hasNext(); + } + + public String next() + { + return nextNodeId(); + } + + public String nextNodeId() throws NoSuchElementException + { + return iter.next(); + } + + public void remove() + { + throw new UnsupportedOperationException(); + + } + }; + + if (removedNodes.size() > 0 || addedNodes.size() > 0) + { + handler.updateNodes(removedIds, addedStates); + } + } + + } + + public void createNewOrAdd(String key, ItemState state, Map<String, List<ItemState>> updatedNodes) + { + List<ItemState> list = updatedNodes.get(key); + if (list == null) + { + list = new ArrayList<ItemState>(); + updatedNodes.put(key, list); + } + list.add(state); + + } + + public void start() + { + + if (log.isDebugEnabled()) + log.debug("start"); + try + { + if (indexingTree == null) + { + List<QPath> excludedPath = new ArrayList<QPath>(); + // Calculating excluded node identifiers + excludedPath.add(Constants.JCR_SYSTEM_PATH); + + //if (config.getExcludedNodeIdentifers() != null) + String excludedNodeIdentifer = + config.getParameterValue(QueryHandlerParams.PARAM_EXCLUDED_NODE_IDENTIFERS, null); + if (excludedNodeIdentifer != null) + { + StringTokenizer stringTokenizer = new StringTokenizer(excludedNodeIdentifer); + while (stringTokenizer.hasMoreTokens()) + { + + try + { + ItemData excludeData = itemMgr.getItemData(stringTokenizer.nextToken()); + if (excludeData != null) + excludedPath.add(excludeData.getQPath()); + } + catch (RepositoryException e) + { + log.warn(e.getLocalizedMessage()); + } + } + } + + NodeData indexingRootData = null; + String rootNodeIdentifer = config.getParameterValue(QueryHandlerParams.PARAM_ROOT_NODE_ID, null); + if (rootNodeIdentifer != null) + { + try + { + ItemData indexingRootDataItem = itemMgr.getItemData(rootNodeIdentifer); + if (indexingRootDataItem != null && indexingRootDataItem.isNode()) + indexingRootData = (NodeData)indexingRootDataItem; + } + catch (RepositoryException e) + { + log.warn(e.getLocalizedMessage() + " Indexing root set to " + Constants.ROOT_PATH.getAsString()); + + } + + } + else + { + try + { + indexingRootData = (NodeData)itemMgr.getItemData(Constants.ROOT_UUID); + // indexingRootData = + // new TransientNodeData(Constants.ROOT_PATH, Constants.ROOT_UUID, 1, Constants.NT_UNSTRUCTURED, + // new InternalQName[0], 0, null, new AccessControlList()); + } + catch (RepositoryException e) + { + log.error("Fail to load root node data"); + } + } + + indexingTree = new IndexingTree(indexingRootData, excludedPath); + } + + initializeQueryHandler(); + } + catch (RepositoryException e) + { + log.error(e.getLocalizedMessage()); + handler = null; + throw new RuntimeException(e.getLocalizedMessage(), e.getCause()); + } + catch (RepositoryConfigurationException e) + { + log.error(e.getLocalizedMessage()); + handler = null; + throw new RuntimeException(e.getLocalizedMessage(), e.getCause()); + } + } + + public void stop() + { + handler.close(); + log.info("Search manager stopped"); + } + + // /** + // * Checks if the given event should be excluded based on the + // * {@link #excludePath} setting. + // * + // * @param event + // * observation event + // * @return <code>true</code> if the event should be excluded, + // * <code>false</code> otherwise + // */ + // protected boolean isExcluded(ItemState event) { + // + // for (QPath excludedPath : excludedPaths) { + // if (event.getData().getQPath().isDescendantOf(excludedPath) + // || event.getData().getQPath().equals(excludedPath)) + // return true; + // } + // + // return !event.getData().getQPath().isDescendantOf(indexingRoot) + // && !event.getData().getQPath().equals(indexingRoot); + // } + + protected QueryHandlerContext createQueryHandlerContext(QueryHandler parentHandler) + throws RepositoryConfigurationException + { + + QueryHandlerContext context = + new QueryHandlerContext(itemMgr, indexingTree, nodeTypeDataManager, nsReg, parentHandler, getIndexDir(), + extractor, true, virtualTableResolver); + return context; + } + + protected String getIndexDir() throws RepositoryConfigurationException + { + String dir = config.getParameterValue(QueryHandlerParams.PARAM_INDEX_DIR, null); + if (dir == null) + { + log.warn(QueryHandlerParams.PARAM_INDEX_DIR + " parameter not found. Using outdated parameter name " + + QueryHandlerParams.OLD_PARAM_INDEX_DIR); + dir = config.getParameterValue(QueryHandlerParams.OLD_PARAM_INDEX_DIR); + } + return dir; + } + + /** + * Initializes the query handler. + * + * @throws RepositoryException + * if the query handler cannot be initialized. + * @throws RepositoryConfigurationException + * @throws ClassNotFoundException + */ + protected void initializeQueryHandler() throws RepositoryException, RepositoryConfigurationException + { + // initialize query handler + String className = config.getType(); + if (className == null) + throw new RepositoryConfigurationException("Content hanler configuration fail"); + + try + { + Class qHandlerClass = Class.forName(className, true, this.getClass().getClassLoader()); + Constructor constuctor = qHandlerClass.getConstructor(QueryHandlerEntry.class, ConfigurationManager.class); + handler = (QueryHandler)constuctor.newInstance(config, cfm); + QueryHandler parentHandler = (this.parentSearchManager != null) ? parentSearchManager.getHandler() : null; + QueryHandlerContext context = createQueryHandlerContext(parentHandler); + handler.init(context); + } + catch (SecurityException e) + { + throw new RepositoryException(e.getMessage(), e); + } + catch (IllegalArgumentException e) + { + throw new RepositoryException(e.getMessage(), e); + } + catch (ClassNotFoundException e) + { + throw new RepositoryException(e.getMessage(), e); + } + catch (NoSuchMethodException e) + { + throw new RepositoryException(e.getMessage(), e); + } + catch (InstantiationException e) + { + throw new RepositoryException(e.getMessage(), e); + } + catch (IllegalAccessException e) + { + throw new RepositoryException(e.getMessage(), e); + } + catch (InvocationTargetException e) + { + throw new RepositoryException(e.getMessage(), e); + } + catch (IOException e) + { + throw new RepositoryException(e.getMessage(), e); + } + } + + /** + * Creates a new instance of an {@link AbstractQueryImpl} which is not + * initialized. + * + * @return an new query instance. + * @throws RepositoryException + * if an error occurs while creating a new query instance. + */ + protected AbstractQueryImpl createQueryInstance() throws RepositoryException + { + try + { + String queryImplClassName = handler.getQueryClass(); + Object obj = Class.forName(queryImplClassName).newInstance(); + if (obj instanceof AbstractQueryImpl) + { + return (AbstractQueryImpl)obj; + } + else + { + throw new IllegalArgumentException(queryImplClassName + " is not of type " + + AbstractQueryImpl.class.getName()); + } + } + catch (Throwable t) + { + throw new RepositoryException("Unable to create query: " + t.toString(), t); + } + } + + /** + * {@inheritDoc} + */ + public Set<String> getFieldNames() throws IndexException + { + final Set<String> fildsSet = new HashSet<String>(); + if (handler instanceof SearchIndex) + { + IndexReader reader = null; + try + { + reader = ((SearchIndex)handler).getIndexReader(); + final Collection fields = reader.getFieldNames(IndexReader.FieldOption.ALL); + for (final Object field : fields) + { + fildsSet.add((String)field); + } + } + catch (IOException e) + { + throw new IndexException(e.getLocalizedMessage(), e); + } + finally + { + try + { + if (reader != null) + reader.close(); + } + catch (IOException e) + { + throw new IndexException(e.getLocalizedMessage(), e); + } + } + + } + return fildsSet; + } + + public Set<String> getNodesByNodeType(final InternalQName nodeType) throws RepositoryException + { + + return getNodes(virtualTableResolver.resolve(nodeType, true)); + } + + /** + * Return set of uuid of nodes. Contains in names prefixes maped to the + * given uri + * + * @param prefix + * @return + * @throws RepositoryException + */ + public Set<String> getNodesByUri(final String uri) throws RepositoryException + { + Set<String> result; + final int defaultClauseCount = BooleanQuery.getMaxClauseCount(); + try + { + + // final LocationFactory locationFactory = new + // LocationFactory(this); + final ValueFactoryImpl valueFactory = new ValueFactoryImpl(new LocationFactory(nsReg)); + BooleanQuery.setMaxClauseCount(Integer.MAX_VALUE); + BooleanQuery query = new BooleanQuery(); + + final String prefix = nsReg.getNamespacePrefixByURI(uri); + query.add(new WildcardQuery(new Term(FieldNames.LABEL, prefix + ":*")), Occur.SHOULD); + // name of the property + query.add(new WildcardQuery(new Term(FieldNames.PROPERTIES_SET, prefix + ":*")), Occur.SHOULD); + + result = getNodes(query); + + // value of the property + + try + { + final Set<String> props = getFieldNames(); + + query = new BooleanQuery(); + for (final String fieldName : props) + { + if (!FieldNames.PROPERTIES_SET.equals(fieldName)) + { + query.add(new WildcardQuery(new Term(fieldName, "*" + prefix + ":*")), Occur.SHOULD); + } + } + } + catch (final IndexException e) + { + throw new RepositoryException(e.getLocalizedMessage(), e); + } + + final Set<String> propSet = getNodes(query); + // Manually check property values; + for (final String uuid : propSet) + { + if (isPrefixMatch(valueFactory, uuid, prefix)) + { + result.add(uuid); + } + } + } + finally + { + BooleanQuery.setMaxClauseCount(defaultClauseCount); + } + + return result; + } + + private boolean isPrefixMatch(final InternalQName value, final String prefix) throws RepositoryException + { + return value.getNamespace().equals(nsReg.getNamespaceURIByPrefix(prefix)); + } + + private boolean isPrefixMatch(final QPath value, final String prefix) throws RepositoryException + { + for (int i = 0; i < value.getEntries().length; i++) + { + if (isPrefixMatch(value.getEntries()[i], prefix)) + { + return true; + } + } + return false; + } + + /** + * @param valueFactory + * @param dm + * @param uuid + * @param prefix + * @throws RepositoryException + */ + private boolean isPrefixMatch(final ValueFactoryImpl valueFactory, final String uuid, final String prefix) + throws RepositoryException + { + + final ItemData node = itemMgr.getItemData(uuid); + if (node != null && node.isNode()) + { + final List<PropertyData> props = itemMgr.getChildPropertiesData((NodeData)node); + for (final PropertyData propertyData : props) + { + if (propertyData.getType() == PropertyType.PATH || propertyData.getType() == PropertyType.NAME) + { + for (final ValueData vdata : propertyData.getValues()) + { + final Value val = + valueFactory.loadValue(((AbstractValueData)vdata).createTransientCopy(), propertyData.getType()); + if (propertyData.getType() == PropertyType.PATH) + { + if (isPrefixMatch(((PathValue)val).getQPath(), prefix)) + { + return true; + } + } + else if (propertyData.getType() == PropertyType.NAME) + { + if (isPrefixMatch(((NameValue)val).getQName(), prefix)) + { + return true; + } + } + } + } + } + } + return false; + } + + /** + * @param query + * @return + * @throws RepositoryException + */ + private Set<String> getNodes(final org.apache.lucene.search.Query query) throws RepositoryException + { + Set<String> result = new HashSet<String>(); + try + { + QueryHits hits = handler.executeQuery(query); + + ScoreNode sn; + + while ((sn = hits.nextScoreNode()) != null) + { + // Node node = session.getNodeById(sn.getNodeId()); + result.add(sn.getNodeId()); + } + } + catch (IOException e) + { + throw new RepositoryException(e.getLocalizedMessage(), e); + } + return result; + } + +} Deleted: jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/core/query/SearchManagerImpl.java =================================================================== --- jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/core/query/SearchManagerImpl.java 2009-11-16 10:07:27 UTC (rev 672) +++ jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/core/query/SearchManagerImpl.java 2009-11-16 10:13:42 UTC (rev 673) @@ -1,883 +0,0 @@ -/* - * Copyright (C) 2003-2009 eXo Platform SAS. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Affero General Public License - * as published by the Free Software Foundation; either version 3 - * of the License, or (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, see<http://www.gnu.org/licenses/>. - */ -package org.exoplatform.services.jcr.impl.core.query; - -import org.apache.lucene.index.IndexReader; -import org.apache.lucene.index.Term; -import org.apache.lucene.search.BooleanQuery; -import org.apache.lucene.search.WildcardQuery; -import org.apache.lucene.search.BooleanClause.Occur; -import org.exoplatform.container.configuration.ConfigurationManager; -import org.exoplatform.services.document.DocumentReaderService; -import org.exoplatform.services.jcr.config.QueryHandlerEntry; -import org.exoplatform.services.jcr.config.QueryHandlerParams; -import org.exoplatform.services.jcr.config.RepositoryConfigurationException; -import org.exoplatform.services.jcr.core.nodetype.NodeTypeDataManager; -import org.exoplatform.services.jcr.dataflow.ItemDataConsumer; -import org.exoplatform.services.jcr.dataflow.ItemState; -import org.exoplatform.services.jcr.dataflow.ItemStateChangesLog; -import org.exoplatform.services.jcr.dataflow.persistent.MandatoryItemsPersistenceListener; -import org.exoplatform.services.jcr.datamodel.InternalQName; -import org.exoplatform.services.jcr.datamodel.ItemData; -import org.exoplatform.services.jcr.datamodel.NodeData; -import org.exoplatform.services.jcr.datamodel.PropertyData; -import org.exoplatform.services.jcr.datamodel.QPath; -import org.exoplatform.services.jcr.datamodel.ValueData; -import org.exoplatform.services.jcr.impl.Constants; -import org.exoplatform.services.jcr.impl.core.LocationFactory; -import org.exoplatform.services.jcr.impl.core.NamespaceRegistryImpl; -import org.exoplatform.services.jcr.impl.core.SessionDataManager; -import org.exoplatform.services.jcr.impl.core.SessionImpl; -import org.exoplatform.services.jcr.impl.core.query.lucene.FieldNames; -import org.exoplatform.services.jcr.impl.core.query.lucene.LuceneVirtualTableResolver; -import org.exoplatform.services.jcr.impl.core.query.lucene.QueryHits; -import org.exoplatform.services.jcr.impl.core.query.lucene.ScoreNode; -import org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex; -import org.exoplatform.services.jcr.impl.core.value.NameValue; -import org.exoplatform.services.jcr.impl.core.value.PathValue; -import org.exoplatform.services.jcr.impl.core.value.ValueFactoryImpl; -import org.exoplatform.services.jcr.impl.dataflow.AbstractValueData; -import org.exoplatform.services.jcr.impl.dataflow.persistent.WorkspacePersistentDataManager; -import org.exoplatform.services.log.ExoLogger; -import org.exoplatform.services.log.Log; -import org.jboss.cache.factories.annotations.NonVolatile; -import org.picocontainer.Startable; - -import java.io.IOException; -import java.lang.reflect.Constructor; -import java.lang.reflect.InvocationTargetException; -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.NoSuchElementException; -import java.util.Set; -import java.util.StringTokenizer; - -import javax.jcr.Node; -import javax.jcr.PropertyType; -import javax.jcr.RepositoryException; -import javax.jcr.Value; -import javax.jcr.query.InvalidQueryException; -import javax.jcr.query.Query; - -/** - * Created by The eXo Platform SAS. - * - * <br/>Date: - * - * @author <a href="karpenko.sergiy(a)gmail.com">Karpenko Sergiy</a> - * @version $Id: SearchManagerImpl.java 111 2008-11-11 11:11:11Z serg $ - */ -@NonVolatile -public class SearchManagerImpl implements SearchManager, Startable, MandatoryItemsPersistenceListener -{ - - /** - * Logger instance for this class - */ - private static final Log log = ExoLogger.getLogger(SearchManagerImpl.class); - - protected final QueryHandlerEntry config; - - /** - * Text extractor for extracting text content of binary properties. - */ - protected final DocumentReaderService extractor; - - /** - * QueryHandler where query execution is delegated to - */ - protected QueryHandler handler; - - /** - * The shared item state manager instance for the workspace. - */ - protected final ItemDataConsumer itemMgr; - - /** - * The namespace registry of the repository. - */ - protected final NamespaceRegistryImpl nsReg; - - /** - * The node type registry. - */ - protected final NodeTypeDataManager nodeTypeDataManager; - - /** - * QueryHandler of the parent search manager or <code>null</code> if there - * is none. - */ - protected final SearchManager parentSearchManager; - - // protected QPath indexingRoot; - // - // protected List<QPath> excludedPaths = new ArrayList<QPath>(); - - protected IndexingTree indexingTree; - - private final ConfigurationManager cfm; - - protected LuceneVirtualTableResolver virtualTableResolver; - - /** - * Creates a new <code>SearchManager</code>. - * - * @param config - * the search configuration. - * @param nsReg - * the namespace registry. - * @param ntReg - * the node type registry. - * @param itemMgr - * the shared item state manager. - * @param rootNodeId - * the id of the root node. - * @param parentMgr - * the parent search manager or <code>null</code> if there is no - * parent search manager. - * @param excludedNodeId - * id of the node that should be excluded from indexing. Any - * descendant of that node will also be excluded from indexing. - * @throws RepositoryException - * if the search manager cannot be initialized - * @throws RepositoryConfigurationException - */ - public SearchManagerImpl(QueryHandlerEntry config, NamespaceRegistryImpl nsReg, NodeTypeDataManager ntReg, - WorkspacePersistentDataManager itemMgr, SystemSearchManagerHolder parentSearchManager, - DocumentReaderService extractor, ConfigurationManager cfm, final RepositoryIndexSearcherHolder indexSearcherHolder) - throws RepositoryException, RepositoryConfigurationException - { - - this.extractor = extractor; - indexSearcherHolder.addIndexSearcher(this); - this.config = config; - this.nodeTypeDataManager = ntReg; - this.nsReg = nsReg; - this.itemMgr = itemMgr; - this.cfm = cfm; - this.virtualTableResolver = new LuceneVirtualTableResolver(nodeTypeDataManager, nsReg); - this.parentSearchManager = parentSearchManager != null ? parentSearchManager.get() : null; - itemMgr.addItemPersistenceListener(this); - } - - /** - * Creates a query object from a node that can be executed on the workspace. - * - * @param session - * the session of the user executing the query. - * @param itemMgr - * the item manager of the user executing the query. Needed to - * return <code>Node</code> instances in the result set. - * @param node - * a node of type nt:query. - * @return a <code>Query</code> instance to execute. - * @throws InvalidQueryException - * if <code>absPath</code> is not a valid persisted query (that - * is, a node of type nt:query) - * @throws RepositoryException - * if any other error occurs. - */ - public Query createQuery(SessionImpl session, SessionDataManager sessionDataManager, Node node) - throws InvalidQueryException, RepositoryException - { - AbstractQueryImpl query = createQueryInstance(); - query.init(session, sessionDataManager, handler, node); - return query; - } - - /** - * Creates a query object that can be executed on the workspace. - * - * @param session - * the session of the user executing the query. - * @param itemMgr - * the item manager of the user executing the query. Needed to - * return <code>Node</code> instances in the result set. - * @param statement - * the actual query statement. - * @param language - * the syntax of the query statement. - * @return a <code>Query</code> instance to execute. - * @throws InvalidQueryException - * if the query is malformed or the <code>language</code> is - * unknown. - * @throws RepositoryException - * if any other error occurs. - */ - public Query createQuery(SessionImpl session, SessionDataManager sessionDataManager, String statement, - String language) throws InvalidQueryException, RepositoryException - { - AbstractQueryImpl query = createQueryInstance(); - query.init(session, sessionDataManager, handler, statement, language); - return query; - } - - /** - * just for test use only - */ - public QueryHandler getHandler() - { - - return handler; - } - - public void onSaveItems(ItemStateChangesLog changesLog) - { - if (handler == null) - return; - - long time = System.currentTimeMillis(); - - // nodes that need to be removed from the index. - final Set<String> removedNodes = new HashSet<String>(); - // nodes that need to be added to the index. - final Set<String> addedNodes = new HashSet<String>(); - - final Map<String, List<ItemState>> updatedNodes = new HashMap<String, List<ItemState>>(); - - for (Iterator<ItemState> iter = changesLog.getAllStates().iterator(); iter.hasNext();) - { - ItemState itemState = iter.next(); - - if (!indexingTree.isExcluded(itemState)) - { - String uuid = - itemState.isNode() ? itemState.getData().getIdentifier() : itemState.getData().getParentIdentifier(); - - if (itemState.isAdded()) - { - if (itemState.isNode()) - { - addedNodes.add(uuid); - } - else - { - if (!addedNodes.contains(uuid)) - { - createNewOrAdd(uuid, itemState, updatedNodes); - } - } - } - else if (itemState.isRenamed()) - { - if (itemState.isNode()) - { - addedNodes.add(uuid); - } - else - { - createNewOrAdd(uuid, itemState, updatedNodes); - } - } - else if (itemState.isUpdated()) - { - createNewOrAdd(uuid, itemState, updatedNodes); - } - else if (itemState.isMixinChanged()) - { - createNewOrAdd(uuid, itemState, updatedNodes); - } - else if (itemState.isDeleted()) - { - if (itemState.isNode()) - { - if (addedNodes.contains(uuid)) - { - addedNodes.remove(uuid); - removedNodes.remove(uuid); - } - else - { - removedNodes.add(uuid); - } - // remove all changes after node remove - updatedNodes.remove(uuid); - } - else - { - if (!removedNodes.contains(uuid) && !addedNodes.contains(uuid)) - { - createNewOrAdd(uuid, itemState, updatedNodes); - } - } - } - } - } - // TODO make quick changes - for (String uuid : updatedNodes.keySet()) - { - removedNodes.add(uuid); - addedNodes.add(uuid); - } - - try - { - updateIndex(removedNodes, addedNodes); - } - catch (RepositoryException e) - { - log.error("Error indexing changes " + e, e); - } - catch (IOException e) - { - log.error("Error indexing changes " + e, e); - try - { - handler.logErrorChanges(removedNodes, addedNodes); - } - catch (IOException ioe) - { - log.warn("Exception occure when errorLog writed. Error log is not complete. " + ioe, ioe); - } - } - - if (log.isDebugEnabled()) - { - log.debug("onEvent: indexing finished in " + String.valueOf(System.currentTimeMillis() - time) + " ms."); - } - - } - - /** - * {@inheritDoc} - */ - public void updateIndex(final Set<String> removedNodes, final Set<String> addedNodes) throws RepositoryException, - IOException - { - if (handler != null) - { - Iterator<NodeData> addedStates = new Iterator<NodeData>() - { - private final Iterator<String> iter = addedNodes.iterator(); - - public boolean hasNext() - { - return iter.hasNext(); - } - - public NodeData next() - { - - // cycle till find a next or meet the end of set - do - { - String id = iter.next(); - try - { - ItemData item = itemMgr.getItemData(id); - if (item != null) - { - if (item.isNode()) - return (NodeData)item; // return node - else - log.warn("Node not found, but property " + id + ", " + item.getQPath().getAsString() - + " found. "); - } - else - log.warn("Unable to index node with id " + id + ", node does not exist."); - - } - catch (RepositoryException e) - { - log.error("Can't read next node data " + id, e); - } - } - while (iter.hasNext()); // get next if error or node not found - - return null; // we met the end of iterator set - } - - public void remove() - { - throw new UnsupportedOperationException(); - } - }; - - Iterator<String> removedIds = new Iterator<String>() - { - private final Iterator<String> iter = removedNodes.iterator(); - - public boolean hasNext() - { - return iter.hasNext(); - } - - public String next() - { - return nextNodeId(); - } - - public String nextNodeId() throws NoSuchElementException - { - return iter.next(); - } - - public void remove() - { - throw new UnsupportedOperationException(); - - } - }; - - if (removedNodes.size() > 0 || addedNodes.size() > 0) - { - handler.updateNodes(removedIds, addedStates); - } - } - - } - - public void createNewOrAdd(String key, ItemState state, Map<String, List<ItemState>> updatedNodes) - { - List<ItemState> list = updatedNodes.get(key); - if (list == null) - { - list = new ArrayList<ItemState>(); - updatedNodes.put(key, list); - } - list.add(state); - - } - - public void start() - { - - if (log.isDebugEnabled()) - log.debug("start"); - try - { - if (indexingTree == null) - { - List<QPath> excludedPath = new ArrayList<QPath>(); - // Calculating excluded node identifiers - excludedPath.add(Constants.JCR_SYSTEM_PATH); - - //if (config.getExcludedNodeIdentifers() != null) - String excludedNodeIdentifer = - config.getParameterValue(QueryHandlerParams.PARAM_EXCLUDED_NODE_IDENTIFERS, null); - if (excludedNodeIdentifer != null) - { - StringTokenizer stringTokenizer = new StringTokenizer(excludedNodeIdentifer); - while (stringTokenizer.hasMoreTokens()) - { - - try - { - ItemData excludeData = itemMgr.getItemData(stringTokenizer.nextToken()); - if (excludeData != null) - excludedPath.add(excludeData.getQPath()); - } - catch (RepositoryException e) - { - log.warn(e.getLocalizedMessage()); - } - } - } - - NodeData indexingRootData = null; - String rootNodeIdentifer = config.getParameterValue(QueryHandlerParams.PARAM_ROOT_NODE_ID, null); - if (rootNodeIdentifer != null) - { - try - { - ItemData indexingRootDataItem = itemMgr.getItemData(rootNodeIdentifer); - if (indexingRootDataItem != null && indexingRootDataItem.isNode()) - indexingRootData = (NodeData)indexingRootDataItem; - } - catch (RepositoryException e) - { - log.warn(e.getLocalizedMessage() + " Indexing root set to " + Constants.ROOT_PATH.getAsString()); - - } - - } - else - { - try - { - indexingRootData = (NodeData)itemMgr.getItemData(Constants.ROOT_UUID); - // indexingRootData = - // new TransientNodeData(Constants.ROOT_PATH, Constants.ROOT_UUID, 1, Constants.NT_UNSTRUCTURED, - // new InternalQName[0], 0, null, new AccessControlList()); - } - catch (RepositoryException e) - { - log.error("Fail to load root node data"); - } - } - - indexingTree = new IndexingTree(indexingRootData, excludedPath); - } - - initializeQueryHandler(); - } - catch (RepositoryException e) - { - log.error(e.getLocalizedMessage()); - handler = null; - throw new RuntimeException(e.getLocalizedMessage(), e.getCause()); - } - catch (RepositoryConfigurationException e) - { - log.error(e.getLocalizedMessage()); - handler = null; - throw new RuntimeException(e.getLocalizedMessage(), e.getCause()); - } - } - - public void stop() - { - handler.close(); - log.info("Search manager stopped"); - } - - // /** - // * Checks if the given event should be excluded based on the - // * {@link #excludePath} setting. - // * - // * @param event - // * observation event - // * @return <code>true</code> if the event should be excluded, - // * <code>false</code> otherwise - // */ - // protected boolean isExcluded(ItemState event) { - // - // for (QPath excludedPath : excludedPaths) { - // if (event.getData().getQPath().isDescendantOf(excludedPath) - // || event.getData().getQPath().equals(excludedPath)) - // return true; - // } - // - // return !event.getData().getQPath().isDescendantOf(indexingRoot) - // && !event.getData().getQPath().equals(indexingRoot); - // } - - protected QueryHandlerContext createQueryHandlerContext(QueryHandler parentHandler) - throws RepositoryConfigurationException - { - - QueryHandlerContext context = - new QueryHandlerContext(itemMgr, indexingTree, nodeTypeDataManager, nsReg, parentHandler, getIndexDir(), - extractor, true, virtualTableResolver); - return context; - } - - protected String getIndexDir() throws RepositoryConfigurationException - { - String dir = config.getParameterValue(QueryHandlerParams.PARAM_INDEX_DIR, null); - if (dir == null) - { - log.warn(QueryHandlerParams.PARAM_INDEX_DIR + " parameter not found. Using outdated parameter name " - + QueryHandlerParams.OLD_PARAM_INDEX_DIR); - dir = config.getParameterValue(QueryHandlerParams.OLD_PARAM_INDEX_DIR); - } - return dir; - } - - /** - * Initializes the query handler. - * - * @throws RepositoryException - * if the query handler cannot be initialized. - * @throws RepositoryConfigurationException - * @throws ClassNotFoundException - */ - protected void initializeQueryHandler() throws RepositoryException, RepositoryConfigurationException - { - // initialize query handler - String className = config.getType(); - if (className == null) - throw new RepositoryConfigurationException("Content hanler configuration fail"); - - try - { - Class qHandlerClass = Class.forName(className, true, this.getClass().getClassLoader()); - Constructor constuctor = qHandlerClass.getConstructor(QueryHandlerEntry.class, ConfigurationManager.class); - handler = (QueryHandler)constuctor.newInstance(config, cfm); - QueryHandler parentHandler = (this.parentSearchManager != null) ? parentSearchManager.getHandler() : null; - QueryHandlerContext context = createQueryHandlerContext(parentHandler); - handler.init(context); - } - catch (SecurityException e) - { - throw new RepositoryException(e.getMessage(), e); - } - catch (IllegalArgumentException e) - { - throw new RepositoryException(e.getMessage(), e); - } - catch (ClassNotFoundException e) - { - throw new RepositoryException(e.getMessage(), e); - } - catch (NoSuchMethodException e) - { - throw new RepositoryException(e.getMessage(), e); - } - catch (InstantiationException e) - { - throw new RepositoryException(e.getMessage(), e); - } - catch (IllegalAccessException e) - { - throw new RepositoryException(e.getMessage(), e); - } - catch (InvocationTargetException e) - { - throw new RepositoryException(e.getMessage(), e); - } - catch (IOException e) - { - throw new RepositoryException(e.getMessage(), e); - } - } - - /** - * Creates a new instance of an {@link AbstractQueryImpl} which is not - * initialized. - * - * @return an new query instance. - * @throws RepositoryException - * if an error occurs while creating a new query instance. - */ - protected AbstractQueryImpl createQueryInstance() throws RepositoryException - { - try - { - String queryImplClassName = handler.getQueryClass(); - Object obj = Class.forName(queryImplClassName).newInstance(); - if (obj instanceof AbstractQueryImpl) - { - return (AbstractQueryImpl)obj; - } - else - { - throw new IllegalArgumentException(queryImplClassName + " is not of type " - + AbstractQueryImpl.class.getName()); - } - } - catch (Throwable t) - { - throw new RepositoryException("Unable to create query: " + t.toString(), t); - } - } - - /** - * {@inheritDoc} - */ - public Set<String> getFieldNames() throws IndexException - { - final Set<String> fildsSet = new HashSet<String>(); - if (handler instanceof SearchIndex) - { - IndexReader reader = null; - try - { - reader = ((SearchIndex)handler).getIndexReader(); - final Collection fields = reader.getFieldNames(IndexReader.FieldOption.ALL); - for (final Object field : fields) - { - fildsSet.add((String)field); - } - } - catch (IOException e) - { - throw new IndexException(e.getLocalizedMessage(), e); - } - finally - { - try - { - if (reader != null) - reader.close(); - } - catch (IOException e) - { - throw new IndexException(e.getLocalizedMessage(), e); - } - } - - } - return fildsSet; - } - - public Set<String> getNodesByNodeType(final InternalQName nodeType) throws RepositoryException - { - - return getNodes(virtualTableResolver.resolve(nodeType, true)); - } - - /** - * Return set of uuid of nodes. Contains in names prefixes maped to the - * given uri - * - * @param prefix - * @return - * @throws RepositoryException - */ - public Set<String> getNodesByUri(final String uri) throws RepositoryException - { - Set<String> result; - final int defaultClauseCount = BooleanQuery.getMaxClauseCount(); - try - { - - // final LocationFactory locationFactory = new - // LocationFactory(this); - final ValueFactoryImpl valueFactory = new ValueFactoryImpl(new LocationFactory(nsReg)); - BooleanQuery.setMaxClauseCount(Integer.MAX_VALUE); - BooleanQuery query = new BooleanQuery(); - - final String prefix = nsReg.getNamespacePrefixByURI(uri); - query.add(new WildcardQuery(new Term(FieldNames.LABEL, prefix + ":*")), Occur.SHOULD); - // name of the property - query.add(new WildcardQuery(new Term(FieldNames.PROPERTIES_SET, prefix + ":*")), Occur.SHOULD); - - result = getNodes(query); - - // value of the property - - try - { - final Set<String> props = getFieldNames(); - - query = new BooleanQuery(); - for (final String fieldName : props) - { - if (!FieldNames.PROPERTIES_SET.equals(fieldName)) - { - query.add(new WildcardQuery(new Term(fieldName, "*" + prefix + ":*")), Occur.SHOULD); - } - } - } - catch (final IndexException e) - { - throw new RepositoryException(e.getLocalizedMessage(), e); - } - - final Set<String> propSet = getNodes(query); - // Manually check property values; - for (final String uuid : propSet) - { - if (isPrefixMatch(valueFactory, uuid, prefix)) - { - result.add(uuid); - } - } - } - finally - { - BooleanQuery.setMaxClauseCount(defaultClauseCount); - } - - return result; - } - - private boolean isPrefixMatch(final InternalQName value, final String prefix) throws RepositoryException - { - return value.getNamespace().equals(nsReg.getNamespaceURIByPrefix(prefix)); - } - - private boolean isPrefixMatch(final QPath value, final String prefix) throws RepositoryException - { - for (int i = 0; i < value.getEntries().length; i++) - { - if (isPrefixMatch(value.getEntries()[i], prefix)) - { - return true; - } - } - return false; - } - - /** - * @param valueFactory - * @param dm - * @param uuid - * @param prefix - * @throws RepositoryException - */ - private boolean isPrefixMatch(final ValueFactoryImpl valueFactory, final String uuid, final String prefix) - throws RepositoryException - { - - final ItemData node = itemMgr.getItemData(uuid); - if (node != null && node.isNode()) - { - final List<PropertyData> props = itemMgr.getChildPropertiesData((NodeData)node); - for (final PropertyData propertyData : props) - { - if (propertyData.getType() == PropertyType.PATH || propertyData.getType() == PropertyType.NAME) - { - for (final ValueData vdata : propertyData.getValues()) - { - final Value val = - valueFactory.loadValue(((AbstractValueData)vdata).createTransientCopy(), propertyData.getType()); - if (propertyData.getType() == PropertyType.PATH) - { - if (isPrefixMatch(((PathValue)val).getQPath(), prefix)) - { - return true; - } - } - else if (propertyData.getType() == PropertyType.NAME) - { - if (isPrefixMatch(((NameValue)val).getQName(), prefix)) - { - return true; - } - } - } - } - } - } - return false; - } - - /** - * @param query - * @return - * @throws RepositoryException - */ - private Set<String> getNodes(final org.apache.lucene.search.Query query) throws RepositoryException - { - Set<String> result = new HashSet<String>(); - try - { - QueryHits hits = handler.executeQuery(query); - - ScoreNode sn; - - while ((sn = hits.nextScoreNode()) != null) - { - // Node node = session.getNodeById(sn.getNodeId()); - result.add(sn.getNodeId()); - } - } - catch (IOException e) - { - throw new RepositoryException(e.getLocalizedMessage(), e); - } - return result; - } - -} Modified: jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/core/query/SystemSearchManager.java =================================================================== --- jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/core/query/SystemSearchManager.java 2009-11-16 10:07:27 UTC (rev 672) +++ jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/core/query/SystemSearchManager.java 2009-11-16 10:13:42 UTC (rev 673) @@ -42,7 +42,7 @@ * @version $Id: SystemSearchManager.java 13891 2008-05-05 16:02:30Z pnedonosko * $ */ -public class SystemSearchManager extends SearchManagerImpl +public class SystemSearchManager extends SearchManager { /** Modified: jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/core/query/cacheloader/IndexerCacheLoader.java =================================================================== --- jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/core/query/cacheloader/IndexerCacheLoader.java 2009-11-16 10:07:27 UTC (rev 672) +++ jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/core/query/cacheloader/IndexerCacheLoader.java 2009-11-16 10:13:42 UTC (rev 673) @@ -211,75 +211,6 @@ } } - // for (Iterator<ItemState> iter = changesLog.getAllStates().iterator(); iter.hasNext();) - // { - // ItemState itemState = iter.next(); - // - // if (!indexingTree.isExcluded(itemState)) - // { - // String uuid = - // itemState.isNode() ? itemState.getData().getIdentifier() : itemState.getData().getParentIdentifier(); - // - // if (itemState.isAdded()) - // { - // if (itemState.isNode()) - // { - // addedNodes.add(uuid); - // } - // else - // { - // if (!addedNodes.contains(uuid)) - // { - // createNewOrAdd(uuid, itemState, updatedNodes); - // } - // } - // } - // else if (itemState.isRenamed()) - // { - // if (itemState.isNode()) - // { - // addedNodes.add(uuid); - // } - // else - // { - // createNewOrAdd(uuid, itemState, updatedNodes); - // } - // } - // else if (itemState.isUpdated()) - // { - // createNewOrAdd(uuid, itemState, updatedNodes); - // } - // else if (itemState.isMixinChanged()) - // { - // createNewOrAdd(uuid, itemState, updatedNodes); - // } - // else if (itemState.isDeleted()) - // { - // if (itemState.isNode()) - // { - // if (addedNodes.contains(uuid)) - // { - // addedNodes.remove(uuid); - // removedNodes.remove(uuid); - // } - // else - // { - // removedNodes.add(uuid); - // } - // // remove all changes after node remove - // updatedNodes.remove(uuid); - // } - // else - // { - // if (!removedNodes.contains(uuid) && !addedNodes.contains(uuid)) - // { - // createNewOrAdd(uuid, itemState, updatedNodes); - // } - // } - // } - // } - // } - for (String uuid : updateNodes) { removedNodes.add(uuid); Modified: jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache/IndexerCacheLoaderRuntimeTest.java =================================================================== --- jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache/IndexerCacheLoaderRuntimeTest.java 2009-11-16 10:07:27 UTC (rev 672) +++ jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache/IndexerCacheLoaderRuntimeTest.java 2009-11-16 10:13:42 UTC (rev 673) @@ -49,7 +49,7 @@ import org.exoplatform.services.jcr.impl.core.nodetype.registration.JcrNodeTypeDataPersister; import org.exoplatform.services.jcr.impl.core.nodetype.registration.NodeTypeDataPersister; import org.exoplatform.services.jcr.impl.core.query.RepositoryIndexSearcherHolder; -import org.exoplatform.services.jcr.impl.core.query.SearchManagerImpl; +import org.exoplatform.services.jcr.impl.core.query.SearchManager; import org.exoplatform.services.jcr.impl.core.query.SystemSearchManagerHolder; import org.exoplatform.services.jcr.impl.core.query.cacheloader.IndexerCacheLoader; import org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex; @@ -94,7 +94,7 @@ private IndexerCacheLoader loader; - SearchManagerImpl manager; + SearchManager manager; public void createNewDataSource(String dataSourceName) throws Exception { @@ -904,7 +904,7 @@ ConfigurationManager cfm = new ConfigurationManagerImpl(); manager = - new SearchManagerImpl(ws.getQueryHandler(), nsReg, ntReg, itemMgr, parentSearchManager, extractor, cfm, + new SearchManager(ws.getQueryHandler(), nsReg, ntReg, itemMgr, parentSearchManager, extractor, cfm, indexSearcherHolder); } Modified: jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache/IndexerCacheLoaderTest.java =================================================================== --- jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache/IndexerCacheLoaderTest.java 2009-11-16 10:07:27 UTC (rev 672) +++ jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache/IndexerCacheLoaderTest.java 2009-11-16 10:13:42 UTC (rev 673) @@ -19,6 +19,7 @@ package org.exoplatform.services.jcr.impl.storage.jbosscache; import org.exoplatform.services.jcr.access.AccessControlList; +import org.exoplatform.services.jcr.config.RepositoryConfigurationException; import org.exoplatform.services.jcr.datamodel.InternalQName; import org.exoplatform.services.jcr.datamodel.NodeData; import org.exoplatform.services.jcr.datamodel.PropertyData; @@ -28,6 +29,7 @@ import org.exoplatform.services.jcr.impl.core.SessionImpl; import org.exoplatform.services.jcr.impl.core.query.IndexException; import org.exoplatform.services.jcr.impl.core.query.QueryHandler; +import org.exoplatform.services.jcr.impl.core.query.RepositoryIndexSearcherHolder; import org.exoplatform.services.jcr.impl.core.query.SearchManager; import org.exoplatform.services.jcr.impl.core.query.cacheloader.IndexerCacheLoader; import org.exoplatform.services.jcr.impl.dataflow.TransientNodeData; @@ -254,13 +256,18 @@ assertTrue(expectedRemoveUUID.containsAll(searchManager.getRemovedNodes())); } - private class DummySearchManager implements SearchManager + private class DummySearchManager extends SearchManager { private Set<String> removedNodes; private Set<String> addedNodes; + public DummySearchManager() throws RepositoryException, RepositoryConfigurationException + { + super(null, null, null, null, null, null, null, new RepositoryIndexSearcherHolder()); + } + /** * @see org.exoplatform.services.jcr.impl.core.query.SearchManager#createQuery(org.exoplatform.services.jcr.impl.core.SessionImpl, org.exoplatform.services.jcr.impl.core.SessionDataManager, javax.jcr.Node) */

16 years, 8 months

1
0
0 / 0

exo-jcr SVN: r672 - parent/trunk.

by do-not-reply＠jboss.org

Author: dkatayev Date: 2009-11-16 05:07:27 -0500 (Mon, 16 Nov 2009) New Revision: 672 Modified: parent/trunk/pom.xml Log: EXOJCR-234 - version reverted to 3-SNAPSHOT Modified: parent/trunk/pom.xml =================================================================== --- parent/trunk/pom.xml 2009-11-16 09:51:32 UTC (rev 671) +++ parent/trunk/pom.xml 2009-11-16 10:07:27 UTC (rev 672) @@ -27,7 +27,7 @@ </parent> <groupId>org.exoplatform</groupId> <artifactId>foundation-parent</artifactId> - <version>4-SNAPSHOT</version> + <version>3-SNAPSHOT</version> <packaging>pom</packaging> <name>eXo JBoss Parent</name>

16 years, 8 months

1
0
0 / 0

exo-jcr SVN: r671 - parent/tags.

by do-not-reply＠jboss.org

Author: dkatayev Date: 2009-11-16 04:51:32 -0500 (Mon, 16 Nov 2009) New Revision: 671 Removed: parent/tags/3/ Log: Tag #3 removed

16 years, 8 months

1
0
0 / 0

exo-jcr SVN: r670 - in jcr/branches/1.12.0-OPT/exo.jcr.component.core/src: main/java/org/exoplatform/services/jcr/impl/dataflow/session and 1 other directories.

by do-not-reply＠jboss.org

Author: tolusha Date: 2009-11-16 04:47:33 -0500 (Mon, 16 Nov 2009) New Revision: 670 Modified: jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SessionDataManager.java jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/session/SessionChangesLog.java jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/load/perf/TestBulkItemsAdd.java Log: EXOJCR-221: SessionChangesLog improvement Modified: jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SessionDataManager.java =================================================================== --- jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SessionDataManager.java 2009-11-16 08:31:56 UTC (rev 669) +++ jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SessionDataManager.java 2009-11-16 09:47:33 UTC (rev 670) @@ -676,23 +676,29 @@ */ public int getChildNodesCount(NodeData parent) throws RepositoryException { - int childsCount = 0; + int childsCount = changesLog.getChildNodesCount(parent.getIdentifier()); - for (ItemState change : changesLog.getAllStates()) - { - if (change.isNode() && change.isPersisted() - && change.getData().getParentIdentifier().equals(parent.getIdentifier())) - { - if (change.isDeleted()) - { - childsCount--; - } - else if (change.isAdded()) - { - childsCount++; - } - } - } + // for (ItemState change : changesLog.getAllStates()) + // { + // if (change.isNode() && change.isPersisted() + // && parent.getIdentifier().equals(change.getData().getParentIdentifier())) + // { + // if (change.isDeleted()) + // { + // childsCount--; + // } + // else if (change.isAdded()) + // { + // childsCount++; + // } + // } + // } + // + // if (childsCount != changesLog.getChildNodesCount(parent.getIdentifier())) + // { + // System.out.println(""); + // changesLog.getChildNodesCount(parent.getIdentifier()); + // } childsCount = transactionableManager.getChildNodesCount(parent) + childsCount; if (childsCount < 0) Modified: jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/session/SessionChangesLog.java =================================================================== --- jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/session/SessionChangesLog.java 2009-11-16 08:31:56 UTC (rev 669) +++ jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/session/SessionChangesLog.java 2009-11-16 09:47:33 UTC (rev 670) @@ -61,6 +61,8 @@ protected Map<String, Map<String, ItemState>> lastChildPropertyStates = new HashMap<String, Map<String, ItemState>>(); + protected Map<String, int[]> childNodesCount = new HashMap<String, int[]>(); + /** * Create empty ChangesLog. * @@ -120,6 +122,7 @@ index.clear(); lastChildNodeStates.clear(); lastChildPropertyStates.clear(); + childNodesCount.clear(); } /** @@ -144,17 +147,44 @@ index.remove(new ParentIDQPathBasedKey(item)); index.remove(new IDStateBasedKey(item.getData().getIdentifier(), item.getState())); + if (item.isNode() && item.isPersisted()) + { + int childCount[] = childNodesCount.get(item.getData().getParentIdentifier()); + if (childCount != null) + { + childNodesCount.remove(item.getData().getIdentifier()); + + if (item.isDeleted()) + childCount[0]++; + else if (item.isAdded()) + childCount[0]--; + + if (childCount[0] == 0) + childNodesCount.remove(item.getData().getParentIdentifier()); + else + childNodesCount.put(item.getData().getParentIdentifier(), childCount); + } + } + if (item.getData().isNode()) { Map<String, ItemState> children = lastChildNodeStates.get(item.getData().getParentIdentifier()); if (children != null) + { children.remove(item.getData().getIdentifier()); + if (children.size() == 0) + lastChildNodeStates.remove(item.getData().getParentIdentifier()); + } } else { Map<String, ItemState> children = lastChildPropertyStates.get(item.getData().getParentIdentifier()); if (children != null) + { children.remove(item.getData().getIdentifier()); + if (children.size() == 0) + lastChildNodeStates.remove(item.getData().getParentIdentifier()); + } } } } @@ -344,6 +374,12 @@ return list; } + public int getChildNodesCount(String rootIdentifier) + { + int[] childCount = childNodesCount.get(rootIdentifier); + return childCount == null ? 0 : childCount[0]; + } + /** * Collect last in ChangesLog order item child changes. * @@ -588,6 +624,20 @@ } children.put(item.getData().getIdentifier(), item); } + + if (item.isNode() && item.isPersisted()) + { + int[] childCount = childNodesCount.get(item.getData().getParentIdentifier()); + if (childCount == null) + childCount = new int[1]; + + if (item.isDeleted()) + childCount[0] -= 1; + else if (item.isAdded()) + childCount[0] += 1; + + childNodesCount.put(item.getData().getParentIdentifier(), childCount); + } } /** Modified: jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/load/perf/TestBulkItemsAdd.java =================================================================== --- jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/load/perf/TestBulkItemsAdd.java 2009-11-16 08:31:56 UTC (rev 669) +++ jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/load/perf/TestBulkItemsAdd.java 2009-11-16 09:47:33 UTC (rev 670) @@ -39,7 +39,7 @@ public void testNodeAdd() throws Exception { StringBuilder stats = new StringBuilder(); - + Node testRoot = session.getRootNode().addNode("testRoot"); session.save(); long startTime = System.currentTimeMillis(); @@ -49,28 +49,35 @@ long addTime = System.currentTimeMillis(); String nodeName = "_" + i + "_node"; Node n = testRoot.addNode(nodeName); - long finishTime = System.currentTimeMillis(); //log.info("add node " + nodeName + ", " + (System.currentTimeMillis() - addTime) + "ms, " // + (finishTime - startTime) + "ms"); //String stat = (System.currentTimeMillis() - addTime) + ";" + (finishTime - startTime); - stats.append(i); - stats.append(";"); - stats.append((System.currentTimeMillis() - addTime)); - stats.append(";"); - stats.append((finishTime - startTime)); - stats.append("\r\n"); + if ((i % 100) == 0) + { + stats.append(i); + stats.append(";"); + stats.append((System.currentTimeMillis() - addTime)); + // stats.append(";"); + // stats.append((System.currentTimeMillis() - startTime)); + stats.append("\r\n"); + } } + // stats.append(nodesCount); + // stats.append(";"); + // stats.append((System.currentTimeMillis() - startTime)); + // stats.append("\r\n"); + log.info("Nodes added " + nodesCount + ", " + (System.currentTimeMillis() - startTime) + "ms"); startTime = System.currentTimeMillis(); log.info("Nodes will be saved, wait few minutes..."); testRoot.save(); log.info("Nodes saved " + nodesCount + ", " + (System.currentTimeMillis() - startTime) + "ms"); - + // save stats PrintWriter statFile = new PrintWriter(new File("stats.txt")); statFile.write(stats.toString()); statFile.close(); - + log.info("Test done"); }

16 years, 8 months

1
0
0 / 0

exo-jcr SVN: r669 - jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache.

by do-not-reply＠jboss.org

Author: nzamosenchuk Date: 2009-11-16 03:31:56 -0500 (Mon, 16 Nov 2009) New Revision: 669 Modified: jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache/DummyInterceptor.java Log: EXOJCR-199: imports fixed Modified: jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache/DummyInterceptor.java =================================================================== --- jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache/DummyInterceptor.java 2009-11-15 14:29:46 UTC (rev 668) +++ jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache/DummyInterceptor.java 2009-11-16 08:31:56 UTC (rev 669) @@ -1,7 +1,6 @@ package org.exoplatform.services.jcr.impl.storage.jbosscache; import org.exoplatform.services.jcr.config.RepositoryConfigurationException; -import org.exoplatform.services.jcr.impl.core.query.SearchManagerHolder; import org.jboss.cache.factories.annotations.Inject; import org.jboss.cache.interceptors.base.CommandInterceptor;

16 years, 8 months

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

exo-jcr-commits November 2009