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

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

by do-not-reply＠jboss.org

Author: pnedonosko Date: 2009-11-24 10:43:13 -0500 (Tue, 24 Nov 2009) New Revision: 838 Modified: core/trunk/exo.core.component.database/pom.xml core/trunk/exo.core.component.document/pom.xml core/trunk/exo.core.component.ldap/pom.xml core/trunk/exo.core.component.organization.api/pom.xml core/trunk/exo.core.component.organization.jdbc/pom.xml core/trunk/exo.core.component.organization.ldap/pom.xml core/trunk/exo.core.component.script.groovy/pom.xml core/trunk/exo.core.component.security.core/pom.xml core/trunk/exo.core.component.web.css/pom.xml core/trunk/exo.core.component.xml-processing/pom.xml core/trunk/packaging/module/pom.xml core/trunk/pom.xml Log: [maven-release-plugin] prepare for next development iteration Modified: core/trunk/exo.core.component.database/pom.xml =================================================================== --- core/trunk/exo.core.component.database/pom.xml 2009-11-24 15:42:47 UTC (rev 837) +++ core/trunk/exo.core.component.database/pom.xml 2009-11-24 15:43:13 UTC (rev 838) @@ -25,7 +25,7 @@ <parent> <groupId>org.exoplatform.core</groupId> <artifactId>core-parent</artifactId> - <version>2.3.0-Beta04</version> + <version>2.3.0-Beta05-SNAPSHOT</version> </parent> <artifactId>exo.core.component.database</artifactId> Modified: core/trunk/exo.core.component.document/pom.xml =================================================================== --- core/trunk/exo.core.component.document/pom.xml 2009-11-24 15:42:47 UTC (rev 837) +++ core/trunk/exo.core.component.document/pom.xml 2009-11-24 15:43:13 UTC (rev 838) @@ -25,7 +25,7 @@ <parent> <groupId>org.exoplatform.core</groupId> <artifactId>core-parent</artifactId> - <version>2.3.0-Beta04</version> + <version>2.3.0-Beta05-SNAPSHOT</version> </parent> <artifactId>exo.core.component.document</artifactId> Modified: core/trunk/exo.core.component.ldap/pom.xml =================================================================== --- core/trunk/exo.core.component.ldap/pom.xml 2009-11-24 15:42:47 UTC (rev 837) +++ core/trunk/exo.core.component.ldap/pom.xml 2009-11-24 15:43:13 UTC (rev 838) @@ -25,7 +25,7 @@ <parent> <groupId>org.exoplatform.core</groupId> <artifactId>core-parent</artifactId> - <version>2.3.0-Beta04</version> + <version>2.3.0-Beta05-SNAPSHOT</version> </parent> <artifactId>exo.core.component.ldap</artifactId> Modified: core/trunk/exo.core.component.organization.api/pom.xml =================================================================== --- core/trunk/exo.core.component.organization.api/pom.xml 2009-11-24 15:42:47 UTC (rev 837) +++ core/trunk/exo.core.component.organization.api/pom.xml 2009-11-24 15:43:13 UTC (rev 838) @@ -25,7 +25,7 @@ <parent> <groupId>org.exoplatform.core</groupId> <artifactId>core-parent</artifactId> - <version>2.3.0-Beta04</version> + <version>2.3.0-Beta05-SNAPSHOT</version> </parent> <artifactId>exo.core.component.organization.api</artifactId> Modified: core/trunk/exo.core.component.organization.jdbc/pom.xml =================================================================== --- core/trunk/exo.core.component.organization.jdbc/pom.xml 2009-11-24 15:42:47 UTC (rev 837) +++ core/trunk/exo.core.component.organization.jdbc/pom.xml 2009-11-24 15:43:13 UTC (rev 838) @@ -25,7 +25,7 @@ <parent> <groupId>org.exoplatform.core</groupId> <artifactId>core-parent</artifactId> - <version>2.3.0-Beta04</version> + <version>2.3.0-Beta05-SNAPSHOT</version> </parent> <artifactId>exo.core.component.organization.jdbc</artifactId> Modified: core/trunk/exo.core.component.organization.ldap/pom.xml =================================================================== --- core/trunk/exo.core.component.organization.ldap/pom.xml 2009-11-24 15:42:47 UTC (rev 837) +++ core/trunk/exo.core.component.organization.ldap/pom.xml 2009-11-24 15:43:13 UTC (rev 838) @@ -25,7 +25,7 @@ <parent> <groupId>org.exoplatform.core</groupId> <artifactId>core-parent</artifactId> - <version>2.3.0-Beta04</version> + <version>2.3.0-Beta05-SNAPSHOT</version> </parent> <artifactId>exo.core.component.organization.ldap</artifactId> Modified: core/trunk/exo.core.component.script.groovy/pom.xml =================================================================== --- core/trunk/exo.core.component.script.groovy/pom.xml 2009-11-24 15:42:47 UTC (rev 837) +++ core/trunk/exo.core.component.script.groovy/pom.xml 2009-11-24 15:43:13 UTC (rev 838) @@ -25,7 +25,7 @@ <parent> <groupId>org.exoplatform.core</groupId> <artifactId>core-parent</artifactId> - <version>2.3.0-Beta04</version> + <version>2.3.0-Beta05-SNAPSHOT</version> </parent> <artifactId>exo.core.component.script.groovy</artifactId> Modified: core/trunk/exo.core.component.security.core/pom.xml =================================================================== --- core/trunk/exo.core.component.security.core/pom.xml 2009-11-24 15:42:47 UTC (rev 837) +++ core/trunk/exo.core.component.security.core/pom.xml 2009-11-24 15:43:13 UTC (rev 838) @@ -25,7 +25,7 @@ <parent> <groupId>org.exoplatform.core</groupId> <artifactId>core-parent</artifactId> - <version>2.3.0-Beta04</version> + <version>2.3.0-Beta05-SNAPSHOT</version> </parent> <artifactId>exo.core.component.security.core</artifactId> Modified: core/trunk/exo.core.component.web.css/pom.xml =================================================================== --- core/trunk/exo.core.component.web.css/pom.xml 2009-11-24 15:42:47 UTC (rev 837) +++ core/trunk/exo.core.component.web.css/pom.xml 2009-11-24 15:43:13 UTC (rev 838) @@ -25,7 +25,7 @@ <parent> <groupId>org.exoplatform.core</groupId> <artifactId>core-parent</artifactId> - <version>2.3.0-Beta04</version> + <version>2.3.0-Beta05-SNAPSHOT</version> </parent> <artifactId>exo.core.component.web.css</artifactId> Modified: core/trunk/exo.core.component.xml-processing/pom.xml =================================================================== --- core/trunk/exo.core.component.xml-processing/pom.xml 2009-11-24 15:42:47 UTC (rev 837) +++ core/trunk/exo.core.component.xml-processing/pom.xml 2009-11-24 15:43:13 UTC (rev 838) @@ -25,7 +25,7 @@ <parent> <groupId>org.exoplatform.core</groupId> <artifactId>core-parent</artifactId> - <version>2.3.0-Beta04</version> + <version>2.3.0-Beta05-SNAPSHOT</version> </parent> <artifactId>exo.core.component.xml-processing</artifactId> Modified: core/trunk/packaging/module/pom.xml =================================================================== --- core/trunk/packaging/module/pom.xml 2009-11-24 15:42:47 UTC (rev 837) +++ core/trunk/packaging/module/pom.xml 2009-11-24 15:43:13 UTC (rev 838) @@ -2,7 +2,7 @@ <parent> <groupId>org.exoplatform.core</groupId> <artifactId>core-parent</artifactId> - <version>2.3.0-Beta04</version> + <version>2.3.0-Beta05-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -17,13 +17,13 @@  <dependencies> - <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.database</artifactId><version>2.3.0-Beta04</version></dependency> - <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.document</artifactId><version>2.3.0-Beta04</version></dependency> - <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.organization.api</artifactId><version>2.3.0-Beta04</version></dependency> - <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.organization.ldap</artifactId><version>2.3.0-Beta04</version></dependency> - <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.security.core</artifactId><version>2.3.0-Beta04</version></dependency> - <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.xml-processing</artifactId><version>2.3.0-Beta04</version></dependency> - <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.script.groovy</artifactId><version>2.3.0-Beta04</version></dependency> + <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.database</artifactId><version>2.3.0-Beta05-SNAPSHOT</version></dependency> + <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.document</artifactId><version>2.3.0-Beta05-SNAPSHOT</version></dependency> + <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.organization.api</artifactId><version>2.3.0-Beta05-SNAPSHOT</version></dependency> + <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.organization.ldap</artifactId><version>2.3.0-Beta05-SNAPSHOT</version></dependency> + <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.security.core</artifactId><version>2.3.0-Beta05-SNAPSHOT</version></dependency> + <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.xml-processing</artifactId><version>2.3.0-Beta05-SNAPSHOT</version></dependency> + <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.script.groovy</artifactId><version>2.3.0-Beta05-SNAPSHOT</version></dependency> </dependencies> <build> Modified: core/trunk/pom.xml =================================================================== --- core/trunk/pom.xml 2009-11-24 15:42:47 UTC (rev 837) +++ core/trunk/pom.xml 2009-11-24 15:43:13 UTC (rev 838) @@ -29,7 +29,7 @@ <groupId>org.exoplatform.core</groupId> <artifactId>core-parent</artifactId> - <version>2.3.0-Beta04</version> + <version>2.3.0-Beta05-SNAPSHOT</version> <packaging>pom</packaging> <name>eXo Core</name> @@ -43,9 +43,9 @@ </properties> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/exo-jcr/core/tags/2.3.0-Beta04</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/exo-jcr/core/tags/2.3.0-Beta04</developerConnection> - <url>http://fisheye.jboss.org/browse/exo-jcr/core/tags/2.3.0-Beta04</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/exo-jcr/core/trunk</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/exo-jcr/core/trunk</developerConnection> + <url>http://fisheye.jboss.org/browse/exo-jcr/core/trunk</url> </scm> <modules>

16 years, 5 months

1
0
0 / 0

exo-jcr SVN: r837 - core/tags.

by do-not-reply＠jboss.org

Author: pnedonosko Date: 2009-11-24 10:42:47 -0500 (Tue, 24 Nov 2009) New Revision: 837 Added: core/tags/2.3.0-Beta04/ Log: [maven-scm] copy for tag 2.3.0-Beta04 Copied: core/tags/2.3.0-Beta04 (from rev 836, core/trunk)

16 years, 5 months

1
0
0 / 0

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

by do-not-reply＠jboss.org

Author: pnedonosko Date: 2009-11-24 10:42:18 -0500 (Tue, 24 Nov 2009) New Revision: 836 Modified: core/trunk/exo.core.component.database/pom.xml core/trunk/exo.core.component.document/pom.xml core/trunk/exo.core.component.ldap/pom.xml core/trunk/exo.core.component.organization.api/pom.xml core/trunk/exo.core.component.organization.jdbc/pom.xml core/trunk/exo.core.component.organization.ldap/pom.xml core/trunk/exo.core.component.script.groovy/pom.xml core/trunk/exo.core.component.security.core/pom.xml core/trunk/exo.core.component.web.css/pom.xml core/trunk/exo.core.component.xml-processing/pom.xml core/trunk/packaging/module/pom.xml core/trunk/pom.xml Log: [maven-release-plugin] prepare release 2.3.0-Beta04 Modified: core/trunk/exo.core.component.database/pom.xml =================================================================== --- core/trunk/exo.core.component.database/pom.xml 2009-11-24 15:40:25 UTC (rev 835) +++ core/trunk/exo.core.component.database/pom.xml 2009-11-24 15:42:18 UTC (rev 836) @@ -1,116 +1,116 @@ - -<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.core</groupId> - <artifactId>core-parent</artifactId> - <version>2.3.0-Beta04-SNAPSHOT</version> - </parent> - - <artifactId>exo.core.component.database</artifactId> - - <name>eXo Core :: Component :: Database Service</name> - <description>exoplatform database 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.component.common</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>org.exoplatform.kernel</groupId> - <artifactId>exo.kernel.component.cache</artifactId> - </dependency> - <dependency> - <groupId>javax.resource</groupId> - <artifactId>connector-api</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>javax.transaction</groupId> - <artifactId>jta</artifactId> - </dependency> - <dependency> - <groupId>pull-parser</groupId> - <artifactId>pull-parser</artifactId> - </dependency> - <dependency> - <groupId>hsqldb</groupId> - <artifactId>hsqldb</artifactId> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>com.experlog</groupId> - <artifactId>xapool</artifactId> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-core</artifactId> - <exclusions> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-annotations</artifactId> - <exclusions> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </exclusion> - </exclusions> - </dependency> - </dependencies> - - <build> - <pluginManagement> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <excludes> - <exclude>**/DBCreatorTest.java</exclude> - </excludes> - </configuration> - </plugin> - </plugins> - </pluginManagement> - </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.core</groupId> + <artifactId>core-parent</artifactId> + <version>2.3.0-Beta04</version> + </parent> + + <artifactId>exo.core.component.database</artifactId> + + <name>eXo Core :: Component :: Database Service</name> + <description>exoplatform database 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.component.common</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>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.component.cache</artifactId> + </dependency> + <dependency> + <groupId>javax.resource</groupId> + <artifactId>connector-api</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>javax.transaction</groupId> + <artifactId>jta</artifactId> + </dependency> + <dependency> + <groupId>pull-parser</groupId> + <artifactId>pull-parser</artifactId> + </dependency> + <dependency> + <groupId>hsqldb</groupId> + <artifactId>hsqldb</artifactId> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>com.experlog</groupId> + <artifactId>xapool</artifactId> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-core</artifactId> + <exclusions> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-annotations</artifactId> + <exclusions> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </exclusion> + </exclusions> + </dependency> + </dependencies> + + <build> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <excludes> + <exclude>**/DBCreatorTest.java</exclude> + </excludes> + </configuration> + </plugin> + </plugins> + </pluginManagement> + </build> +</project> Modified: core/trunk/exo.core.component.document/pom.xml =================================================================== --- core/trunk/exo.core.component.document/pom.xml 2009-11-24 15:40:25 UTC (rev 835) +++ core/trunk/exo.core.component.document/pom.xml 2009-11-24 15:42:18 UTC (rev 836) @@ -1,108 +1,108 @@ - -<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.core</groupId> - <artifactId>core-parent</artifactId> - <version>2.3.0-Beta04-SNAPSHOT</version> - </parent> - - <artifactId>exo.core.component.document</artifactId> - - <name>eXo Core :: Component :: Demo Service</name> - <description>eXo demo service Impl</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>pdfbox</groupId> - <artifactId>pdfbox</artifactId> - </dependency> - <dependency> - <groupId>com.lowagie</groupId> - <artifactId>itext</artifactId> - </dependency> - <dependency> - <groupId>org.htmlparser</groupId> - <artifactId>htmlparser</artifactId> - </dependency> - <dependency> - <groupId>org.apache.poi</groupId> - <artifactId>poi</artifactId> - <exclusions> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.poi</groupId> - <artifactId>poi-scratchpad</artifactId> - <exclusions> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> - </exclusions> - </dependency> - </dependencies> - - <build> - <testResources> - <testResource> - <directory>src/test/resources</directory> - <includes> - <include>**/*.properties</include> - <include>**/*.xml</include> - <include>**/*.drl</include> - <include>**/*.vm</include> - <include>**/*.doc</include> - <include>**/*.dot</include> - <include>**/*.xls</include> - <include>**/*.ppt</include> - <include>**/*.txt</include> - <include>**/*.tiff</include> - <include>**/*.pdf</include> - <include>**/*.odt</include> - <include>**/*.html</include> - <include>**/*.msg</include> - <include>**/*.pst</include> - </includes> - </testResource> - </testResources> - </build> + +<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.core</groupId> + <artifactId>core-parent</artifactId> + <version>2.3.0-Beta04</version> + </parent> + + <artifactId>exo.core.component.document</artifactId> + + <name>eXo Core :: Component :: Demo Service</name> + <description>eXo demo service Impl</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>pdfbox</groupId> + <artifactId>pdfbox</artifactId> + </dependency> + <dependency> + <groupId>com.lowagie</groupId> + <artifactId>itext</artifactId> + </dependency> + <dependency> + <groupId>org.htmlparser</groupId> + <artifactId>htmlparser</artifactId> + </dependency> + <dependency> + <groupId>org.apache.poi</groupId> + <artifactId>poi</artifactId> + <exclusions> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.poi</groupId> + <artifactId>poi-scratchpad</artifactId> + <exclusions> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + </exclusions> + </dependency> + </dependencies> + + <build> + <testResources> + <testResource> + <directory>src/test/resources</directory> + <includes> + <include>**/*.properties</include> + <include>**/*.xml</include> + <include>**/*.drl</include> + <include>**/*.vm</include> + <include>**/*.doc</include> + <include>**/*.dot</include> + <include>**/*.xls</include> + <include>**/*.ppt</include> + <include>**/*.txt</include> + <include>**/*.tiff</include> + <include>**/*.pdf</include> + <include>**/*.odt</include> + <include>**/*.html</include> + <include>**/*.msg</include> + <include>**/*.pst</include> + </includes> + </testResource> + </testResources> + </build> </project> \ No newline at end of file Modified: core/trunk/exo.core.component.ldap/pom.xml =================================================================== --- core/trunk/exo.core.component.ldap/pom.xml 2009-11-24 15:40:25 UTC (rev 835) +++ core/trunk/exo.core.component.ldap/pom.xml 2009-11-24 15:42:18 UTC (rev 836) @@ -1,77 +1,77 @@ - -<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.core</groupId> - <artifactId>core-parent</artifactId> - <version>2.3.0-Beta04-SNAPSHOT</version> - </parent> - - <artifactId>exo.core.component.ldap</artifactId> - - <name>eXo Core :: Component :: LDAP Service</name> - <description>eXo LDAP impl</description> - - <dependencies> - <dependency> - <groupId>org.exoplatform.tool</groupId> - <artifactId>exo.tool.framework.junit</artifactId> - </dependency> - <dependency> - <groupId>org.exoplatform.kernel</groupId> - <artifactId>exo.kernel.component.common</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>com.novell.ldap</groupId> - <artifactId>jldap</artifactId> - <scope>test</scope> - </dependency> - </dependencies> - - <build> - <pluginManagement> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <excludes> - <exclude>**/TestLDAPService.java</exclude> - <exclude>**/TestNovellLDAPAPI.java</exclude> - <exclude>**/TestStandardLDAPAPI.java</exclude> - </excludes> - </configuration> - </plugin> - </plugins> - </pluginManagement> - </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.core</groupId> + <artifactId>core-parent</artifactId> + <version>2.3.0-Beta04</version> + </parent> + + <artifactId>exo.core.component.ldap</artifactId> + + <name>eXo Core :: Component :: LDAP Service</name> + <description>eXo LDAP impl</description> + + <dependencies> + <dependency> + <groupId>org.exoplatform.tool</groupId> + <artifactId>exo.tool.framework.junit</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.component.common</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>com.novell.ldap</groupId> + <artifactId>jldap</artifactId> + <scope>test</scope> + </dependency> + </dependencies> + + <build> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <excludes> + <exclude>**/TestLDAPService.java</exclude> + <exclude>**/TestNovellLDAPAPI.java</exclude> + <exclude>**/TestStandardLDAPAPI.java</exclude> + </excludes> + </configuration> + </plugin> + </plugins> + </pluginManagement> + </build> +</project> Modified: core/trunk/exo.core.component.organization.api/pom.xml =================================================================== --- core/trunk/exo.core.component.organization.api/pom.xml 2009-11-24 15:40:25 UTC (rev 835) +++ core/trunk/exo.core.component.organization.api/pom.xml 2009-11-24 15:42:18 UTC (rev 836) @@ -1,124 +1,124 @@ - -<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.core</groupId> - <artifactId>core-parent</artifactId> - <version>2.3.0-Beta04-SNAPSHOT</version> - </parent> - - <artifactId>exo.core.component.organization.api</artifactId> - - <name>eXo Core :: Component :: Organization Service API</name> - <description>eXo Organization Service API</description> - - <dependencies> - <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>org.exoplatform.kernel</groupId> - <artifactId>exo.kernel.component.cache</artifactId> - </dependency> - <dependency> - <groupId>org.exoplatform.core</groupId> - <artifactId>exo.core.component.security.core</artifactId> - </dependency> - <dependency> - <groupId>xdoclet</groupId> - <artifactId>xdoclet-hibernate-module</artifactId> - </dependency> - <dependency> - <groupId>xdoclet</groupId> - <artifactId>xdoclet-xdoclet-module</artifactId> - </dependency> - <dependency> - <groupId>xdoclet</groupId> - <artifactId>xjavadoc</artifactId> - </dependency> - <dependency> - <groupId>xstream</groupId> - <artifactId>xstream</artifactId> - </dependency> - <dependency> - <groupId>picocontainer</groupId> - <artifactId>picocontainer</artifactId> - </dependency> - </dependencies> - - <build> - <testResources> - <testResource> - <directory>src/test/java</directory> - <includes> - <include>**/*.properties</include> - <include>**/*.xml</include> - </includes> - </testResource> - <testResource> - <directory>src/test/resources</directory> - <includes> - <include>**/*.properties</include> - <include>**/*.xml</include> - <include>**/login.conf</include> - </includes> - </testResource> - </testResources> - - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <phase>compile</phase> - <configuration> - <tasks> - <taskdef name="hibernatedoclet" classname="xdoclet.modules.hibernate.HibernateDocletTask" classpathref="maven.dependency.classpath" /> - <hibernatedoclet destdir="${basedir}/target/classes" excludedtags="@version,@author,@todo" mergedir="target/classes" force="true" verbose="false"> - <fileset dir="${basedir}/src/main/java"> - <include name="org/exoplatform/services/organization/impl/UserImpl.java" /> - <include name="org/exoplatform/services/organization/impl/MembershipImpl.java" /> - <include name="org/exoplatform/services/organization/impl/GroupImpl.java" /> - <include name="org/exoplatform/services/organization/impl/MembershipTypeImpl.java" /> - <include name="org/exoplatform/services/organization/impl/UserProfileData.java" /> - </fileset> - <hibernate version="3.0" /> - </hibernatedoclet> - </tasks> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> + +<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.core</groupId> + <artifactId>core-parent</artifactId> + <version>2.3.0-Beta04</version> + </parent> + + <artifactId>exo.core.component.organization.api</artifactId> + + <name>eXo Core :: Component :: Organization Service API</name> + <description>eXo Organization Service API</description> + + <dependencies> + <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>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.component.cache</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.core</groupId> + <artifactId>exo.core.component.security.core</artifactId> + </dependency> + <dependency> + <groupId>xdoclet</groupId> + <artifactId>xdoclet-hibernate-module</artifactId> + </dependency> + <dependency> + <groupId>xdoclet</groupId> + <artifactId>xdoclet-xdoclet-module</artifactId> + </dependency> + <dependency> + <groupId>xdoclet</groupId> + <artifactId>xjavadoc</artifactId> + </dependency> + <dependency> + <groupId>xstream</groupId> + <artifactId>xstream</artifactId> + </dependency> + <dependency> + <groupId>picocontainer</groupId> + <artifactId>picocontainer</artifactId> + </dependency> + </dependencies> + + <build> + <testResources> + <testResource> + <directory>src/test/java</directory> + <includes> + <include>**/*.properties</include> + <include>**/*.xml</include> + </includes> + </testResource> + <testResource> + <directory>src/test/resources</directory> + <includes> + <include>**/*.properties</include> + <include>**/*.xml</include> + <include>**/login.conf</include> + </includes> + </testResource> + </testResources> + + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <phase>compile</phase> + <configuration> + <tasks> + <taskdef name="hibernatedoclet" classname="xdoclet.modules.hibernate.HibernateDocletTask" classpathref="maven.dependency.classpath" /> + <hibernatedoclet destdir="${basedir}/target/classes" excludedtags="@version,@author,@todo" mergedir="target/classes" force="true" verbose="false"> + <fileset dir="${basedir}/src/main/java"> + <include name="org/exoplatform/services/organization/impl/UserImpl.java" /> + <include name="org/exoplatform/services/organization/impl/MembershipImpl.java" /> + <include name="org/exoplatform/services/organization/impl/GroupImpl.java" /> + <include name="org/exoplatform/services/organization/impl/MembershipTypeImpl.java" /> + <include name="org/exoplatform/services/organization/impl/UserProfileData.java" /> + </fileset> + <hibernate version="3.0" /> + </hibernatedoclet> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> </project> \ No newline at end of file Modified: core/trunk/exo.core.component.organization.jdbc/pom.xml =================================================================== --- core/trunk/exo.core.component.organization.jdbc/pom.xml 2009-11-24 15:40:25 UTC (rev 835) +++ core/trunk/exo.core.component.organization.jdbc/pom.xml 2009-11-24 15:42:18 UTC (rev 836) @@ -1,113 +1,113 @@ - -<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.core</groupId> - <artifactId>core-parent</artifactId> - <version>2.3.0-Beta04-SNAPSHOT</version> - </parent> - - <artifactId>exo.core.component.organization.jdbc</artifactId> - - <name>eXo Core :: Component :: Organization Service JDBC</name> - <description>eXo Organization Service JDBC</description> - - <dependencies> - <dependency> - <groupId>org.exoplatform.tool</groupId> - <artifactId>exo.tool.framework.junit</artifactId> - </dependency> - <dependency> - <groupId>org.exoplatform.kernel</groupId> - <artifactId>exo.kernel.component.common</artifactId> - </dependency> - <dependency> - <groupId>org.exoplatform.kernel</groupId> - <artifactId>exo.kernel.component.cache</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>xstream</groupId> - <artifactId>xstream</artifactId> - </dependency> - <dependency> - <groupId>picocontainer</groupId> - <artifactId>picocontainer</artifactId> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-core</artifactId> - </dependency> - <dependency> - <groupId>org.exoplatform.core</groupId> - <artifactId>exo.core.component.database</artifactId> - </dependency> - <dependency> - <groupId>org.exoplatform.core</groupId> - <artifactId>exo.core.component.organization.api</artifactId> - </dependency> - <dependency> - <groupId>javax.resource</groupId> - <artifactId>connector-api</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>com.microsoft</groupId> - <artifactId>sqljdbc</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>com.ibm.db2</groupId> - <artifactId>db2jcc</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>com.ibm.db2</groupId> - <artifactId>db2jcc_license_cu</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>oracle</groupId> - <artifactId>ojdbc</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>postgresql</groupId> - <artifactId>postgresql</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>mysql</groupId> - <artifactId>mysql-connector-java</artifactId> - <scope>test</scope> - </dependency> - </dependencies> + +<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.core</groupId> + <artifactId>core-parent</artifactId> + <version>2.3.0-Beta04</version> + </parent> + + <artifactId>exo.core.component.organization.jdbc</artifactId> + + <name>eXo Core :: Component :: Organization Service JDBC</name> + <description>eXo Organization Service JDBC</description> + + <dependencies> + <dependency> + <groupId>org.exoplatform.tool</groupId> + <artifactId>exo.tool.framework.junit</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.component.common</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.component.cache</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>xstream</groupId> + <artifactId>xstream</artifactId> + </dependency> + <dependency> + <groupId>picocontainer</groupId> + <artifactId>picocontainer</artifactId> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-core</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.core</groupId> + <artifactId>exo.core.component.database</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.core</groupId> + <artifactId>exo.core.component.organization.api</artifactId> + </dependency> + <dependency> + <groupId>javax.resource</groupId> + <artifactId>connector-api</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>com.microsoft</groupId> + <artifactId>sqljdbc</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>com.ibm.db2</groupId> + <artifactId>db2jcc</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>com.ibm.db2</groupId> + <artifactId>db2jcc_license_cu</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>oracle</groupId> + <artifactId>ojdbc</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>postgresql</groupId> + <artifactId>postgresql</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>mysql</groupId> + <artifactId>mysql-connector-java</artifactId> + <scope>test</scope> + </dependency> + </dependencies> </project> \ No newline at end of file Modified: core/trunk/exo.core.component.organization.ldap/pom.xml =================================================================== --- core/trunk/exo.core.component.organization.ldap/pom.xml 2009-11-24 15:40:25 UTC (rev 835) +++ core/trunk/exo.core.component.organization.ldap/pom.xml 2009-11-24 15:42:18 UTC (rev 836) @@ -1,83 +1,83 @@ - -<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.core</groupId> - <artifactId>core-parent</artifactId> - <version>2.3.0-Beta04-SNAPSHOT</version> - </parent> - - <artifactId>exo.core.component.organization.ldap</artifactId> - - <name>eXo Core :: Component :: Organization Service LDAP</name> - <description>eXo Organization Service LDAP</description> - - <dependencies> - <dependency> - <groupId>org.exoplatform.kernel</groupId> - <artifactId>exo.kernel.component.cache</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>org.exoplatform.core</groupId> - <artifactId>exo.core.component.ldap</artifactId> - </dependency> - <dependency> - <groupId>org.exoplatform.core</groupId> - <artifactId>exo.core.component.database</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.exoplatform.core</groupId> - <artifactId>exo.core.component.organization.api</artifactId> - </dependency> - <dependency> - <groupId>org.exoplatform.core</groupId> - <artifactId>exo.core.component.organization.jdbc</artifactId> - </dependency> - </dependencies> - - <build> - <pluginManagement> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <excludes> - <exclude>**/TestOrganizationService.java</exclude> - </excludes> - </configuration> - </plugin> - </plugins> - </pluginManagement> - </build> + +<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.core</groupId> + <artifactId>core-parent</artifactId> + <version>2.3.0-Beta04</version> + </parent> + + <artifactId>exo.core.component.organization.ldap</artifactId> + + <name>eXo Core :: Component :: Organization Service LDAP</name> + <description>eXo Organization Service LDAP</description> + + <dependencies> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.component.cache</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>org.exoplatform.core</groupId> + <artifactId>exo.core.component.ldap</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.core</groupId> + <artifactId>exo.core.component.database</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.exoplatform.core</groupId> + <artifactId>exo.core.component.organization.api</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.core</groupId> + <artifactId>exo.core.component.organization.jdbc</artifactId> + </dependency> + </dependencies> + + <build> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <excludes> + <exclude>**/TestOrganizationService.java</exclude> + </excludes> + </configuration> + </plugin> + </plugins> + </pluginManagement> + </build> </project> \ No newline at end of file Modified: core/trunk/exo.core.component.script.groovy/pom.xml =================================================================== --- core/trunk/exo.core.component.script.groovy/pom.xml 2009-11-24 15:40:25 UTC (rev 835) +++ core/trunk/exo.core.component.script.groovy/pom.xml 2009-11-24 15:42:18 UTC (rev 836) @@ -1,50 +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.core</groupId> - <artifactId>core-parent</artifactId> - <version>2.3.0-Beta04-SNAPSHOT</version> - </parent> - - <artifactId>exo.core.component.script.groovy</artifactId> - - <name>eXo Core :: Component :: Groovy Scripts Instantiator</name> - <description>Load and compile Groovy script</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>org.codehaus.groovy</groupId> - <artifactId>groovy-all</artifactId> - </dependency> - </dependencies> + +<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.core</groupId> + <artifactId>core-parent</artifactId> + <version>2.3.0-Beta04</version> + </parent> + + <artifactId>exo.core.component.script.groovy</artifactId> + + <name>eXo Core :: Component :: Groovy Scripts Instantiator</name> + <description>Load and compile Groovy script</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>org.codehaus.groovy</groupId> + <artifactId>groovy-all</artifactId> + </dependency> + </dependencies> </project> \ No newline at end of file Modified: core/trunk/exo.core.component.security.core/pom.xml =================================================================== --- core/trunk/exo.core.component.security.core/pom.xml 2009-11-24 15:40:25 UTC (rev 835) +++ core/trunk/exo.core.component.security.core/pom.xml 2009-11-24 15:42:18 UTC (rev 836) @@ -1,78 +1,78 @@ - -<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.core</groupId> - <artifactId>core-parent</artifactId> - <version>2.3.0-Beta04-SNAPSHOT</version> - </parent> - - <artifactId>exo.core.component.security.core</artifactId> - - <name>eXo Core :: Component :: Security Service</name> - <description>eXo Security</description> - - <dependencies> - <dependency> - <groupId>org.exoplatform.kernel</groupId> - <artifactId>exo.kernel.component.common</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>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - </dependency> - <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - </dependency> - </dependencies> - - <build> - <testResources> - <testResource> - <directory>src/test/java</directory> - <includes> - <include>**/*.properties</include> - <include>**/*.xml</include> - </includes> - </testResource> - <testResource> - <directory>src/test/resources</directory> - <includes> - <include>**/*.properties</include> - <include>**/*.xml</include> - <include>**/login.conf</include> - </includes> - </testResource> - </testResources> - </build> + +<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.core</groupId> + <artifactId>core-parent</artifactId> + <version>2.3.0-Beta04</version> + </parent> + + <artifactId>exo.core.component.security.core</artifactId> + + <name>eXo Core :: Component :: Security Service</name> + <description>eXo Security</description> + + <dependencies> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.component.common</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>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + </dependency> + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + </dependency> + </dependencies> + + <build> + <testResources> + <testResource> + <directory>src/test/java</directory> + <includes> + <include>**/*.properties</include> + <include>**/*.xml</include> + </includes> + </testResource> + <testResource> + <directory>src/test/resources</directory> + <includes> + <include>**/*.properties</include> + <include>**/*.xml</include> + <include>**/login.conf</include> + </includes> + </testResource> + </testResources> + </build> </project> \ No newline at end of file Modified: core/trunk/exo.core.component.web.css/pom.xml =================================================================== --- core/trunk/exo.core.component.web.css/pom.xml 2009-11-24 15:40:25 UTC (rev 835) +++ core/trunk/exo.core.component.web.css/pom.xml 2009-11-24 15:42:18 UTC (rev 836) @@ -1,50 +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.core</groupId> - <artifactId>core-parent</artifactId> - <version>2.3.0-Beta04-SNAPSHOT</version> - </parent> - - <artifactId>exo.core.component.web.css</artifactId> - - <name>eXo Core :: Component :: Web CSS</name> - <description>Stylesheet engine</description> - - <dependencies> - <dependency> - <groupId>org.w3c</groupId> - <artifactId>sac</artifactId> - </dependency> - <dependency> - <groupId>batik</groupId> - <artifactId>batik-util</artifactId> - </dependency> - <dependency> - <groupId>batik</groupId> - <artifactId>batik-css</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.core</groupId> + <artifactId>core-parent</artifactId> + <version>2.3.0-Beta04</version> + </parent> + + <artifactId>exo.core.component.web.css</artifactId> + + <name>eXo Core :: Component :: Web CSS</name> + <description>Stylesheet engine</description> + + <dependencies> + <dependency> + <groupId>org.w3c</groupId> + <artifactId>sac</artifactId> + </dependency> + <dependency> + <groupId>batik</groupId> + <artifactId>batik-util</artifactId> + </dependency> + <dependency> + <groupId>batik</groupId> + <artifactId>batik-css</artifactId> + </dependency> + </dependencies> +</project> Modified: core/trunk/exo.core.component.xml-processing/pom.xml =================================================================== --- core/trunk/exo.core.component.xml-processing/pom.xml 2009-11-24 15:40:25 UTC (rev 835) +++ core/trunk/exo.core.component.xml-processing/pom.xml 2009-11-24 15:42:18 UTC (rev 836) @@ -1,105 +1,105 @@ - -<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.core</groupId> - <artifactId>core-parent</artifactId> - <version>2.3.0-Beta04-SNAPSHOT</version> - </parent> - - <artifactId>exo.core.component.xml-processing</artifactId> - - <name>eXo Core :: Component :: XML Processing Service</name> - <description>eXo XML Processing Services</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>jtidy</groupId> - <artifactId>jtidy</artifactId> - </dependency> - <dependency> - <groupId>picocontainer</groupId> - <artifactId>picocontainer</artifactId> - </dependency> - </dependencies> - - <build> - <resources> - <resource> - <directory>src/main/java</directory> - <includes> - <include>**/*.properties</include> - <include>**/*.xml</include> - <include>**/*.xsl</include> - <include>**/*.ent</include> - <include>**/*.dtd</include> - <include>**/*.xsd</include> - </includes> - </resource> - <resource> - <directory>src/main/resources</directory> - <includes> - <include>**/*.properties</include> - <include>**/*.xml</include> - <include>**/*.xsl</include> - <include>**/*.ent</include> - <include>**/*.dtd</include> - <include>**/*.xsd</include> - </includes> - </resource> - - </resources> - - <testResources> - <testResource> - <directory>src/test/resources</directory> - <includes> - <include>**/*.properties</include> - <include>**/*.xml</include> - <include>**/*.xhtml</include> - <include>**/*.html</include> - <include>**/*.xsl</include> - </includes> - </testResource> - <testResource> - <directory>src/test/java</directory> - <includes> - <include>**/*.properties</include> - <include>**/*.xml</include> - <include>**/*.xhtml</include> - <include>**/*.html</include> - <include>**/*.xsl</include> - </includes> - </testResource> - </testResources> - </build> + +<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.core</groupId> + <artifactId>core-parent</artifactId> + <version>2.3.0-Beta04</version> + </parent> + + <artifactId>exo.core.component.xml-processing</artifactId> + + <name>eXo Core :: Component :: XML Processing Service</name> + <description>eXo XML Processing Services</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>jtidy</groupId> + <artifactId>jtidy</artifactId> + </dependency> + <dependency> + <groupId>picocontainer</groupId> + <artifactId>picocontainer</artifactId> + </dependency> + </dependencies> + + <build> + <resources> + <resource> + <directory>src/main/java</directory> + <includes> + <include>**/*.properties</include> + <include>**/*.xml</include> + <include>**/*.xsl</include> + <include>**/*.ent</include> + <include>**/*.dtd</include> + <include>**/*.xsd</include> + </includes> + </resource> + <resource> + <directory>src/main/resources</directory> + <includes> + <include>**/*.properties</include> + <include>**/*.xml</include> + <include>**/*.xsl</include> + <include>**/*.ent</include> + <include>**/*.dtd</include> + <include>**/*.xsd</include> + </includes> + </resource> + + </resources> + + <testResources> + <testResource> + <directory>src/test/resources</directory> + <includes> + <include>**/*.properties</include> + <include>**/*.xml</include> + <include>**/*.xhtml</include> + <include>**/*.html</include> + <include>**/*.xsl</include> + </includes> + </testResource> + <testResource> + <directory>src/test/java</directory> + <includes> + <include>**/*.properties</include> + <include>**/*.xml</include> + <include>**/*.xhtml</include> + <include>**/*.html</include> + <include>**/*.xsl</include> + </includes> + </testResource> + </testResources> + </build> </project> \ No newline at end of file Modified: core/trunk/packaging/module/pom.xml =================================================================== --- core/trunk/packaging/module/pom.xml 2009-11-24 15:40:25 UTC (rev 835) +++ core/trunk/packaging/module/pom.xml 2009-11-24 15:42:18 UTC (rev 836) @@ -1,77 +1,77 @@ -<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"> - <parent> - <groupId>org.exoplatform.core</groupId> - <artifactId>core-parent</artifactId> - <version>2.3.0-Beta04-SNAPSHOT</version> - </parent> - - <modelVersion>4.0.0</modelVersion> - <artifactId>core.packaging.module</artifactId> - <packaging>pom</packaging> - <name>eXo Core Build module</name> - - <properties> - <exobuild.name>core</exobuild.name> - <exobuild.type>module</exobuild.type> - </properties> - -  - <dependencies> - <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.database</artifactId><version>2.3.0-Beta04-SNAPSHOT</version></dependency> - <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.document</artifactId><version>2.3.0-Beta04-SNAPSHOT</version></dependency> - <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.organization.api</artifactId><version>2.3.0-Beta04-SNAPSHOT</version></dependency> - <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.organization.ldap</artifactId><version>2.3.0-Beta04-SNAPSHOT</version></dependency> - <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.security.core</artifactId><version>2.3.0-Beta04-SNAPSHOT</version></dependency> - <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.xml-processing</artifactId><version>2.3.0-Beta04-SNAPSHOT</version></dependency> - <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.script.groovy</artifactId><version>2.3.0-Beta04-SNAPSHOT</version></dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-resources-plugin</artifactId> - <executions> - <execution> - <id>prepare</id> - <phase>package</phase> - <goals> - <goal>copy-resources</goal> - </goals> - <configuration> - <outputDirectory>target</outputDirectory> - <resources> - <resource> - <directory>src/main/javascript</directory> - <filtering>true</filtering> - </resource> - </resources> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <version>1.3</version> - <executions> - <execution> - <id>attach-artifacts</id> - <phase>package</phase> - <goals> - <goal>attach-artifact</goal> - </goals> - <configuration> - <artifacts> - <artifact> - <file>target/${exobuild.name}.packaging.${exobuild.type}.js</file> - <type>js</type> - </artifact> - </artifacts> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> +<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"> + <parent> + <groupId>org.exoplatform.core</groupId> + <artifactId>core-parent</artifactId> + <version>2.3.0-Beta04</version> + </parent> + + <modelVersion>4.0.0</modelVersion> + <artifactId>core.packaging.module</artifactId> + <packaging>pom</packaging> + <name>eXo Core Build module</name> + + <properties> + <exobuild.name>core</exobuild.name> + <exobuild.type>module</exobuild.type> + </properties> + +  + <dependencies> + <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.database</artifactId><version>2.3.0-Beta04</version></dependency> + <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.document</artifactId><version>2.3.0-Beta04</version></dependency> + <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.organization.api</artifactId><version>2.3.0-Beta04</version></dependency> + <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.organization.ldap</artifactId><version>2.3.0-Beta04</version></dependency> + <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.security.core</artifactId><version>2.3.0-Beta04</version></dependency> + <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.xml-processing</artifactId><version>2.3.0-Beta04</version></dependency> + <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.script.groovy</artifactId><version>2.3.0-Beta04</version></dependency> + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-resources-plugin</artifactId> + <executions> + <execution> + <id>prepare</id> + <phase>package</phase> + <goals> + <goal>copy-resources</goal> + </goals> + <configuration> + <outputDirectory>target</outputDirectory> + <resources> + <resource> + <directory>src/main/javascript</directory> + <filtering>true</filtering> + </resource> + </resources> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + <version>1.3</version> + <executions> + <execution> + <id>attach-artifacts</id> + <phase>package</phase> + <goals> + <goal>attach-artifact</goal> + </goals> + <configuration> + <artifacts> + <artifact> + <file>target/${exobuild.name}.packaging.${exobuild.type}.js</file> + <type>js</type> + </artifact> + </artifacts> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> </project> \ No newline at end of file Modified: core/trunk/pom.xml =================================================================== --- core/trunk/pom.xml 2009-11-24 15:40:25 UTC (rev 835) +++ core/trunk/pom.xml 2009-11-24 15:42:18 UTC (rev 836) @@ -1,358 +1,358 @@ - -<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.core</groupId> - <artifactId>core-parent</artifactId> - <version>2.3.0-Beta04-SNAPSHOT</version> - <packaging>pom</packaging> - - <name>eXo Core</name> - - <properties> - <exo.product.name>exo-core</exo.product.name> - <exo.product.specification>2.3</exo.product.specification> - - <org.exoplatform.kernel.version>2.2.0-Beta04</org.exoplatform.kernel.version> - <exo.test.includes>*Test*</exo.test.includes> - </properties> - - <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/exo-jcr/core/trunk</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/exo-jcr/core/trunk</developerConnection> - <url>http://fisheye.jboss.org/browse/exo-jcr/core/trunk</url> - </scm> - - <modules> - <module>exo.core.component.security.core</module> - <module>exo.core.component.database</module> - <module>exo.core.component.document</module> - <module>exo.core.component.ldap</module> - <module>exo.core.component.organization.api</module> - <module>exo.core.component.organization.jdbc</module> - <module>exo.core.component.organization.ldap</module> - <module>exo.core.component.xml-processing</module> - <module>exo.core.component.script.groovy</module> - <module>exo.core.component.web.css</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.commons</artifactId> - <version>${org.exoplatform.kernel.version}</version> - </dependency> - - <dependency> - <groupId>org.exoplatform.kernel</groupId> - <artifactId>exo.kernel.component.common</artifactId> - <version>${org.exoplatform.kernel.version}</version> - </dependency> - - <dependency> - <groupId>org.exoplatform.kernel</groupId> - <artifactId>exo.kernel.container</artifactId> - <version>${org.exoplatform.kernel.version}</version> - </dependency> - - <dependency> - <groupId>org.exoplatform.kernel</groupId> - <artifactId>exo.kernel.component.cache</artifactId> - <version>${org.exoplatform.kernel.version}</version> - </dependency> - - <dependency> - <groupId>org.exoplatform.core</groupId> - <artifactId>exo.core.component.database</artifactId> - <version>${project.version}</version> - </dependency> - - <dependency> - <groupId>org.exoplatform.core</groupId> - <artifactId>exo.core.component.ldap</artifactId> - <version>${project.version}</version> - </dependency> - - <dependency> - <groupId>org.exoplatform.core</groupId> - <artifactId>exo.core.component.organization.api</artifactId> - <version>${project.version}</version> - </dependency> - - <dependency> - <groupId>org.exoplatform.core</groupId> - <artifactId>exo.core.component.organization.jdbc</artifactId> - <version>${project.version}</version> - </dependency> - - <dependency> - <groupId>org.exoplatform.core</groupId> - <artifactId>exo.core.component.security.core</artifactId> - <version>${project.version}</version> - </dependency> - - <dependency> - <groupId>javax.resource</groupId> - <artifactId>connector-api</artifactId> - <version>1.5</version> - </dependency> - - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>2.4</version> - </dependency> - - <dependency> - <groupId>javax.transaction</groupId> - <artifactId>jta</artifactId> - <version>1.0.1B</version> - </dependency> - - <dependency> - <groupId>pull-parser</groupId> - <artifactId>pull-parser</artifactId> - <version>2</version> - </dependency> - - <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - <version>2.3</version> - </dependency> - - <dependency> - <groupId>hsqldb</groupId> - <artifactId>hsqldb</artifactId> - <version>1.8.0.7</version> - </dependency> - - <dependency> - <groupId>com.experlog</groupId> - <artifactId>xapool</artifactId> - <version>1.5.0</version> - </dependency> - - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-core</artifactId> - <version>3.3.2.GA</version> - </dependency> - - <dependency> - <groupId>xstream</groupId> - <artifactId>xstream</artifactId> - <version>1.0.2</version> - </dependency> - - <dependency> - <groupId>picocontainer</groupId> - <artifactId>picocontainer</artifactId> - <version>1.1</version> - </dependency> - - <dependency> - <groupId>xdoclet</groupId> - <artifactId>xdoclet-hibernate-module</artifactId> - <version>1.2.3</version> - </dependency> - - <dependency> - <groupId>xdoclet</groupId> - <artifactId>xdoclet-xdoclet-module</artifactId> - <version>1.2</version> - </dependency> - - <dependency> - <groupId>xdoclet</groupId> - <artifactId>xjavadoc</artifactId> - <version>1.0.3</version> - </dependency> - - <dependency> - <groupId>com.microsoft</groupId> - <artifactId>sqljdbc</artifactId> - <version>1.1.1501</version> - </dependency> - - <dependency> - <groupId>com.ibm.db2</groupId> - <artifactId>db2jcc</artifactId> - <version>9.1</version> - </dependency> - - <dependency> - <groupId>com.ibm.db2</groupId> - <artifactId>db2jcc_license_cu</artifactId> - <version>9.1</version> - </dependency> - - <dependency> - <groupId>oracle</groupId> - <artifactId>ojdbc</artifactId> - <version>1.4</version> - </dependency> - - <dependency> - <groupId>postgresql</groupId> - <artifactId>postgresql</artifactId> - <version>8.3-603.jdbc3</version> - </dependency> - - <dependency> - <groupId>mysql</groupId> - <artifactId>mysql-connector-java</artifactId> - <version>5.0.8</version> - </dependency> - - <dependency> - <groupId>org.codehaus.groovy</groupId> - <artifactId>groovy-all</artifactId> - <version>1.6.5</version> - </dependency> - - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-annotations</artifactId> - <version>3.4.0.GA</version> - </dependency> - - <dependency> - <groupId>pdfbox</groupId> - <artifactId>pdfbox</artifactId> - <version>0.7.3</version> - </dependency> - - <dependency> - <groupId>com.lowagie</groupId> - <artifactId>itext</artifactId> - <version>2.1.0</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>org.htmlparser</groupId> - <artifactId>htmlparser</artifactId> - <version>1.6</version> - <scope>compile</scope> - <exclusions> - <exclusion> - <groupId>com.sun</groupId> - <artifactId>tools</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>org.apache.poi</groupId> - <artifactId>poi</artifactId> - <version>3.0.2-FINAL</version> - </dependency> - - <dependency> - <groupId>org.apache.poi</groupId> - <artifactId>poi-scratchpad</artifactId> - <version>3.0.2-FINAL</version> - </dependency> - - <dependency> - <groupId>com.novell.ldap</groupId> - <artifactId>jldap</artifactId> - <version>4.3</version> - </dependency> - - <dependency> - <groupId>jtidy</groupId> - <artifactId>jtidy</artifactId> - <version>4aug2000r7-dev</version> - </dependency> - - <dependency> - <groupId>org.w3c</groupId> - <artifactId>sac</artifactId> - <version>1.3</version> - </dependency> - - <dependency> - <groupId>batik</groupId> - <artifactId>batik-util</artifactId> - <version>1.7</version> - </dependency> - - <dependency> - <groupId>batik</groupId> - <artifactId>batik-css</artifactId> - <version>1.7</version> - </dependency> - - </dependencies> - </dependencyManagement> - - <dependencies> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> - </dependencies> - - <build> - <plugins> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <forkMode>always</forkMode> - <excludes> - <exclude>**/*$*</exclude> - <exclude>**/DBCreatorTest.java</exclude> - <exclude>**/TestLDAPService.java</exclude> - <exclude>**/TestNovellLDAPAPI.java</exclude> - <exclude>**/TestStandardLDAPAPI.java</exclude> -  - <exclude>**/TestOrganizationService.java</exclude> - - <exclude>**/TestPipe.java</exclude> - <exclude>**/TestTidy.java</exclude> - </excludes> - </configuration> - </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</groupId> + <artifactId>foundation-parent</artifactId> + <version>3</version> + </parent> + + <groupId>org.exoplatform.core</groupId> + <artifactId>core-parent</artifactId> + <version>2.3.0-Beta04</version> + <packaging>pom</packaging> + + <name>eXo Core</name> + + <properties> + <exo.product.name>exo-core</exo.product.name> + <exo.product.specification>2.3</exo.product.specification> + + <org.exoplatform.kernel.version>2.2.0-Beta04</org.exoplatform.kernel.version> + <exo.test.includes>*Test*</exo.test.includes> + </properties> + + <scm> + <connection>scm:svn:http://anonsvn.jboss.org/repos/exo-jcr/core/tags/2.3.0-Beta04</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/exo-jcr/core/tags/2.3.0-Beta04</developerConnection> + <url>http://fisheye.jboss.org/browse/exo-jcr/core/tags/2.3.0-Beta04</url> + </scm> + + <modules> + <module>exo.core.component.security.core</module> + <module>exo.core.component.database</module> + <module>exo.core.component.document</module> + <module>exo.core.component.ldap</module> + <module>exo.core.component.organization.api</module> + <module>exo.core.component.organization.jdbc</module> + <module>exo.core.component.organization.ldap</module> + <module>exo.core.component.xml-processing</module> + <module>exo.core.component.script.groovy</module> + <module>exo.core.component.web.css</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.commons</artifactId> + <version>${org.exoplatform.kernel.version}</version> + </dependency> + + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.component.common</artifactId> + <version>${org.exoplatform.kernel.version}</version> + </dependency> + + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.container</artifactId> + <version>${org.exoplatform.kernel.version}</version> + </dependency> + + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.component.cache</artifactId> + <version>${org.exoplatform.kernel.version}</version> + </dependency> + + <dependency> + <groupId>org.exoplatform.core</groupId> + <artifactId>exo.core.component.database</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>org.exoplatform.core</groupId> + <artifactId>exo.core.component.ldap</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>org.exoplatform.core</groupId> + <artifactId>exo.core.component.organization.api</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>org.exoplatform.core</groupId> + <artifactId>exo.core.component.organization.jdbc</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>org.exoplatform.core</groupId> + <artifactId>exo.core.component.security.core</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>javax.resource</groupId> + <artifactId>connector-api</artifactId> + <version>1.5</version> + </dependency> + + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>2.4</version> + </dependency> + + <dependency> + <groupId>javax.transaction</groupId> + <artifactId>jta</artifactId> + <version>1.0.1B</version> + </dependency> + + <dependency> + <groupId>pull-parser</groupId> + <artifactId>pull-parser</artifactId> + <version>2</version> + </dependency> + + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + <version>2.3</version> + </dependency> + + <dependency> + <groupId>hsqldb</groupId> + <artifactId>hsqldb</artifactId> + <version>1.8.0.7</version> + </dependency> + + <dependency> + <groupId>com.experlog</groupId> + <artifactId>xapool</artifactId> + <version>1.5.0</version> + </dependency> + + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-core</artifactId> + <version>3.3.2.GA</version> + </dependency> + + <dependency> + <groupId>xstream</groupId> + <artifactId>xstream</artifactId> + <version>1.0.2</version> + </dependency> + + <dependency> + <groupId>picocontainer</groupId> + <artifactId>picocontainer</artifactId> + <version>1.1</version> + </dependency> + + <dependency> + <groupId>xdoclet</groupId> + <artifactId>xdoclet-hibernate-module</artifactId> + <version>1.2.3</version> + </dependency> + + <dependency> + <groupId>xdoclet</groupId> + <artifactId>xdoclet-xdoclet-module</artifactId> + <version>1.2</version> + </dependency> + + <dependency> + <groupId>xdoclet</groupId> + <artifactId>xjavadoc</artifactId> + <version>1.0.3</version> + </dependency> + + <dependency> + <groupId>com.microsoft</groupId> + <artifactId>sqljdbc</artifactId> + <version>1.1.1501</version> + </dependency> + + <dependency> + <groupId>com.ibm.db2</groupId> + <artifactId>db2jcc</artifactId> + <version>9.1</version> + </dependency> + + <dependency> + <groupId>com.ibm.db2</groupId> + <artifactId>db2jcc_license_cu</artifactId> + <version>9.1</version> + </dependency> + + <dependency> + <groupId>oracle</groupId> + <artifactId>ojdbc</artifactId> + <version>1.4</version> + </dependency> + + <dependency> + <groupId>postgresql</groupId> + <artifactId>postgresql</artifactId> + <version>8.3-603.jdbc3</version> + </dependency> + + <dependency> + <groupId>mysql</groupId> + <artifactId>mysql-connector-java</artifactId> + <version>5.0.8</version> + </dependency> + + <dependency> + <groupId>org.codehaus.groovy</groupId> + <artifactId>groovy-all</artifactId> + <version>1.6.5</version> + </dependency> + + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-annotations</artifactId> + <version>3.4.0.GA</version> + </dependency> + + <dependency> + <groupId>pdfbox</groupId> + <artifactId>pdfbox</artifactId> + <version>0.7.3</version> + </dependency> + + <dependency> + <groupId>com.lowagie</groupId> + <artifactId>itext</artifactId> + <version>2.1.0</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>org.htmlparser</groupId> + <artifactId>htmlparser</artifactId> + <version>1.6</version> + <scope>compile</scope> + <exclusions> + <exclusion> + <groupId>com.sun</groupId> + <artifactId>tools</artifactId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>org.apache.poi</groupId> + <artifactId>poi</artifactId> + <version>3.0.2-FINAL</version> + </dependency> + + <dependency> + <groupId>org.apache.poi</groupId> + <artifactId>poi-scratchpad</artifactId> + <version>3.0.2-FINAL</version> + </dependency> + + <dependency> + <groupId>com.novell.ldap</groupId> + <artifactId>jldap</artifactId> + <version>4.3</version> + </dependency> + + <dependency> + <groupId>jtidy</groupId> + <artifactId>jtidy</artifactId> + <version>4aug2000r7-dev</version> + </dependency> + + <dependency> + <groupId>org.w3c</groupId> + <artifactId>sac</artifactId> + <version>1.3</version> + </dependency> + + <dependency> + <groupId>batik</groupId> + <artifactId>batik-util</artifactId> + <version>1.7</version> + </dependency> + + <dependency> + <groupId>batik</groupId> + <artifactId>batik-css</artifactId> + <version>1.7</version> + </dependency> + + </dependencies> + </dependencyManagement> + + <dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + </dependencies> + + <build> + <plugins> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <forkMode>always</forkMode> + <excludes> + <exclude>**/*$*</exclude> + <exclude>**/DBCreatorTest.java</exclude> + <exclude>**/TestLDAPService.java</exclude> + <exclude>**/TestNovellLDAPAPI.java</exclude> + <exclude>**/TestStandardLDAPAPI.java</exclude> +  + <exclude>**/TestOrganizationService.java</exclude> + + <exclude>**/TestPipe.java</exclude> + <exclude>**/TestTidy.java</exclude> + </excludes> + </configuration> + </plugin> + </plugins> + + </build> +</project>

16 years, 5 months

1
0
0 / 0

exo-jcr SVN: r835 - core/trunk.

by do-not-reply＠jboss.org

Author: pnedonosko Date: 2009-11-24 10:40:25 -0500 (Tue, 24 Nov 2009) New Revision: 835 Modified: core/trunk/pom.xml Log: EXOJCR-260: dependency on kernel-2.2.0-Beta04 Modified: core/trunk/pom.xml =================================================================== --- core/trunk/pom.xml 2009-11-24 15:28:54 UTC (rev 834) +++ core/trunk/pom.xml 2009-11-24 15:40:25 UTC (rev 835) @@ -38,7 +38,7 @@ <exo.product.name>exo-core</exo.product.name> <exo.product.specification>2.3</exo.product.specification> - <org.exoplatform.kernel.version>2.2.0-Beta04-SNAPSHOT</org.exoplatform.kernel.version> + <org.exoplatform.kernel.version>2.2.0-Beta04</org.exoplatform.kernel.version> <exo.test.includes>*Test*</exo.test.includes> </properties>

16 years, 5 months

1
0
0 / 0

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

by do-not-reply＠jboss.org

Author: pnedonosko Date: 2009-11-24 10:28:54 -0500 (Tue, 24 Nov 2009) New Revision: 834 Modified: kernel/trunk/exo.kernel.commons/pom.xml kernel/trunk/exo.kernel.component.cache/pom.xml kernel/trunk/exo.kernel.component.command/pom.xml kernel/trunk/exo.kernel.component.common/pom.xml kernel/trunk/exo.kernel.component.remote/pom.xml kernel/trunk/exo.kernel.container/pom.xml kernel/trunk/packaging/module/pom.xml kernel/trunk/pom.xml Log: [maven-release-plugin] prepare for next development iteration Modified: kernel/trunk/exo.kernel.commons/pom.xml =================================================================== --- kernel/trunk/exo.kernel.commons/pom.xml 2009-11-24 15:28:32 UTC (rev 833) +++ kernel/trunk/exo.kernel.commons/pom.xml 2009-11-24 15:28:54 UTC (rev 834) @@ -25,7 +25,7 @@ <parent> <groupId>org.exoplatform.kernel</groupId> <artifactId>kernel-parent</artifactId> - <version>2.2.0-Beta04</version> + <version>2.2.0-Beta05-SNAPSHOT</version> </parent> <artifactId>exo.kernel.commons</artifactId> Modified: kernel/trunk/exo.kernel.component.cache/pom.xml =================================================================== --- kernel/trunk/exo.kernel.component.cache/pom.xml 2009-11-24 15:28:32 UTC (rev 833) +++ kernel/trunk/exo.kernel.component.cache/pom.xml 2009-11-24 15:28:54 UTC (rev 834) @@ -25,7 +25,7 @@ <parent> <groupId>org.exoplatform.kernel</groupId> <artifactId>kernel-parent</artifactId> - <version>2.2.0-Beta04</version> + <version>2.2.0-Beta05-SNAPSHOT</version> </parent> <artifactId>exo.kernel.component.cache</artifactId> Modified: kernel/trunk/exo.kernel.component.command/pom.xml =================================================================== --- kernel/trunk/exo.kernel.component.command/pom.xml 2009-11-24 15:28:32 UTC (rev 833) +++ kernel/trunk/exo.kernel.component.command/pom.xml 2009-11-24 15:28:54 UTC (rev 834) @@ -25,7 +25,7 @@ <parent> <groupId>org.exoplatform.kernel</groupId> <artifactId>kernel-parent</artifactId> - <version>2.2.0-Beta04</version> + <version>2.2.0-Beta05-SNAPSHOT</version> </parent> <artifactId>exo.kernel.component.command</artifactId> Modified: kernel/trunk/exo.kernel.component.common/pom.xml =================================================================== --- kernel/trunk/exo.kernel.component.common/pom.xml 2009-11-24 15:28:32 UTC (rev 833) +++ kernel/trunk/exo.kernel.component.common/pom.xml 2009-11-24 15:28:54 UTC (rev 834) @@ -25,7 +25,7 @@ <parent> <groupId>org.exoplatform.kernel</groupId> <artifactId>kernel-parent</artifactId> - <version>2.2.0-Beta04</version> + <version>2.2.0-Beta05-SNAPSHOT</version> </parent> <artifactId>exo.kernel.component.common</artifactId> Modified: kernel/trunk/exo.kernel.component.remote/pom.xml =================================================================== --- kernel/trunk/exo.kernel.component.remote/pom.xml 2009-11-24 15:28:32 UTC (rev 833) +++ kernel/trunk/exo.kernel.component.remote/pom.xml 2009-11-24 15:28:54 UTC (rev 834) @@ -25,7 +25,7 @@ <parent> <groupId>org.exoplatform.kernel</groupId> <artifactId>kernel-parent</artifactId> - <version>2.2.0-Beta04</version> + <version>2.2.0-Beta05-SNAPSHOT</version> </parent> <artifactId>exo.kernel.component.remote</artifactId> Modified: kernel/trunk/exo.kernel.container/pom.xml =================================================================== --- kernel/trunk/exo.kernel.container/pom.xml 2009-11-24 15:28:32 UTC (rev 833) +++ kernel/trunk/exo.kernel.container/pom.xml 2009-11-24 15:28:54 UTC (rev 834) @@ -25,7 +25,7 @@ <parent> <groupId>org.exoplatform.kernel</groupId> <artifactId>kernel-parent</artifactId> - <version>2.2.0-Beta04</version> + <version>2.2.0-Beta05-SNAPSHOT</version> </parent> <artifactId>exo.kernel.container</artifactId> Modified: kernel/trunk/packaging/module/pom.xml =================================================================== --- kernel/trunk/packaging/module/pom.xml 2009-11-24 15:28:32 UTC (rev 833) +++ kernel/trunk/packaging/module/pom.xml 2009-11-24 15:28:54 UTC (rev 834) @@ -2,7 +2,7 @@ <parent> <groupId>org.exoplatform.kernel</groupId> <artifactId>kernel-parent</artifactId> - <version>2.2.0-Beta04</version> + <version>2.2.0-Beta05-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: kernel/trunk/pom.xml =================================================================== --- kernel/trunk/pom.xml 2009-11-24 15:28:32 UTC (rev 833) +++ kernel/trunk/pom.xml 2009-11-24 15:28:54 UTC (rev 834) @@ -30,7 +30,7 @@ <groupId>org.exoplatform.kernel</groupId> <artifactId>kernel-parent</artifactId> - <version>2.2.0-Beta04</version> + <version>2.2.0-Beta05-SNAPSHOT</version> <packaging>pom</packaging> <name>eXo Kernel</name> @@ -42,9 +42,9 @@ </properties> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/exo-jcr/kernel/tags/2.2.0-Beta04</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/exo-jcr/kernel/tags/2.2.0-Beta04</developerConnection> - <url>http://fisheye.jboss.org/browse/exo-jcr/kernel/tags/2.2.0-Beta04</url> + <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>

16 years, 5 months

1
0
0 / 0

exo-jcr SVN: r833 - kernel/tags.

by do-not-reply＠jboss.org

Author: pnedonosko Date: 2009-11-24 10:28:32 -0500 (Tue, 24 Nov 2009) New Revision: 833 Added: kernel/tags/2.2.0-Beta04/ Log: [maven-scm] copy for tag 2.2.0-Beta04 Copied: kernel/tags/2.2.0-Beta04 (from rev 831, kernel/trunk)

16 years, 5 months

1
0
0 / 0

exo-jcr SVN: r832 - 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: pnedonosko Date: 2009-11-24 10:28:15 -0500 (Tue, 24 Nov 2009) New Revision: 832 Modified: jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JDBCCacheLoader.java Log: EXOJCR-201: loader cleanup; rely on JDBC storage impl 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-24 15:28:04 UTC (rev 831) +++ jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JDBCCacheLoader.java 2009-11-24 15:28:15 UTC (rev 832) @@ -62,8 +62,7 @@ /** * Storage connections involved in transactions. */ - protected Map<Object, WorkspaceStorageConnection> transactions = - new ConcurrentHashMap<Object, WorkspaceStorageConnection>(); + protected Map<Object, JDBCStorageConnection> transactions = new ConcurrentHashMap<Object, JDBCStorageConnection>(); private IndividualCacheLoaderConfig config; @@ -93,12 +92,12 @@ * Apply all Modifications to JDBC database, but don't commite them. * * @param modifications List if Modification - * @param conn WorkspaceStorageConnection + * @param conn JDBCStorageConnection * @throws RepositoryException if error */ - protected void apply(WorkspaceStorageConnection conn, List<Modification> modifications) throws RepositoryException + protected void apply(List<Modification> modifications, JDBCStorageConnection conn) throws RepositoryException { - // Prepare modifications list. + // TODO Prepare modifications list. // Will be added oldValueData to modification for UPDATE. //prepareModifications(modifications); @@ -119,7 +118,7 @@ } break; case PUT_KEY_VALUE : - doUpdate(m, (JDBCStorageConnection)conn); + doUpdate(m, conn); break; case REMOVE_DATA : if (LOG.isDebugEnabled()) @@ -134,16 +133,7 @@ } break; case REMOVE_NODE : - - // if (m.getFqn().get(0).equals(JBossCacheStorage.REFS)) - // { - // removeReference((JDBCStorageConnection)conn, m); - // } - // else - // { - doRemove(m, (JDBCStorageConnection)conn); - // } - + doRemove(m, conn); break; case MOVE : if (LOG.isDebugEnabled()) @@ -167,20 +157,21 @@ LOG.debug("Modifications list size = " + modifications.size()); } - WorkspaceStorageConnection conn = dataContainer.openConnection(); + JDBCStorageConnection conn = (JDBCStorageConnection)dataContainer.openConnection(); + try { - apply(conn, modifications); + apply(modifications, conn); conn.commit(); } catch (RepositoryException e) { - LOG.error("RepositoryException: ", e); // TODO don't catch + LOG.error("RepositoryException: ", e); // TODO don't catch, but be sure it will be thrown to JCR throw new RepositoryException(e); } catch (IllegalStateException e) { - LOG.error("IllegalStateException: ", e); // TODO don't catch + LOG.error("IllegalStateException: ", e); // TODO don't catch, but be sure it will be thrown to JCR throw new IllegalStateException(e); } finally @@ -195,11 +186,10 @@ /** * Remove NodeData or PropertyData. * - * @param modification - * @param conn - * @param identifier - * @throws IllegalStateException - * @throws RepositoryException + * @param modification Modification + * @param conn JDBCStorageConnection + * @throws IllegalStateException if connection closed + * @throws RepositoryException if error occurs */ private void doRemove(Modification modification, JDBCStorageConnection conn) throws IllegalStateException, RepositoryException @@ -225,12 +215,13 @@ /** * Performs ADD to NodeData and PropertyData. - * @param modification - * @param conn - * @throws IllegalStateException - * @throws RepositoryException + * + * @param modification Modification + * @param conn JDBCStorageConnection + * @throws IllegalStateException if connection closed + * @throws RepositoryException if error occurs */ - private void doAdd(Modification modification, WorkspaceStorageConnection conn) throws IllegalStateException, + private void doAdd(Modification modification, JDBCStorageConnection conn) throws IllegalStateException, RepositoryException { if (modification.getValue() instanceof NodeData) @@ -253,12 +244,11 @@ * Performs UPDATE to NodeData or PropertyData. * * @param modification Modification - * @param conn WorkspaceStorageConnection + * @param conn JDBCStorageConnection * @throws IllegalStateException if connection closed * @throws RepositoryException if error occurs */ - private void doUpdate(Modification m, JDBCStorageConnection conn) throws IllegalStateException, - RepositoryException + private void doUpdate(Modification m, JDBCStorageConnection conn) throws IllegalStateException, RepositoryException { if (m.getFqn().size() == 2 && m.getValue() instanceof TransientItemData) { @@ -272,7 +262,6 @@ || (item.getState() & TransientItemData.TRANSITIVE_MIXIN_UPDATED) == 0) { if (conn.itemExists((String)m.getFqn().get(1), item.isNode())) - //if (isUpdate(m, (JDBCStorageConnection)conn)) { // update if it's non transitive update if (item.isNode()) @@ -297,7 +286,6 @@ } } } - } /** @@ -693,23 +681,23 @@ { if (onePhase) { - final WorkspaceStorageConnection conn = dataContainer.openConnection(); - apply(conn, modifications); + final JDBCStorageConnection conn = (JDBCStorageConnection)dataContainer.openConnection(); + apply(modifications, conn); conn.commit(); // same immediately } else { - final WorkspaceStorageConnection exconn = transactions.remove(tx); + final JDBCStorageConnection exconn = transactions.remove(tx); if (exconn != null) { // apply in existed connection associated with tx - apply(exconn, modifications); + apply(modifications, exconn); } else { // open new tx conn, apply in it, save the conn - final WorkspaceStorageConnection conn = dataContainer.openConnection(); - apply(conn, modifications); + final JDBCStorageConnection conn = (JDBCStorageConnection)dataContainer.openConnection(); + apply(modifications, conn); transactions.put(tx, conn); } }

16 years, 5 months

1
0
0 / 0

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

by do-not-reply＠jboss.org

Author: pnedonosko Date: 2009-11-24 10:28:04 -0500 (Tue, 24 Nov 2009) New Revision: 831 Modified: kernel/trunk/exo.kernel.commons/pom.xml kernel/trunk/exo.kernel.component.cache/pom.xml kernel/trunk/exo.kernel.component.command/pom.xml kernel/trunk/exo.kernel.component.common/pom.xml kernel/trunk/exo.kernel.component.remote/pom.xml kernel/trunk/exo.kernel.container/pom.xml kernel/trunk/packaging/module/pom.xml kernel/trunk/pom.xml Log: [maven-release-plugin] prepare release 2.2.0-Beta04 Modified: kernel/trunk/exo.kernel.commons/pom.xml =================================================================== --- kernel/trunk/exo.kernel.commons/pom.xml 2009-11-24 14:49:52 UTC (rev 830) +++ kernel/trunk/exo.kernel.commons/pom.xml 2009-11-24 15:28:04 UTC (rev 831) @@ -1,58 +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>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</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-24 14:49:52 UTC (rev 830) +++ kernel/trunk/exo.kernel.component.cache/pom.xml 2009-11-24 15:28:04 UTC (rev 831) @@ -1,50 +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.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 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</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-24 14:49:52 UTC (rev 830) +++ kernel/trunk/exo.kernel.component.command/pom.xml 2009-11-24 15:28:04 UTC (rev 831) @@ -1,64 +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.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 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</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-24 14:49:52 UTC (rev 830) +++ kernel/trunk/exo.kernel.component.common/pom.xml 2009-11-24 15:28:04 UTC (rev 831) @@ -1,90 +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.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> + +<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</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-24 14:49:52 UTC (rev 830) +++ kernel/trunk/exo.kernel.component.remote/pom.xml 2009-11-24 15:28:04 UTC (rev 831) @@ -1,54 +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.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> + +<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</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-24 14:49:52 UTC (rev 830) +++ kernel/trunk/exo.kernel.container/pom.xml 2009-11-24 15:28:04 UTC (rev 831) @@ -1,120 +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> - <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 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</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/packaging/module/pom.xml =================================================================== --- kernel/trunk/packaging/module/pom.xml 2009-11-24 14:49:52 UTC (rev 830) +++ kernel/trunk/packaging/module/pom.xml 2009-11-24 15:28:04 UTC (rev 831) @@ -2,7 +2,7 @@ <parent> <groupId>org.exoplatform.kernel</groupId> <artifactId>kernel-parent</artifactId> - <version>2.2.0-Beta04-SNAPSHOT</version> + <version>2.2.0-Beta04</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: kernel/trunk/pom.xml =================================================================== --- kernel/trunk/pom.xml 2009-11-24 14:49:52 UTC (rev 830) +++ kernel/trunk/pom.xml 2009-11-24 15:28:04 UTC (rev 831) @@ -1,199 +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.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> + +<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</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/tags/2.2.0-Beta04</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/exo-jcr/kernel/tags/2.2.0-Beta04</developerConnection> + <url>http://fisheye.jboss.org/browse/exo-jcr/kernel/tags/2.2.0-Beta04</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, 5 months

1
0
0 / 0

exo-jcr SVN: r830 - 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: pnedonosko Date: 2009-11-24 09:49:52 -0500 (Tue, 24 Nov 2009) New Revision: 830 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/JDBCCacheLoader.java Log: EXOJCR-203: updateMixin in conn and loader 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-24 13:56:05 UTC (rev 829) +++ jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JBossCacheStorageConnection.java 2009-11-24 14:49:52 UTC (rev 830) @@ -712,7 +712,7 @@ if (data instanceof TransientNodeData) { - ((TransientNodeData)data).setState(TransientNodeData.TRANSITIVE_MIXIN_UPDATED); + ((TransientNodeData)data).addState(TransientNodeData.TRANSITIVE_MIXIN_UPDATED); } } 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-24 13:56:05 UTC (rev 829) +++ jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JDBCCacheLoader.java 2009-11-24 14:49:52 UTC (rev 830) @@ -119,29 +119,7 @@ } break; case PUT_KEY_VALUE : - if (m.getFqn().size() == 2) - { - // if (m.getValue() instanceof TransientNodeData) - // { - // //Check flag it's mixin update for node, if this flag set we have node need to - // // update node - // int skipMask = TransientNodeData.TRANSITIVE_MIXIN_UPDATED; - // if ((((TransientNodeData)m.getValue()).getState() & skipMask) > 0) - // { - // - // continue; - // } - // } - if (isUpdate(m, (JDBCStorageConnection)conn)) - { - doUpdate(m, conn); - } - else - { - doAdd(m, conn); - } - } - + doUpdate(m, (JDBCStorageConnection)conn); break; case REMOVE_DATA : if (LOG.isDebugEnabled()) @@ -180,19 +158,6 @@ } /** - * Check update item or add item. - * - * @param m Modification - * @param conn JDBCStorageConnection - * @return boolean - * return true if update, false if add - */ - private boolean isUpdate(Modification m, JDBCStorageConnection conn) throws RepositoryException - { - return conn.itemExists((String)m.getFqn().get(1), m.getValue() instanceof NodeData); - } - - /** * {@inheritDoc} */ public void put(List<Modification> modifications) throws Exception @@ -285,44 +250,54 @@ } /** - * Performs UPDATE to NodeData and PropertyData. - * @param modification - * @param conn - * @throws IllegalStateException - * @throws RepositoryException + * Performs UPDATE to NodeData or PropertyData. + * + * @param modification Modification + * @param conn WorkspaceStorageConnection + * @throws IllegalStateException if connection closed + * @throws RepositoryException if error occurs */ - private void doUpdate(Modification modification, WorkspaceStorageConnection conn) throws IllegalStateException, + private void doUpdate(Modification m, JDBCStorageConnection conn) throws IllegalStateException, RepositoryException { - if (modification.getValue() instanceof ItemData) + if (m.getFqn().size() == 2 && m.getValue() instanceof TransientItemData) { - TransientItemData item = (TransientItemData)modification.getValue(); + //Check flag it's mixin update for node, if this flag set we have node need to + TransientItemData item = (TransientItemData)m.getValue(); - if ((item.getState() & TransientItemData.TRANSITIVE_PATH_UPDATED) == 0) + // TODO try + // if ((item.getState() == TransientItemData.TRANSITIVE_NONE) + + if ((item.getState() & TransientItemData.TRANSITIVE_PATH_UPDATED) == 0 + || (item.getState() & TransientItemData.TRANSITIVE_MIXIN_UPDATED) == 0) { - // update if it's non transitive update - if (item.isNode()) + if (conn.itemExists((String)m.getFqn().get(1), item.isNode())) + //if (isUpdate(m, (JDBCStorageConnection)conn)) { - // conn.rename() is used to update all the fields in DB. - // Original conn.update() will be matched as deprecated, - // and conn.rename() should be renamed to update. This - // is done to solve the issue, when we need to guess each - // time whether node is moved or just updated. This - // solution is used as the fastest among other. - conn.rename((NodeData)item); + // update if it's non transitive update + if (item.isNode()) + { + // TODO conn.rename() is used to update all the fields in DB. + // Original conn.update() will be matched as deprecated, + // and conn.rename() should be renamed to update. This + // is done to solve the issue, when we need to guess each + // time whether node is moved or just updated. This + // solution is used as the fastest among other. + conn.rename((NodeData)item); + } + else + { + //update property data + conn.update((PropertyData)item); + } } else { - //update property data - conn.update((PropertyData)item); + doAdd(m, conn); } } - else - { - // TODO for debug - LOG.info("TRANSITIVE_PATH_UPDATED " + item.getQPath().getAsString()); - } } + } /**

16 years, 5 months

1
0
0 / 0

exo-jcr SVN: r829 - 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: sergiykarpenko Date: 2009-11-24 08:56:05 -0500 (Tue, 24 Nov 2009) New Revision: 829 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/JDBCCacheLoader.java jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/SingleDbJDBCConnection.java Log: EXOJCR-246: JBossCacheStorageConnection remove commented code. SingleJDBC - reference query added 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-24 13:50:27 UTC (rev 828) +++ jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JBossCacheStorageConnection.java 2009-11-24 13:56:05 UTC (rev 829) @@ -226,26 +226,6 @@ { startBatch(); - // TODO remove this check - // for (InternalQName mixin : data.getMixinTypeNames()) - // { - // - // - // if (mixin.equals(Constants.MIX_REFERENCEABLE)) - // { - // // check and release references - // Node<Serializable, Object> node = refsRoot.addChild(Fqn.fromElements(data.getIdentifier())); - // if (node != null) - // { - // if (node.getChildrenNames().size() != 0) - // { - // throw new RepositoryException("Referenceable node removed but still have live references."); - // } - // } - // break; - // } - // } - // get parent Node<Serializable, Object> parent = nodesRoot.getChild(makeNodeFqn(data.getParentIdentifier())); if (parent == null) @@ -703,38 +683,6 @@ // 4. update all child nodes updateTreePath(node, data.getQPath()); //treePrint(node) - // TODO cleanup - // for (Node<Serializable, Object> child : node.getChildren()) - // { - // String childNodeId = (String)child.get(ITEM_ID); - // if (childNodeId == null) - // { - // throw new RepositoryException("FATAL Child Node Id key is null. Parent " + data.getQPath().getAsString()); - // } - // - // // TODO NodeData or PropertyData? As ItemData check then and cast. - // Node<Serializable, Object> childnode = nodesRoot.getChild(makeNodeFqn(childNodeId)); //cache.evict(fqn) - // if (childnode == null) - // { - // throw new RepositoryException("FATAL Node record not found(" + childNodeId + "), but listed in childs of " - // + data.getQPath().getAsString()); - // } - // NodeData nodeData = (NodeData)childnode.get(ITEM_DATA); - // if (nodeData == null) - // { - // // TODO should not occurs by contract - // throw new RepositoryException("Child node data is null. Parent " + data.getQPath().getAsString()); - // } - // - // //repack child NodeData with new QPath - // //TODO check it - // QPath newPath = QPath.makeChildPath(data.getQPath(), nodeData.getQPath().getName()); - // TransientNodeData newNodeData = - // new TransientNodeData(newPath, nodeData.getIdentifier(), nodeData.getPersistedVersion(), nodeData - // .getPrimaryTypeName(), nodeData.getMixinTypeNames(), nodeData.getOrderNumber(), nodeData - // .getParentIdentifier(), nodeData.getACL()); - // childnode.put(ITEM_DATA, newNodeData); - // } } /** 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-24 13:50:27 UTC (rev 828) +++ jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JDBCCacheLoader.java 2009-11-24 13:56:05 UTC (rev 829) @@ -111,11 +111,6 @@ { LOG.debug("PUT_DATA modification"); } - // Process references - // if (m.getFqn().get(0).equals(JBossCacheStorage.REFS)) - // { - // addReferences((JDBCStorageConnection)conn, m); - // } break; case PUT_DATA_ERASE : if (LOG.isDebugEnabled()) 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-24 13:50:27 UTC (rev 828) +++ jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/SingleDbJDBCConnection.java 2009-11-24 13:56:05 UTC (rev 829) @@ -123,6 +123,10 @@ protected PreparedStatement renameNode; + protected PreparedStatement findReference; + + protected PreparedStatement findAllReferencedNodes; + /** * Singledatabase JDBC Connection constructor. * @@ -197,6 +201,11 @@ "select P.ID, P.PARENT_ID, P.VERSION, P.P_TYPE, P.P_MULTIVALUED, P.NAME" + " from JCR_SREF R, JCR_SITEM P" + " where R.NODE_ID=? and P.CONTAINER_NAME=? and P.ID=R.PROPERTY_ID and P.I_CLASS=2"; + FIND_REFERENCE = + "select P.ID from JCR_SREF R, JCR_SITEM P where R.NODE_ID=? and R.PROPERTY_ID=? and P.ID = R.PROPERTY_ID"; + + FIND_REFERENCED_NODES = "select N.ID from JCR_SREF R, JCR_SITEM N where N.ID=R.NODE_ID"; + FIND_VALUES_BY_PROPERTYID = "select PROPERTY_ID, ORDER_NUM, DATA, STORAGE_DESC from JCR_SVALUE where PROPERTY_ID=? order by ORDER_NUM"; @@ -724,16 +733,32 @@ } @Override - protected boolean hasReferenceRecord(String nodeId, String refPropertyId) throws SQLException + protected boolean hasReferenceRecord(String nodeIdentifier, String refPropertyIdentifier) throws SQLException { - // TODO Auto-generated method stub - return false; + // TODO check queries + if (findReference == null) + findReference = dbConnection.prepareStatement(FIND_REFERENCE); + else + findReference.clearParameters(); + + findReference.setString(1, nodeIdentifier); + findReference.setString(1, refPropertyIdentifier); + ResultSet result = findReference.executeQuery(); + + return result.next(); } @Override protected ResultSet findAllReferencedNodeIdentifiers() throws SQLException { - // TODO Auto-generated method stub - return null; + // TODO check queries + if (findAllReferencedNodes == null) + findAllReferencedNodes = dbConnection.prepareStatement(this.FIND_REFERENCED_NODES); + else + findAllReferencedNodes.clearParameters(); + + ResultSet result = findAllReferencedNodes.executeQuery(); + + return result; } }

16 years, 5 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