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

exo-jcr SVN: r738 - in kernel/trunk: exo.kernel.commons and 5 other directories.

by do-not-reply＠jboss.org

Author: dkatayev Date: 2009-11-18 03:43:13 -0500 (Wed, 18 Nov 2009) New Revision: 738 Modified: kernel/trunk/exo.kernel.commons/pom.xml kernel/trunk/exo.kernel.component.cache/pom.xml kernel/trunk/exo.kernel.component.command/pom.xml kernel/trunk/exo.kernel.component.common/pom.xml kernel/trunk/exo.kernel.component.remote/pom.xml kernel/trunk/exo.kernel.container/pom.xml kernel/trunk/pom.xml Log: EXOJCR-162 Modules dependencies cleaned Modified: kernel/trunk/exo.kernel.commons/pom.xml =================================================================== --- kernel/trunk/exo.kernel.commons/pom.xml 2009-11-18 08:33:14 UTC (rev 737) +++ kernel/trunk/exo.kernel.commons/pom.xml 2009-11-18 08:43:13 UTC (rev 738) @@ -1,67 +1,58 @@ - -<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.exoplatform.kernel</groupId> - <artifactId>kernel-parent</artifactId> - <version>2.2.0-Beta04-SNAPSHOT</version> - </parent> - - <artifactId>exo.kernel.commons</artifactId> - - <name>eXo Kernel :: Commons Utils</name> - <description>eXo Commons</description> - - <dependencies> - <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - </dependency> - - <dependency> - <groupId>xpp3</groupId> - <artifactId>xpp3</artifactId> - </dependency> - - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </dependency> - - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </dependency> - - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </dependency> - - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </dependency> - </dependencies> -</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.exoplatform.kernel</groupId> + <artifactId>kernel-parent</artifactId> + <version>2.2.0-Beta04-SNAPSHOT</version> + </parent> + + <artifactId>exo.kernel.commons</artifactId> + + <name>eXo Kernel :: Commons Utils</name> + <description>eXo Commons</description> + + <dependencies> + <dependency> + <groupId>xpp3</groupId> + <artifactId>xpp3</artifactId> + </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </dependency> + </dependencies> +</project> Modified: kernel/trunk/exo.kernel.component.cache/pom.xml =================================================================== --- kernel/trunk/exo.kernel.component.cache/pom.xml 2009-11-18 08:33:14 UTC (rev 737) +++ kernel/trunk/exo.kernel.component.cache/pom.xml 2009-11-18 08:43:13 UTC (rev 738) @@ -1,51 +1,50 @@ - -<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.exoplatform.kernel</groupId> - <artifactId>kernel-parent</artifactId> - <version>2.2.0-Beta04-SNAPSHOT</version> - </parent> - - <artifactId>exo.kernel.component.cache</artifactId> - - <name>eXo Kernel :: Component :: Cache Service</name> - <description>exoplatform Cache services implementation</description> - - <dependencies> - <dependency> - <groupId>org.exoplatform.kernel</groupId> - <artifactId>exo.kernel.container</artifactId> - </dependency> - <dependency> - <groupId>org.exoplatform.kernel</groupId> - <artifactId>exo.kernel.component.remote</artifactId> - </dependency> - <dependency> - <groupId>org.exoplatform.kernel</groupId> - <artifactId>exo.kernel.component.common</artifactId> - </dependency> - </dependencies> -</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.exoplatform.kernel</groupId> + <artifactId>kernel-parent</artifactId> + <version>2.2.0-Beta04-SNAPSHOT</version> + </parent> + + <artifactId>exo.kernel.component.cache</artifactId> + + <name>eXo Kernel :: Component :: Cache Service</name> + <description>exoplatform Cache services implementation</description> + + <dependencies> + <dependency> + <groupId>org.exoplatform.tool</groupId> + <artifactId>exo.tool.framework.junit</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.container</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.commons</artifactId> + </dependency> + </dependencies> +</project> \ No newline at end of file Modified: kernel/trunk/exo.kernel.component.command/pom.xml =================================================================== --- kernel/trunk/exo.kernel.component.command/pom.xml 2009-11-18 08:33:14 UTC (rev 737) +++ kernel/trunk/exo.kernel.component.command/pom.xml 2009-11-18 08:43:13 UTC (rev 738) @@ -1,54 +1,64 @@ - -<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.exoplatform.kernel</groupId> - <artifactId>kernel-parent</artifactId> - <version>2.2.0-Beta04-SNAPSHOT</version> - </parent> - - <artifactId>exo.kernel.component.command</artifactId> - - <name>eXo Kernel :: Component :: Command Service</name> - <description>exoplatform command services implementation</description> - - <dependencies> - - <dependency> - <groupId>org.exoplatform.kernel</groupId> - <artifactId>exo.kernel.component.common</artifactId> - </dependency> - - <dependency> - <groupId>commons-chain</groupId> - <artifactId>commons-chain</artifactId> - <exclusions> - <exclusion> - <groupId>xml-apis</groupId> - <artifactId>xml-apis</artifactId> - </exclusion> - </exclusions> - </dependency> - </dependencies> -</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.exoplatform.kernel</groupId> + <artifactId>kernel-parent</artifactId> + <version>2.2.0-Beta04-SNAPSHOT</version> + </parent> + + <artifactId>exo.kernel.component.command</artifactId> + + <name>eXo Kernel :: Component :: Command Service</name> + <description>exoplatform command services implementation</description> + + <dependencies> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.commons</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.container</artifactId> + </dependency> + <dependency> + <groupId>commons-chain</groupId> + <artifactId>commons-chain</artifactId> + <exclusions> + <exclusion> + <groupId>xml-apis</groupId> + <artifactId>xml-apis</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>commons-digester</groupId> + <artifactId>commons-digester</artifactId> + </dependency> + <dependency> + <groupId>xml-apis</groupId> + <artifactId>xml-apis</artifactId> + </dependency> + </dependencies> +</project> \ No newline at end of file Modified: kernel/trunk/exo.kernel.component.common/pom.xml =================================================================== --- kernel/trunk/exo.kernel.component.common/pom.xml 2009-11-18 08:33:14 UTC (rev 737) +++ kernel/trunk/exo.kernel.component.common/pom.xml 2009-11-18 08:43:13 UTC (rev 738) @@ -1,84 +1,90 @@ - -<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.exoplatform.kernel</groupId> - <artifactId>kernel-parent</artifactId> - <version>2.2.0-Beta04-SNAPSHOT</version> - </parent> - - <artifactId>exo.kernel.component.common</artifactId> - - <name>eXo Kernel :: Component :: Common Service</name> - <description>exoplatform common services implementation</description> - - <dependencies> - <dependency> - <groupId>org.exoplatform.kernel</groupId> - <artifactId>exo.kernel.container</artifactId> - </dependency> - - <dependency> - <groupId>javax.activation</groupId> - <artifactId>activation</artifactId> - </dependency> - - <dependency> - <groupId>jotm</groupId> - <artifactId>jotm</artifactId> - <exclusions> - <exclusion> - <groupId>javax.resource</groupId> - <artifactId>connector</artifactId> - </exclusion> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>javax.resource</groupId> - <artifactId>connector-api</artifactId> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>quartz</groupId> - <artifactId>quartz</artifactId> - </dependency> - - <dependency> - <groupId>javax.mail</groupId> - <artifactId>mail</artifactId> - </dependency> - - <dependency> - <groupId>javax.transaction</groupId> - <artifactId>jta</artifactId> - </dependency> - </dependencies> - -</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.exoplatform.kernel</groupId> + <artifactId>kernel-parent</artifactId> + <version>2.2.0-Beta04-SNAPSHOT</version> + </parent> + + <artifactId>exo.kernel.component.common</artifactId> + + <name>eXo Kernel :: Component :: Common Service</name> + <description>exoplatform common services implementation</description> + + <dependencies> + <dependency> + <groupId>org.exoplatform.tool</groupId> + <artifactId>exo.tool.framework.junit</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.container</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.commons</artifactId> + </dependency> + <dependency> + <groupId>javax.activation</groupId> + <artifactId>activation</artifactId> + </dependency> + <dependency> + <groupId>jotm</groupId> + <artifactId>jotm</artifactId> + <exclusions> + <exclusion> + <groupId>javax.resource</groupId> + <artifactId>connector</artifactId> + </exclusion> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>javax.resource</groupId> + <artifactId>connector-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>quartz</groupId> + <artifactId>quartz</artifactId> + </dependency> + <dependency> + <groupId>picocontainer</groupId> + <artifactId>picocontainer</artifactId> + </dependency> + <dependency> + <groupId>javax.mail</groupId> + <artifactId>mail</artifactId> + </dependency> + <dependency> + <groupId>javax.transaction</groupId> + <artifactId>jta</artifactId> + </dependency> + </dependencies> + +</project> Modified: kernel/trunk/exo.kernel.component.remote/pom.xml =================================================================== --- kernel/trunk/exo.kernel.component.remote/pom.xml 2009-11-18 08:33:14 UTC (rev 737) +++ kernel/trunk/exo.kernel.component.remote/pom.xml 2009-11-18 08:43:13 UTC (rev 738) @@ -1,47 +1,54 @@ - -<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.exoplatform.kernel</groupId> - <artifactId>kernel-parent</artifactId> - <version>2.2.0-Beta04-SNAPSHOT</version> - </parent> - - <artifactId>exo.kernel.component.remote</artifactId> - - <name>eXo Kernel :: Component :: Remote Service</name> - <description>exoplatform remote services implementation</description> - - <dependencies> - <dependency> - <groupId>org.exoplatform.kernel</groupId> - <artifactId>exo.kernel.component.common</artifactId> - </dependency> - - <dependency> - <groupId>jgroups</groupId> - <artifactId>jgroups</artifactId> - </dependency> - </dependencies> -</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.exoplatform.kernel</groupId> + <artifactId>kernel-parent</artifactId> + <version>2.2.0-Beta04-SNAPSHOT</version> + </parent> + + <artifactId>exo.kernel.component.remote</artifactId> + + <name>eXo Kernel :: Component :: Remote Service</name> + <description>exoplatform remote services implementation</description> + + <dependencies> + <dependency> + <groupId>org.exoplatform.tool</groupId> + <artifactId>exo.tool.framework.junit</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.commons</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.container</artifactId> + </dependency> + <dependency> + <groupId>jgroups</groupId> + <artifactId>jgroups</artifactId> + </dependency> + </dependencies> +</project> Modified: kernel/trunk/exo.kernel.container/pom.xml =================================================================== --- kernel/trunk/exo.kernel.container/pom.xml 2009-11-18 08:33:14 UTC (rev 737) +++ kernel/trunk/exo.kernel.container/pom.xml 2009-11-18 08:43:13 UTC (rev 738) @@ -1,122 +1,120 @@ - -<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.exoplatform.kernel</groupId> - <artifactId>kernel-parent</artifactId> - <version>2.2.0-Beta04-SNAPSHOT</version> - </parent> - - <artifactId>exo.kernel.container</artifactId> - - <name>eXo Kernel :: Container</name> - <description>eXo Kernel Container</description> - - <dependencies> - <dependency> - <groupId>org.exoplatform.kernel</groupId> - <artifactId>exo.kernel.commons</artifactId> - </dependency> - - <dependency> - <groupId>org.exoplatform.tool</groupId> - <artifactId>exo.tool.framework.junit</artifactId> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - </dependency> - - <dependency> - <groupId>picocontainer</groupId> - <artifactId>picocontainer</artifactId> - </dependency> - - <dependency> - <groupId>commons-beanutils</groupId> - <artifactId>commons-beanutils</artifactId> - </dependency> - - <dependency> - <groupId>org.jibx</groupId> - <artifactId>jibx-run</artifactId> - <exclusions> - <exclusion> - <groupId>org.codehaus.woodstox</groupId> - <artifactId>wstx-asl</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>org.jibx</groupId> - <artifactId>jibx-bind</artifactId> - <exclusions> - <exclusion> - <groupId>org.codehaus.woodstox</groupId> - <artifactId>wstx-asl</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>org.jibx</groupId> - <artifactId>jibx-extras</artifactId> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.jibx</groupId> - <artifactId>maven-jibx-plugin</artifactId> - <configuration> - <directory>src/main/resources</directory> - <includes> - <includes>binding.xml</includes> - </includes> - </configuration> - <executions> - <execution> - <goals> - <goal>bind</goal> - </goals> - </execution> - </executions> - </plugin> - -  - </plugins> - </build> -</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.exoplatform.kernel</groupId> + <artifactId>kernel-parent</artifactId> + <version>2.2.0-Beta04-SNAPSHOT</version> + </parent> + + <artifactId>exo.kernel.container</artifactId> + + <name>eXo Kernel :: Container</name> + <description>eXo Kernel Container</description> + + <dependencies> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.commons</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.tool</groupId> + <artifactId>exo.tool.framework.junit</artifactId> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + </dependency> + <dependency> + <groupId>picocontainer</groupId> + <artifactId>picocontainer</artifactId> + </dependency> + <dependency> + <groupId>commons-beanutils</groupId> + <artifactId>commons-beanutils</artifactId> + </dependency> + <dependency> + <groupId>org.jibx</groupId> + <artifactId>jibx-run</artifactId> + <exclusions> + <exclusion> + <groupId>org.codehaus.woodstox</groupId> + <artifactId>wstx-asl</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.jibx</groupId> + <artifactId>jibx-bind</artifactId> + <exclusions> + <exclusion> + <groupId>org.codehaus.woodstox</groupId> + <artifactId>wstx-asl</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.jibx</groupId> + <artifactId>jibx-extras</artifactId> + </dependency> + <dependency> + <groupId>xpp3</groupId> + <artifactId>xpp3</artifactId> + <version>1.1.3.4.O</version> + </dependency> + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.jibx</groupId> + <artifactId>maven-jibx-plugin</artifactId> + <configuration> + <directory>src/main/resources</directory> + <includes> + <includes>binding.xml</includes> + </includes> + </configuration> + <executions> + <execution> + <goals> + <goal>bind</goal> + </goals> + </execution> + </executions> + </plugin> + +  + </plugins> + </build> +</project> \ No newline at end of file Modified: kernel/trunk/pom.xml =================================================================== --- kernel/trunk/pom.xml 2009-11-18 08:33:14 UTC (rev 737) +++ kernel/trunk/pom.xml 2009-11-18 08:43:13 UTC (rev 738) @@ -1,224 +1,199 @@ - -<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.exoplatform</groupId> - <artifactId>foundation-parent</artifactId> - <version>3</version> - </parent> - - <groupId>org.exoplatform.kernel</groupId> - <artifactId>kernel-parent</artifactId> - <version>2.2.0-Beta04-SNAPSHOT</version> - <packaging>pom</packaging> - - <name>eXo Kernel</name> - - <properties> - <exo.product.name>exo-kernel</exo.product.name> - <exo.product.specification>2.2</exo.product.specification> - <forkMode>always</forkMode> - </properties> - - <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/exo-jcr/kernel/trunk</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/exo-jcr/kernel/trunk</developerConnection> - <url>http://fisheye.jboss.org/browse/exo-jcr/kernel/trunk</url> - </scm> - - <modules> - <module>exo.kernel.container</module> - <module>exo.kernel.commons</module> - <module>exo.kernel.component.common</module> - <module>exo.kernel.component.remote</module> - <module>exo.kernel.component.cache</module> - <module>exo.kernel.component.command</module> - <module>packaging/module</module> - </modules> - - <dependencyManagement> - <dependencies> - - <dependency> - <groupId>org.exoplatform.kernel</groupId> - <artifactId>exo.kernel.container</artifactId> - <version>${project.version}</version> - </dependency> - - <dependency> - <groupId>org.exoplatform.kernel</groupId> - <artifactId>exo.kernel.commons</artifactId> - <version>${project.version}</version> - </dependency> - - <dependency> - <groupId>org.exoplatform.kernel</groupId> - <artifactId>exo.kernel.component.common</artifactId> - <version>${project.version}</version> - </dependency> - - <dependency> - <groupId>org.exoplatform.kernel</groupId> - <artifactId>exo.kernel.component.remote</artifactId> - <version>${project.version}</version> - </dependency> - - <dependency> - <groupId>org.exoplatform.tool</groupId> - <artifactId>exo.tool.framework.junit</artifactId> - <version>1.2.0</version> - </dependency> - - <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - <version>2.3</version> - </dependency> - - <dependency> - <groupId>commons-chain</groupId> - <artifactId>commons-chain</artifactId> - <version>1.0</version> - </dependency> - - <dependency> - <groupId>xpp3</groupId> - <artifactId>xpp3</artifactId> - <version>1.1.3.4.O</version> - </dependency> - - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <version>1.0.4</version> - </dependency> - - <dependency> - <groupId>jgroups</groupId> - <artifactId>jgroups</artifactId> - <version>2.6.10.GA</version> - </dependency> - - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - <version>1.5.6</version> - </dependency> - - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <version>1.5.6</version> - </dependency> - - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.14</version> - </dependency> - - <dependency> - <groupId>picocontainer</groupId> - <artifactId>picocontainer</artifactId> - <version>1.1</version> - </dependency> - - <dependency> - <groupId>commons-beanutils</groupId> - <artifactId>commons-beanutils</artifactId> - <version>1.6</version> - </dependency> - - <dependency> - <groupId>org.jibx</groupId> - <artifactId>jibx-run</artifactId> - <version>${jibx.plugin.version}</version> - </dependency> - - <dependency> - <groupId>org.jibx</groupId> - <artifactId>jibx-bind</artifactId> - <version>${jibx.plugin.version}</version> - </dependency> - - <dependency> - <groupId>org.jibx</groupId> - <artifactId>jibx-extras</artifactId> - <version>${jibx.plugin.version}</version> - </dependency> - - <dependency> - <groupId>javax.activation</groupId> - <artifactId>activation</artifactId> - <version>1.1</version> - </dependency> - - <dependency> - <groupId>javax.resource</groupId> - <artifactId>connector-api</artifactId> - <version>1.5</version> - </dependency> - - <dependency> - <groupId>jotm</groupId> - <artifactId>jotm</artifactId> - <version>2.0.10</version> - </dependency> - - <dependency> - <groupId>quartz</groupId> - <artifactId>quartz</artifactId> - <version>1.5.0-RC2</version> - </dependency> - - <dependency> - <groupId>javax.mail</groupId> - <artifactId>mail</artifactId> - <version>1.4</version> - </dependency> - - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>2.5</version> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>javax.transaction</groupId> - <artifactId>jta</artifactId> - <version>1.0.1B</version> - </dependency> - </dependencies> - </dependencyManagement> - - <dependencies> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> - </dependencies> - -</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.exoplatform</groupId> + <artifactId>foundation-parent</artifactId> + <version>3</version> + </parent> + + <groupId>org.exoplatform.kernel</groupId> + <artifactId>kernel-parent</artifactId> + <version>2.2.0-Beta04-SNAPSHOT</version> + <packaging>pom</packaging> + + <name>eXo Kernel</name> + + <properties> + <exo.product.name>exo-kernel</exo.product.name> + <exo.product.specification>2.2</exo.product.specification> + <forkMode>always</forkMode> + </properties> + + <scm> + <connection>scm:svn:http://anonsvn.jboss.org/repos/exo-jcr/kernel/trunk</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/exo-jcr/kernel/trunk</developerConnection> + <url>http://fisheye.jboss.org/browse/exo-jcr/kernel/trunk</url> + </scm> + + <modules> + <module>exo.kernel.container</module> + <module>exo.kernel.commons</module> + <module>exo.kernel.component.common</module> + <module>exo.kernel.component.remote</module> + <module>exo.kernel.component.cache</module> + <module>exo.kernel.component.command</module> + <module>packaging/module</module> + </modules> + + <dependencyManagement> + <dependencies> + <dependency> + <groupId>org.exoplatform.tool</groupId> + <artifactId>exo.tool.framework.junit</artifactId> + <version>1.2.0</version> + </dependency> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.container</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.commons</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.component.remote</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>xpp3</groupId> + <artifactId>xpp3</artifactId> + <version>1.1.3.4.O</version> + </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>1.0.4</version> + </dependency> + <dependency> + <groupId>commons-beanutils</groupId> + <artifactId>commons-beanutils</artifactId> + <version>1.6</version> + </dependency> + <dependency> + <groupId>commons-chain</groupId> + <artifactId>commons-chain</artifactId> + <version>1.0</version> + </dependency> + <dependency> + <groupId>commons-digester</groupId> + <artifactId>commons-digester</artifactId> + <version>1.6</version> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>1.5.6</version> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <version>1.5.6</version> + </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.2.14</version> + </dependency> + <dependency> + <groupId>xml-apis</groupId> + <artifactId>xml-apis</artifactId> + <version>1.0.b2</version> + </dependency> + <dependency> + <groupId>quartz</groupId> + <artifactId>quartz</artifactId> + <version>1.5.0-RC2</version> + </dependency> + <dependency> + <groupId>javax.mail</groupId> + <artifactId>mail</artifactId> + <version>1.4</version> + </dependency> + <dependency> + <groupId>javax.activation</groupId> + <artifactId>activation</artifactId> + <version>1.1</version> + </dependency> + <dependency> + <groupId>javax.resource</groupId> + <artifactId>connector-api</artifactId> + <version>1.5</version> + </dependency> + <dependency> + <groupId>javax.transaction</groupId> + <artifactId>jta</artifactId> + <version>1.0.1B</version> + </dependency> + <dependency> + <groupId>picocontainer</groupId> + <artifactId>picocontainer</artifactId> + <version>1.1</version> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>2.5</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>jgroups</groupId> + <artifactId>jgroups</artifactId> + <version>2.6.10.GA</version> + </dependency> + <dependency> + <groupId>org.jibx</groupId> + <artifactId>jibx-bind</artifactId> + <version>${jibx.plugin.version}</version> + </dependency> + <dependency> + <groupId>org.jibx</groupId> + <artifactId>jibx-extras</artifactId> + <version>${jibx.plugin.version}</version> + </dependency> + <dependency> + <groupId>org.jibx</groupId> + <artifactId>jibx-run</artifactId> + <version>${jibx.plugin.version}</version> + </dependency> + <dependency> + <groupId>jotm</groupId> + <artifactId>jotm</artifactId> + <version>2.0.10</version> + </dependency> + </dependencies> + </dependencyManagement> + + <dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + </dependencies> + +</project>

16 years, 8 months

1
0
0 / 0

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

by do-not-reply＠jboss.org

Author: nzamosenchuk Date: 2009-11-18 03:33:14 -0500 (Wed, 18 Nov 2009) New Revision: 737 Modified: jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/session/LocalWorkspaceStorageDataManagerProxy.java Log: EXOJCR-242: LocalWorkspaceStorageDataManagerProxy updated to re-pack PlainChangesLog ad LockPlainChangesLog if it's type is ExtendedEvent.LOCK. Modified: jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/session/LocalWorkspaceStorageDataManagerProxy.java =================================================================== --- jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/session/LocalWorkspaceStorageDataManagerProxy.java 2009-11-18 08:03:56 UTC (rev 736) +++ jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/session/LocalWorkspaceStorageDataManagerProxy.java 2009-11-18 08:33:14 UTC (rev 737) @@ -23,6 +23,7 @@ import org.exoplatform.services.jcr.dataflow.CompositeChangesLog; import org.exoplatform.services.jcr.dataflow.ItemState; import org.exoplatform.services.jcr.dataflow.ItemStateChangesLog; +import org.exoplatform.services.jcr.dataflow.LockPlainChangesLogImpl; import org.exoplatform.services.jcr.dataflow.PlainChangesLog; import org.exoplatform.services.jcr.dataflow.PlainChangesLogImpl; import org.exoplatform.services.jcr.dataflow.TransactionChangesLog; @@ -38,6 +39,7 @@ import org.exoplatform.services.jcr.impl.dataflow.TransientNodeData; import org.exoplatform.services.jcr.impl.dataflow.TransientPropertyData; import org.exoplatform.services.jcr.impl.dataflow.persistent.LocalWorkspaceDataManagerStub; +import org.exoplatform.services.jcr.observation.ExtendedEvent; import java.util.ArrayList; import java.util.Calendar; @@ -92,7 +94,18 @@ .getAncestorToSave(), change.isInternallyCreated(), change.isPersisted())); } - newLog.addLog(new PlainChangesLogImpl(states, changes.getSessionId(), changes.getEventType())); + // if it is a lockPlainChangesLog then pack it as following + if (changes.getEventType() == ExtendedEvent.LOCK) + { + LockPlainChangesLogImpl lockChangesLog = + new LockPlainChangesLogImpl(states, changes.getSessionId(), changes.getEventType()); + lockChangesLog.setLockData(((LockPlainChangesLogImpl)changes).getLockData()); + newLog.addLog(lockChangesLog); + } + else + { + newLog.addLog(new PlainChangesLogImpl(states, changes.getSessionId(), changes.getEventType())); + } } storageDataManager.save(newLog);

16 years, 8 months

1
0
0 / 0

exo-jcr SVN: r736 - in jcr/branches/1.12.0-JBC/component/core/src: main/java/org/exoplatform/services/jcr/impl/storage/inmemory and 4 other directories.

by do-not-reply＠jboss.org

Author: nzamosenchuk Date: 2009-11-18 03:03:56 -0500 (Wed, 18 Nov 2009) New Revision: 736 Modified: jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/JBossCacheWorkspaceDataManager.java jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/inmemory/InmemoryStorageConnection.java jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JBossCacheStorageConnection.java jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JBossCacheTreeStorageConnection.java jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCStorageConnection.java jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/storage/WorkspaceStorageConnection.java jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache/ObservationCacheLoaderTest.java Log: EXOJCR-242: WorkspaceStorageConnection (and all their implementators) extended with addLockData() and removeLockData(). JBossCacheStorageConnection filled with logic: locks are written and removed to or from /$LOCKS subtree of cache. Modified: jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/JBossCacheWorkspaceDataManager.java =================================================================== --- jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/JBossCacheWorkspaceDataManager.java 2009-11-18 06:44:11 UTC (rev 735) +++ jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/JBossCacheWorkspaceDataManager.java 2009-11-18 08:03:56 UTC (rev 736) @@ -18,11 +18,8 @@ */ package org.exoplatform.services.jcr.impl.dataflow.persistent; -import org.exoplatform.services.jcr.dataflow.ChangesLogIterator; -import org.exoplatform.services.jcr.dataflow.CompositeChangesLog; import org.exoplatform.services.jcr.dataflow.ItemState; import org.exoplatform.services.jcr.dataflow.ItemStateChangesLog; -import org.exoplatform.services.jcr.dataflow.PlainChangesLog; import org.exoplatform.services.jcr.dataflow.ReadOnlyThroughChanges; import org.exoplatform.services.jcr.datamodel.QPath; import org.exoplatform.services.jcr.impl.Constants; @@ -31,10 +28,8 @@ import org.exoplatform.services.jcr.storage.WorkspaceDataContainer; import org.exoplatform.services.jcr.storage.WorkspaceStorageConnection; -import java.util.ArrayList; import java.util.HashSet; import java.util.Iterator; -import java.util.List; import java.util.Set; import javax.jcr.RepositoryException; Modified: jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/inmemory/InmemoryStorageConnection.java =================================================================== --- jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/inmemory/InmemoryStorageConnection.java 2009-11-18 06:44:11 UTC (rev 735) +++ jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/inmemory/InmemoryStorageConnection.java 2009-11-18 08:03:56 UTC (rev 736) @@ -249,7 +249,7 @@ /** * @see org.exoplatform.services.jcr.storage.WorkspaceStorageConnection#getLockData(java.lang.String) */ - public LockData getLockData(String identifier) + public LockData getLockData(String identifier) throws RepositoryException { return null; } @@ -257,9 +257,23 @@ /** * @see org.exoplatform.services.jcr.storage.WorkspaceStorageConnection#getLocksData() */ - public List<LockData> getLocksData() + public List<LockData> getLocksData() throws RepositoryException { return null; } + /** + * @see org.exoplatform.services.jcr.storage.WorkspaceStorageConnection#addLockData(org.exoplatform.services.jcr.impl.core.lock.LockData) + */ + public void addLockData(LockData lockData) throws RepositoryException + { + } + + /** + * @see org.exoplatform.services.jcr.storage.WorkspaceStorageConnection#removeLockData(java.lang.String) + */ + public void removeLockData(String identifier) throws RepositoryException + { + } + } Modified: jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JBossCacheStorageConnection.java =================================================================== --- jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JBossCacheStorageConnection.java 2009-11-18 06:44:11 UTC (rev 735) +++ jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JBossCacheStorageConnection.java 2009-11-18 08:03:56 UTC (rev 736) @@ -38,6 +38,7 @@ import javax.jcr.InvalidItemStateException; import javax.jcr.RepositoryException; +import javax.jcr.lock.LockException; /** * Created by The eXo Platform SAS. @@ -660,7 +661,7 @@ /** * @see org.exoplatform.services.jcr.storage.WorkspaceStorageConnection#getLockData(java.lang.String) */ - public LockData getLockData(String identifier) + public LockData getLockData(String identifier) throws RepositoryException { LockData lockData = null; Node<Serializable, Object> node = locksRoot.getChild(makeNodeFqn(identifier)); @@ -674,7 +675,7 @@ /** * @see org.exoplatform.services.jcr.storage.WorkspaceStorageConnection#getLocksData() */ - public List<LockData> getLocksData() + public List<LockData> getLocksData() throws RepositoryException { Set<Node<Serializable, Object>> lockSet = locksRoot.getChildren(); List<LockData> locksData = new ArrayList<LockData>(); @@ -691,4 +692,44 @@ } return locksData; } + + /** + * @see org.exoplatform.services.jcr.storage.WorkspaceStorageConnection#addLockData(org.exoplatform.services.jcr.impl.core.lock.LockData) + */ + public void addLockData(LockData lockData) throws RepositoryException + { + if (lockData == null) + { + throw new RepositoryException("Lock data to write can't be null!"); + } + // check that there is no lock data for given node + Node<Serializable, Object> oldNode = locksRoot.getChild(makeNodeFqn(lockData.getNodeIdentifier())); + if (oldNode.get(JBossCacheStorage.LOCK_DATA) != null) + { + throw new LockException("Unable to write lock data. Node [" + lockData.getNodeIdentifier() + + "] already has LockData!"); + } + // try to write LockData + Node<Serializable, Object> node = locksRoot.addChild(makeNodeFqn(lockData.getNodeIdentifier())); + if (node == null) + { + throw new RepositoryException("Unable to write to cache!"); + } + // this will prevent from deleting it by eviction. + node.setResident(true); + node.put(JBossCacheStorage.LOCK_DATA, lockData); + + } + + /** + * @see org.exoplatform.services.jcr.storage.WorkspaceStorageConnection#removeLockData(java.lang.String) + */ + public void removeLockData(String identifier) throws RepositoryException + { + if (identifier != null) + { + throw new RepositoryException("Item ID to clear lock can't be null!"); + } + locksRoot.removeChild(makeNodeFqn(identifier)); + } } Modified: jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JBossCacheTreeStorageConnection.java =================================================================== --- jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JBossCacheTreeStorageConnection.java 2009-11-18 06:44:11 UTC (rev 735) +++ jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JBossCacheTreeStorageConnection.java 2009-11-18 08:03:56 UTC (rev 736) @@ -422,4 +422,22 @@ throw new UnsupportedOperationException(); } + /** + * @see org.exoplatform.services.jcr.storage.WorkspaceStorageConnection#addLockData(org.exoplatform.services.jcr.impl.core.lock.LockData) + */ + public void addLockData(LockData lockData) throws RepositoryException + { + // TODO Auto-generated method stub + + } + + /** + * @see org.exoplatform.services.jcr.storage.WorkspaceStorageConnection#removeLockData(java.lang.String) + */ + public void removeLockData(String identifier) throws RepositoryException + { + // TODO Auto-generated method stub + + } + } Modified: jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCStorageConnection.java =================================================================== --- jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCStorageConnection.java 2009-11-18 06:44:11 UTC (rev 735) +++ jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCStorageConnection.java 2009-11-18 08:03:56 UTC (rev 736) @@ -716,6 +716,22 @@ return null; } + /** + * @see org.exoplatform.services.jcr.storage.WorkspaceStorageConnection#addLockData(org.exoplatform.services.jcr.impl.core.lock.LockData) + */ + public void addLockData(LockData lockData) throws RepositoryException + { + // TODO Add logic HERE! Need to store locks some where + } + + /** + * @see org.exoplatform.services.jcr.storage.WorkspaceStorageConnection#removeLockData(java.lang.String) + */ + public void removeLockData(String identifier) throws RepositoryException + { + // TODO Add logic HERE! Need to store locks some where + } + // ------------------ Private methods --------------- /** Modified: jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/storage/WorkspaceStorageConnection.java =================================================================== --- jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/storage/WorkspaceStorageConnection.java 2009-11-18 06:44:11 UTC (rev 735) +++ jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/storage/WorkspaceStorageConnection.java 2009-11-18 08:03:56 UTC (rev 736) @@ -321,11 +321,27 @@ * @return * LockData by given node uuid, or null if not present */ - LockData getLockData(String identifier); + LockData getLockData(String identifier) throws RepositoryException; /** * @return * List of all locks. */ - List<LockData> getLocksData(); + List<LockData> getLocksData() throws RepositoryException; + + /** + * Writes lock data + * + * @param lockData + * @throws RepositoryException + */ + void addLockData(LockData lockData) throws RepositoryException; + + /** + * Removes lock data + * + * @param identifier + * @throws RepositoryException + */ + void removeLockData(String identifier) throws RepositoryException; } Modified: jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache/ObservationCacheLoaderTest.java =================================================================== --- jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache/ObservationCacheLoaderTest.java 2009-11-18 06:44:11 UTC (rev 735) +++ jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache/ObservationCacheLoaderTest.java 2009-11-18 08:03:56 UTC (rev 736) @@ -547,7 +547,7 @@ /** * @see org.exoplatform.services.jcr.storage.WorkspaceStorageConnection#getLockData(java.lang.String) */ - public LockData getLockData(String identifier) + public LockData getLockData(String identifier) throws RepositoryException { return null; } @@ -555,11 +555,25 @@ /** * @see org.exoplatform.services.jcr.storage.WorkspaceStorageConnection#getLocksData() */ - public List<LockData> getLocksData() + public List<LockData> getLocksData() throws RepositoryException { return null; } + /** + * @see org.exoplatform.services.jcr.storage.WorkspaceStorageConnection#addLockData(org.exoplatform.services.jcr.impl.core.lock.LockData) + */ + public void addLockData(LockData lockData) throws RepositoryException + { + } + + /** + * @see org.exoplatform.services.jcr.storage.WorkspaceStorageConnection#removeLockData(java.lang.String) + */ + public void removeLockData(String identifier) throws RepositoryException + { + } + } }

16 years, 8 months

1
0
0 / 0

exo-jcr SVN: r735 - in jcr/branches/1.12.0-JBC/component/core/src: main/java/org/exoplatform/services/jcr/impl/storage/inmemory and 4 other directories.

by do-not-reply＠jboss.org

Author: tolusha Date: 2009-11-18 01:44:11 -0500 (Wed, 18 Nov 2009) New Revision: 735 Modified: jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/JBossCacheWorkspaceDataManager.java jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/inmemory/InmemoryStorageConnection.java jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JBossCacheStorage.java jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JBossCacheStorageConnection.java jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JBossCacheTreeStorageConnection.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/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCStorageConnection.java jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/storage/WorkspaceStorageConnection.java jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache/AbstractCacheLoaderTest.java jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JBossCacheStorageConnectionTest.java jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache/ObservationCacheLoaderTest.java Log: EXOJCR-201: remove deprecated $SESSION stub Modified: jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/JBossCacheWorkspaceDataManager.java =================================================================== --- jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/JBossCacheWorkspaceDataManager.java 2009-11-17 17:00:52 UTC (rev 734) +++ jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/JBossCacheWorkspaceDataManager.java 2009-11-18 06:44:11 UTC (rev 735) @@ -74,124 +74,85 @@ WorkspaceStorageConnection thisConnection = null; WorkspaceStorageConnection systemConnection = null; - // prepare changes log list - List<PlainChangesLog> chengesLogList = new ArrayList<PlainChangesLog>(); - if (changesLog instanceof PlainChangesLog) - { - chengesLogList.add((PlainChangesLog)changesLog); - } - else if (changesLog instanceof CompositeChangesLog) - { - for (ChangesLogIterator iter = ((CompositeChangesLog)changesLog).getLogIterator(); iter.hasNextLog();) - { - chengesLogList.add(iter.nextLog()); - } - } - try { - for (PlainChangesLog currChangesLog : chengesLogList) + for (Iterator<ItemState> iter = changesLog.getAllStates().iterator(); iter.hasNext();) { - boolean systemConnSessionInfoAdded = false; - boolean thisConnSessionInfoAdded = false; + ItemState itemState = iter.next(); - for (Iterator<ItemState> iter = currChangesLog.getAllStates().iterator(); iter.hasNext();) - { - ItemState itemState = iter.next(); + if (!itemState.isPersisted()) + continue; - if (!itemState.isPersisted()) - continue; + long start = System.currentTimeMillis(); - long start = System.currentTimeMillis(); + TransientItemData data = (TransientItemData)itemState.getData(); - TransientItemData data = (TransientItemData)itemState.getData(); + WorkspaceStorageConnection conn = null; + if (isSystemDescendant(data.getQPath())) + { + conn = systemConnection == null + // we need system connection but it's not exist + ? systemConnection = (systemDataContainer != dataContainer + // if it's different container instances + ? systemDataContainer.equals(dataContainer) && thisConnection != null + // but container confugrations are same and non-system connnection open + // reuse this connection as system + ? systemDataContainer.reuseConnection(thisConnection) + // or open one new system + : systemDataContainer.openConnection() + // else if it's same container instances (system and this) + : thisConnection == null + // and non-system connection doens't exist - open it + ? thisConnection = dataContainer.openConnection() + // if already open - use it + : thisConnection) + // system connection opened - use it + : systemConnection; + } + else + { + conn = thisConnection == null + // we need this conatiner conection + ? thisConnection = (systemDataContainer != dataContainer + // if it's different container instances + ? dataContainer.equals(systemDataContainer) && systemConnection != null + // but container confugrations are same and system connnection open + // reuse system connection as this + ? dataContainer.reuseConnection(systemConnection) + // or open one new + : dataContainer.openConnection() + // else if it's same container instances (system and this) + : systemConnection == null + // and system connection doens't exist - open it + ? systemConnection = dataContainer.openConnection() + // if already open - use it + : systemConnection) + // this connection opened - use it + : thisConnection; + } - WorkspaceStorageConnection conn = null; - if (isSystemDescendant(data.getQPath())) - { - conn = systemConnection == null - // we need system connection but it's not exist - ? systemConnection = (systemDataContainer != dataContainer - // if it's different container instances - ? systemDataContainer.equals(dataContainer) && thisConnection != null - // but container confugrations are same and non-system connnection open - // reuse this connection as system - ? systemDataContainer.reuseConnection(thisConnection) - // or open one new system - : systemDataContainer.openConnection() - // else if it's same container instances (system and this) - : thisConnection == null - // and non-system connection doens't exist - open it - ? thisConnection = dataContainer.openConnection() - // if already open - use it - : thisConnection) - // system connection opened - use it - : systemConnection; + data.increasePersistedVersion(); - if (!systemConnSessionInfoAdded) - { - if (!systemConnection.equals(thisConnection)) - systemConnection.addSessionInfo(currChangesLog.getSessionId()); - systemConnSessionInfoAdded = true; - } - } - else - { - conn = thisConnection == null - // we need this conatiner conection - ? thisConnection = (systemDataContainer != dataContainer - // if it's different container instances - ? dataContainer.equals(systemDataContainer) && systemConnection != null - // but container confugrations are same and system connnection open - // reuse system connection as this - ? dataContainer.reuseConnection(systemConnection) - // or open one new - : dataContainer.openConnection() - // else if it's same container instances (system and this) - : systemConnection == null - // and system connection doens't exist - open it - ? systemConnection = dataContainer.openConnection() - // if already open - use it - : systemConnection) - // this connection opened - use it - : thisConnection; - - if (!thisConnSessionInfoAdded) - { - if (!thisConnection.equals(systemConnection)) - thisConnection.addSessionInfo(currChangesLog.getSessionId()); - thisConnSessionInfoAdded = true; - } - } - - data.increasePersistedVersion(); - - if (itemState.isAdded()) - { - doAdd(data, conn, addedNodes); - } - else if (itemState.isUpdated()) - { - doUpdate(data, conn); - } - else if (itemState.isDeleted()) - { - doDelete(data, conn); - } - else if (itemState.isRenamed()) - { - doRename(data, conn, addedNodes); - } - - if (LOG.isDebugEnabled()) - LOG.debug(ItemState.nameFromValue(itemState.getState()) + " " + (System.currentTimeMillis() - start) - + "ms, " + data.getQPath().getAsString()); + if (itemState.isAdded()) + { + doAdd(data, conn, addedNodes); } - //TODO rainf0x - /*if (thisConnection != null) - thisConnection.removeSessionInfo(); - if (systemConnection != null && !systemConnection.equals(thisConnection)) - systemConnection.removeSessionInfo();*/ + else if (itemState.isUpdated()) + { + doUpdate(data, conn); + } + else if (itemState.isDeleted()) + { + doDelete(data, conn); + } + else if (itemState.isRenamed()) + { + doRename(data, conn, addedNodes); + } + + if (LOG.isDebugEnabled()) + LOG.debug(ItemState.nameFromValue(itemState.getState()) + " " + (System.currentTimeMillis() - start) + + "ms, " + data.getQPath().getAsString()); } if (thisConnection != null) thisConnection.commit(); Modified: jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/inmemory/InmemoryStorageConnection.java =================================================================== --- jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/inmemory/InmemoryStorageConnection.java 2009-11-17 17:00:52 UTC (rev 734) +++ jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/inmemory/InmemoryStorageConnection.java 2009-11-18 06:44:11 UTC (rev 735) @@ -212,20 +212,6 @@ { } - /** - * {@inheritDoc} - */ - public void addSessionInfo(String sessionId) throws RepositoryException - { - } - - /** - * {@inheritDoc} - */ - public void removeSessionInfo() throws RepositoryException - { - } - public boolean isOpened() { return false; Modified: jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JBossCacheStorage.java =================================================================== --- jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JBossCacheStorage.java 2009-11-17 17:00:52 UTC (rev 734) +++ jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JBossCacheStorage.java 2009-11-18 06:44:11 UTC (rev 735) @@ -35,6 +35,7 @@ public abstract class JBossCacheStorage { + @Deprecated public static final String SESSION = "$SESSION".intern(); public static final String NODES = "$NODES".intern(); @@ -47,30 +48,28 @@ public static final String ITEM_ID = "$id".intern(); + @Deprecated public static final String SESSION_ID = "$sessionId".intern(); + @Deprecated public static final String USER_ID = "$userId".intern(); - + public static final String LOCK_DATA = "$lock".intern(); protected final Node<Serializable, Object> nodesRoot; protected final Node<Serializable, Object> propsRoot; - protected final Node<Serializable, Object> sessionRoot; - protected final Node<Serializable, Object> locksRoot; protected JBossCacheStorage(Node<Serializable, Object> nodesRoot, Node<Serializable, Object> propsRoot, - Node<Serializable, Object> sessionRoot, Node<Serializable, Object> locksRoot) + Node<Serializable, Object> locksRoot) { this.nodesRoot = nodesRoot; this.propsRoot = propsRoot; - this.sessionRoot = sessionRoot; - - this.locksRoot = locksRoot; + this.locksRoot = locksRoot; } /** Modified: jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JBossCacheStorageConnection.java =================================================================== --- jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JBossCacheStorageConnection.java 2009-11-17 17:00:52 UTC (rev 734) +++ jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JBossCacheStorageConnection.java 2009-11-18 06:44:11 UTC (rev 735) @@ -74,9 +74,9 @@ * @param cache Cache<Serializable, Object> */ public JBossCacheStorageConnection(Cache<Serializable, Object> cache, Node<Serializable, Object> nodesRoot, - Node<Serializable, Object> propsRoot, Node<Serializable, Object> sessionRoot, Node<Serializable, Object> locksRoot) + Node<Serializable, Object> propsRoot, Node<Serializable, Object> locksRoot) { - super(nodesRoot, propsRoot, sessionRoot, locksRoot); + super(nodesRoot, propsRoot, locksRoot); this.cache = cache; } @@ -646,38 +646,6 @@ } /** - * {@inheritDoc} - */ - public void addSessionInfo(String sessionId) throws RepositoryException - { - startBatch(); - - if (sessionRoot.getData().size() != 0) - { - throw new RepositoryException("Session attributes already exists in cache storage."); - } - - // add attributes - sessionRoot.put(JBossCacheStorage.SESSION_ID, sessionId); - } - - /** - * {@inheritDoc} - */ - public void removeSessionInfo() throws InvalidItemStateException, RepositoryException - { - startBatch(); - - if (sessionRoot.getData().size() == 0) - { - throw new RepositoryException("Session attributes not exists in cache storage."); - } - - // remove attributes - sessionRoot.clearData(); - } - - /** * Start batching. */ private void startBatch() Modified: jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JBossCacheTreeStorageConnection.java =================================================================== --- jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JBossCacheTreeStorageConnection.java 2009-11-17 17:00:52 UTC (rev 734) +++ jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JBossCacheTreeStorageConnection.java 2009-11-18 06:44:11 UTC (rev 735) @@ -395,20 +395,6 @@ } /** - * {@inheritDoc} - */ - public void addSessionInfo(String sessionId) throws RepositoryException - { - } - - /** - * {@inheritDoc} - */ - public void removeSessionInfo() throws InvalidItemStateException, RepositoryException - { - } - - /** * Start batching. */ private void startBatch() 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-17 17:00:52 UTC (rev 734) +++ jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JBossCacheWorkspaceDataContainer.java 2009-11-18 06:44:11 UTC (rev 735) @@ -72,8 +72,6 @@ private Node<Serializable, Object> properties; - private Node<Serializable, Object> session; - private Node<Serializable, Object> locks; /** @@ -131,7 +129,6 @@ cache.startBatch(); this.nodes = cacheRoot.addChild(Fqn.fromElements(JBossCacheStorage.NODES)); this.properties = cacheRoot.addChild(Fqn.fromElements(JBossCacheStorage.PROPS)); - this.session = cacheRoot.addChild(Fqn.fromElements(JBossCacheStorage.SESSION)); // TODO remove it this.locks = cacheRoot.addChild(Fqn.fromElements(JBossCacheStorage.LOCKS)); cache.endBatch(true); } @@ -182,7 +179,7 @@ // throw new RepositoryException("Container is not started"); // } - return new JBossCacheStorageConnection(cache, nodes, properties, session, locks); + return new JBossCacheStorageConnection(cache, nodes, properties, locks); } /** @@ -196,7 +193,7 @@ // throw new RepositoryException("Container is not started"); // } - return new JBossCacheStorageConnection(cache, nodes, properties, session, locks); + return new JBossCacheStorageConnection(cache, nodes, properties, locks); } /** Modified: jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCStorageConnection.java =================================================================== --- jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCStorageConnection.java 2009-11-17 17:00:52 UTC (rev 734) +++ jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCStorageConnection.java 2009-11-18 06:44:11 UTC (rev 735) @@ -716,20 +716,6 @@ return null; } - /** - * {@inheritDoc} - */ - public void addSessionInfo(String sessionId) throws RepositoryException - { - } - - /** - * {@inheritDoc} - */ - public void removeSessionInfo() throws RepositoryException - { - } - // ------------------ Private methods --------------- /** @@ -2017,7 +2003,7 @@ try { List<PropertyDataInfo> children = new ArrayList<PropertyDataInfo>(); - + ResultSet prop = findChildPropertiesIdNameByParentIdentifier(getInternalId(parentId)); while (prop.next()) { Modified: jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/storage/WorkspaceStorageConnection.java =================================================================== --- jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/storage/WorkspaceStorageConnection.java 2009-11-17 17:00:52 UTC (rev 734) +++ jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/storage/WorkspaceStorageConnection.java 2009-11-18 06:44:11 UTC (rev 735) @@ -259,7 +259,7 @@ */ void delete(NodeData data) throws RepositoryException, UnsupportedOperationException, InvalidItemStateException, IllegalStateException; - + /** * Deletes <code>PropertyData</code>. * @@ -310,38 +310,19 @@ void close() throws IllegalStateException, RepositoryException; /** - * Add session information to cache storage. - * - * @param sessionId - * the session identifier to be added - * - * @throws RepositoryException - * if some exception occured - */ - void addSessionInfo(String sessionId) throws RepositoryException; - - /** - * Remove session information from cache storage. - * - * @throws RepositoryException - * if some exception occured - */ - void removeSessionInfo() throws RepositoryException; - - /** * Returns true if connection can be used. * * @return boolean, true if connection is open and ready, false - otherwise */ boolean isOpened(); - + /** * @param identifier * @return * LockData by given node uuid, or null if not present */ LockData getLockData(String identifier); - + /** * @return * List of all locks. Modified: jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache/AbstractCacheLoaderTest.java =================================================================== --- jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache/AbstractCacheLoaderTest.java 2009-11-17 17:00:52 UTC (rev 734) +++ jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache/AbstractCacheLoaderTest.java 2009-11-18 06:44:11 UTC (rev 735) @@ -162,7 +162,7 @@ list.add(modification); return list; } - + /** * Returns {@link Modification} like as node update. * @@ -172,21 +172,24 @@ * @param data * @return */ - public List<Modification> updateNode(NodeData data) { + public List<Modification> updateNode(NodeData data) + { - List<Modification> list = new ArrayList<Modification>(); - Fqn fqn = Fqn.fromElements(JBossCacheStorage.NODES, data.getParentIdentifier(), data.getQPath().getEntries()[data.getQPath().getEntries().length - 1].getAsString(true)); - + List<Modification> list = new ArrayList<Modification>(); + Fqn fqn = + Fqn.fromElements(JBossCacheStorage.NODES, data.getParentIdentifier(), data.getQPath().getEntries()[data + .getQPath().getEntries().length - 1].getAsString(true)); + Modification modification = new Modification(ModificationType.PUT_KEY_VALUE, fqn, JBossCacheStorage.ITEM_ID, data.getIdentifier()); list.add(modification); - + fqn = Fqn.fromElements(JBossCacheStorage.NODES, data.getIdentifier()); modification = new Modification(ModificationType.PUT_KEY_VALUE, fqn, JBossCacheStorage.ITEM_DATA, data); modification.setOldValue(data); list.add(modification); - - return list; + + return list; } /** @@ -227,6 +230,7 @@ * @param userId * @return */ + @Deprecated public List<Modification> addSessionInfo(String sessionId, String userId) { List<Modification> list = new ArrayList<Modification>(); @@ -247,6 +251,7 @@ * * @return */ + @Deprecated public List<Modification> removeSessionInfo() { List<Modification> list = new ArrayList<Modification>(); Modified: jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JBossCacheStorageConnectionTest.java =================================================================== --- jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JBossCacheStorageConnectionTest.java 2009-11-17 17:00:52 UTC (rev 734) +++ jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JBossCacheStorageConnectionTest.java 2009-11-18 06:44:11 UTC (rev 735) @@ -59,8 +59,6 @@ protected Node<Serializable, Object> props; - protected Node<Serializable, Object> session; - protected Node<Serializable, Object> locks; protected String jbcConfig; @@ -88,11 +86,10 @@ // prepare cache structures nodes = cacheRoot.addChild(Fqn.fromString(JBossCacheStorage.NODES)); props = cacheRoot.addChild(Fqn.fromString(JBossCacheStorage.PROPS)); - session = cacheRoot.addChild(Fqn.fromString(JBossCacheStorage.SESSION)); - locks = cacheRoot.addChild(Fqn.fromString(JBossCacheStorage.SESSION)); + locks = cacheRoot.addChild(Fqn.fromString(JBossCacheStorage.LOCKS)); // JCR connection - conn = new JBossCacheStorageConnection(cache, nodes, props, session, locks); + conn = new JBossCacheStorageConnection(cache, nodes, props, locks); } protected void initJBCConfig() Modified: jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache/ObservationCacheLoaderTest.java =================================================================== --- jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache/ObservationCacheLoaderTest.java 2009-11-17 17:00:52 UTC (rev 734) +++ jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache/ObservationCacheLoaderTest.java 2009-11-18 06:44:11 UTC (rev 735) @@ -473,10 +473,6 @@ storage.put(data.getIdentifier(), data); } - public void addSessionInfo(String sessionId, String userId) throws RepositoryException - { - } - public void close() throws IllegalStateException, RepositoryException { } @@ -529,10 +525,6 @@ return null; } - public void removeSessionInfo() throws RepositoryException - { - } - public void rename(NodeData data) throws RepositoryException, UnsupportedOperationException, InvalidItemStateException, IllegalStateException { @@ -552,10 +544,6 @@ { } - public void addSessionInfo(String sessionId) throws RepositoryException - { - } - /** * @see org.exoplatform.services.jcr.storage.WorkspaceStorageConnection#getLockData(java.lang.String) */

16 years, 8 months

1
0
0 / 0

exo-jcr SVN: r734 - in jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage: jdbc and 1 other directory.

by do-not-reply＠jboss.org

Author: pnedonosko Date: 2009-11-17 12:00:52 -0500 (Tue, 17 Nov 2009) New Revision: 734 Added: jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/PropertyDataInfo.java 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/jdbc/JDBCStorageConnection.java Log: EXOJCR-248: get child props optimization 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-17 16:58:22 UTC (rev 733) +++ jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JDBCCacheLoader.java 2009-11-17 17:00:52 UTC (rev 734) @@ -25,6 +25,7 @@ import org.exoplatform.services.jcr.datamodel.PropertyData; import org.exoplatform.services.jcr.datamodel.QPathEntry; import org.exoplatform.services.jcr.impl.storage.jdbc.JDBCStorageConnection; +import org.exoplatform.services.jcr.impl.storage.jdbc.PropertyDataInfo; import org.exoplatform.services.jcr.storage.WorkspaceDataContainer; import org.exoplatform.services.jcr.storage.WorkspaceStorageConnection; import org.exoplatform.services.log.ExoLogger; @@ -277,7 +278,7 @@ if (nodeData != null) { // TODO use dedicated select, not child datas - List<PropertyData> childProps = conn.getChildPropertiesData(nodeData); + List<PropertyDataInfo> childProps = conn.getChildProperties(nodeId); if (childProps.size() <= 0) { throw new JDBCCacheLoaderException("FATAL Empty attributes for Node " + nodeId + " '" + name @@ -286,9 +287,9 @@ attrs = new LinkedHashMap<Object, Object>(); attrs.put(JBossCacheStorage.ITEM_DATA, nodeData); - for (PropertyData prop : childProps) + for (PropertyDataInfo prop : childProps) { - attrs.put(prop.getQPath().getName().getAsString(), prop.getIdentifier()); + attrs.put(prop.getPropertyName(), prop.getPropertyId()); } } else Modified: jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCStorageConnection.java =================================================================== --- jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCStorageConnection.java 2009-11-17 16:58:22 UTC (rev 733) +++ jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCStorageConnection.java 2009-11-17 17:00:52 UTC (rev 734) @@ -1894,7 +1894,7 @@ } // for JBC etc. - + /** * Deletes <code>NodeData</code> by identifier. * @@ -1994,29 +1994,34 @@ exceptionHandler.handleDeleteException(e, identifier, true); } } - + public String getItemIdentifier(String parentId, String name) throws RepositoryException, IllegalStateException { - + return null; // TODO } - - class PropertyDataInfo { - String propertyId; - String propertyName; - } - + + /** + * Get child properties id and name. + * + * @param parentId parent Node id. + * @return List of PropertyDataInfo + * @throws RepositoryException if error + * @throws IllegalStateException if the parent in illegal state + */ public List<PropertyDataInfo> getChildProperties(String parentId) throws RepositoryException, IllegalStateException { - + checkIfOpened(); - - List<PropertyDataInfo> children = new ArrayList<PropertyDataInfo>(); + try { + List<PropertyDataInfo> children = new ArrayList<PropertyDataInfo>(); + ResultSet prop = findChildPropertiesIdNameByParentIdentifier(getInternalId(parentId)); - while (prop.next()) { - //children.add((PropertyData)itemData(parent.getQPath(), prop, I_CLASS_PROPERTY, null)); + while (prop.next()) + { + children.add(new PropertyDataInfo(prop.getString(COLUMN_ID), prop.getString(COLUMN_NAME))); } return children; @@ -2026,7 +2031,7 @@ throw new RepositoryException(e); } } - + public List<String> getChildNodeNames(String parentId) throws RepositoryException, IllegalStateException { checkIfOpened(); @@ -2035,7 +2040,7 @@ ResultSet node = findChildNodesByParentIdentifier(getInternalId(parentId)); List<String> childrens = new ArrayList<String>(); //while (node.next()) - //childrens.add((NodeData)itemData(parent.getQPath(), node, I_CLASS_NODE, parent.getACL())); + //childrens.add((NodeData)itemData(parent.getQPath(), node, I_CLASS_NODE, parent.getACL())); return childrens; } @@ -2044,7 +2049,7 @@ throw new RepositoryException(e); } } - + public List<String> getAllPropertyIdentifiers() throws RepositoryException, IllegalStateException { checkIfOpened(); @@ -2053,7 +2058,7 @@ ResultSet node = findChildNodesByParentIdentifier(getInternalId("???")); List<String> childrens = new ArrayList<String>(); //while (node.next()) - //childrens.add((NodeData)itemData(parent.getQPath(), node, I_CLASS_NODE, parent.getACL())); + //childrens.add((NodeData)itemData(parent.getQPath(), node, I_CLASS_NODE, parent.getACL())); return childrens; } @@ -2062,7 +2067,7 @@ throw new RepositoryException(e); } } - + public List<String> getAllNodeIdentifiers() throws RepositoryException, IllegalStateException { checkIfOpened(); @@ -2071,7 +2076,7 @@ ResultSet node = findChildNodesByParentIdentifier(getInternalId("???")); List<String> childrens = new ArrayList<String>(); //while (node.next()) - //childrens.add((NodeData)itemData(parent.getQPath(), node, I_CLASS_NODE, parent.getACL())); + //childrens.add((NodeData)itemData(parent.getQPath(), node, I_CLASS_NODE, parent.getACL())); return childrens; } @@ -2096,9 +2101,10 @@ protected abstract ResultSet findChildNodesByParentIdentifier(String parentIdentifier) throws SQLException; protected abstract ResultSet findChildPropertiesByParentIdentifier(String parentIdentifier) throws SQLException; - - protected abstract ResultSet findChildPropertiesIdNameByParentIdentifier(String parentIdentifier) throws SQLException; + protected abstract ResultSet findChildPropertiesIdNameByParentIdentifier(String parentIdentifier) + throws SQLException; + protected abstract int addReference(PropertyData data) throws SQLException, IOException; protected abstract int renameNode(NodeData data) throws SQLException; Added: jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/PropertyDataInfo.java =================================================================== --- jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/PropertyDataInfo.java (rev 0) +++ jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/PropertyDataInfo.java 2009-11-17 17:00:52 UTC (rev 734) @@ -0,0 +1,50 @@ +/* + * Copyright (C) 2009 eXo Platform SAS. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 3 of + * the License, or (at your option) any later version. + * + * This software 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.exoplatform.services.jcr.impl.storage.jdbc; + +/** + * Created by The eXo Platform SAS. + * + * <br/>Date: 17.11.2009 + * + * @author <a href="mailto:peter.nedonosko@exoplatform.com.ua">Peter Nedonosko</a> + * @version $Id$ + */ +public class PropertyDataInfo +{ + private final String propertyId; + private final String propertyName; + + PropertyDataInfo(String propertyId, String propertyName) { + this.propertyId = propertyId; + this.propertyName = propertyName; + } + + public String getPropertyId() + { + return propertyId; + } + + public String getPropertyName() + { + return propertyName; + } + + +} Property changes on: jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/PropertyDataInfo.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + Id

16 years, 8 months

1
0
0 / 0

exo-jcr SVN: r733 - 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-17 11:58:22 -0500 (Tue, 17 Nov 2009) New Revision: 733 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. 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-17 16:58:03 UTC (rev 732) +++ jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JDBCCacheLoader.java 2009-11-17 16:58:22 UTC (rev 733) @@ -127,7 +127,7 @@ break; case REMOVE_NODE : - doRemove(m, conn); + doRemove(m, (JDBCStorageConnection) conn); break; case MOVE : @@ -183,27 +183,21 @@ * @throws IllegalStateException * @throws RepositoryException */ - private void doRemove(Modification modification, WorkspaceStorageConnection conn) throws IllegalStateException, - RepositoryException + private void doRemove(Modification modification, JDBCStorageConnection conn) throws IllegalStateException, + RepositoryException { - - if (modification.getFqn().size() == 2 - && (modification.getFqn().get(0).equals(JBossCacheStorage.NODES) || modification.getFqn().get(0).equals( - JBossCacheStorage.PROPS))) + if (modification.getFqn().size() == 2) { + String identifier = (String) modification.getFqn().get(1); - // 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); - - ItemData itemData = (ItemData)modification.getValue(); - - if (itemData instanceof NodeData) - conn.delete((NodeData)itemData); - if (itemData instanceof PropertyData) - conn.delete((PropertyData)itemData); + if (modification.getFqn().get(0).equals(JBossCacheStorage.NODES)) + { + conn.deleteNode(identifier); + } + else if (modification.getFqn().get(0).equals(JBossCacheStorage.PROPS)) + { + conn.deleteProperty(identifier); + } } } @@ -607,7 +601,7 @@ /** * Prepare list of modifications. * - * Will be checked the UPDATE, ADD, REMOVE. + * Will be checked the UPDATE or ADD. * * @param modifications * @throws RepositoryException @@ -646,20 +640,6 @@ modifications.get(i).setOldValue(itemData); } } - else if (m.getType() == ModificationType.REMOVE_NODE) - { - if (m.getFqn().size() == 2 - && (m.getFqn().get(0).equals(JBossCacheStorage.NODES) || m.getFqn().get(0).equals( - JBossCacheStorage.PROPS))) - { - String id = (String)m.getFqn().get(1); - ItemData removedItemData = conn.getItemData(id); - - // Set valueData for update property or node. - if (removedItemData != null) - modifications.get(i).setValue(removedItemData); - } - } } } finally

16 years, 8 months

1
0
0 / 0

exo-jcr SVN: r732 - ws/branches/2.2.x/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl.

by do-not-reply＠jboss.org

Author: aparfonov Date: 2009-11-17 11:58:03 -0500 (Tue, 17 Nov 2009) New Revision: 732 Modified: ws/branches/2.2.x/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/InputHeadersMap.java Log: EXOJCR-255 : method size() return size of back-end map. Modified: ws/branches/2.2.x/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/InputHeadersMap.java =================================================================== --- ws/branches/2.2.x/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/InputHeadersMap.java 2009-11-17 16:51:55 UTC (rev 731) +++ ws/branches/2.2.x/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/InputHeadersMap.java 2009-11-17 16:58:03 UTC (rev 732) @@ -254,6 +254,14 @@ { throw new UnsupportedOperationException(); } + + /** + * {@inheritDoc} + */ + public int size() + { + return m.size(); + } // MultivaluedMap

16 years, 8 months

1
0
0 / 0

exo-jcr SVN: r731 - in jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc: db and 1 other directory.

by do-not-reply＠jboss.org

Author: pnedonosko Date: 2009-11-17 11:51:55 -0500 (Tue, 17 Nov 2009) New Revision: 731 Modified: jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/DBConstants.java jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCStorageConnection.java jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/HSQLDBSingleDbJDBCConnection.java jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/MultiDbJDBCConnection.java jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/SingleDbJDBCConnection.java Log: EXOJCR-203: JDBC conn new methods Modified: jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/DBConstants.java =================================================================== --- jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/DBConstants.java 2009-11-17 16:51:35 UTC (rev 730) +++ jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/DBConstants.java 2009-11-17 16:51:55 UTC (rev 731) @@ -131,6 +131,11 @@ * FIND_PROPERTIES_BY_PARENTID. */ protected String FIND_PROPERTIES_BY_PARENTID; + + /** + * FIND_PROPERTIES_IDNAME_BY_PARENTID. + */ + protected String FIND_PROPERTIES_IDNAME_BY_PARENTID; /** * INSERT_NODE. Modified: jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCStorageConnection.java =================================================================== --- jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCStorageConnection.java 2009-11-17 16:51:35 UTC (rev 730) +++ jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCStorageConnection.java 2009-11-17 16:51:55 UTC (rev 731) @@ -2009,7 +2009,22 @@ public List<PropertyDataInfo> getChildProperties(String parentId) throws RepositoryException, IllegalStateException { - return new ArrayList<PropertyDataInfo>(); // TODO + checkIfOpened(); + + List<PropertyDataInfo> children = new ArrayList<PropertyDataInfo>(); + try + { + ResultSet prop = findChildPropertiesIdNameByParentIdentifier(getInternalId(parentId)); + while (prop.next()) { + //children.add((PropertyData)itemData(parent.getQPath(), prop, I_CLASS_PROPERTY, null)); + } + + return children; + } + catch (SQLException e) + { + throw new RepositoryException(e); + } } public List<String> getChildNodeNames(String parentId) throws RepositoryException, IllegalStateException @@ -2081,6 +2096,8 @@ protected abstract ResultSet findChildNodesByParentIdentifier(String parentIdentifier) throws SQLException; protected abstract ResultSet findChildPropertiesByParentIdentifier(String parentIdentifier) throws SQLException; + + protected abstract ResultSet findChildPropertiesIdNameByParentIdentifier(String parentIdentifier) throws SQLException; protected abstract int addReference(PropertyData data) throws SQLException, IOException; Modified: jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/HSQLDBSingleDbJDBCConnection.java =================================================================== --- jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/HSQLDBSingleDbJDBCConnection.java 2009-11-17 16:51:35 UTC (rev 730) +++ jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/HSQLDBSingleDbJDBCConnection.java 2009-11-17 16:51:55 UTC (rev 731) @@ -83,6 +83,8 @@ "select * from JCR_SITEM" + " where PARENT_ID=? and I_CLASS=1 and CONTAINER_NAME=?" + " order by N_ORDER_NUM"; FIND_PROPERTIES_BY_PARENTID = "select * from JCR_SITEM" + " where PARENT_ID=? and I_CLASS=2 and CONTAINER_NAME=?" + " order by ID"; + FIND_PROPERTIES_IDNAME_BY_PARENTID = + "select ID, NAME from JCR_SITEM" + " where PARENT_ID=? and I_CLASS=2 and CONTAINER_NAME=?"; } /** @@ -151,4 +153,20 @@ findPropertiesByParentId.setString(2, containerName); return findPropertiesByParentId.executeQuery(); } + + /** + * {@inheritDoc} + */ + @Override + protected ResultSet findChildPropertiesIdNameByParentIdentifier(String parentCid) throws SQLException + { + if (findPropertiesIdNameByParentId == null) + findPropertiesIdNameByParentId = dbConnection.prepareStatement(FIND_PROPERTIES_IDNAME_BY_PARENTID); + else + findPropertiesIdNameByParentId.clearParameters(); + + findPropertiesIdNameByParentId.setString(1, parentCid); + findPropertiesIdNameByParentId.setString(2, containerName); + return findPropertiesIdNameByParentId.executeQuery(); + } } Modified: jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/MultiDbJDBCConnection.java =================================================================== --- jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/MultiDbJDBCConnection.java 2009-11-17 16:51:35 UTC (rev 730) +++ jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/MultiDbJDBCConnection.java 2009-11-17 16:51:55 UTC (rev 731) @@ -79,6 +79,8 @@ protected PreparedStatement findNodesByParentId; protected PreparedStatement findPropertiesByParentId; + + protected PreparedStatement findPropertiesIdNameByParentId; protected PreparedStatement insertNode; @@ -187,6 +189,8 @@ FIND_NODES_BY_PARENTID = "select * from JCR_MITEM" + " where I_CLASS=1 and PARENT_ID=?" + " order by N_ORDER_NUM"; FIND_PROPERTIES_BY_PARENTID = "select * from JCR_MITEM" + " where I_CLASS=2 and PARENT_ID=?" + " order by ID"; + + FIND_PROPERTIES_IDNAME_BY_PARENTID = "select ID, NAME from JCR_MITEM" + " where I_CLASS=2 and PARENT_ID=?"; INSERT_NODE = "insert into JCR_MITEM(ID, PARENT_ID, NAME, VERSION, I_CLASS, I_INDEX, N_ORDER_NUM) VALUES(?,?,?,?," @@ -439,6 +443,17 @@ return findPropertiesByParentId.executeQuery(); } + protected ResultSet findChildPropertiesIdNameByParentIdentifier(String parentIdentifier) throws SQLException + { + if (findPropertiesIdNameByParentId == null) + findPropertiesIdNameByParentId = dbConnection.prepareStatement(FIND_PROPERTIES_IDNAME_BY_PARENTID); + else + findPropertiesIdNameByParentId.clearParameters(); + + findPropertiesIdNameByParentId.setString(1, parentIdentifier); + return findPropertiesIdNameByParentId.executeQuery(); + } + // -------- values processing ------------ /** Modified: jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/SingleDbJDBCConnection.java =================================================================== --- jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/SingleDbJDBCConnection.java 2009-11-17 16:51:35 UTC (rev 730) +++ jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/SingleDbJDBCConnection.java 2009-11-17 16:51:55 UTC (rev 731) @@ -76,6 +76,8 @@ protected PreparedStatement findNodesByParentId; protected PreparedStatement findPropertiesByParentId; + + protected PreparedStatement findPropertiesIdNameByParentId; protected PreparedStatement insertItem; @@ -196,6 +198,9 @@ FIND_PROPERTIES_BY_PARENTID = "select * from JCR_SITEM" + " where I_CLASS=2 and CONTAINER_NAME=? and PARENT_ID=?" + " order by ID"; + FIND_PROPERTIES_IDNAME_BY_PARENTID = + "select ID, NAME from JCR_SITEM" + " where I_CLASS=2 and CONTAINER_NAME=? and PARENT_ID=?"; + INSERT_NODE = "insert into JCR_SITEM(ID, PARENT_ID, NAME, CONTAINER_NAME, VERSION, I_CLASS, I_INDEX, N_ORDER_NUM) VALUES(?,?,?,?,?," + I_CLASS_NODE + ",?,?)"; @@ -350,7 +355,22 @@ findPropertiesByParentId.setString(2, parentCid); return findPropertiesByParentId.executeQuery(); } + + /** + * {@inheritDoc} + */ + protected ResultSet findChildPropertiesIdNameByParentIdentifier(String parentCid) throws SQLException + { + if (findPropertiesIdNameByParentId == null) + findPropertiesIdNameByParentId = dbConnection.prepareStatement(FIND_PROPERTIES_IDNAME_BY_PARENTID); + else + findPropertiesIdNameByParentId.clearParameters(); + findPropertiesIdNameByParentId.setString(1, containerName); + findPropertiesIdNameByParentId.setString(2, parentCid); + return findPropertiesIdNameByParentId.executeQuery(); + } + /** * {@inheritDoc} */

16 years, 8 months

1
0
0 / 0

exo-jcr SVN: r730 - ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl.

by do-not-reply＠jboss.org

Author: aparfonov Date: 2009-11-17 11:51:35 -0500 (Tue, 17 Nov 2009) New Revision: 730 Modified: ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/InputHeadersMap.java Log: EXOJCR-255 : method size() return size of back-end map. Modified: ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/InputHeadersMap.java =================================================================== --- ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/InputHeadersMap.java 2009-11-17 16:42:18 UTC (rev 729) +++ ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/InputHeadersMap.java 2009-11-17 16:51:35 UTC (rev 730) @@ -255,6 +255,14 @@ throw new UnsupportedOperationException(); } + /** + * {@inheritDoc} + */ + public int size() + { + return m.size(); + } + // MultivaluedMap /** @@ -281,7 +289,7 @@ { throw new UnsupportedOperationException(); } - + // helpers methods /**

16 years, 8 months

1
0
0 / 0

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

by do-not-reply＠jboss.org

Author: areshetnyak Date: 2009-11-17 11:42:18 -0500 (Tue, 17 Nov 2009) New Revision: 729 Modified: jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/JDBCStorageConnectionTest.java Log: EXOJCR-249 : The JDBCStorageConnectionTest was changed. Modified: jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/JDBCStorageConnectionTest.java =================================================================== --- jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/JDBCStorageConnectionTest.java 2009-11-17 16:35:30 UTC (rev 728) +++ jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/JDBCStorageConnectionTest.java 2009-11-17 16:42:18 UTC (rev 729) @@ -267,21 +267,31 @@ WorkspaceDataContainer dataContainer = (WorkspaceDataContainer) session.getContainer().getComponentInstanceOfType(WorkspaceDataContainer.class); - List<PropertyData> propertysData = dataManager.getChildPropertiesData(testRoot); + // create node with property primary type. + TransientNodeData troot = + TransientNodeData.createNodeData(root, InternalQName.parse("[]node_to_delete_by_id"), + Constants.NT_UNSTRUCTURED); - assertNotNull(propertysData); - assertEquals(1, propertysData.size()); + TransientPropertyData pt = + TransientPropertyData.createPropertyData(troot, Constants.JCR_PRIMARYTYPE, PropertyType.NAME, false, + new TransientValueData(Constants.NT_UNSTRUCTURED)); - PropertyData primaryTypeData = propertysData.get(0); + PlainChangesLogImpl chlog = new PlainChangesLogImpl(); + chlog.add(ItemState.createAddedState(troot)); + chlog.add(ItemState.createAddedState(pt)); + dataManager.save(new TransactionChangesLog(chlog)); + + // Delete node and property by ID. JDBCStorageConnection connection = (JDBCStorageConnection) dataContainer.openConnection(); - connection.deleteProperty(primaryTypeData.getIdentifier()); - connection.deleteNode(testRoot.getIdentifier()); + connection.deleteProperty(pt.getIdentifier()); + connection.deleteNode(troot.getIdentifier()); connection.commit(); - assertNull(dataManager.getItemData(testRoot.getIdentifier())); - assertNull(dataManager.getItemData(primaryTypeData.getIdentifier())); + //check + assertNull(dataManager.getItemData(troot.getIdentifier())); + assertNull(dataManager.getItemData(pt.getIdentifier())); } }

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