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

by do-not-reply＠jboss.org

Author: pnedonosko Date: 2009-11-16 11:33:00 -0500 (Mon, 16 Nov 2009) New Revision: 688 Added: parent/tags/3/ Log: [maven-scm] copy for tag 3 Copied: parent/tags/3 (from rev 687, parent/trunk)

16 years, 8 months

1
0
0 / 0

exo-jcr SVN: r687 - parent/trunk.

by do-not-reply＠jboss.org

Author: pnedonosko Date: 2009-11-16 11:32:37 -0500 (Mon, 16 Nov 2009) New Revision: 687 Modified: parent/trunk/pom.xml Log: [maven-release-plugin] prepare release 3 Modified: parent/trunk/pom.xml =================================================================== --- parent/trunk/pom.xml 2009-11-16 15:30:08 UTC (rev 686) +++ parent/trunk/pom.xml 2009-11-16 16:32:37 UTC (rev 687) @@ -1,621 +1,621 @@ - -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.jboss</groupId> - <artifactId>jboss-parent</artifactId> - <version>5-beta-1</version> - </parent> - <groupId>org.exoplatform</groupId> - <artifactId>foundation-parent</artifactId> - <version>3-SNAPSHOT</version> - <packaging>pom</packaging> - - <name>eXo JBoss Parent</name> - - <organization> - <name>eXo Platform SAS</name> - <url>http://www.exoplatform.com</url> - </organization> - - <licenses> - <license> - <name>LGPL, version 2.1</name> - <url>http://www.opensource.org/licenses/lgpl-license.php</url> - </license> - </licenses> - - <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/exo-jcr/parent/trunk</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/exo-jcr/parent/trunk</developerConnection> - <url>http://fisheye.jboss.org/browse/exo-jcr/parent/trunk</url> - </scm> - -  - <repositories> - <repository> - <id>repository.jboss.com</id> - <url>http://repository.jboss.com/maven2</url> - </repository> - <repository> - <id>exo-int</id> - <name>exoplatform.org internal repository</name> - <url>http://maven2.exoplatform.org/rest/maven2</url> - </repository> - <repository> - <id>repo.jfrog.org-releases</id> - <name>repo.jfrog.org-releases</name> - <url>http://repo.jfrog.org/artifactory/plugins-releases-local</url> - </repository> - <repository> - <id>download.java.net</id> - <name>download.java.net repository</name> - <url>http://download.java.net/maven/2</url> - </repository> - </repositories> - <pluginRepositories> - <pluginRepository> - <id>repository.jboss.com</id> - <url>http://repository.jboss.com/maven2</url> - </pluginRepository> - <pluginRepository> - <id>exo-int</id> - <name>exoplatform.org internal repository</name> - <url>http://maven2.exoplatform.org/rest/maven2</url> - </pluginRepository> - <pluginRepository> - <id>repo.jfrog.org-releases</id> - <name>repo.jfrog.org-releases</name> - <url>http://repo.jfrog.org/artifactory/plugins-releases-local</url> - </pluginRepository> - <pluginRepository> - <id>download.java.net</id> - <name>download.java.net repository</name> - <url>http://download.java.net/maven/2</url> - </pluginRepository> -  - <pluginRepository> - <id>mc-release</id> - <name>Local Maven repository of releases</name> - <url>http://mc-repo.googlecode.com/svn/maven2/releases</url> - </pluginRepository> - </pluginRepositories> - - <properties> - <exo.projects.directory.base>D:/java</exo.projects.directory.base> - <exo.projects.directory.dependencies>${exo.projects.directory.base}/exo-dependencies</exo.projects.directory.dependencies> - <exo.projects.directory.working>${exo.projects.directory.base}/exo-working</exo.projects.directory.working> - - <exo.projects.app.mvn.repo>${exo.projects.directory.dependencies}/repository</exo.projects.app.mvn.repo> - - <exo.projects.app.tomcat.version>tomcat-6.0.16</exo.projects.app.tomcat.version> - <exo.projects.app.jboss.version>jboss-4.2.3.GA</exo.projects.app.jboss.version> - <exo.projects.app.jonas.version>JONAS_4_8_5</exo.projects.app.jonas.version> - - <exo.dev.resources.version>1.2.0</exo.dev.resources.version> - - <exo.product.name>eXo Platform</exo.product.name> - <exo.product.specification>N/A</exo.product.specification> - -  - <maven.test.skip>false</maven.test.skip> - <forkMode>once</forkMode> - <maven.test.failure.ignore>false</maven.test.failure.ignore> - <surefire.useFile>true</surefire.useFile> - <exo.test.includes>Test*</exo.test.includes> - -  - <maven.compiler.optimize>true</maven.compiler.optimize> - <maven.compiler.source>1.5</maven.compiler.source> - <maven.compiler.target>1.5</maven.compiler.target> - -  -  -  - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - -  - <assembly.plugin.version>2.2-beta-4</assembly.plugin.version> - <buildnumber.plugin.version>1.0-beta-3</buildnumber.plugin.version> - <clean.plugin.version>2.3</clean.plugin.version> - <checkstyle.plugin.version>2.3</checkstyle.plugin.version> - <compiler.plugin.version>2.0.2</compiler.plugin.version> - <ear.plugin.version>2.3.2</ear.plugin.version> - <enforcer.plugin.version>1.0-beta-1</enforcer.plugin.version> - <install.plugin.version>2.3</install.plugin.version> - <jar.plugin.version>2.2</jar.plugin.version> - <javacc.plugin.version>2.5</javacc.plugin.version> - <javadoc.plugin.version>2.6</javadoc.plugin.version> - <jaxb2.plugin.version>0.1</jaxb2.plugin.version> - <jibx.plugin.version>1.2.1</jibx.plugin.version> - <project.info.reports.plugin.version>2.1.2</project.info.reports.plugin.version> - <release.plugin.version>2.0-beta-9</release.plugin.version> - <site.plugin.version>2.0.1</site.plugin.version> - <surefire.plugin.version>2.4.3</surefire.plugin.version> - <surefire.report.plugin.version>2.4.3</surefire.report.plugin.version> - <taglist.plugin.version>2.3</taglist.plugin.version> - <war.plugin.version>2.1-beta-1</war.plugin.version> - </properties> - - <dependencyManagement> - <dependencies> -  - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>3.8.2</version> - </dependency> - </dependencies> - </dependencyManagement> - - <build> - <defaultGoal>install</defaultGoal> - <pluginManagement> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-clean-plugin</artifactId> - <version>${clean.plugin.version}</version> - </plugin> -  - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>${compiler.plugin.version}</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-enforcer-plugin</artifactId> - <version>${enforcer.plugin.version}</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-install-plugin</artifactId> - <version>${install.plugin.version}</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <version>${jar.plugin.version}</version> - <configuration> - <configuration> - <source>${maven.compiler.source}</source> - <target>${maven.compiler.target}</target> - </configuration> - <archive> -  - <manifestEntries> - <SCM-URL>${project.scm.connection}</SCM-URL> - <Specification-Title>${exo.product.name}</Specification-Title> - <Specification-Version>${exo.product.specification}</Specification-Version> - <Specification-Vendor>${project.organization.name}</Specification-Vendor> - <Implementation-Title>${project.name}</Implementation-Title> - <Implementation-Version>${project.version}</Implementation-Version> - <Implementation-Vendor>${project.organization.name}</Implementation-Vendor> - </manifestEntries> - </archive> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-release-plugin</artifactId> - <version>${release.plugin.version}</version> -  - <configuration> - <useReleaseProfile>false</useReleaseProfile> - <arguments>-Prelease -Dmaven.test.skip=true</arguments> - <autoVersionSubmodules>true</autoVersionSubmodules> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-site-plugin</artifactId> - <version>${site.plugin.version}</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-source-plugin</artifactId> -  - <configuration> -  - <includePom>true</includePom> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <version>${surefire.plugin.version}</version> - <configuration> - <includes> - <include>**/${exo.test.includes}.java</include> - </includes> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-war-plugin</artifactId> - <version>${war.plugin.version}</version> - <configuration> - <archive> - <manifestEntries> - <SCM-URL>${project.scm.connection}</SCM-URL> - <Specification-Title>${exo.product.name}</Specification-Title> - <Specification-Version>${exo.product.specification}</Specification-Version> - <Specification-Vendor>${project.organization.name}</Specification-Vendor> - <Implementation-Title>${project.name}</Implementation-Title> - <Implementation-Version>${project.version}</Implementation-Version> - <Implementation-Vendor>${project.organization.name}</Implementation-Vendor> - </manifestEntries> - </archive> - </configuration> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>buildnumber-maven-plugin</artifactId> - <version>${buildnumber.plugin.version}</version> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>javacc-maven-plugin</artifactId> - <version>${javacc.plugin.version}</version> - </plugin> - <plugin> - <groupId>org.jibx</groupId> - <artifactId>maven-jibx-plugin</artifactId> - <version>${jibx.plugin.version}</version> - </plugin> - <plugin> - <groupId>org.jvnet.jaxb2.maven2</groupId> - <artifactId>maven-jaxb2-plugin</artifactId> - <version>${jaxb2.plugin.version}</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-checkstyle-plugin</artifactId> - <version>${checkstyle.plugin.version}</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <version>${javadoc.plugin.version}</version> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>taglist-maven-plugin</artifactId> - <version>${taglist.plugin.version}</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-ear-plugin</artifactId> - <version>${ear.plugin.version}</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-assembly-plugin</artifactId> - <version>${assembly.plugin.version}</version> - </plugin> - </plugins> - </pluginManagement> - </build> - -  - <reporting> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-project-info-reports-plugin</artifactId> - <version>${project.info.reports.plugin.version}</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <version>${javadoc.plugin.version}</version> - <configuration> - <aggregate>true</aggregate> - <reportOutputDirectory>${project.build.directory}/javadoc</reportOutputDirectory> - <maxmemory>512m</maxmemory> - <minmemory>256m</minmemory> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-report-plugin</artifactId> - <version>${surefire.report.plugin.version}</version> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>taglist-maven-plugin</artifactId> - <version>${taglist.plugin.version}</version> - </plugin> - </plugins> - </reporting> - - <profiles> - <profile> - <id>checkstyle</id> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-checkstyle-plugin</artifactId> - <version>${checkstyle.plugin.version}</version> - <dependencies> - <dependency> - <groupId>org.exoplatform.tool</groupId> - <artifactId>dev-resources</artifactId> - <version>${exo.dev.resources.version}</version> - </dependency> - </dependencies> - <executions> - <execution> - <phase>verify</phase> - <goals> - <goal>check</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - <reporting> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-checkstyle-plugin</artifactId> - <version>${checkstyle.plugin.version}</version> - <configuration> - <violationSeverity>warning</violationSeverity> - <configLocation>checkstyle/codestyle.xml</configLocation> - <headerLocation>checkstyle/java.header</headerLocation> - </configuration> - </plugin> - </plugins> - </reporting> - </profile> - <profile> - <id>release</id> - <build> - <pluginManagement> - <plugins> -  - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-war-plugin</artifactId> - <configuration> - <archive> - <manifestEntries> - <SCM-Revision>${buildNumber}</SCM-Revision> - <SCM-URL>${project.scm.connection}</SCM-URL> - <Specification-Title>${exo.product.name}</Specification-Title> - <Specification-Version>${exo.product.specification}</Specification-Version> - <Specification-Vendor>${project.organization.name}</Specification-Vendor> - <Implementation-Title>${project.name}</Implementation-Title> - <Implementation-Version>${project.version}</Implementation-Version> - <Implementation-Vendor>${project.organization.name}</Implementation-Vendor> - </manifestEntries> - </archive> - </configuration> - </plugin> - -  - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <configuration> - <archive> - <manifestEntries> - <SCM-Revision>${buildNumber}</SCM-Revision> - <SCM-URL>${project.scm.connection}</SCM-URL> - <Specification-Title>${exo.product.name}</Specification-Title> - <Specification-Version>${exo.product.specification}</Specification-Version> - <Specification-Vendor>${project.organization.name}</Specification-Vendor> - <Implementation-Title>${project.name}</Implementation-Title> - <Implementation-Version>${project.version}</Implementation-Version> - <Implementation-Vendor>${project.organization.name}</Implementation-Vendor> - </manifestEntries> - </archive> - </configuration> - </plugin> - </plugins> - </pluginManagement> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>buildnumber-maven-plugin</artifactId> - <executions> - <execution> - <phase>validate</phase> - <goals> - <goal>create</goal> - </goals> - </execution> - </executions> - <configuration> - <doCheck>false</doCheck> - <doUpdate>false</doUpdate> - </configuration> - </plugin> - </plugins> - </build> - </profile> - <profile> - <id>tomcat-server</id> - <activation> - <property> - <name>tomcat</name> - </property> - <activeByDefault>false</activeByDefault> - </activation> - </profile> - <profile> - <id>jboss-server</id> - <activation> - <property> - <name>jboss-server</name> - </property> - <activeByDefault>false</activeByDefault> - </activation> - </profile> - <profile> - <id>jonas-server</id> - <activation> - <property> - <name>jonas-server</name> - </property> - <activeByDefault>false</activeByDefault> - </activation> - </profile> - <profile> - <id>jmeter-perftest</id> - <activation> - <property> - <name>jmeter-perftest</name> - </property> - <activeByDefault>false</activeByDefault> - </activation> - </profile> - -  - <profile> - <id>emma</id> - <properties> - <maven.test.failure.ignore>true</maven.test.failure.ignore> - </properties> - <build> - <pluginManagement> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <systemProperties> - <property> - <name>emma.coverage.out.file</name> - <value>target/emma/coverage.ec</value> - </property> - </systemProperties> - </configuration> - </plugin> - </plugins> - </pluginManagement> - <plugins> - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <id>emma1</id> - <phase>test-compile</phase> - <configuration> - <tasks if="emma.run"> - <echo message="[EMMA] Start classes instrumentation ..." /> - <taskdef resource="emma_ant.properties" classpathref="maven.dependency.classpath" /> - <mkdir dir="target" /> - <mkdir dir="target/classes" /> - <mkdir dir="target/emma/classes" /> -  - <copy todir="target/emma/classes" verbose="false" overwrite="true"> - <fileset dir="target/classes" /> - </copy> - <emma enabled="true"> - <instr mode="overwrite" metadatafile="target/emma/metadata.em"> - <filter excludes="*.xml.*" /> - <filter excludes="*JiBX*" /> - <filter excludes="*Entry*" /> - <filter excludes="*Value*" /> - <filter excludes="*RepositoryServiceConfiguration*" /> - <filter excludes="*.query*" /> - - <instrpath> - <dirset dir="target"> - <include name="emma/classes" /> - </dirset> - </instrpath> - </instr> - </emma> - </tasks> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - <execution> - <id>emma2</id> - <phase>test</phase> - <configuration> - <tasks if="emma.run"> - <echo message="[EMMA] Start report generation..." /> - <taskdef resource="emma_ant.properties" classpathref="maven.dependency.classpath" /> - <emma enabled="true"> -  - <merge outfile="target/coverage.es"> - <fileset dir="."> - <include name="**/target/emma/*.e*" /> - <include name="**/target/emma/*.e*" /> - </fileset> - </merge> - <report> - <sourcepath> - <dirset dir="."> - <include name="**/src/**/java" /> - </dirset> - </sourcepath> - <fileset dir="target/"> - <include name="*.es" /> - </fileset> - <html outfile="target/coverage.html" /> - <xml outfile="target/coverage.xml" /> - </report> - </emma> - </tasks> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - </executions> - <dependencies> - <dependency> - <groupId>emma</groupId> - <artifactId>emma</artifactId> - <version>2.0.5312</version> - </dependency> - <dependency> - <groupId>emma</groupId> - <artifactId>emma_ant</artifactId> - <version>2.0.5312</version> - </dependency> - </dependencies> - </plugin> - </plugins> - </build> - <dependencies> - <dependency> - <groupId>emma</groupId> - <artifactId>emma</artifactId> - <version>2.0.5312</version> - <scope>test</scope> - </dependency> - </dependencies> - </profile> -</profiles> -</project> + +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.jboss</groupId> + <artifactId>jboss-parent</artifactId> + <version>5-beta-1</version> + </parent> + <groupId>org.exoplatform</groupId> + <artifactId>foundation-parent</artifactId> + <version>3</version> + <packaging>pom</packaging> + + <name>eXo JBoss Parent</name> + + <organization> + <name>eXo Platform SAS</name> + <url>http://www.exoplatform.com</url> + </organization> + + <licenses> + <license> + <name>LGPL, version 2.1</name> + <url>http://www.opensource.org/licenses/lgpl-license.php</url> + </license> + </licenses> + + <scm> + <connection>scm:svn:http://anonsvn.jboss.org/repos/exo-jcr/parent/tags/3</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/exo-jcr/parent/tags/3</developerConnection> + <url>http://fisheye.jboss.org/browse/exo-jcr/parent/tags/3</url> + </scm> + +  + <repositories> + <repository> + <id>repository.jboss.com</id> + <url>http://repository.jboss.com/maven2</url> + </repository> + <repository> + <id>exo-int</id> + <name>exoplatform.org internal repository</name> + <url>http://maven2.exoplatform.org/rest/maven2</url> + </repository> + <repository> + <id>repo.jfrog.org-releases</id> + <name>repo.jfrog.org-releases</name> + <url>http://repo.jfrog.org/artifactory/plugins-releases-local</url> + </repository> + <repository> + <id>download.java.net</id> + <name>download.java.net repository</name> + <url>http://download.java.net/maven/2</url> + </repository> + </repositories> + <pluginRepositories> + <pluginRepository> + <id>repository.jboss.com</id> + <url>http://repository.jboss.com/maven2</url> + </pluginRepository> + <pluginRepository> + <id>exo-int</id> + <name>exoplatform.org internal repository</name> + <url>http://maven2.exoplatform.org/rest/maven2</url> + </pluginRepository> + <pluginRepository> + <id>repo.jfrog.org-releases</id> + <name>repo.jfrog.org-releases</name> + <url>http://repo.jfrog.org/artifactory/plugins-releases-local</url> + </pluginRepository> + <pluginRepository> + <id>download.java.net</id> + <name>download.java.net repository</name> + <url>http://download.java.net/maven/2</url> + </pluginRepository> +  + <pluginRepository> + <id>mc-release</id> + <name>Local Maven repository of releases</name> + <url>http://mc-repo.googlecode.com/svn/maven2/releases</url> + </pluginRepository> + </pluginRepositories> + + <properties> + <exo.projects.directory.base>D:/java</exo.projects.directory.base> + <exo.projects.directory.dependencies>${exo.projects.directory.base}/exo-dependencies</exo.projects.directory.dependencies> + <exo.projects.directory.working>${exo.projects.directory.base}/exo-working</exo.projects.directory.working> + + <exo.projects.app.mvn.repo>${exo.projects.directory.dependencies}/repository</exo.projects.app.mvn.repo> + + <exo.projects.app.tomcat.version>tomcat-6.0.16</exo.projects.app.tomcat.version> + <exo.projects.app.jboss.version>jboss-4.2.3.GA</exo.projects.app.jboss.version> + <exo.projects.app.jonas.version>JONAS_4_8_5</exo.projects.app.jonas.version> + + <exo.dev.resources.version>1.2.0</exo.dev.resources.version> + + <exo.product.name>eXo Platform</exo.product.name> + <exo.product.specification>N/A</exo.product.specification> + +  + <maven.test.skip>false</maven.test.skip> + <forkMode>once</forkMode> + <maven.test.failure.ignore>false</maven.test.failure.ignore> + <surefire.useFile>true</surefire.useFile> + <exo.test.includes>Test*</exo.test.includes> + +  + <maven.compiler.optimize>true</maven.compiler.optimize> + <maven.compiler.source>1.5</maven.compiler.source> + <maven.compiler.target>1.5</maven.compiler.target> + +  +  +  + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + +  + <assembly.plugin.version>2.2-beta-4</assembly.plugin.version> + <buildnumber.plugin.version>1.0-beta-3</buildnumber.plugin.version> + <clean.plugin.version>2.3</clean.plugin.version> + <checkstyle.plugin.version>2.3</checkstyle.plugin.version> + <compiler.plugin.version>2.0.2</compiler.plugin.version> + <ear.plugin.version>2.3.2</ear.plugin.version> + <enforcer.plugin.version>1.0-beta-1</enforcer.plugin.version> + <install.plugin.version>2.3</install.plugin.version> + <jar.plugin.version>2.2</jar.plugin.version> + <javacc.plugin.version>2.5</javacc.plugin.version> + <javadoc.plugin.version>2.6</javadoc.plugin.version> + <jaxb2.plugin.version>0.1</jaxb2.plugin.version> + <jibx.plugin.version>1.2.1</jibx.plugin.version> + <project.info.reports.plugin.version>2.1.2</project.info.reports.plugin.version> + <release.plugin.version>2.0-beta-9</release.plugin.version> + <site.plugin.version>2.0.1</site.plugin.version> + <surefire.plugin.version>2.4.3</surefire.plugin.version> + <surefire.report.plugin.version>2.4.3</surefire.report.plugin.version> + <taglist.plugin.version>2.3</taglist.plugin.version> + <war.plugin.version>2.1-beta-1</war.plugin.version> + </properties> + + <dependencyManagement> + <dependencies> +  + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>3.8.2</version> + </dependency> + </dependencies> + </dependencyManagement> + + <build> + <defaultGoal>install</defaultGoal> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-clean-plugin</artifactId> + <version>${clean.plugin.version}</version> + </plugin> +  + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>${compiler.plugin.version}</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-enforcer-plugin</artifactId> + <version>${enforcer.plugin.version}</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-install-plugin</artifactId> + <version>${install.plugin.version}</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <version>${jar.plugin.version}</version> + <configuration> + <configuration> + <source>${maven.compiler.source}</source> + <target>${maven.compiler.target}</target> + </configuration> + <archive> +  + <manifestEntries> + <SCM-URL>${project.scm.connection}</SCM-URL> + <Specification-Title>${exo.product.name}</Specification-Title> + <Specification-Version>${exo.product.specification}</Specification-Version> + <Specification-Vendor>${project.organization.name}</Specification-Vendor> + <Implementation-Title>${project.name}</Implementation-Title> + <Implementation-Version>${project.version}</Implementation-Version> + <Implementation-Vendor>${project.organization.name}</Implementation-Vendor> + </manifestEntries> + </archive> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-release-plugin</artifactId> + <version>${release.plugin.version}</version> +  + <configuration> + <useReleaseProfile>false</useReleaseProfile> + <arguments>-Prelease -Dmaven.test.skip=true</arguments> + <autoVersionSubmodules>true</autoVersionSubmodules> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-site-plugin</artifactId> + <version>${site.plugin.version}</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-source-plugin</artifactId> +  + <configuration> +  + <includePom>true</includePom> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <version>${surefire.plugin.version}</version> + <configuration> + <includes> + <include>**/${exo.test.includes}.java</include> + </includes> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-war-plugin</artifactId> + <version>${war.plugin.version}</version> + <configuration> + <archive> + <manifestEntries> + <SCM-URL>${project.scm.connection}</SCM-URL> + <Specification-Title>${exo.product.name}</Specification-Title> + <Specification-Version>${exo.product.specification}</Specification-Version> + <Specification-Vendor>${project.organization.name}</Specification-Vendor> + <Implementation-Title>${project.name}</Implementation-Title> + <Implementation-Version>${project.version}</Implementation-Version> + <Implementation-Vendor>${project.organization.name}</Implementation-Vendor> + </manifestEntries> + </archive> + </configuration> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>buildnumber-maven-plugin</artifactId> + <version>${buildnumber.plugin.version}</version> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>javacc-maven-plugin</artifactId> + <version>${javacc.plugin.version}</version> + </plugin> + <plugin> + <groupId>org.jibx</groupId> + <artifactId>maven-jibx-plugin</artifactId> + <version>${jibx.plugin.version}</version> + </plugin> + <plugin> + <groupId>org.jvnet.jaxb2.maven2</groupId> + <artifactId>maven-jaxb2-plugin</artifactId> + <version>${jaxb2.plugin.version}</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-checkstyle-plugin</artifactId> + <version>${checkstyle.plugin.version}</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <version>${javadoc.plugin.version}</version> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>taglist-maven-plugin</artifactId> + <version>${taglist.plugin.version}</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-ear-plugin</artifactId> + <version>${ear.plugin.version}</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-assembly-plugin</artifactId> + <version>${assembly.plugin.version}</version> + </plugin> + </plugins> + </pluginManagement> + </build> + +  + <reporting> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-project-info-reports-plugin</artifactId> + <version>${project.info.reports.plugin.version}</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <version>${javadoc.plugin.version}</version> + <configuration> + <aggregate>true</aggregate> + <reportOutputDirectory>${project.build.directory}/javadoc</reportOutputDirectory> + <maxmemory>512m</maxmemory> + <minmemory>256m</minmemory> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-report-plugin</artifactId> + <version>${surefire.report.plugin.version}</version> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>taglist-maven-plugin</artifactId> + <version>${taglist.plugin.version}</version> + </plugin> + </plugins> + </reporting> + + <profiles> + <profile> + <id>checkstyle</id> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-checkstyle-plugin</artifactId> + <version>${checkstyle.plugin.version}</version> + <dependencies> + <dependency> + <groupId>org.exoplatform.tool</groupId> + <artifactId>dev-resources</artifactId> + <version>${exo.dev.resources.version}</version> + </dependency> + </dependencies> + <executions> + <execution> + <phase>verify</phase> + <goals> + <goal>check</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + <reporting> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-checkstyle-plugin</artifactId> + <version>${checkstyle.plugin.version}</version> + <configuration> + <violationSeverity>warning</violationSeverity> + <configLocation>checkstyle/codestyle.xml</configLocation> + <headerLocation>checkstyle/java.header</headerLocation> + </configuration> + </plugin> + </plugins> + </reporting> + </profile> + <profile> + <id>release</id> + <build> + <pluginManagement> + <plugins> +  + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-war-plugin</artifactId> + <configuration> + <archive> + <manifestEntries> + <SCM-Revision>${buildNumber}</SCM-Revision> + <SCM-URL>${project.scm.connection}</SCM-URL> + <Specification-Title>${exo.product.name}</Specification-Title> + <Specification-Version>${exo.product.specification}</Specification-Version> + <Specification-Vendor>${project.organization.name}</Specification-Vendor> + <Implementation-Title>${project.name}</Implementation-Title> + <Implementation-Version>${project.version}</Implementation-Version> + <Implementation-Vendor>${project.organization.name}</Implementation-Vendor> + </manifestEntries> + </archive> + </configuration> + </plugin> + +  + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <configuration> + <archive> + <manifestEntries> + <SCM-Revision>${buildNumber}</SCM-Revision> + <SCM-URL>${project.scm.connection}</SCM-URL> + <Specification-Title>${exo.product.name}</Specification-Title> + <Specification-Version>${exo.product.specification}</Specification-Version> + <Specification-Vendor>${project.organization.name}</Specification-Vendor> + <Implementation-Title>${project.name}</Implementation-Title> + <Implementation-Version>${project.version}</Implementation-Version> + <Implementation-Vendor>${project.organization.name}</Implementation-Vendor> + </manifestEntries> + </archive> + </configuration> + </plugin> + </plugins> + </pluginManagement> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>buildnumber-maven-plugin</artifactId> + <executions> + <execution> + <phase>validate</phase> + <goals> + <goal>create</goal> + </goals> + </execution> + </executions> + <configuration> + <doCheck>false</doCheck> + <doUpdate>false</doUpdate> + </configuration> + </plugin> + </plugins> + </build> + </profile> + <profile> + <id>tomcat-server</id> + <activation> + <property> + <name>tomcat</name> + </property> + <activeByDefault>false</activeByDefault> + </activation> + </profile> + <profile> + <id>jboss-server</id> + <activation> + <property> + <name>jboss-server</name> + </property> + <activeByDefault>false</activeByDefault> + </activation> + </profile> + <profile> + <id>jonas-server</id> + <activation> + <property> + <name>jonas-server</name> + </property> + <activeByDefault>false</activeByDefault> + </activation> + </profile> + <profile> + <id>jmeter-perftest</id> + <activation> + <property> + <name>jmeter-perftest</name> + </property> + <activeByDefault>false</activeByDefault> + </activation> + </profile> + +  + <profile> + <id>emma</id> + <properties> + <maven.test.failure.ignore>true</maven.test.failure.ignore> + </properties> + <build> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <systemProperties> + <property> + <name>emma.coverage.out.file</name> + <value>target/emma/coverage.ec</value> + </property> + </systemProperties> + </configuration> + </plugin> + </plugins> + </pluginManagement> + <plugins> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <id>emma1</id> + <phase>test-compile</phase> + <configuration> + <tasks if="emma.run"> + <echo message="[EMMA] Start classes instrumentation ..." /> + <taskdef resource="emma_ant.properties" classpathref="maven.dependency.classpath" /> + <mkdir dir="target" /> + <mkdir dir="target/classes" /> + <mkdir dir="target/emma/classes" /> +  + <copy todir="target/emma/classes" verbose="false" overwrite="true"> + <fileset dir="target/classes" /> + </copy> + <emma enabled="true"> + <instr mode="overwrite" metadatafile="target/emma/metadata.em"> + <filter excludes="*.xml.*" /> + <filter excludes="*JiBX*" /> + <filter excludes="*Entry*" /> + <filter excludes="*Value*" /> + <filter excludes="*RepositoryServiceConfiguration*" /> + <filter excludes="*.query*" /> + + <instrpath> + <dirset dir="target"> + <include name="emma/classes" /> + </dirset> + </instrpath> + </instr> + </emma> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + <execution> + <id>emma2</id> + <phase>test</phase> + <configuration> + <tasks if="emma.run"> + <echo message="[EMMA] Start report generation..." /> + <taskdef resource="emma_ant.properties" classpathref="maven.dependency.classpath" /> + <emma enabled="true"> +  + <merge outfile="target/coverage.es"> + <fileset dir="."> + <include name="**/target/emma/*.e*" /> + <include name="**/target/emma/*.e*" /> + </fileset> + </merge> + <report> + <sourcepath> + <dirset dir="."> + <include name="**/src/**/java" /> + </dirset> + </sourcepath> + <fileset dir="target/"> + <include name="*.es" /> + </fileset> + <html outfile="target/coverage.html" /> + <xml outfile="target/coverage.xml" /> + </report> + </emma> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + <dependencies> + <dependency> + <groupId>emma</groupId> + <artifactId>emma</artifactId> + <version>2.0.5312</version> + </dependency> + <dependency> + <groupId>emma</groupId> + <artifactId>emma_ant</artifactId> + <version>2.0.5312</version> + </dependency> + </dependencies> + </plugin> + </plugins> + </build> + <dependencies> + <dependency> + <groupId>emma</groupId> + <artifactId>emma</artifactId> + <version>2.0.5312</version> + <scope>test</scope> + </dependency> + </dependencies> + </profile> +</profiles> +</project>

16 years, 8 months

1
0
0 / 0

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

by do-not-reply＠jboss.org

Author: tolusha Date: 2009-11-16 10:30:08 -0500 (Mon, 16 Nov 2009) New Revision: 686 Modified: jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/ItemImpl.java jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/NodeImpl.java jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/ItemAutocreator.java jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/NodeTypeDataManagerImpl.java jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/QueryImpl.java Log: EXOJCR-221: ItemAutocreator improvement: dont check exists child items for new added node Modified: jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/ItemImpl.java =================================================================== --- jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/ItemImpl.java 2009-11-16 15:13:25 UTC (rev 685) +++ jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/ItemImpl.java 2009-11-16 15:30:08 UTC (rev 686) @@ -123,7 +123,6 @@ this.session = session; this.data = data; - this.location = session.getLocationFactory().createJCRPath(data.getQPath()); this.dataManager = session.getTransientNodesManager(); this.locationFactory = session.getLocationFactory(); Modified: jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/NodeImpl.java =================================================================== --- jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/NodeImpl.java 2009-11-16 15:13:25 UTC (rev 685) +++ jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/NodeImpl.java 2009-11-16 15:30:08 UTC (rev 686) @@ -585,7 +585,7 @@ dataManager.update(state, false); NodeTypeDataManager ntmanager = session.getWorkspace().getNodeTypesHolder(); - ItemAutocreator itemAutocreator = new ItemAutocreator(ntmanager, valueFactory, dataManager); + ItemAutocreator itemAutocreator = new ItemAutocreator(ntmanager, valueFactory, dataManager, false); PlainChangesLog changes = itemAutocreator.makeAutoCreatedItems(nodeData(), type.getName(), dataManager, session.getUserID()); @@ -2604,7 +2604,7 @@ NodeImpl node = (NodeImpl)dataManager.update(state, true); NodeTypeDataManager ntmanager = session.getWorkspace().getNodeTypesHolder(); - ItemAutocreator itemAutocreator = new ItemAutocreator(ntmanager, valueFactory, dataManager); + ItemAutocreator itemAutocreator = new ItemAutocreator(ntmanager, valueFactory, dataManager, true); PlainChangesLog changes = itemAutocreator.makeAutoCreatedItems(node.nodeData(), primaryTypeName, dataManager, session.getUserID()); Modified: jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/ItemAutocreator.java =================================================================== --- jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/ItemAutocreator.java 2009-11-16 15:13:25 UTC (rev 685) +++ jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/ItemAutocreator.java 2009-11-16 15:30:08 UTC (rev 686) @@ -69,16 +69,19 @@ private final ValueFactory valueFactory; + private final boolean avoidCheckExistedChildItems; + /** * @param nodeTypeDataManager */ public ItemAutocreator(NodeTypeDataManager nodeTypeDataManager, ValueFactory valueFactory, - ItemDataConsumer dataConsumer) + ItemDataConsumer dataConsumer, boolean avoidCheckExistedChildItems) { super(); this.nodeTypeDataManager = nodeTypeDataManager; this.valueFactory = valueFactory; this.dataConsumer = dataConsumer; + this.avoidCheckExistedChildItems = avoidCheckExistedChildItems; } public PlainChangesLog makeAutoCreatedItems(final NodeData parent, final InternalQName nodeTypeName, @@ -113,7 +116,9 @@ { if (ndef.isAutoCreated()) { - final ItemData pdata = targetDataManager.getItemData(parent, new QPathEntry(ndef.getName(), 0)); + final ItemData pdata = + avoidCheckExistedChildItems ? null : targetDataManager.getItemData(parent, new QPathEntry( + ndef.getName(), 0)); if (pdata == null && !addedNodes.contains(ndef.getName()) || pdata != null && !pdata.isNode()) { @@ -156,7 +161,9 @@ if (pdef.isAutoCreated()) { - final ItemData pdata = targetDataManager.getItemData(parent, new QPathEntry(pdef.getName(), 0)); + final ItemData pdata = + avoidCheckExistedChildItems ? null : targetDataManager.getItemData(parent, new QPathEntry( + pdef.getName(), 0)); if (pdata == null && !addedProperties.contains(pdef.getName()) || pdata != null && pdata.isNode()) { Modified: jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/NodeTypeDataManagerImpl.java =================================================================== --- jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/NodeTypeDataManagerImpl.java 2009-11-16 15:13:25 UTC (rev 685) +++ jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/NodeTypeDataManagerImpl.java 2009-11-16 15:30:08 UTC (rev 686) @@ -638,7 +638,7 @@ final boolean recipientsMixVersionable = isNodeType(Constants.MIX_VERSIONABLE, recipienAllNodeTypeNames); final boolean ancestorIsMixVersionable = isNodeType(Constants.MIX_VERSIONABLE, ancestorAllNodeTypeNames); - ItemAutocreator itemAutocreator = new ItemAutocreator(this, valueFactory, dataManager); + ItemAutocreator itemAutocreator = new ItemAutocreator(this, valueFactory, dataManager, false); if (recipientsMixVersionable && !ancestorIsMixVersionable) { @@ -838,7 +838,8 @@ volatileNodeTypeDataManager.registerVolatileNodeTypes(volatileNodeTypes); - ItemAutocreator itemAutocreator = new ItemAutocreator(volatileNodeTypeDataManager, valueFactory, dataManager); + ItemAutocreator itemAutocreator = + new ItemAutocreator(volatileNodeTypeDataManager, valueFactory, dataManager, false); final Set<String> nodes = this.indexSearcherHolder.getNodesByNodeType(recipientDefinition.getName()); // check add mix:versionable super Modified: jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/QueryImpl.java =================================================================== --- jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/QueryImpl.java 2009-11-16 15:13:25 UTC (rev 685) +++ jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/QueryImpl.java 2009-11-16 15:30:08 UTC (rev 686) @@ -16,7 +16,6 @@ */ package org.exoplatform.services.jcr.impl.core.query; - import java.text.NumberFormat; import javax.jcr.ItemExistsException; @@ -56,298 +55,302 @@ /** * Provides the default implementation for a JCR query. */ -public class QueryImpl extends AbstractQueryImpl { +public class QueryImpl extends AbstractQueryImpl +{ - /** - * The logger instance for this class - */ - private static final Logger log = LoggerFactory.getLogger(QueryImpl.class); + /** + * The logger instance for this class + */ + private static final Logger log = LoggerFactory.getLogger(QueryImpl.class); - /** - * A string constant representing the JCR-SQL2 query language. - * - * @since JCR 2.0 - * TODO: REMOVE WHEN JSR 283 IS FINAL!! - */ - public static final String JCR_SQL2 = "JCR-SQL2"; + /** + * A string constant representing the JCR-SQL2 query language. + * + * @since JCR 2.0 + * TODO: REMOVE WHEN JSR 283 IS FINAL!! + */ + public static final String JCR_SQL2 = "JCR-SQL2"; - /** - * A string constant representing the JCR-JQOM query language. - * - * @since JCR 2.0 - * TODO: REMOVE WHEN JSR 283 IS FINAL!! - */ - public static final String JCR_JQOM = "JCR-JQOM"; + /** + * A string constant representing the JCR-JQOM query language. + * + * @since JCR 2.0 + * TODO: REMOVE WHEN JSR 283 IS FINAL!! + */ + public static final String JCR_JQOM = "JCR-JQOM"; - /** - * The session of the user executing this query - */ - protected SessionImpl session; + /** + * The session of the user executing this query + */ + protected SessionImpl session; - /** - * The query statement - */ - protected String statement; + /** + * The query statement + */ + protected String statement; - /** - * The syntax of the query statement - */ - protected String language; + /** + * The syntax of the query statement + */ + protected String language; - /** - * The actual query implementation that can be executed - */ - protected ExecutableQuery query; + /** + * The actual query implementation that can be executed + */ + protected ExecutableQuery query; - /** - * The node where this query is persisted. Only set when this is a persisted - * query. - */ - protected Node node; + /** + * The node where this query is persisted. Only set when this is a persisted + * query. + */ + protected Node node; - /** - * The query handler for this query. - */ - protected QueryHandler handler; + /** + * The query handler for this query. + */ + protected QueryHandler handler; - /** - * Flag indicating whether this query is initialized. - */ - private boolean initialized = false; + /** + * Flag indicating whether this query is initialized. + */ + private boolean initialized = false; - /** - * The maximum result size - */ - private long limit; + /** + * The maximum result size + */ + private long limit; - /** - * The offset in the total result set - */ - private long offset; + /** + * The offset in the total result set + */ + private long offset; - /** - * @inheritDoc - */ - public void init(SessionImpl session, - SessionDataManager itemMgr, - QueryHandler handler, - String statement, - String language) throws InvalidQueryException { - checkNotInitialized(); - this.session = session; - this.statement = statement; - this.language = language; - this.handler = handler; - this.query = handler.createExecutableQuery(session, itemMgr, statement, language); - setInitialized(); - } + /** + * @inheritDoc + */ + public void init(SessionImpl session, SessionDataManager itemMgr, QueryHandler handler, String statement, + String language) throws InvalidQueryException + { + checkNotInitialized(); + this.session = session; + this.statement = statement; + this.language = language; + this.handler = handler; + this.query = handler.createExecutableQuery(session, itemMgr, statement, language); + setInitialized(); + } - /** - * @inheritDoc - */ - public void init(SessionImpl session, - SessionDataManager itemMgr, - QueryHandler handler, - Node node) - throws InvalidQueryException, RepositoryException { - checkNotInitialized(); - this.session = session; - this.node = node; - this.handler = handler; + /** + * @inheritDoc + */ + public void init(SessionImpl session, SessionDataManager itemMgr, QueryHandler handler, Node node) + throws InvalidQueryException, RepositoryException + { + checkNotInitialized(); + this.session = session; + this.node = node; + this.handler = handler; - if (!((ExtendedNode)node).isNodeType(Constants.NT_QUERY)){ - throw new InvalidQueryException("node is not of type nt:query"); - } - statement = node.getProperty("jcr:statement").getString(); - language = node.getProperty("jcr:language").getString(); - query = handler.createExecutableQuery(session, itemMgr, statement, language); - setInitialized(); - } + if (!((ExtendedNode)node).isNodeType(Constants.NT_QUERY)) + { + throw new InvalidQueryException("node is not of type nt:query"); + } + statement = node.getProperty("jcr:statement").getString(); + language = node.getProperty("jcr:language").getString(); + query = handler.createExecutableQuery(session, itemMgr, statement, language); + setInitialized(); + } -// /** -// * @inheritDoc -// * <p/> -// * Throws an {@link UnsupportedOperationException}. -// */ -// public void init(SessionImpl session, -// Sess itemMgr, -// QueryHandler handler, -// QueryObjectModelTree qomTree, -// String language) -// throws InvalidQueryException, RepositoryException { -// throw new UnsupportedOperationException("not a prepared query"); -// } + // /** + // * @inheritDoc + // * <p/> + // * Throws an {@link UnsupportedOperationException}. + // */ + // public void init(SessionImpl session, + // Sess itemMgr, + // QueryHandler handler, + // QueryObjectModelTree qomTree, + // String language) + // throws InvalidQueryException, RepositoryException { + // throw new UnsupportedOperationException("not a prepared query"); + // } - /** - * This method simply forwards the <code>execute</code> call to the - * {@link ExecutableQuery} object returned by - * {@link QueryHandler#createExecutableQuery}. - * {@inheritDoc} - */ - public QueryResult execute() throws RepositoryException { - checkInitialized(); - long time = System.currentTimeMillis(); - QueryResult result = query.execute(offset, limit); - if (log.isDebugEnabled()) { - time = System.currentTimeMillis() - time; - NumberFormat format = NumberFormat.getNumberInstance(); - format.setMinimumFractionDigits(2); - format.setMaximumFractionDigits(2); - String seconds = format.format((double) time / 1000); - log.debug("executed in " + seconds + " s. (" + statement + ")"); - } - return result; - } + /** + * This method simply forwards the <code>execute</code> call to the + * {@link ExecutableQuery} object returned by + * {@link QueryHandler#createExecutableQuery}. + * {@inheritDoc} + */ + public QueryResult execute() throws RepositoryException + { + checkInitialized(); + long time = System.currentTimeMillis(); + QueryResult result = query.execute(offset, limit); + if (log.isDebugEnabled()) + { + time = System.currentTimeMillis() - time; + NumberFormat format = NumberFormat.getNumberInstance(); + format.setMinimumFractionDigits(2); + format.setMaximumFractionDigits(2); + String seconds = format.format((double)time / 1000); + log.debug("executed in " + seconds + " s. (" + statement + ")"); + } + return result; + } - /** - * {@inheritDoc} - */ - public String getStatement() { - checkInitialized(); - return statement; - } + /** + * {@inheritDoc} + */ + public String getStatement() + { + checkInitialized(); + return statement; + } - /** - * {@inheritDoc} - */ - public String getLanguage() { - checkInitialized(); - return language; - } + /** + * {@inheritDoc} + */ + public String getLanguage() + { + checkInitialized(); + return language; + } - /** - * {@inheritDoc} - */ - public String getStoredQueryPath() - throws ItemNotFoundException, RepositoryException { - checkInitialized(); - if (node == null) { - throw new ItemNotFoundException("not a persistent query"); - } - return node.getPath(); - } + /** + * {@inheritDoc} + */ + public String getStoredQueryPath() throws ItemNotFoundException, RepositoryException + { + checkInitialized(); + if (node == null) + { + throw new ItemNotFoundException("not a persistent query"); + } + return node.getPath(); + } - /** - * {@inheritDoc} - */ - public Node storeAsNode(String absPath) - throws ItemExistsException, - PathNotFoundException, - VersionException, - ConstraintViolationException, - LockException, - UnsupportedRepositoryOperationException, - RepositoryException { + /** + * {@inheritDoc} + */ + public Node storeAsNode(String absPath) throws ItemExistsException, PathNotFoundException, VersionException, + ConstraintViolationException, LockException, UnsupportedRepositoryOperationException, RepositoryException + { - checkInitialized(); - JCRPath path = session.getLocationFactory().parseAbsPath(absPath); - QPath qpath = path.getInternalPath(); - NodeImpl parent = (NodeImpl)session.getTransientNodesManager().getItem(qpath.makeParentPath(), false); - if (parent == null) - throw new PathNotFoundException("Parent not found for " + path.getAsString(false)); + checkInitialized(); + JCRPath path = session.getLocationFactory().parseAbsPath(absPath); + QPath qpath = path.getInternalPath(); + NodeImpl parent = (NodeImpl)session.getTransientNodesManager().getItem(qpath.makeParentPath(), false); + if (parent == null) + throw new PathNotFoundException("Parent not found for " + path.getAsString(false)); - // validate as on parent child node - parent.validateChildNode(qpath.getName(), Constants.NT_QUERY); + // validate as on parent child node + parent.validateChildNode(qpath.getName(), Constants.NT_QUERY); - NodeData queryData = - TransientNodeData.createNodeData((NodeData)parent.getData(), qpath.getName(), Constants.NT_QUERY); - NodeImpl queryNode = - (NodeImpl)session.getTransientNodesManager().update(ItemState.createAddedState(queryData), false); + NodeData queryData = + TransientNodeData.createNodeData((NodeData)parent.getData(), qpath.getName(), Constants.NT_QUERY); + NodeImpl queryNode = + (NodeImpl)session.getTransientNodesManager().update(ItemState.createAddedState(queryData), false); - NodeTypeDataManager ntmanager = session.getWorkspace().getNodeTypesHolder(); + NodeTypeDataManager ntmanager = session.getWorkspace().getNodeTypesHolder(); - ItemAutocreator itemAutocreator = new ItemAutocreator(ntmanager, session.getValueFactory(),session.getTransientNodesManager()); + ItemAutocreator itemAutocreator = + new ItemAutocreator(ntmanager, session.getValueFactory(), session.getTransientNodesManager(), false); - PlainChangesLog changes = - itemAutocreator.makeAutoCreatedItems((NodeData)queryNode.getData(), Constants.NT_QUERY, session - .getTransientNodesManager(), session.getUserID()); + PlainChangesLog changes = + itemAutocreator.makeAutoCreatedItems((NodeData)queryNode.getData(), Constants.NT_QUERY, session + .getTransientNodesManager(), session.getUserID()); - for (ItemState autoCreatedState : changes.getAllStates()) - { - session.getTransientNodesManager().update(autoCreatedState, false); - } - // queryNode.addAutoCreatedItems(Constants.NT_QUERY); - // set properties - TransientValueData value = new TransientValueData(language); - TransientPropertyData jcrLanguage = - TransientPropertyData.createPropertyData(queryData, Constants.JCR_LANGUAGE, PropertyType.STRING, false, value); - session.getTransientNodesManager().update(ItemState.createAddedState(jcrLanguage), false); + for (ItemState autoCreatedState : changes.getAllStates()) + { + session.getTransientNodesManager().update(autoCreatedState, false); + } + // queryNode.addAutoCreatedItems(Constants.NT_QUERY); + // set properties + TransientValueData value = new TransientValueData(language); + TransientPropertyData jcrLanguage = + TransientPropertyData.createPropertyData(queryData, Constants.JCR_LANGUAGE, PropertyType.STRING, false, value); + session.getTransientNodesManager().update(ItemState.createAddedState(jcrLanguage), false); - value = new TransientValueData(statement); - TransientPropertyData jcrStatement = - TransientPropertyData - .createPropertyData(queryData, Constants.JCR_STATEMENT, PropertyType.STRING, false, value); - session.getTransientNodesManager().update(ItemState.createAddedState(jcrStatement), false); + value = new TransientValueData(statement); + TransientPropertyData jcrStatement = + TransientPropertyData + .createPropertyData(queryData, Constants.JCR_STATEMENT, PropertyType.STRING, false, value); + session.getTransientNodesManager().update(ItemState.createAddedState(jcrStatement), false); - // NOTE: for save stored node need save() on parent or on session (6.6.10 - // The Query Object) - node = queryNode; - return node; - } + // NOTE: for save stored node need save() on parent or on session (6.6.10 + // The Query Object) + node = queryNode; + return node; + } - /** - * Binds the given <code>value</code> to the variable named - * <code>varName</code>. - * - * @param varName name of variable in query - * @param value value to bind - * @throws IllegalArgumentException if <code>varName</code> is not a - * valid variable in this query. - * @throws javax.jcr.RepositoryException if an error occurs. - */ - public void bindValue(String varName, Value value) - throws IllegalArgumentException, RepositoryException { - checkInitialized(); - query.bindValue(session.getLocationFactory().parseJCRName(varName).getInternalName(), value); - } + /** + * Binds the given <code>value</code> to the variable named + * <code>varName</code>. + * + * @param varName name of variable in query + * @param value value to bind + * @throws IllegalArgumentException if <code>varName</code> is not a + * valid variable in this query. + * @throws javax.jcr.RepositoryException if an error occurs. + */ + public void bindValue(String varName, Value value) throws IllegalArgumentException, RepositoryException + { + checkInitialized(); + query.bindValue(session.getLocationFactory().parseJCRName(varName).getInternalName(), value); + } - /** - * Sets the maximum size of the result set. - * - * @param limit new maximum size of the result set - */ - public void setLimit(long limit) { - this.limit = limit; - } + /** + * Sets the maximum size of the result set. + * + * @param limit new maximum size of the result set + */ + public void setLimit(long limit) + { + this.limit = limit; + } - /** - * Sets the start offset of the result set. - * - * @param offset new start offset of the result set - */ - public void setOffset(long offset) { - this.offset = offset; - } + /** + * Sets the start offset of the result set. + * + * @param offset new start offset of the result set + */ + public void setOffset(long offset) + { + this.offset = offset; + } - //-----------------------------< internal >--------------------------------- + //-----------------------------< internal >--------------------------------- - /** - * Sets the initialized flag. - */ - protected void setInitialized() { - initialized = true; - } + /** + * Sets the initialized flag. + */ + protected void setInitialized() + { + initialized = true; + } - /** - * Checks if this query is not yet initialized and throws an - * <code>IllegalStateException</code> if it is already initialized. - */ - protected void checkNotInitialized() { - if (initialized) { - throw new IllegalStateException("already initialized"); - } - } + /** + * Checks if this query is not yet initialized and throws an + * <code>IllegalStateException</code> if it is already initialized. + */ + protected void checkNotInitialized() + { + if (initialized) + { + throw new IllegalStateException("already initialized"); + } + } - /** - * Checks if this query is initialized and throws an - * <code>IllegalStateException</code> if it is not yet initialized. - */ - protected void checkInitialized() { - if (!initialized) { - throw new IllegalStateException("not initialized"); - } - } + /** + * Checks if this query is initialized and throws an + * <code>IllegalStateException</code> if it is not yet initialized. + */ + protected void checkInitialized() + { + if (!initialized) + { + throw new IllegalStateException("not initialized"); + } + } - } -

16 years, 8 months

1
0
0 / 0

exo-jcr SVN: r685 - jcr/branches/1.12.0-JBC/component/core/src/test/resources/conf/standalone.

by do-not-reply＠jboss.org

Author: sergiykarpenko Date: 2009-11-16 10:13:25 -0500 (Mon, 16 Nov 2009) New Revision: 685 Modified: jcr/branches/1.12.0-JBC/component/core/src/test/resources/conf/standalone/test-jbosscache-config-exoloader.xml jcr/branches/1.12.0-JBC/component/core/src/test/resources/conf/standalone/test-jcr-config.xml Log: EXOJCR-202: config updated - IndexerCacheLoader conf added Modified: jcr/branches/1.12.0-JBC/component/core/src/test/resources/conf/standalone/test-jbosscache-config-exoloader.xml =================================================================== --- jcr/branches/1.12.0-JBC/component/core/src/test/resources/conf/standalone/test-jbosscache-config-exoloader.xml 2009-11-16 14:23:56 UTC (rev 684) +++ jcr/branches/1.12.0-JBC/component/core/src/test/resources/conf/standalone/test-jbosscache-config-exoloader.xml 2009-11-16 15:13:25 UTC (rev 685) @@ -1,78 +1,84 @@ -<?xml version="1.0" encoding="UTF-8"?> -<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns="urn:jboss:jbosscache-core:config:3.1"> - -  - <transaction - transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup" /> - - <clustering mode="replication"> - - <jgroupsConfig> - <UDP discard_incompatible_packets="true" enable_bundling="false" enable_diagnostics="false" ip_ttl="2" - loopback="false" max_bundle_size="64000" max_bundle_timeout="30" mcast_addr="228.10.10.10" - mcast_port="45588" mcast_recv_buf_size="25000000" mcast_send_buf_size="640000" - oob_thread_pool.enabled="true" oob_thread_pool.keep_alive_time="10000" oob_thread_pool.max_threads="4" - oob_thread_pool.min_threads="1" oob_thread_pool.queue_enabled="true" oob_thread_pool.queue_max_size="10" - oob_thread_pool.rejection_policy="Run" thread_naming_pattern="pl" thread_pool.enabled="true" - thread_pool.keep_alive_time="30000" thread_pool.max_threads="25" thread_pool.min_threads="1" - thread_pool.queue_enabled="true" thread_pool.queue_max_size="10" thread_pool.rejection_policy="Run" - tos="8" ucast_recv_buf_size="20000000" ucast_send_buf_size="640000" use_concurrent_stack="true" - use_incoming_packet_handler="true" /> - <PING num_initial_members="3" timeout="2000" /> - -  - - <MERGE2 max_interval="30000" min_interval="10000"/> - <FD_SOCK/> - <FD max_tries="5" shun="true" timeout="10000"/> - <VERIFY_SUSPECT timeout="1500"/> - <pbcast.NAKACK discard_delivered_msgs="true" gc_lag="0" retransmit_timeout="300,600,1200,2400,4800" - use_mcast_xmit="false"/> - <UNICAST timeout="300,600,1200,2400,3600"/> - <pbcast.STABLE desired_avg_gossip="50000" max_bytes="400000" stability_delay="1000"/> - <pbcast.GMS join_timeout="5000" print_local_addr="true" shun="false" view_ack_collection_timeout="5000" - view_bundling="true"/> - <FRAG2 frag_size="60000"/> - <pbcast.STREAMING_STATE_TRANSFER/> - <pbcast.FLUSH timeout="0"/> - - </jgroupsConfig> - - <sync /> -  -  - </clustering> - - <loaders passivation="false" shared="false"> -  - - <loader class="org.exoplatform.services.jcr.impl.storage.jbosscache.JDBCCacheLoader" - async="false" fetchPersistentState="true" ignoreModifications="false" purgeOnStartup="false"> - <properties> - </properties> - </loader> - - <loader class="org.exoplatform.services.jcr.impl.storage.jbosscache.LockCacheLoader" - async="false" fetchPersistentState="false" ignoreModifications="false" purgeOnStartup="false"> - <properties> - </properties> - </loader> - </loaders> - -  - <invocationBatching enabled="true"/> -</jbosscache> +<?xml version="1.0" encoding="UTF-8"?> +<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns="urn:jboss:jbosscache-core:config:3.1"> + +  + <transaction + transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup" /> + + <clustering mode="replication"> + + <jgroupsConfig> + <UDP discard_incompatible_packets="true" enable_bundling="false" enable_diagnostics="false" ip_ttl="2" + loopback="false" max_bundle_size="64000" max_bundle_timeout="30" mcast_addr="228.10.10.10" + mcast_port="45588" mcast_recv_buf_size="25000000" mcast_send_buf_size="640000" + oob_thread_pool.enabled="true" oob_thread_pool.keep_alive_time="10000" oob_thread_pool.max_threads="4" + oob_thread_pool.min_threads="1" oob_thread_pool.queue_enabled="true" oob_thread_pool.queue_max_size="10" + oob_thread_pool.rejection_policy="Run" thread_naming_pattern="pl" thread_pool.enabled="true" + thread_pool.keep_alive_time="30000" thread_pool.max_threads="25" thread_pool.min_threads="1" + thread_pool.queue_enabled="true" thread_pool.queue_max_size="10" thread_pool.rejection_policy="Run" + tos="8" ucast_recv_buf_size="20000000" ucast_send_buf_size="640000" use_concurrent_stack="true" + use_incoming_packet_handler="true" /> + <PING num_initial_members="3" timeout="2000" /> + +  + + <MERGE2 max_interval="30000" min_interval="10000"/> + <FD_SOCK/> + <FD max_tries="5" shun="true" timeout="10000"/> + <VERIFY_SUSPECT timeout="1500"/> + <pbcast.NAKACK discard_delivered_msgs="true" gc_lag="0" retransmit_timeout="300,600,1200,2400,4800" + use_mcast_xmit="false"/> + <UNICAST timeout="300,600,1200,2400,3600"/> + <pbcast.STABLE desired_avg_gossip="50000" max_bytes="400000" stability_delay="1000"/> + <pbcast.GMS join_timeout="5000" print_local_addr="true" shun="false" view_ack_collection_timeout="5000" + view_bundling="true"/> + <FRAG2 frag_size="60000"/> + <pbcast.STREAMING_STATE_TRANSFER/> + <pbcast.FLUSH timeout="0"/> + + </jgroupsConfig> + + <sync /> +  +  + </clustering> + + <loaders passivation="false" shared="false"> +  + + <loader class="org.exoplatform.services.jcr.impl.storage.jbosscache.JDBCCacheLoader" + async="false" fetchPersistentState="true" ignoreModifications="false" purgeOnStartup="false"> + <properties> + </properties> + </loader> + + <loader class="org.exoplatform.services.jcr.impl.core.query.cacheloader.IndexerCacheLoader" + async="false" fetchPersistentState="false" ignoreModifications="false" purgeOnStartup="false"> + <properties> + </properties> + </loader> + + <loader class="org.exoplatform.services.jcr.impl.storage.jbosscache.LockCacheLoader" + async="false" fetchPersistentState="false" ignoreModifications="false" purgeOnStartup="false"> + <properties> + </properties> + </loader> + </loaders> + +  + <invocationBatching enabled="true"/> +</jbosscache> Modified: jcr/branches/1.12.0-JBC/component/core/src/test/resources/conf/standalone/test-jcr-config.xml =================================================================== --- jcr/branches/1.12.0-JBC/component/core/src/test/resources/conf/standalone/test-jcr-config.xml 2009-11-16 14:23:56 UTC (rev 684) +++ jcr/branches/1.12.0-JBC/component/core/src/test/resources/conf/standalone/test-jcr-config.xml 2009-11-16 15:13:25 UTC (rev 685) @@ -1,393 +1,393 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> - -<repository-service default-repository="db1"> - <repositories> - <repository name="db1" system-workspace="ws" default-workspace="ws"> - <security-domain>exo-domain</security-domain> -  -  - <session-max-age>1h</session-max-age> - <authentication-policy>org.exoplatform.services.jcr.impl.core.access.JAASAuthenticator</authentication-policy> - <workspaces> - <workspace name="ws"> -  - <container class="org.exoplatform.services.jcr.impl.storage.jbosscache.JBossCacheWorkspaceDataContainer"> - <properties> - <property name="jbosscache-configuration" value="conf/standalone/test-jbosscache-config-exoloader.xml" /> - <property name="source-name" value="jdbcjcr" /> - <property name="dialect" value="hsqldb" /> - <property name="multi-db" value="true" /> - <property name="update-storage" value="false" /> - <property name="max-buffer-size" value="200k" /> - <property name="swap-directory" value="target/temp/swap/ws" /> - </properties> - <value-storages> - <value-storage id="ws" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> - <properties> - <property name="path" value="target/temp/values/ws" /> - <property name="digest-algo" value="MD5" /> - <property name="vcas-type" value="org.exoplatform.services.jcr.impl.storage.value.cas.JDBCValueContentAddressStorageImpl" /> - <property name="jdbc-source-name" value="jdbcjcr" /> - <property name="jdbc-dialect" value="hsqldb" /> - </properties> - <filters> - <filter property-type="Binary" /> - </filters> - </value-storage> - </value-storages> - </container> - <initializer class="org.exoplatform.services.jcr.impl.core.ScratchWorkspaceInitializer"> - <properties> - <property name="root-nodetype" value="nt:unstructured" /> - </properties> - </initializer> -  -  - </workspace> - - <workspace name="ws1"> - <container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer"> - <properties> - <property name="source-name" value="jdbcjcr1" /> - <property name="dialect" value="hsqldb" /> - <property name="multi-db" value="true" /> - <property name="update-storage" value="false" /> - <property name="max-buffer-size" value="200k" /> - <property name="swap-directory" value="target/temp/swap/ws1" /> - </properties> - <value-storages> - <value-storage id="ws1" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> - <properties> - <property name="path" value="target/temp/values/ws1" /> - </properties> - <filters> - <filter property-type="Binary" /> - </filters> - </value-storage> - </value-storages> - </container> - <cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.LinkedWorkspaceStorageCacheImpl"> - <properties> - <property name="max-size" value="2k" /> - <property name="live-time" value="20m" /> - </properties> - </cache> - <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> - <properties> - <property name="index-dir" value="target/temp/index/db1/ws1" /> - <property name="synonymprovider-class" value="org.exoplatform.services.jcr.impl.core.query.lucene.PropertiesSynonymProvider" /> - <property name="synonymprovider-config-path" value="../../synonyms.properties" /> - <property name="support-highlighting" value="true" /> - <property name="indexing-configuration-path" value="../../indexing-configuration.xml" /> - <property name="query-class" value="org.exoplatform.services.jcr.impl.core.query.QueryImpl" /> - <property name="spellchecker-class" value="org.exoplatform.services.jcr.impl.core.query.lucene.spell.LuceneSpellChecker$FiveSecondsRefreshInterval" /> - </properties> - </query-handler> - </workspace> - - <workspace name="ws2"> - <container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer"> - <properties> - <property name="source-name" value="jdbcjcr2" /> - <property name="dialect" value="hsqldb" /> - <property name="multi-db" value="true" /> - <property name="update-storage" value="false" /> - <property name="max-buffer-size" value="200k" /> - <property name="swap-directory" value="target/temp/swap/ws2" /> - </properties> - <value-storages> - <value-storage id="ws2" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> - <properties> - <property name="path" value="target/temp/values/ws2" /> - </properties> - <filters> - <filter property-type="Binary" /> - </filters> - </value-storage> - </value-storages> - </container> - <cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.LinkedWorkspaceStorageCacheImpl"> - <properties> - <property name="max-size" value="2k" /> - <property name="live-time" value="20m" /> - </properties> - </cache> - <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> - <properties> - <property name="index-dir" value="target/temp/index/db1/ws2" /> - <property name="synonymprovider-class" value="org.exoplatform.services.jcr.impl.core.query.lucene.PropertiesSynonymProvider" /> - <property name="synonymprovider-config-path" value="../../synonyms.properties" /> - <property name="support-highlighting" value="true" /> - <property name="indexing-configuration-path" value="../../indexing-configuration.xml" /> - <property name="query-class" value="org.exoplatform.services.jcr.impl.core.query.QueryImpl" /> - <property name="spellchecker-class" value="org.exoplatform.services.jcr.impl.core.query.lucene.spell.LuceneSpellChecker$FiveSecondsRefreshInterval" /> - </properties> - </query-handler> - </workspace> - - <workspace name="ws3"> -  - <container - class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer"> - <properties> - <property name="source-name" value="jdbcjcr3" /> - <property name="dialect" value="hsqldb" /> - <property name="multi-db" value="true" /> - <property name="update-storage" value="false" /> - <property name="max-buffer-size" value="200k" /> - <property name="swap-directory" value="target/temp/swap/ws3" /> - </properties> - <value-storages> -  - <value-storage id="ws3_big" - class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> - <properties> - <property name="path" value="target/temp/values/ws3_big" /> - </properties> - <filters> - <filter property-type="Binary" min-value-size="1024K" /> - </filters> - </value-storage> - <value-storage id="ws3" - class="org.exoplatform.services.jcr.impl.storage.value.fs.CASableTreeFileValueStorage"> - <properties> - <property name="path" value="target/temp/values/ws3" /> - <property name="digest-algo" value="MD5" /> - <property name="vcas-type" - value="org.exoplatform.services.jcr.impl.storage.value.cas.JDBCValueContentAddressStorageImpl" /> - <property name="jdbc-source-name" value="jdbcjcr" /> - <property name="jdbc-dialect" value="hsqldb" /> - </properties> - <filters> - <filter property-type="Binary" /> - </filters> - </value-storage> - </value-storages> - </container> - <initializer - class="org.exoplatform.services.jcr.impl.core.ScratchWorkspaceInitializer"> - <properties> - <property name="root-nodetype" value="nt:unstructured" /> - </properties> - </initializer> - <cache enabled="true" - class="org.exoplatform.services.jcr.impl.dataflow.persistent.LinkedWorkspaceStorageCacheImpl"> - <properties> - <property name="max-size" value="2k" /> - <property name="live-time" value="20m" /> - </properties> - </cache> - <query-handler - class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> - <properties> - <property name="index-dir" value="target/temp/index/db1/ws3" /> - <property name="synonymprovider-class" - value="org.exoplatform.services.jcr.impl.core.query.lucene.PropertiesSynonymProvider" /> - <property name="synonymprovider-config-path" value="../../synonyms.properties" /> - <property name="support-highlighting" value="true" /> - <property name="indexing-configuration-path" value="../../indexing-configuration.xml" /> - <property name="query-class" - value="org.exoplatform.services.jcr.impl.core.query.QueryImpl" /> - <property name="spellchecker-class" - value="org.exoplatform.services.jcr.impl.core.query.lucene.spell.LuceneSpellChecker$FiveSecondsRefreshInterval" /> - </properties> - </query-handler> - </workspace> - </workspaces> - </repository> - - <repository name="db1tck" system-workspace="ws" default-workspace="ws"> - <security-domain>exo-domain</security-domain> -  -  - <session-max-age>1h</session-max-age> - <authentication-policy>org.exoplatform.services.jcr.impl.core.access.JAASAuthenticator</authentication-policy> - <workspaces> - <workspace name="ws"> -  - <container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer"> - <properties> - <property name="source-name" value="jdbcjcrtck" /> - <property name="dialect" value="hsqldb" /> - <property name="multi-db" value="true" /> - <property name="update-storage" value="false" /> - <property name="max-buffer-size" value="200k" /> - <property name="swap-directory" value="target/temp/swap/wstck" /> - </properties> - <value-storages> - <value-storage id="ws" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> - <properties> - <property name="path" value="target/temp/values/wstck" /> - </properties> - <filters> - <filter property-type="Binary" min-value-size="100K" /> - </filters> - </value-storage> - </value-storages> - </container> - <initializer class="org.exoplatform.services.jcr.impl.core.ScratchWorkspaceInitializer"> - <properties> - <property name="root-nodetype" value="nt:unstructured" /> - <property name="root-permissions" value="any read;*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove" /> - </properties> - </initializer> - <cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.LinkedWorkspaceStorageCacheImpl"> - <properties> - <property name="max-size" value="2k" /> - <property name="live-time" value="20m" /> - </properties> - </cache> - <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> - <properties> - <property name="index-dir" value="target/temp/index/db1tck/ws" /> - <property name="synonymprovider-class" value="org.exoplatform.services.jcr.impl.core.query.lucene.PropertiesSynonymProvider" /> - <property name="synonymprovider-config-path" value="../../synonyms.properties" /> - <property name="support-highlighting" value="true" /> - <property name="indexing-configuration-path" value="../../indexing-configuration.xml" /> - <property name="query-class" value="org.exoplatform.services.jcr.impl.core.query.QueryImpl" /> - <property name="excerptprovider-class" value="org.exoplatform.services.jcr.impl.core.query.lucene.WeightedHTMLExcerpt" /> - <property name="spellchecker-class" value="org.exoplatform.services.jcr.impl.core.query.lucene.spell.LuceneSpellChecker$FiveSecondsRefreshInterval" /> - </properties> - </query-handler> - <lock-manager> - <time-out>15m</time-out> - <persister class="org.exoplatform.services.jcr.impl.core.lock.FileSystemLockPersister"> - <properties> - <property name="path" value="target/temp/locktck" /> - </properties> - </persister> - </lock-manager> - </workspace> - - <workspace name="ws1"> - <container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer"> - <properties> - <property name="source-name" value="jdbcjcr1tck" /> - <property name="dialect" value="hsqldb" /> - <property name="multi-db" value="true" /> - <property name="update-storage" value="false" /> - <property name="max-buffer-size" value="200k" /> - <property name="swap-directory" value="target/temp/swap/ws1tck" /> - </properties> - <value-storages> - <value-storage id="ws1" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> - <properties> - <property name="path" value="target/temp/values/ws1tck" /> - </properties> - <filters> - <filter property-type="Binary" min-value-size="100K" /> - </filters> - </value-storage> - </value-storages> - </container> - <initializer class="org.exoplatform.services.jcr.impl.core.ScratchWorkspaceInitializer"> - <properties> - <property name="root-nodetype" value="nt:unstructured" /> - <property name="root-permissions" value="any read;*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove" /> - </properties> - </initializer> - <cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.LinkedWorkspaceStorageCacheImpl"> - <properties> - <property name="max-size" value="2k" /> - <property name="live-time" value="20m" /> - </properties> - </cache> - <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> - <properties> - <property name="index-dir" value="target/temp/index/db1tck/ws1" /> - <property name="synonymprovider-class" value="org.exoplatform.services.jcr.impl.core.query.lucene.PropertiesSynonymProvider" /> - <property name="synonymprovider-config-path" value="../../synonyms.properties" /> - <property name="support-highlighting" value="true" /> - <property name="indexing-configuration-path" value="../../indexing-configuration.xml" /> - <property name="query-class" value="org.exoplatform.services.jcr.impl.core.query.QueryImpl" /> - <property name="spellchecker-class" value="org.exoplatform.services.jcr.impl.core.query.lucene.spell.LuceneSpellChecker$FiveSecondsRefreshInterval" /> - </properties> - </query-handler> - </workspace> - - <workspace name="ws2"> - <container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer"> - <properties> - <property name="source-name" value="jdbcjcr2tck" /> - <property name="dialect" value="hsqldb" /> - <property name="multi-db" value="true" /> - <property name="update-storage" value="false" /> - <property name="max-buffer-size" value="200k" /> - <property name="swap-directory" value="target/temp/swap/ws2tck" /> - </properties> - <value-storages> - <value-storage id="ws2" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> - <properties> - <property name="path" value="target/temp/values/ws2tck" /> - </properties> - <filters> - <filter property-type="Binary" min-value-size="100K" /> - </filters> - </value-storage> - </value-storages> - </container> - <initializer class="org.exoplatform.services.jcr.impl.core.ScratchWorkspaceInitializer"> - <properties> - <property name="root-nodetype" value="nt:unstructured" /> - <property name="root-permissions" value="any read;*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove" /> - </properties> - </initializer> - <cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.LinkedWorkspaceStorageCacheImpl"> - <properties> - <property name="max-size" value="2k" /> - <property name="live-time" value="20m" /> - </properties> - </cache> - <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> - <properties> - <property name="index-dir" value="target/temp/index/db1tck/ws2" /> - <property name="synonymprovider-class" value="org.exoplatform.services.jcr.impl.core.query.lucene.PropertiesSynonymProvider" /> - <property name="synonymprovider-config-path" value="../../synonyms.properties" /> - <property name="support-highlighting" value="true" /> - <property name="indexing-configuration-path" value="../../indexing-configuration.xml" /> - <property name="query-class" value="org.exoplatform.services.jcr.impl.core.query.QueryImpl" /> - <property name="spellchecker-class" value="org.exoplatform.services.jcr.impl.core.query.lucene.spell.LuceneSpellChecker$FiveSecondsRefreshInterval" /> - <property name="excerptprovider-class" value="org.exoplatform.services.jcr.impl.core.query.lucene.WeightedHTMLExcerpt"/> - <property name="extractorPoolSize" value="2"/> - <property name="extractorTimeout" value="10"/> - </properties> - </query-handler> - </workspace> - </workspaces> - </repository> - </repositories> -</repository-service> +<?xml version="1.0" encoding="ISO-8859-1"?> + +<repository-service default-repository="db1"> + <repositories> + <repository name="db1" system-workspace="ws" default-workspace="ws"> + <security-domain>exo-domain</security-domain> +  +  + <session-max-age>1h</session-max-age> + <authentication-policy>org.exoplatform.services.jcr.impl.core.access.JAASAuthenticator</authentication-policy> + <workspaces> + <workspace name="ws"> +  + <container class="org.exoplatform.services.jcr.impl.storage.jbosscache.JBossCacheWorkspaceDataContainer"> + <properties> + <property name="jbosscache-configuration" value="conf/standalone/test-jbosscache-config-exoloader.xml" /> + <property name="source-name" value="jdbcjcr" /> + <property name="dialect" value="hsqldb" /> + <property name="multi-db" value="true" /> + <property name="update-storage" value="false" /> + <property name="max-buffer-size" value="200k" /> + <property name="swap-directory" value="target/temp/swap/ws" /> + </properties> + <value-storages> + <value-storage id="ws" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> + <properties> + <property name="path" value="target/temp/values/ws" /> + <property name="digest-algo" value="MD5" /> + <property name="vcas-type" value="org.exoplatform.services.jcr.impl.storage.value.cas.JDBCValueContentAddressStorageImpl" /> + <property name="jdbc-source-name" value="jdbcjcr" /> + <property name="jdbc-dialect" value="hsqldb" /> + </properties> + <filters> + <filter property-type="Binary" /> + </filters> + </value-storage> + </value-storages> + </container> + <initializer class="org.exoplatform.services.jcr.impl.core.ScratchWorkspaceInitializer"> + <properties> + <property name="root-nodetype" value="nt:unstructured" /> + </properties> + </initializer> + <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> + <properties> + <property name="index-dir" value="target/temp/index/db1/ws" /> + </properties> + </query-handler> +  + </workspace> + + <workspace name="ws1"> + <container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer"> + <properties> + <property name="source-name" value="jdbcjcr1" /> + <property name="dialect" value="hsqldb" /> + <property name="multi-db" value="true" /> + <property name="update-storage" value="false" /> + <property name="max-buffer-size" value="200k" /> + <property name="swap-directory" value="target/temp/swap/ws1" /> + </properties> + <value-storages> + <value-storage id="ws1" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> + <properties> + <property name="path" value="target/temp/values/ws1" /> + </properties> + <filters> + <filter property-type="Binary" /> + </filters> + </value-storage> + </value-storages> + </container> + <cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.LinkedWorkspaceStorageCacheImpl"> + <properties> + <property name="max-size" value="2k" /> + <property name="live-time" value="20m" /> + </properties> + </cache> + <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> + <properties> + <property name="index-dir" value="target/temp/index/db1/ws1" /> + <property name="synonymprovider-class" value="org.exoplatform.services.jcr.impl.core.query.lucene.PropertiesSynonymProvider" /> + <property name="synonymprovider-config-path" value="../../synonyms.properties" /> + <property name="support-highlighting" value="true" /> + <property name="indexing-configuration-path" value="../../indexing-configuration.xml" /> + <property name="query-class" value="org.exoplatform.services.jcr.impl.core.query.QueryImpl" /> + <property name="spellchecker-class" value="org.exoplatform.services.jcr.impl.core.query.lucene.spell.LuceneSpellChecker$FiveSecondsRefreshInterval" /> + </properties> + </query-handler> + </workspace> + + <workspace name="ws2"> + <container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer"> + <properties> + <property name="source-name" value="jdbcjcr2" /> + <property name="dialect" value="hsqldb" /> + <property name="multi-db" value="true" /> + <property name="update-storage" value="false" /> + <property name="max-buffer-size" value="200k" /> + <property name="swap-directory" value="target/temp/swap/ws2" /> + </properties> + <value-storages> + <value-storage id="ws2" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> + <properties> + <property name="path" value="target/temp/values/ws2" /> + </properties> + <filters> + <filter property-type="Binary" /> + </filters> + </value-storage> + </value-storages> + </container> + <cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.LinkedWorkspaceStorageCacheImpl"> + <properties> + <property name="max-size" value="2k" /> + <property name="live-time" value="20m" /> + </properties> + </cache> + <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> + <properties> + <property name="index-dir" value="target/temp/index/db1/ws2" /> + <property name="synonymprovider-class" value="org.exoplatform.services.jcr.impl.core.query.lucene.PropertiesSynonymProvider" /> + <property name="synonymprovider-config-path" value="../../synonyms.properties" /> + <property name="support-highlighting" value="true" /> + <property name="indexing-configuration-path" value="../../indexing-configuration.xml" /> + <property name="query-class" value="org.exoplatform.services.jcr.impl.core.query.QueryImpl" /> + <property name="spellchecker-class" value="org.exoplatform.services.jcr.impl.core.query.lucene.spell.LuceneSpellChecker$FiveSecondsRefreshInterval" /> + </properties> + </query-handler> + </workspace> + + <workspace name="ws3"> +  + <container + class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer"> + <properties> + <property name="source-name" value="jdbcjcr3" /> + <property name="dialect" value="hsqldb" /> + <property name="multi-db" value="true" /> + <property name="update-storage" value="false" /> + <property name="max-buffer-size" value="200k" /> + <property name="swap-directory" value="target/temp/swap/ws3" /> + </properties> + <value-storages> +  + <value-storage id="ws3_big" + class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> + <properties> + <property name="path" value="target/temp/values/ws3_big" /> + </properties> + <filters> + <filter property-type="Binary" min-value-size="1024K" /> + </filters> + </value-storage> + <value-storage id="ws3" + class="org.exoplatform.services.jcr.impl.storage.value.fs.CASableTreeFileValueStorage"> + <properties> + <property name="path" value="target/temp/values/ws3" /> + <property name="digest-algo" value="MD5" /> + <property name="vcas-type" + value="org.exoplatform.services.jcr.impl.storage.value.cas.JDBCValueContentAddressStorageImpl" /> + <property name="jdbc-source-name" value="jdbcjcr" /> + <property name="jdbc-dialect" value="hsqldb" /> + </properties> + <filters> + <filter property-type="Binary" /> + </filters> + </value-storage> + </value-storages> + </container> + <initializer + class="org.exoplatform.services.jcr.impl.core.ScratchWorkspaceInitializer"> + <properties> + <property name="root-nodetype" value="nt:unstructured" /> + </properties> + </initializer> + <cache enabled="true" + class="org.exoplatform.services.jcr.impl.dataflow.persistent.LinkedWorkspaceStorageCacheImpl"> + <properties> + <property name="max-size" value="2k" /> + <property name="live-time" value="20m" /> + </properties> + </cache> + <query-handler + class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> + <properties> + <property name="index-dir" value="target/temp/index/db1/ws3" /> + <property name="synonymprovider-class" + value="org.exoplatform.services.jcr.impl.core.query.lucene.PropertiesSynonymProvider" /> + <property name="synonymprovider-config-path" value="../../synonyms.properties" /> + <property name="support-highlighting" value="true" /> + <property name="indexing-configuration-path" value="../../indexing-configuration.xml" /> + <property name="query-class" + value="org.exoplatform.services.jcr.impl.core.query.QueryImpl" /> + <property name="spellchecker-class" + value="org.exoplatform.services.jcr.impl.core.query.lucene.spell.LuceneSpellChecker$FiveSecondsRefreshInterval" /> + </properties> + </query-handler> + </workspace> + </workspaces> + </repository> + + <repository name="db1tck" system-workspace="ws" default-workspace="ws"> + <security-domain>exo-domain</security-domain> +  +  + <session-max-age>1h</session-max-age> + <authentication-policy>org.exoplatform.services.jcr.impl.core.access.JAASAuthenticator</authentication-policy> + <workspaces> + <workspace name="ws"> +  + <container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer"> + <properties> + <property name="source-name" value="jdbcjcrtck" /> + <property name="dialect" value="hsqldb" /> + <property name="multi-db" value="true" /> + <property name="update-storage" value="false" /> + <property name="max-buffer-size" value="200k" /> + <property name="swap-directory" value="target/temp/swap/wstck" /> + </properties> + <value-storages> + <value-storage id="ws" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> + <properties> + <property name="path" value="target/temp/values/wstck" /> + </properties> + <filters> + <filter property-type="Binary" min-value-size="100K" /> + </filters> + </value-storage> + </value-storages> + </container> + <initializer class="org.exoplatform.services.jcr.impl.core.ScratchWorkspaceInitializer"> + <properties> + <property name="root-nodetype" value="nt:unstructured" /> + <property name="root-permissions" value="any read;*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove" /> + </properties> + </initializer> + <cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.LinkedWorkspaceStorageCacheImpl"> + <properties> + <property name="max-size" value="2k" /> + <property name="live-time" value="20m" /> + </properties> + </cache> + <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> + <properties> + <property name="index-dir" value="target/temp/index/db1tck/ws" /> + <property name="synonymprovider-class" value="org.exoplatform.services.jcr.impl.core.query.lucene.PropertiesSynonymProvider" /> + <property name="synonymprovider-config-path" value="../../synonyms.properties" /> + <property name="support-highlighting" value="true" /> + <property name="indexing-configuration-path" value="../../indexing-configuration.xml" /> + <property name="query-class" value="org.exoplatform.services.jcr.impl.core.query.QueryImpl" /> + <property name="excerptprovider-class" value="org.exoplatform.services.jcr.impl.core.query.lucene.WeightedHTMLExcerpt" /> + <property name="spellchecker-class" value="org.exoplatform.services.jcr.impl.core.query.lucene.spell.LuceneSpellChecker$FiveSecondsRefreshInterval" /> + </properties> + </query-handler> + <lock-manager> + <time-out>15m</time-out> + <persister class="org.exoplatform.services.jcr.impl.core.lock.FileSystemLockPersister"> + <properties> + <property name="path" value="target/temp/locktck" /> + </properties> + </persister> + </lock-manager> + </workspace> + + <workspace name="ws1"> + <container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer"> + <properties> + <property name="source-name" value="jdbcjcr1tck" /> + <property name="dialect" value="hsqldb" /> + <property name="multi-db" value="true" /> + <property name="update-storage" value="false" /> + <property name="max-buffer-size" value="200k" /> + <property name="swap-directory" value="target/temp/swap/ws1tck" /> + </properties> + <value-storages> + <value-storage id="ws1" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> + <properties> + <property name="path" value="target/temp/values/ws1tck" /> + </properties> + <filters> + <filter property-type="Binary" min-value-size="100K" /> + </filters> + </value-storage> + </value-storages> + </container> + <initializer class="org.exoplatform.services.jcr.impl.core.ScratchWorkspaceInitializer"> + <properties> + <property name="root-nodetype" value="nt:unstructured" /> + <property name="root-permissions" value="any read;*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove" /> + </properties> + </initializer> + <cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.LinkedWorkspaceStorageCacheImpl"> + <properties> + <property name="max-size" value="2k" /> + <property name="live-time" value="20m" /> + </properties> + </cache> + <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> + <properties> + <property name="index-dir" value="target/temp/index/db1tck/ws1" /> + <property name="synonymprovider-class" value="org.exoplatform.services.jcr.impl.core.query.lucene.PropertiesSynonymProvider" /> + <property name="synonymprovider-config-path" value="../../synonyms.properties" /> + <property name="support-highlighting" value="true" /> + <property name="indexing-configuration-path" value="../../indexing-configuration.xml" /> + <property name="query-class" value="org.exoplatform.services.jcr.impl.core.query.QueryImpl" /> + <property name="spellchecker-class" value="org.exoplatform.services.jcr.impl.core.query.lucene.spell.LuceneSpellChecker$FiveSecondsRefreshInterval" /> + </properties> + </query-handler> + </workspace> + + <workspace name="ws2"> + <container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer"> + <properties> + <property name="source-name" value="jdbcjcr2tck" /> + <property name="dialect" value="hsqldb" /> + <property name="multi-db" value="true" /> + <property name="update-storage" value="false" /> + <property name="max-buffer-size" value="200k" /> + <property name="swap-directory" value="target/temp/swap/ws2tck" /> + </properties> + <value-storages> + <value-storage id="ws2" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> + <properties> + <property name="path" value="target/temp/values/ws2tck" /> + </properties> + <filters> + <filter property-type="Binary" min-value-size="100K" /> + </filters> + </value-storage> + </value-storages> + </container> + <initializer class="org.exoplatform.services.jcr.impl.core.ScratchWorkspaceInitializer"> + <properties> + <property name="root-nodetype" value="nt:unstructured" /> + <property name="root-permissions" value="any read;*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove" /> + </properties> + </initializer> + <cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.LinkedWorkspaceStorageCacheImpl"> + <properties> + <property name="max-size" value="2k" /> + <property name="live-time" value="20m" /> + </properties> + </cache> + <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> + <properties> + <property name="index-dir" value="target/temp/index/db1tck/ws2" /> + <property name="synonymprovider-class" value="org.exoplatform.services.jcr.impl.core.query.lucene.PropertiesSynonymProvider" /> + <property name="synonymprovider-config-path" value="../../synonyms.properties" /> + <property name="support-highlighting" value="true" /> + <property name="indexing-configuration-path" value="../../indexing-configuration.xml" /> + <property name="query-class" value="org.exoplatform.services.jcr.impl.core.query.QueryImpl" /> + <property name="spellchecker-class" value="org.exoplatform.services.jcr.impl.core.query.lucene.spell.LuceneSpellChecker$FiveSecondsRefreshInterval" /> + <property name="excerptprovider-class" value="org.exoplatform.services.jcr.impl.core.query.lucene.WeightedHTMLExcerpt"/> + <property name="extractorPoolSize" value="2"/> + <property name="extractorTimeout" value="10"/> + </properties> + </query-handler> + </workspace> + </workspaces> + </repository> + </repositories> +</repository-service>

16 years, 8 months

1
0
0 / 0

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

by do-not-reply＠jboss.org

Author: areshetnyak Date: 2009-11-16 09:23:56 -0500 (Mon, 16 Nov 2009) New Revision: 684 Modified: jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JDBCCacheLoader.java Log: EXOJCR-201 : Clean JDBCCacheLoader Modified: jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JDBCCacheLoader.java =================================================================== --- jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JDBCCacheLoader.java 2009-11-16 14:16:42 UTC (rev 683) +++ jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JDBCCacheLoader.java 2009-11-16 14:23:56 UTC (rev 684) @@ -177,11 +177,6 @@ } } - private boolean isNodeData(Fqn<String> fqn) - { - return fqn.toString().startsWith("/" +JBossCacheStorage.NODES); - } - /** * Performs ADD to NodeData and PropertyData. * @param modification

16 years, 8 months

1
0
0 / 0

exo-jcr SVN: r683 - core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap.

by do-not-reply＠jboss.org

Author: dkatayev Date: 2009-11-16 09:16:42 -0500 (Mon, 16 Nov 2009) New Revision: 683 Modified: core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/LDAPUserPageList.java Log: EXOJCR-244 exc.printStackTrace() replaced with log.warning Modified: core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/LDAPUserPageList.java =================================================================== --- core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/LDAPUserPageList.java 2009-11-16 13:36:14 UTC (rev 682) +++ core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/LDAPUserPageList.java 2009-11-16 14:16:42 UTC (rev 683) @@ -20,6 +20,8 @@ import org.exoplatform.commons.utils.PageList; import org.exoplatform.services.ldap.LDAPService; +import org.exoplatform.services.log.ExoLogger; +import org.exoplatform.services.log.Log; import org.exoplatform.services.organization.User; import java.util.ArrayList; @@ -52,6 +54,8 @@ private LDAPService ldapService; private LDAPAttributeMapping ldapAttrMapping; + + private static Log logger = ExoLogger.getLogger(LDAPUserPageList.class); static boolean SEARCH_CONTROL = Control.NONCRITICAL; @@ -68,14 +72,14 @@ int size = this.getResultSize(); setAvailablePage(size); } - catch (NameNotFoundException exp) + catch (NameNotFoundException e) { - exp.printStackTrace(); + logger.warn("Cannot set the page size while creating a LDAPUserPageList, no page size will be used", e); setAvailablePage(0); } - catch (OperationNotSupportedException exp) + catch (OperationNotSupportedException e) { - exp.printStackTrace(); + logger.warn("Cannot set the page size while creating a LDAPUserPageList, no page size will be used", e); setAvailablePage(0); } }

16 years, 8 months

1
0
0 / 0

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

by do-not-reply＠jboss.org

Author: sergiykarpenko Date: 2009-11-16 08:36:14 -0500 (Mon, 16 Nov 2009) New Revision: 682 Added: jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/core/query/SearchManagerHolder.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/main/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JBossCacheWorkspaceDataContainer.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 added to JCR setup 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 13:33:32 UTC (rev 681) +++ jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/RepositoryContainer.java 2009-11-16 13:36:14 UTC (rev 682) @@ -48,7 +48,9 @@ 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.query.SearchManagerHolder; +import org.exoplatform.services.jcr.impl.core.query.SystemSearchManager; +import org.exoplatform.services.jcr.impl.core.query.SystemSearchManagerHolder; 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; @@ -210,22 +212,19 @@ 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()); workspaceContainer.registerComponentImplementation(containerType); + // TODO hardcoded SearchManagerHolder will by puted to JBossWorkspaceDataContainer + //constructor, and injected to IndexerCacheLoader, and later SearchManager will be inserted to this holder, + //so IndexerCacheLoader will use it. + //registerComponentInstance(new SearchManagerHolder()); + // workspaceContainer.registerComponentImplementation(SearchManagerHolder.class); + workspaceContainer.registerComponentInstance(new SearchManagerHolder()); if (isSystem) { + //registerComponentInstance(new SearchManagerHolder()); registerComponentInstance(new SystemDataContainerHolder((WorkspaceDataContainer)workspaceContainer .getComponentInstanceOfType(WorkspaceDataContainer.class))); } @@ -283,10 +282,10 @@ workspaceContainer.registerComponentImplementation(QueryManager.class); workspaceContainer.registerComponentImplementation(QueryManagerFactory.class); workspaceContainer.registerComponentInstance(wsConfig.getQueryHandler()); - // TODO if (isSystem) - // { - // workspaceContainer.registerComponentImplementation(SystemSearchManager.class); - // } + if (isSystem) + { + workspaceContainer.registerComponentImplementation(SystemSearchManager.class); + } } // access manager @@ -519,13 +518,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)); - // } + 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 13:33:32 UTC (rev 681) +++ jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/core/query/SearchManager.java 2009-11-16 13:36:14 UTC (rev 682) @@ -161,9 +161,11 @@ * 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) + DocumentReaderService extractor, ConfigurationManager cfm, + final RepositoryIndexSearcherHolder indexSearcherHolder, final SearchManagerHolder searchManagerHolder) throws RepositoryException, RepositoryConfigurationException { @@ -177,6 +179,7 @@ this.virtualTableResolver = new LuceneVirtualTableResolver(nodeTypeDataManager, nsReg); this.parentSearchManager = parentSearchManager != null ? parentSearchManager.get() : null; itemMgr.addItemPersistenceListener(this); + searchManagerHolder.put(this); } /** @@ -242,6 +245,9 @@ public void onSaveItems(ItemStateChangesLog changesLog) { + Exception es = new Exception(); + es.printStackTrace(); + if (handler == null) return; Added: jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/core/query/SearchManagerHolder.java =================================================================== --- jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/core/query/SearchManagerHolder.java (rev 0) +++ jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/core/query/SearchManagerHolder.java 2009-11-16 13:36:14 UTC (rev 682) @@ -0,0 +1,47 @@ +/* + * 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.jboss.cache.factories.annotations.NonVolatile; + +/** + * Created by The eXo Platform SAS. + * + * <br/>Date: + * + * @author <a href="karpenko.sergiy(a)gmail.com">Karpenko Sergiy</a> + * @version $Id: SearchManagerHolder.java 111 2008-11-11 11:11:11Z serg $ + */ +@NonVolatile +public class SearchManagerHolder +{ + protected SearchManager manager; + + public SearchManagerHolder() + { + } + + public void put(SearchManager manager) + { + this.manager = manager; + } + + public SearchManager get() + { + return manager; + } +} 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 13:33:32 UTC (rev 681) +++ jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/core/query/SystemSearchManager.java 2009-11-16 13:36:14 UTC (rev 682) @@ -64,9 +64,10 @@ public SystemSearchManager(QueryHandlerEntry config, NamespaceRegistryImpl nsReg, NodeTypeDataManager ntReg, WorkspacePersistentDataManager itemMgr, DocumentReaderService service, ConfigurationManager cfm, - RepositoryIndexSearcherHolder indexSearcherHolder) throws RepositoryException, RepositoryConfigurationException + RepositoryIndexSearcherHolder indexSearcherHolder, SearchManagerHolder holder) throws RepositoryException, + RepositoryConfigurationException { - super(config, nsReg, ntReg, itemMgr, null, service, cfm, indexSearcherHolder); + super(config, nsReg, ntReg, itemMgr, null, service, cfm, indexSearcherHolder, holder); } @Override 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 13:33:32 UTC (rev 681) +++ jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/core/query/cacheloader/IndexerCacheLoader.java 2009-11-16 13:36:14 UTC (rev 682) @@ -17,7 +17,7 @@ package org.exoplatform.services.jcr.impl.core.query.cacheloader; import org.exoplatform.services.jcr.datamodel.PropertyData; -import org.exoplatform.services.jcr.impl.core.query.SearchManager; +import org.exoplatform.services.jcr.impl.core.query.SearchManagerHolder; import org.exoplatform.services.jcr.impl.storage.jbosscache.AbstractWriteOnlyCacheLoader; import org.exoplatform.services.jcr.impl.storage.jbosscache.JBossCacheStorage; import org.exoplatform.services.log.ExoLogger; @@ -47,16 +47,16 @@ */ private static final Log log = ExoLogger.getLogger(IndexerCacheLoader.class); - SearchManager searchManager = null; + SearchManagerHolder searchManagerHolder = null; public IndexerCacheLoader() { } @Inject - public void injectDependencies(SearchManager manager) + public void injectDependencies(SearchManagerHolder holder) { - searchManager = manager; + searchManagerHolder = holder; } private String parseUUID(Fqn<String> fqn) @@ -85,8 +85,10 @@ @Override public void put(List<Modification> modifications) throws Exception { - if (searchManager == null) + if (searchManagerHolder == null && searchManagerHolder.get() != null) + { return; + } // nodes that need to be removed from the index. final Set<String> removedNodes = new HashSet<String>(); @@ -217,7 +219,7 @@ addedNodes.add(uuid); } - searchManager.updateIndex(removedNodes, addedNodes); + searchManagerHolder.get().updateIndex(removedNodes, addedNodes); } } Modified: jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JBossCacheWorkspaceDataContainer.java =================================================================== --- jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JBossCacheWorkspaceDataContainer.java 2009-11-16 13:33:32 UTC (rev 681) +++ jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JBossCacheWorkspaceDataContainer.java 2009-11-16 13:36:14 UTC (rev 682) @@ -18,10 +18,10 @@ */ package org.exoplatform.services.jcr.impl.storage.jbosscache; -import org.exoplatform.services.jbosscache.JBossCacheService; import org.exoplatform.services.jcr.config.RepositoryConfigurationException; import org.exoplatform.services.jcr.config.RepositoryEntry; import org.exoplatform.services.jcr.config.WorkspaceEntry; +import org.exoplatform.services.jcr.impl.core.query.SearchManagerHolder; import org.exoplatform.services.jcr.impl.storage.WorkspaceDataContainerBase; import org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer; import org.exoplatform.services.jcr.storage.WorkspaceDataContainer; @@ -78,8 +78,9 @@ * */ public JBossCacheWorkspaceDataContainer(WorkspaceEntry wsConfig, RepositoryEntry repConfig, - InitialContextInitializer contextInit, ValueStoragePluginProvider valueStorageProvider) - throws RepositoryConfigurationException, NamingException, RepositoryException, IOException + InitialContextInitializer contextInit, ValueStoragePluginProvider valueStorageProvider, + SearchManagerHolder searchManagerHolder) throws RepositoryConfigurationException, NamingException, + RepositoryException, IOException { this.repositoryName = repConfig.getName(); this.containerName = wsConfig.getName(); @@ -111,6 +112,9 @@ ((CacheSPI<Serializable, Object>)cache).getComponentRegistry().registerComponent(this.persistentContainer, WorkspaceDataContainer.class); + ((CacheSPI<Serializable, Object>)cache).getComponentRegistry().registerComponent(searchManagerHolder, + SearchManagerHolder.class); + // TODO check lifecycle, might be we have to create in start(), with jdbc start. // initializes configuration state, the root node, etc. this.cache.create(); @@ -129,6 +133,7 @@ public void start() { + // TODO started on init, due to RepositoryContainer logic // if (persistentContainer instanceof Startable) // { 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 13:33:32 UTC (rev 681) +++ jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache/IndexerCacheLoaderRuntimeTest.java 2009-11-16 13:36:14 UTC (rev 682) @@ -50,6 +50,7 @@ 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.SearchManager; +import org.exoplatform.services.jcr.impl.core.query.SearchManagerHolder; 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; @@ -96,6 +97,8 @@ SearchManager manager; + SearchManagerHolder holder; + public void createNewDataSource(String dataSourceName) throws Exception { @@ -123,7 +126,7 @@ initPersistence(); loader = new IndexerCacheLoader(); - loader.injectDependencies(manager); + loader.injectDependencies(holder); initJCRRoot(); @@ -857,6 +860,8 @@ protected void initPersistence() throws Exception { + holder = new SearchManagerHolder(); + // Create WorkspaceEntry ContainerEntry containerEntry = new ContainerEntry(); List<SimpleParameterEntry> params = new ArrayList<SimpleParameterEntry>(); @@ -905,7 +910,7 @@ manager = new SearchManager(ws.getQueryHandler(), nsReg, ntReg, itemMgr, parentSearchManager, extractor, cfm, - indexSearcherHolder); + indexSearcherHolder, holder); } @Override 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 13:33:32 UTC (rev 681) +++ jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache/IndexerCacheLoaderTest.java 2009-11-16 13:36:14 UTC (rev 682) @@ -31,6 +31,7 @@ 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.SearchManagerHolder; import org.exoplatform.services.jcr.impl.core.query.cacheloader.IndexerCacheLoader; import org.exoplatform.services.jcr.impl.dataflow.TransientNodeData; import org.exoplatform.services.jcr.impl.dataflow.TransientPropertyData; @@ -59,6 +60,8 @@ private DummySearchManager searchManager; + private SearchManagerHolder holder; + /** * @see junit.framework.TestCase#setUp() */ @@ -67,9 +70,11 @@ { // TODO Auto-generated method stub super.setUp(); + holder = new SearchManagerHolder(); + indexerCacheLoader = new IndexerCacheLoader(); + indexerCacheLoader.injectDependencies(holder); searchManager = new DummySearchManager(); - indexerCacheLoader = new IndexerCacheLoader(); - indexerCacheLoader.injectDependencies(searchManager); + } /** @@ -265,7 +270,7 @@ public DummySearchManager() throws RepositoryException, RepositoryConfigurationException { - super(null, null, null, null, null, null, null, new RepositoryIndexSearcherHolder()); + super(null, null, null, null, null, null, null, new RepositoryIndexSearcherHolder(), holder); } /**

16 years, 8 months

1
0
0 / 0

exo-jcr SVN: r681 - jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/session.

by do-not-reply＠jboss.org

Author: tolusha Date: 2009-11-16 08:33:32 -0500 (Mon, 16 Nov 2009) New Revision: 681 Modified: jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/session/SessionChangesLog.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/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 10:38:24 UTC (rev 680) +++ 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 13:33:32 UTC (rev 681) @@ -61,6 +61,9 @@ protected Map<String, Map<String, ItemState>> lastChildPropertyStates = new HashMap<String, Map<String, ItemState>>(); + /** + * Stores persisted child nodes count. + */ protected Map<String, int[]> childNodesCount = new HashMap<String, int[]>(); /** @@ -146,23 +149,21 @@ index.remove(item.getData().getQPath()); index.remove(new ParentIDQPathBasedKey(item)); index.remove(new IDStateBasedKey(item.getData().getIdentifier(), item.getState())); + childNodesCount.remove(item.getData().getIdentifier()); + lastChildNodeStates.remove(item.getData().getIdentifier()); + lastChildPropertyStates.remove(item.getData().getIdentifier()); 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]++; + ++childCount[0]; else if (item.isAdded()) - childCount[0]--; + --childCount[0]; - if (childCount[0] == 0) - childNodesCount.remove(item.getData().getParentIdentifier()); - else - childNodesCount.put(item.getData().getParentIdentifier(), childCount); + childNodesCount.put(item.getData().getParentIdentifier(), childCount); } } @@ -170,21 +171,13 @@ { 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()); - } } } } @@ -632,9 +625,9 @@ childCount = new int[1]; if (item.isDeleted()) - childCount[0] -= 1; + --childCount[0]; else if (item.isAdded()) - childCount[0] += 1; + ++childCount[0]; childNodesCount.put(item.getData().getParentIdentifier(), childCount); }

16 years, 8 months

1
0
0 / 0

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

by do-not-reply＠jboss.org

Author: areshetnyak Date: 2009-11-16 05:38:24 -0500 (Mon, 16 Nov 2009) New Revision: 680 Modified: jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JDBCCacheLoader.java Log: EXOJCR-201 : The JDBCCacheLoader was changed (more detailed TODO). Modified: jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JDBCCacheLoader.java =================================================================== --- jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JDBCCacheLoader.java 2009-11-16 10:32:05 UTC (rev 679) +++ jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JDBCCacheLoader.java 2009-11-16 10:38:24 UTC (rev 680) @@ -161,11 +161,13 @@ if ( modification.getFqn().size() == 2 && (modification.getFqn().get(0).equals(JBossCacheStorage.NODES) || modification.getFqn().get(0).equals(JBossCacheStorage.PROPS))) { - + + // TODO The removed ItemData was setting to value in prepareModifications(); + // That is need because we do not get NodeData from DB if we delete property with primaytype. + // String identifier = (String) modification.getFqn().get(1); // ItemData itemData = jdbcConnection.getItemData(identifier); - // TODO the removed ItemData is setting in value in prepareModifications(); ItemData itemData = (ItemData) modification.getValue(); if (itemData instanceof NodeData) @@ -357,7 +359,7 @@ { NodeData parentNodeData = (NodeData) conn.getItemData((String)name.get(1)); - //TODO rainf0x + //TODO We do not throw exception if parentNodeData not exists in DB, because we use that method (get(Fqn name)) in exists(Fqn name). /*if (parentNodeData == null) throw new JDBCCacheLoaderException("The parent node with ID = " + (String)name.get(1) + " not exis, FQN = '" + name + "'.");*/ @@ -405,7 +407,7 @@ */ public boolean exists(Fqn name) throws Exception { - // TODO do it with less cost + // TODO Will be created specialization code to checking exist node or property in DB without getting NodeData or PropertyData from DB. return get(name) != null; } @@ -440,11 +442,6 @@ conn.close(); } } - else if (name.equals(Fqn.ROOT)) - { -// childs.add(JBossCacheStorage.NODES); -// childs.add(JBossCacheStorage.PROPS); - } return (childs.size() == 0 ? null : childs); }

16 years, 8 months

1
0
0 / 0

exo-jcr SVN: r679 - ws/tags.

by do-not-reply＠jboss.org

Author: dkatayev Date: 2009-11-16 05:32:05 -0500 (Mon, 16 Nov 2009) New Revision: 679 Removed: ws/tags/2.1.0-Beta03/ Log: EXOJCR-234 2.1.0-Beta03 tag removed

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