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

exo-jcr SVN: r2932 - core/branches/2.3.x.

by do-not-reply＠jboss.org

Author: tolusha Date: 2010-08-18 04:36:29 -0400 (Wed, 18 Aug 2010) New Revision: 2932 Modified: core/branches/2.3.x/pom.xml Log: EXOJCR-826: change dependency to branch Modified: core/branches/2.3.x/pom.xml =================================================================== --- core/branches/2.3.x/pom.xml 2010-08-18 08:25:46 UTC (rev 2931) +++ core/branches/2.3.x/pom.xml 2010-08-18 08:36:29 UTC (rev 2932) @@ -39,7 +39,7 @@ <exo.product.specification>2.3</exo.product.specification> <org.exoplatform.framework.junit.version>1.2.1-GA</org.exoplatform.framework.junit.version> - <org.exoplatform.kernel.version>2.2.3-GA</org.exoplatform.kernel.version> + <org.exoplatform.kernel.version>2.2.4-GA-SNAPSHOT</org.exoplatform.kernel.version> </properties> <scm>

13 years, 10 months

1
0
0 / 0

exo-jcr SVN: r2931 - in core/branches/2.3.x: exo.core.component.database and 10 other directories.

by do-not-reply＠jboss.org

Author: tolusha Date: 2010-08-18 04:25:46 -0400 (Wed, 18 Aug 2010) New Revision: 2931 Modified: core/branches/2.3.x/exo.core.component.database/pom.xml core/branches/2.3.x/exo.core.component.document/pom.xml core/branches/2.3.x/exo.core.component.ldap/pom.xml core/branches/2.3.x/exo.core.component.organization.api/pom.xml core/branches/2.3.x/exo.core.component.organization.jdbc/pom.xml core/branches/2.3.x/exo.core.component.organization.ldap/pom.xml core/branches/2.3.x/exo.core.component.script.groovy/pom.xml core/branches/2.3.x/exo.core.component.security.core/pom.xml core/branches/2.3.x/exo.core.component.web.css/pom.xml core/branches/2.3.x/exo.core.component.xml-processing/pom.xml core/branches/2.3.x/packaging/module/pom.xml core/branches/2.3.x/pom.xml Log: [maven-release-plugin] prepare for next development iteration Modified: core/branches/2.3.x/exo.core.component.database/pom.xml =================================================================== --- core/branches/2.3.x/exo.core.component.database/pom.xml 2010-08-18 08:25:21 UTC (rev 2930) +++ core/branches/2.3.x/exo.core.component.database/pom.xml 2010-08-18 08:25:46 UTC (rev 2931) @@ -25,7 +25,7 @@ <parent> <groupId>org.exoplatform.core</groupId> <artifactId>core-parent</artifactId> - <version>2.3.3-GA</version> + <version>2.3.4-GA-SNAPSHOT</version> </parent> <artifactId>exo.core.component.database</artifactId> Modified: core/branches/2.3.x/exo.core.component.document/pom.xml =================================================================== --- core/branches/2.3.x/exo.core.component.document/pom.xml 2010-08-18 08:25:21 UTC (rev 2930) +++ core/branches/2.3.x/exo.core.component.document/pom.xml 2010-08-18 08:25:46 UTC (rev 2931) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.core</groupId> <artifactId>core-parent</artifactId> - <version>2.3.3-GA</version> + <version>2.3.4-GA-SNAPSHOT</version> </parent> <artifactId>exo.core.component.document</artifactId> <name>eXo Core :: Component :: Demo Service</name> Modified: core/branches/2.3.x/exo.core.component.ldap/pom.xml =================================================================== --- core/branches/2.3.x/exo.core.component.ldap/pom.xml 2010-08-18 08:25:21 UTC (rev 2930) +++ core/branches/2.3.x/exo.core.component.ldap/pom.xml 2010-08-18 08:25:46 UTC (rev 2931) @@ -25,7 +25,7 @@ <parent> <groupId>org.exoplatform.core</groupId> <artifactId>core-parent</artifactId> - <version>2.3.3-GA</version> + <version>2.3.4-GA-SNAPSHOT</version> </parent> <artifactId>exo.core.component.ldap</artifactId> Modified: core/branches/2.3.x/exo.core.component.organization.api/pom.xml =================================================================== --- core/branches/2.3.x/exo.core.component.organization.api/pom.xml 2010-08-18 08:25:21 UTC (rev 2930) +++ core/branches/2.3.x/exo.core.component.organization.api/pom.xml 2010-08-18 08:25:46 UTC (rev 2931) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.core</groupId> <artifactId>core-parent</artifactId> - <version>2.3.3-GA</version> + <version>2.3.4-GA-SNAPSHOT</version> </parent> <artifactId>exo.core.component.organization.api</artifactId> <name>eXo Core :: Component :: Organization Service API</name> Modified: core/branches/2.3.x/exo.core.component.organization.jdbc/pom.xml =================================================================== --- core/branches/2.3.x/exo.core.component.organization.jdbc/pom.xml 2010-08-18 08:25:21 UTC (rev 2930) +++ core/branches/2.3.x/exo.core.component.organization.jdbc/pom.xml 2010-08-18 08:25:46 UTC (rev 2931) @@ -25,7 +25,7 @@ <parent> <groupId>org.exoplatform.core</groupId> <artifactId>core-parent</artifactId> - <version>2.3.3-GA</version> + <version>2.3.4-GA-SNAPSHOT</version> </parent> <artifactId>exo.core.component.organization.jdbc</artifactId> Modified: core/branches/2.3.x/exo.core.component.organization.ldap/pom.xml =================================================================== --- core/branches/2.3.x/exo.core.component.organization.ldap/pom.xml 2010-08-18 08:25:21 UTC (rev 2930) +++ core/branches/2.3.x/exo.core.component.organization.ldap/pom.xml 2010-08-18 08:25:46 UTC (rev 2931) @@ -25,7 +25,7 @@ <parent> <groupId>org.exoplatform.core</groupId> <artifactId>core-parent</artifactId> - <version>2.3.3-GA</version> + <version>2.3.4-GA-SNAPSHOT</version> </parent> <artifactId>exo.core.component.organization.ldap</artifactId> Modified: core/branches/2.3.x/exo.core.component.script.groovy/pom.xml =================================================================== --- core/branches/2.3.x/exo.core.component.script.groovy/pom.xml 2010-08-18 08:25:21 UTC (rev 2930) +++ core/branches/2.3.x/exo.core.component.script.groovy/pom.xml 2010-08-18 08:25:46 UTC (rev 2931) @@ -25,7 +25,7 @@ <parent> <groupId>org.exoplatform.core</groupId> <artifactId>core-parent</artifactId> - <version>2.3.3-GA</version> + <version>2.3.4-GA-SNAPSHOT</version> </parent> <artifactId>exo.core.component.script.groovy</artifactId> Modified: core/branches/2.3.x/exo.core.component.security.core/pom.xml =================================================================== --- core/branches/2.3.x/exo.core.component.security.core/pom.xml 2010-08-18 08:25:21 UTC (rev 2930) +++ core/branches/2.3.x/exo.core.component.security.core/pom.xml 2010-08-18 08:25:46 UTC (rev 2931) @@ -25,7 +25,7 @@ <parent> <groupId>org.exoplatform.core</groupId> <artifactId>core-parent</artifactId> - <version>2.3.3-GA</version> + <version>2.3.4-GA-SNAPSHOT</version> </parent> <artifactId>exo.core.component.security.core</artifactId> Modified: core/branches/2.3.x/exo.core.component.web.css/pom.xml =================================================================== --- core/branches/2.3.x/exo.core.component.web.css/pom.xml 2010-08-18 08:25:21 UTC (rev 2930) +++ core/branches/2.3.x/exo.core.component.web.css/pom.xml 2010-08-18 08:25:46 UTC (rev 2931) @@ -25,7 +25,7 @@ <parent> <groupId>org.exoplatform.core</groupId> <artifactId>core-parent</artifactId> - <version>2.3.3-GA</version> + <version>2.3.4-GA-SNAPSHOT</version> </parent> <artifactId>exo.core.component.web.css</artifactId> Modified: core/branches/2.3.x/exo.core.component.xml-processing/pom.xml =================================================================== --- core/branches/2.3.x/exo.core.component.xml-processing/pom.xml 2010-08-18 08:25:21 UTC (rev 2930) +++ core/branches/2.3.x/exo.core.component.xml-processing/pom.xml 2010-08-18 08:25:46 UTC (rev 2931) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.core</groupId> <artifactId>core-parent</artifactId> - <version>2.3.3-GA</version> + <version>2.3.4-GA-SNAPSHOT</version> </parent> <artifactId>exo.core.component.xml-processing</artifactId> <name>eXo Core :: Component :: XML Processing Service</name> Modified: core/branches/2.3.x/packaging/module/pom.xml =================================================================== --- core/branches/2.3.x/packaging/module/pom.xml 2010-08-18 08:25:21 UTC (rev 2930) +++ core/branches/2.3.x/packaging/module/pom.xml 2010-08-18 08:25:46 UTC (rev 2931) @@ -2,7 +2,7 @@ <parent> <groupId>org.exoplatform.core</groupId> <artifactId>core-parent</artifactId> - <version>2.3.3-GA</version> + <version>2.3.4-GA-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -18,13 +18,13 @@  <dependencies> - <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.database</artifactId><version>2.3.3-GA</version></dependency> - <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.document</artifactId><version>2.3.3-GA</version></dependency> - <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.organization.api</artifactId><version>2.3.3-GA</version></dependency> - <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.organization.ldap</artifactId><version>2.3.3-GA</version></dependency> - <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.security.core</artifactId><version>2.3.3-GA</version></dependency> - <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.xml-processing</artifactId><version>2.3.3-GA</version></dependency> - <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.script.groovy</artifactId><version>2.3.3-GA</version></dependency> + <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.database</artifactId><version>2.3.4-GA-SNAPSHOT</version></dependency> + <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.document</artifactId><version>2.3.4-GA-SNAPSHOT</version></dependency> + <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.organization.api</artifactId><version>2.3.4-GA-SNAPSHOT</version></dependency> + <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.organization.ldap</artifactId><version>2.3.4-GA-SNAPSHOT</version></dependency> + <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.security.core</artifactId><version>2.3.4-GA-SNAPSHOT</version></dependency> + <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.xml-processing</artifactId><version>2.3.4-GA-SNAPSHOT</version></dependency> + <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.script.groovy</artifactId><version>2.3.4-GA-SNAPSHOT</version></dependency> </dependencies> <build> Modified: core/branches/2.3.x/pom.xml =================================================================== --- core/branches/2.3.x/pom.xml 2010-08-18 08:25:21 UTC (rev 2930) +++ core/branches/2.3.x/pom.xml 2010-08-18 08:25:46 UTC (rev 2931) @@ -29,7 +29,7 @@ <groupId>org.exoplatform.core</groupId> <artifactId>core-parent</artifactId> - <version>2.3.3-GA</version> + <version>2.3.4-GA-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.3-GA</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/exo-jcr/core/tags/2.3.3-GA</developerConnection> - <url>http://fisheye.jboss.org/browse/exo-jcr/core/tags/2.3.3-GA</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/exo-jcr/core/branches/2.3.x/</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/exo-jcr/core/branches/2.3.x/</developerConnection> + <url>http://fisheye.jboss.org/browse/exo-jcr/core/branches/2.3.x</url> </scm> <modules>

13 years, 10 months

1
0
0 / 0

exo-jcr SVN: r2930 - core/tags.

by do-not-reply＠jboss.org

Author: tolusha Date: 2010-08-18 04:25:21 -0400 (Wed, 18 Aug 2010) New Revision: 2930 Added: core/tags/2.3.3-GA/ Log: [maven-scm] copy for tag 2.3.3-GA Copied: core/tags/2.3.3-GA (from rev 2929, core/branches/2.3.x)

13 years, 10 months

1
0
0 / 0

exo-jcr SVN: r2929 - in core/branches/2.3.x: exo.core.component.database and 10 other directories.

by do-not-reply＠jboss.org

Author: tolusha Date: 2010-08-18 04:24:59 -0400 (Wed, 18 Aug 2010) New Revision: 2929 Modified: core/branches/2.3.x/exo.core.component.database/pom.xml core/branches/2.3.x/exo.core.component.document/pom.xml core/branches/2.3.x/exo.core.component.ldap/pom.xml core/branches/2.3.x/exo.core.component.organization.api/pom.xml core/branches/2.3.x/exo.core.component.organization.jdbc/pom.xml core/branches/2.3.x/exo.core.component.organization.ldap/pom.xml core/branches/2.3.x/exo.core.component.script.groovy/pom.xml core/branches/2.3.x/exo.core.component.security.core/pom.xml core/branches/2.3.x/exo.core.component.web.css/pom.xml core/branches/2.3.x/exo.core.component.xml-processing/pom.xml core/branches/2.3.x/packaging/module/pom.xml core/branches/2.3.x/pom.xml Log: [maven-release-plugin] prepare release 2.3.3-GA Modified: core/branches/2.3.x/exo.core.component.database/pom.xml =================================================================== --- core/branches/2.3.x/exo.core.component.database/pom.xml 2010-08-18 08:22:42 UTC (rev 2928) +++ core/branches/2.3.x/exo.core.component.database/pom.xml 2010-08-18 08:24:59 UTC (rev 2929) @@ -1,136 +1,136 @@ - -<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.3-GA-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.slf4j</groupId> - <artifactId>slf4j-log4j12</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> - <dependency> - <groupId>commons-dbcp</groupId> - <artifactId>commons-dbcp</artifactId> - <exclusions> - <exclusion> - <groupId>xerces</groupId> - <artifactId>xercesImpl</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>commons-pool</groupId> - <artifactId>commons-pool</artifactId> - </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.3-GA</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.slf4j</groupId> + <artifactId>slf4j-log4j12</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> + <dependency> + <groupId>commons-dbcp</groupId> + <artifactId>commons-dbcp</artifactId> + <exclusions> + <exclusion> + <groupId>xerces</groupId> + <artifactId>xercesImpl</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>commons-pool</groupId> + <artifactId>commons-pool</artifactId> + </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/branches/2.3.x/exo.core.component.document/pom.xml =================================================================== --- core/branches/2.3.x/exo.core.component.document/pom.xml 2010-08-18 08:22:42 UTC (rev 2928) +++ core/branches/2.3.x/exo.core.component.document/pom.xml 2010-08-18 08:24:59 UTC (rev 2929) @@ -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.3-GA-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>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </dependency> - <dependency> - <groupId>org.apache.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> + +<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.3-GA</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>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </dependency> + <dependency> + <groupId>org.apache.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> Modified: core/branches/2.3.x/exo.core.component.ldap/pom.xml =================================================================== --- core/branches/2.3.x/exo.core.component.ldap/pom.xml 2010-08-18 08:22:42 UTC (rev 2928) +++ core/branches/2.3.x/exo.core.component.ldap/pom.xml 2010-08-18 08:24:59 UTC (rev 2929) @@ -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.3-GA-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.3-GA</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/branches/2.3.x/exo.core.component.organization.api/pom.xml =================================================================== --- core/branches/2.3.x/exo.core.component.organization.api/pom.xml 2010-08-18 08:22:42 UTC (rev 2928) +++ core/branches/2.3.x/exo.core.component.organization.api/pom.xml 2010-08-18 08:24:59 UTC (rev 2929) @@ -1,121 +1,121 @@ - -<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.3-GA-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> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</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.3-GA</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> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</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/branches/2.3.x/exo.core.component.organization.jdbc/pom.xml =================================================================== --- core/branches/2.3.x/exo.core.component.organization.jdbc/pom.xml 2010-08-18 08:22:42 UTC (rev 2928) +++ core/branches/2.3.x/exo.core.component.organization.jdbc/pom.xml 2010-08-18 08:24:59 UTC (rev 2929) @@ -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.core</groupId> - <artifactId>core-parent</artifactId> - <version>2.3.3-GA-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> + +<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.3-GA</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> + <dependency> <groupId>javassist</groupId> <artifactId>javassist</artifactId> <scope>test</scope> </dependency> - </dependencies> + </dependencies> </project> \ No newline at end of file Modified: core/branches/2.3.x/exo.core.component.organization.ldap/pom.xml =================================================================== --- core/branches/2.3.x/exo.core.component.organization.ldap/pom.xml 2010-08-18 08:22:42 UTC (rev 2928) +++ core/branches/2.3.x/exo.core.component.organization.ldap/pom.xml 2010-08-18 08:24:59 UTC (rev 2929) @@ -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.3-GA-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.3-GA</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/branches/2.3.x/exo.core.component.script.groovy/pom.xml =================================================================== --- core/branches/2.3.x/exo.core.component.script.groovy/pom.xml 2010-08-18 08:22:42 UTC (rev 2928) +++ core/branches/2.3.x/exo.core.component.script.groovy/pom.xml 2010-08-18 08:24:59 UTC (rev 2929) @@ -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.3-GA-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.3-GA</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/branches/2.3.x/exo.core.component.security.core/pom.xml =================================================================== --- core/branches/2.3.x/exo.core.component.security.core/pom.xml 2010-08-18 08:22:42 UTC (rev 2928) +++ core/branches/2.3.x/exo.core.component.security.core/pom.xml 2010-08-18 08:24:59 UTC (rev 2929) @@ -1,82 +1,82 @@ - -<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.3-GA-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>org.slf4j</groupId> - <artifactId>slf4j-log4j12</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.3-GA</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>org.slf4j</groupId> + <artifactId>slf4j-log4j12</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/branches/2.3.x/exo.core.component.web.css/pom.xml =================================================================== --- core/branches/2.3.x/exo.core.component.web.css/pom.xml 2010-08-18 08:22:42 UTC (rev 2928) +++ core/branches/2.3.x/exo.core.component.web.css/pom.xml 2010-08-18 08:24:59 UTC (rev 2929) @@ -1,51 +1,51 @@ - -<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.3-GA-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> - <scope>test</scope> - </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.3-GA</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> + <scope>test</scope> + </dependency> + <dependency> + <groupId>batik</groupId> + <artifactId>batik-css</artifactId> + </dependency> + </dependencies> +</project> Modified: core/branches/2.3.x/exo.core.component.xml-processing/pom.xml =================================================================== --- core/branches/2.3.x/exo.core.component.xml-processing/pom.xml 2010-08-18 08:22:42 UTC (rev 2928) +++ core/branches/2.3.x/exo.core.component.xml-processing/pom.xml 2010-08-18 08:24:59 UTC (rev 2929) @@ -1,101 +1,101 @@ - -<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.3-GA-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> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</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.3-GA</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> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</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/branches/2.3.x/packaging/module/pom.xml =================================================================== --- core/branches/2.3.x/packaging/module/pom.xml 2010-08-18 08:22:42 UTC (rev 2928) +++ core/branches/2.3.x/packaging/module/pom.xml 2010-08-18 08:24:59 UTC (rev 2929) @@ -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"> - <parent> - <groupId>org.exoplatform.core</groupId> - <artifactId>core-parent</artifactId> - <version>2.3.3-GA-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> - <enforcer.skip>true</enforcer.skip> - </properties> - -  - <dependencies> - <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.database</artifactId><version>2.3.3-GA-SNAPSHOT</version></dependency> - <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.document</artifactId><version>2.3.3-GA-SNAPSHOT</version></dependency> - <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.organization.api</artifactId><version>2.3.3-GA-SNAPSHOT</version></dependency> - <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.organization.ldap</artifactId><version>2.3.3-GA-SNAPSHOT</version></dependency> - <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.security.core</artifactId><version>2.3.3-GA-SNAPSHOT</version></dependency> - <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.xml-processing</artifactId><version>2.3.3-GA-SNAPSHOT</version></dependency> - <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.script.groovy</artifactId><version>2.3.3-GA-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> +<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.3-GA</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> + <enforcer.skip>true</enforcer.skip> + </properties> + +  + <dependencies> + <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.database</artifactId><version>2.3.3-GA</version></dependency> + <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.document</artifactId><version>2.3.3-GA</version></dependency> + <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.organization.api</artifactId><version>2.3.3-GA</version></dependency> + <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.organization.ldap</artifactId><version>2.3.3-GA</version></dependency> + <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.security.core</artifactId><version>2.3.3-GA</version></dependency> + <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.xml-processing</artifactId><version>2.3.3-GA</version></dependency> + <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.script.groovy</artifactId><version>2.3.3-GA</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> Modified: core/branches/2.3.x/pom.xml =================================================================== --- core/branches/2.3.x/pom.xml 2010-08-18 08:22:42 UTC (rev 2928) +++ core/branches/2.3.x/pom.xml 2010-08-18 08:24:59 UTC (rev 2929) @@ -1,376 +1,376 @@ - -<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>7</version> - </parent> - - <groupId>org.exoplatform.core</groupId> - <artifactId>core-parent</artifactId> - <version>2.3.3-GA-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.framework.junit.version>1.2.1-GA</org.exoplatform.framework.junit.version> - <org.exoplatform.kernel.version>2.2.3-GA</org.exoplatform.kernel.version> - </properties> - - <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/exo-jcr/core/branches/2.3.x/</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/exo-jcr/core/branches/2.3.x/</developerConnection> - <url>http://fisheye.jboss.org/browse/exo-jcr/core/branches/2.3.x</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>${org.exoplatform.framework.junit.version}</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>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - <version>1.5.8</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <version>1.5.8</version> - <scope>test</scope> - </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.4</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.3</version> - </dependency> - - <dependency> - <groupId>xdoclet</groupId> - <artifactId>xjavadoc</artifactId> - <version>1.2.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>org.apache.pdfbox</groupId> - <artifactId>pdfbox</artifactId> - <version>1.1.0</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> - - <dependency> - <groupId>commons-dbcp</groupId> - <artifactId>commons-dbcp</artifactId> - <version>1.2.2</version> - <exclusions> - <exclusion> - <groupId>commons-pool</groupId> - <artifactId>commons-pool</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>commons-pool</groupId> - <artifactId>commons-pool</artifactId> - <version>1.5.4</version> - </dependency> + +<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>7</version> + </parent> + + <groupId>org.exoplatform.core</groupId> + <artifactId>core-parent</artifactId> + <version>2.3.3-GA</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.framework.junit.version>1.2.1-GA</org.exoplatform.framework.junit.version> + <org.exoplatform.kernel.version>2.2.3-GA</org.exoplatform.kernel.version> + </properties> + + <scm> + <connection>scm:svn:http://anonsvn.jboss.org/repos/exo-jcr/core/tags/2.3.3-GA</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/exo-jcr/core/tags/2.3.3-GA</developerConnection> + <url>http://fisheye.jboss.org/browse/exo-jcr/core/tags/2.3.3-GA</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>${org.exoplatform.framework.junit.version}</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>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>1.5.8</version> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <version>1.5.8</version> + <scope>test</scope> + </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.4</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.3</version> + </dependency> + + <dependency> + <groupId>xdoclet</groupId> + <artifactId>xjavadoc</artifactId> + <version>1.2.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>org.apache.pdfbox</groupId> + <artifactId>pdfbox</artifactId> + <version>1.1.0</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> + + <dependency> + <groupId>commons-dbcp</groupId> + <artifactId>commons-dbcp</artifactId> + <version>1.2.2</version> + <exclusions> + <exclusion> + <groupId>commons-pool</groupId> + <artifactId>commons-pool</artifactId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>commons-pool</groupId> + <artifactId>commons-pool</artifactId> + <version>1.5.4</version> + </dependency> <dependency> <groupId>javassist</groupId> <artifactId>javassist</artifactId> <version>3.4.GA</version> </dependency> - - </dependencies> - </dependencyManagement> - - <dependencies> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <scope>test</scope> - </dependency> - </dependencies> -</project> + + </dependencies> + </dependencyManagement> + + <dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <scope>test</scope> + </dependency> + </dependencies> +</project>

13 years, 10 months

1
0
0 / 0

exo-jcr SVN: r2928 - core/branches/2.3.x.

by do-not-reply＠jboss.org

Author: tolusha Date: 2010-08-18 04:22:42 -0400 (Wed, 18 Aug 2010) New Revision: 2928 Modified: core/branches/2.3.x/pom.xml Log: EXOJCR-826: change dependency to tag Modified: core/branches/2.3.x/pom.xml =================================================================== --- core/branches/2.3.x/pom.xml 2010-08-18 07:58:20 UTC (rev 2927) +++ core/branches/2.3.x/pom.xml 2010-08-18 08:22:42 UTC (rev 2928) @@ -39,7 +39,7 @@ <exo.product.specification>2.3</exo.product.specification> <org.exoplatform.framework.junit.version>1.2.1-GA</org.exoplatform.framework.junit.version> - <org.exoplatform.kernel.version>2.2.3-GA-SNAPSHOT</org.exoplatform.kernel.version> + <org.exoplatform.kernel.version>2.2.3-GA</org.exoplatform.kernel.version> </properties> <scm>

13 years, 10 months

1
0
0 / 0

exo-jcr SVN: r2927 - in kernel/branches/2.2.x: exo.kernel.commons and 12 other directories.

by do-not-reply＠jboss.org

Author: tolusha Date: 2010-08-18 03:58:20 -0400 (Wed, 18 Aug 2010) New Revision: 2927 Modified: kernel/branches/2.2.x/exo.kernel.commons/pom.xml kernel/branches/2.2.x/exo.kernel.component.cache/pom.xml kernel/branches/2.2.x/exo.kernel.component.command/pom.xml kernel/branches/2.2.x/exo.kernel.component.common/pom.xml kernel/branches/2.2.x/exo.kernel.component.ext.cache.impl.jboss.v3/pom.xml kernel/branches/2.2.x/exo.kernel.component.remote/pom.xml kernel/branches/2.2.x/exo.kernel.container/pom.xml kernel/branches/2.2.x/exo.kernel.mc-integration/exo.kernel.mc-int-demo/pom.xml kernel/branches/2.2.x/exo.kernel.mc-integration/exo.kernel.mc-int-tests/pom.xml kernel/branches/2.2.x/exo.kernel.mc-integration/exo.kernel.mc-int/pom.xml kernel/branches/2.2.x/exo.kernel.mc-integration/exo.kernel.mc-kernel-extras/pom.xml kernel/branches/2.2.x/exo.kernel.mc-integration/pom.xml kernel/branches/2.2.x/packaging/module/pom.xml kernel/branches/2.2.x/pom.xml Log: [maven-release-plugin] prepare for next development iteration Modified: kernel/branches/2.2.x/exo.kernel.commons/pom.xml =================================================================== --- kernel/branches/2.2.x/exo.kernel.commons/pom.xml 2010-08-18 07:57:53 UTC (rev 2926) +++ kernel/branches/2.2.x/exo.kernel.commons/pom.xml 2010-08-18 07:58:20 UTC (rev 2927) @@ -25,7 +25,7 @@ <parent> <groupId>org.exoplatform.kernel</groupId> <artifactId>kernel-parent</artifactId> - <version>2.2.3-GA</version> + <version>2.2.4-GA-SNAPSHOT</version> </parent> <artifactId>exo.kernel.commons</artifactId> Modified: kernel/branches/2.2.x/exo.kernel.component.cache/pom.xml =================================================================== --- kernel/branches/2.2.x/exo.kernel.component.cache/pom.xml 2010-08-18 07:57:53 UTC (rev 2926) +++ kernel/branches/2.2.x/exo.kernel.component.cache/pom.xml 2010-08-18 07:58:20 UTC (rev 2927) @@ -25,7 +25,7 @@ <parent> <groupId>org.exoplatform.kernel</groupId> <artifactId>kernel-parent</artifactId> - <version>2.2.3-GA</version> + <version>2.2.4-GA-SNAPSHOT</version> </parent> <artifactId>exo.kernel.component.cache</artifactId> Modified: kernel/branches/2.2.x/exo.kernel.component.command/pom.xml =================================================================== --- kernel/branches/2.2.x/exo.kernel.component.command/pom.xml 2010-08-18 07:57:53 UTC (rev 2926) +++ kernel/branches/2.2.x/exo.kernel.component.command/pom.xml 2010-08-18 07:58:20 UTC (rev 2927) @@ -25,7 +25,7 @@ <parent> <groupId>org.exoplatform.kernel</groupId> <artifactId>kernel-parent</artifactId> - <version>2.2.3-GA</version> + <version>2.2.4-GA-SNAPSHOT</version> </parent> <artifactId>exo.kernel.component.command</artifactId> Modified: kernel/branches/2.2.x/exo.kernel.component.common/pom.xml =================================================================== --- kernel/branches/2.2.x/exo.kernel.component.common/pom.xml 2010-08-18 07:57:53 UTC (rev 2926) +++ kernel/branches/2.2.x/exo.kernel.component.common/pom.xml 2010-08-18 07:58:20 UTC (rev 2927) @@ -25,7 +25,7 @@ <parent> <groupId>org.exoplatform.kernel</groupId> <artifactId>kernel-parent</artifactId> - <version>2.2.3-GA</version> + <version>2.2.4-GA-SNAPSHOT</version> </parent> <artifactId>exo.kernel.component.common</artifactId> Modified: kernel/branches/2.2.x/exo.kernel.component.ext.cache.impl.jboss.v3/pom.xml =================================================================== --- kernel/branches/2.2.x/exo.kernel.component.ext.cache.impl.jboss.v3/pom.xml 2010-08-18 07:57:53 UTC (rev 2926) +++ kernel/branches/2.2.x/exo.kernel.component.ext.cache.impl.jboss.v3/pom.xml 2010-08-18 07:58:20 UTC (rev 2927) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.kernel</groupId> <artifactId>kernel-parent</artifactId> - <version>2.2.3-GA</version> + <version>2.2.4-GA-SNAPSHOT</version> </parent> <artifactId>exo.kernel.component.ext.cache.impl.jboss.v3</artifactId> <name>eXo Kernel :: Cache Extension :: JBoss Cache Implementation</name> Modified: kernel/branches/2.2.x/exo.kernel.component.remote/pom.xml =================================================================== --- kernel/branches/2.2.x/exo.kernel.component.remote/pom.xml 2010-08-18 07:57:53 UTC (rev 2926) +++ kernel/branches/2.2.x/exo.kernel.component.remote/pom.xml 2010-08-18 07:58:20 UTC (rev 2927) @@ -25,7 +25,7 @@ <parent> <groupId>org.exoplatform.kernel</groupId> <artifactId>kernel-parent</artifactId> - <version>2.2.3-GA</version> + <version>2.2.4-GA-SNAPSHOT</version> </parent> <artifactId>exo.kernel.component.remote</artifactId> Modified: kernel/branches/2.2.x/exo.kernel.container/pom.xml =================================================================== --- kernel/branches/2.2.x/exo.kernel.container/pom.xml 2010-08-18 07:57:53 UTC (rev 2926) +++ kernel/branches/2.2.x/exo.kernel.container/pom.xml 2010-08-18 07:58:20 UTC (rev 2927) @@ -12,7 +12,7 @@ <parent> <groupId>org.exoplatform.kernel</groupId> <artifactId>kernel-parent</artifactId> - <version>2.2.3-GA</version> + <version>2.2.4-GA-SNAPSHOT</version> </parent> <artifactId>exo.kernel.container</artifactId> <name>eXo Kernel :: Container</name> Modified: kernel/branches/2.2.x/exo.kernel.mc-integration/exo.kernel.mc-int/pom.xml =================================================================== --- kernel/branches/2.2.x/exo.kernel.mc-integration/exo.kernel.mc-int/pom.xml 2010-08-18 07:57:53 UTC (rev 2926) +++ kernel/branches/2.2.x/exo.kernel.mc-integration/exo.kernel.mc-int/pom.xml 2010-08-18 07:58:20 UTC (rev 2927) @@ -6,7 +6,7 @@ <parent> <groupId>org.exoplatform.kernel</groupId> <artifactId>mc-integration-parent</artifactId> - <version>2.2.3-GA</version> + <version>2.2.4-GA-SNAPSHOT</version> </parent> <artifactId>exo.kernel.mc-int</artifactId> Modified: kernel/branches/2.2.x/exo.kernel.mc-integration/exo.kernel.mc-int-demo/pom.xml =================================================================== --- kernel/branches/2.2.x/exo.kernel.mc-integration/exo.kernel.mc-int-demo/pom.xml 2010-08-18 07:57:53 UTC (rev 2926) +++ kernel/branches/2.2.x/exo.kernel.mc-integration/exo.kernel.mc-int-demo/pom.xml 2010-08-18 07:58:20 UTC (rev 2927) @@ -5,7 +5,7 @@ <parent> <groupId>org.exoplatform.kernel</groupId> <artifactId>mc-integration-parent</artifactId> - <version>2.2.3-GA</version> + <version>2.2.4-GA-SNAPSHOT</version> </parent> <artifactId>exo.kernel.mc-int-demo</artifactId> Modified: kernel/branches/2.2.x/exo.kernel.mc-integration/exo.kernel.mc-int-tests/pom.xml =================================================================== --- kernel/branches/2.2.x/exo.kernel.mc-integration/exo.kernel.mc-int-tests/pom.xml 2010-08-18 07:57:53 UTC (rev 2926) +++ kernel/branches/2.2.x/exo.kernel.mc-integration/exo.kernel.mc-int-tests/pom.xml 2010-08-18 07:58:20 UTC (rev 2927) @@ -5,7 +5,7 @@ <parent> <groupId>org.exoplatform.kernel</groupId> <artifactId>mc-integration-parent</artifactId> - <version>2.2.3-GA</version> + <version>2.2.4-GA-SNAPSHOT</version> </parent> <artifactId>exo.kernel.mc-int-tests</artifactId> Modified: kernel/branches/2.2.x/exo.kernel.mc-integration/exo.kernel.mc-kernel-extras/pom.xml =================================================================== --- kernel/branches/2.2.x/exo.kernel.mc-integration/exo.kernel.mc-kernel-extras/pom.xml 2010-08-18 07:57:53 UTC (rev 2926) +++ kernel/branches/2.2.x/exo.kernel.mc-integration/exo.kernel.mc-kernel-extras/pom.xml 2010-08-18 07:58:20 UTC (rev 2927) @@ -6,7 +6,7 @@ <parent> <groupId>org.exoplatform.kernel</groupId> <artifactId>mc-integration-parent</artifactId> - <version>2.2.3-GA</version> + <version>2.2.4-GA-SNAPSHOT</version> </parent> <artifactId>exo.kernel.mc-kernel-extras</artifactId> Modified: kernel/branches/2.2.x/exo.kernel.mc-integration/pom.xml =================================================================== --- kernel/branches/2.2.x/exo.kernel.mc-integration/pom.xml 2010-08-18 07:57:53 UTC (rev 2926) +++ kernel/branches/2.2.x/exo.kernel.mc-integration/pom.xml 2010-08-18 07:58:20 UTC (rev 2927) @@ -6,7 +6,7 @@ <parent> <groupId>org.exoplatform.kernel</groupId> <artifactId>kernel-parent</artifactId> - <version>2.2.3-GA</version> + <version>2.2.4-GA-SNAPSHOT</version> </parent> <artifactId>mc-integration-parent</artifactId> Modified: kernel/branches/2.2.x/packaging/module/pom.xml =================================================================== --- kernel/branches/2.2.x/packaging/module/pom.xml 2010-08-18 07:57:53 UTC (rev 2926) +++ kernel/branches/2.2.x/packaging/module/pom.xml 2010-08-18 07:58:20 UTC (rev 2927) @@ -2,7 +2,7 @@ <parent> <groupId>org.exoplatform.kernel</groupId> <artifactId>kernel-parent</artifactId> - <version>2.2.3-GA</version> + <version>2.2.4-GA-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: kernel/branches/2.2.x/pom.xml =================================================================== --- kernel/branches/2.2.x/pom.xml 2010-08-18 07:57:53 UTC (rev 2926) +++ kernel/branches/2.2.x/pom.xml 2010-08-18 07:58:20 UTC (rev 2927) @@ -30,7 +30,7 @@ <groupId>org.exoplatform.kernel</groupId> <artifactId>kernel-parent</artifactId> - <version>2.2.3-GA</version> + <version>2.2.4-GA-SNAPSHOT</version> <packaging>pom</packaging> <name>eXo Kernel</name> @@ -43,9 +43,9 @@ </properties> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/exo-jcr/kernel/tags/2.2.3-GA</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/exo-jcr/kernel/tags/2.2.3-GA</developerConnection> - <url>http://fisheye.jboss.org/browse/exo-jcr/kernel/tags/2.2.3-GA</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/exo-jcr/kernel/branches/2.2.x/</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/exo-jcr/kernel/branches/2.2.x/</developerConnection> + <url>http://fisheye.jboss.org/browse/exo-jcr/kernel/branches/2.2.x</url> </scm> <modules>

13 years, 10 months

1
0
0 / 0

exo-jcr SVN: r2926 - kernel/tags.

by do-not-reply＠jboss.org

Author: tolusha Date: 2010-08-18 03:57:53 -0400 (Wed, 18 Aug 2010) New Revision: 2926 Added: kernel/tags/2.2.3-GA/ Log: [maven-scm] copy for tag 2.2.3-GA Copied: kernel/tags/2.2.3-GA (from rev 2925, kernel/branches/2.2.x)

13 years, 10 months

1
0
0 / 0

exo-jcr SVN: r2925 - in kernel/branches/2.2.x: exo.kernel.commons and 12 other directories.

by do-not-reply＠jboss.org

Author: tolusha Date: 2010-08-18 03:57:30 -0400 (Wed, 18 Aug 2010) New Revision: 2925 Modified: kernel/branches/2.2.x/exo.kernel.commons/pom.xml kernel/branches/2.2.x/exo.kernel.component.cache/pom.xml kernel/branches/2.2.x/exo.kernel.component.command/pom.xml kernel/branches/2.2.x/exo.kernel.component.common/pom.xml kernel/branches/2.2.x/exo.kernel.component.ext.cache.impl.jboss.v3/pom.xml kernel/branches/2.2.x/exo.kernel.component.remote/pom.xml kernel/branches/2.2.x/exo.kernel.container/pom.xml kernel/branches/2.2.x/exo.kernel.mc-integration/exo.kernel.mc-int-demo/pom.xml kernel/branches/2.2.x/exo.kernel.mc-integration/exo.kernel.mc-int-tests/pom.xml kernel/branches/2.2.x/exo.kernel.mc-integration/exo.kernel.mc-int/pom.xml kernel/branches/2.2.x/exo.kernel.mc-integration/exo.kernel.mc-kernel-extras/pom.xml kernel/branches/2.2.x/exo.kernel.mc-integration/pom.xml kernel/branches/2.2.x/packaging/module/pom.xml kernel/branches/2.2.x/pom.xml Log: [maven-release-plugin] prepare release 2.2.3-GA Modified: kernel/branches/2.2.x/exo.kernel.commons/pom.xml =================================================================== --- kernel/branches/2.2.x/exo.kernel.commons/pom.xml 2010-08-18 07:28:06 UTC (rev 2924) +++ kernel/branches/2.2.x/exo.kernel.commons/pom.xml 2010-08-18 07:57:30 UTC (rev 2925) @@ -1,60 +1,60 @@ - -<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.3-GA-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> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </dependency> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <scope>compile</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.kernel</groupId> + <artifactId>kernel-parent</artifactId> + <version>2.2.3-GA</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> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <scope>compile</scope> + </dependency> + </dependencies> +</project> Modified: kernel/branches/2.2.x/exo.kernel.component.cache/pom.xml =================================================================== --- kernel/branches/2.2.x/exo.kernel.component.cache/pom.xml 2010-08-18 07:28:06 UTC (rev 2924) +++ kernel/branches/2.2.x/exo.kernel.component.cache/pom.xml 2010-08-18 07:57:30 UTC (rev 2925) @@ -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.3-GA-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> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</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.3-GA</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> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </dependency> + </dependencies> </project> \ No newline at end of file Modified: kernel/branches/2.2.x/exo.kernel.component.command/pom.xml =================================================================== --- kernel/branches/2.2.x/exo.kernel.component.command/pom.xml 2010-08-18 07:28:06 UTC (rev 2924) +++ kernel/branches/2.2.x/exo.kernel.component.command/pom.xml 2010-08-18 07:57:30 UTC (rev 2925) @@ -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.kernel</groupId> - <artifactId>kernel-parent</artifactId> - <version>2.2.3-GA-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> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <excludes> - <exclude>**/CommandServiceTest.java</exclude> - <exclude>**/MultiConfigServiceTest.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.kernel</groupId> + <artifactId>kernel-parent</artifactId> + <version>2.2.3-GA</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> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <excludes> + <exclude>**/CommandServiceTest.java</exclude> + <exclude>**/MultiConfigServiceTest.java</exclude> + </excludes> + </configuration> + </plugin> + </plugins> + </build> +</project> Modified: kernel/branches/2.2.x/exo.kernel.component.common/pom.xml =================================================================== --- kernel/branches/2.2.x/exo.kernel.component.common/pom.xml 2010-08-18 07:28:06 UTC (rev 2924) +++ kernel/branches/2.2.x/exo.kernel.component.common/pom.xml 2010-08-18 07:57:30 UTC (rev 2925) @@ -1,111 +1,111 @@ - -<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.3-GA-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>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </dependency> - <dependency> - <groupId>xpp3</groupId> - <artifactId>xpp3</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> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <excludes> - <exclude>**/InitialContextTest.java</exclude> - <exclude>**/TransactionTest.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.kernel</groupId> + <artifactId>kernel-parent</artifactId> + <version>2.2.3-GA</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>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </dependency> + <dependency> + <groupId>xpp3</groupId> + <artifactId>xpp3</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> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <excludes> + <exclude>**/InitialContextTest.java</exclude> + <exclude>**/TransactionTest.java</exclude> + </excludes> + </configuration> + </plugin> + </plugins> + </build> +</project> Modified: kernel/branches/2.2.x/exo.kernel.component.ext.cache.impl.jboss.v3/pom.xml =================================================================== --- kernel/branches/2.2.x/exo.kernel.component.ext.cache.impl.jboss.v3/pom.xml 2010-08-18 07:28:06 UTC (rev 2924) +++ kernel/branches/2.2.x/exo.kernel.component.ext.cache.impl.jboss.v3/pom.xml 2010-08-18 07:57:30 UTC (rev 2925) @@ -1,84 +1,84 @@ - -<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.3-GA-SNAPSHOT</version> - </parent> - <artifactId>exo.kernel.component.ext.cache.impl.jboss.v3</artifactId> - <name>eXo Kernel :: Cache Extension :: JBoss Cache Implementation</name> - <description>JBoss Cache Implementation for the Cache Service</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>org.exoplatform.kernel</groupId> - <artifactId>exo.kernel.component.cache</artifactId> - </dependency> - <dependency> - <groupId>org.jboss.cache</groupId> - <artifactId>jbosscache-core</artifactId> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </dependency> - </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <systemProperties> -  - <property> - <name>java.net.preferIPv4Stack</name> - <value>true</value> - </property> -  - <property> - <name>bind.address</name> - <value>127.0.0.1</value> - </property> - <property> - <name>jgroups.stack</name> - <value>udp</value> - </property> - </systemProperties> - </configuration> - </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.3-GA</version> + </parent> + <artifactId>exo.kernel.component.ext.cache.impl.jboss.v3</artifactId> + <name>eXo Kernel :: Cache Extension :: JBoss Cache Implementation</name> + <description>JBoss Cache Implementation for the Cache Service</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>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.component.cache</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.cache</groupId> + <artifactId>jbosscache-core</artifactId> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </dependency> + </dependencies> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <systemProperties> +  + <property> + <name>java.net.preferIPv4Stack</name> + <value>true</value> + </property> +  + <property> + <name>bind.address</name> + <value>127.0.0.1</value> + </property> + <property> + <name>jgroups.stack</name> + <value>udp</value> + </property> + </systemProperties> + </configuration> + </plugin> + </plugins> + </build> </project> \ No newline at end of file Modified: kernel/branches/2.2.x/exo.kernel.component.remote/pom.xml =================================================================== --- kernel/branches/2.2.x/exo.kernel.component.remote/pom.xml 2010-08-18 07:28:06 UTC (rev 2924) +++ kernel/branches/2.2.x/exo.kernel.component.remote/pom.xml 2010-08-18 07:57:30 UTC (rev 2925) @@ -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.3-GA-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.3-GA</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/branches/2.2.x/exo.kernel.container/pom.xml =================================================================== --- kernel/branches/2.2.x/exo.kernel.container/pom.xml 2010-08-18 07:28:06 UTC (rev 2924) +++ kernel/branches/2.2.x/exo.kernel.container/pom.xml 2010-08-18 07:57:30 UTC (rev 2925) @@ -1,100 +1,100 @@ - -  -<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.3-GA-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> - </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.slf4j</groupId> - <artifactId>slf4j-log4j12</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.3-GA</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> + </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.slf4j</groupId> + <artifactId>slf4j-log4j12</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/branches/2.2.x/exo.kernel.mc-integration/exo.kernel.mc-int/pom.xml =================================================================== --- kernel/branches/2.2.x/exo.kernel.mc-integration/exo.kernel.mc-int/pom.xml 2010-08-18 07:28:06 UTC (rev 2924) +++ kernel/branches/2.2.x/exo.kernel.mc-integration/exo.kernel.mc-int/pom.xml 2010-08-18 07:57:30 UTC (rev 2925) @@ -1,59 +1,59 @@ - -<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>mc-integration-parent</artifactId> - <version>2.2.3-GA-SNAPSHOT</version> - </parent> - - <artifactId>exo.kernel.mc-int</artifactId> - - <name>eXo Kernel :: MC Kernel Integration :: Implementation</name> - <description>MC Kernel Integration 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>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - </dependency> - <dependency> - <groupId>picocontainer</groupId> - <artifactId>picocontainer</artifactId> - </dependency> - <dependency> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-kernel</artifactId> - </dependency> - <dependency> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-aop-mc-int</artifactId> - </dependency> - <dependency> - <groupId>org.jboss.mc-int</groupId> - <artifactId>jboss-mc-int-common</artifactId> - </dependency> - <dependency> - <groupId>org.jboss.mc-int</groupId> - <artifactId>jboss-mc-int-servlet</artifactId> - </dependency> - <dependency> - <groupId>org.jboss.cl</groupId> - <artifactId>jboss-classloader</artifactId> - </dependency> - <dependency> - <groupId>org.exoplatform.kernel</groupId> - <artifactId>exo.kernel.mc-kernel-extras</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>mc-integration-parent</artifactId> + <version>2.2.3-GA</version> + </parent> + + <artifactId>exo.kernel.mc-int</artifactId> + + <name>eXo Kernel :: MC Kernel Integration :: Implementation</name> + <description>MC Kernel Integration 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>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + </dependency> + <dependency> + <groupId>picocontainer</groupId> + <artifactId>picocontainer</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.microcontainer</groupId> + <artifactId>jboss-kernel</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.microcontainer</groupId> + <artifactId>jboss-aop-mc-int</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.mc-int</groupId> + <artifactId>jboss-mc-int-common</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.mc-int</groupId> + <artifactId>jboss-mc-int-servlet</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.cl</groupId> + <artifactId>jboss-classloader</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.mc-kernel-extras</artifactId> + </dependency> + </dependencies> +</project> Modified: kernel/branches/2.2.x/exo.kernel.mc-integration/exo.kernel.mc-int-demo/pom.xml =================================================================== --- kernel/branches/2.2.x/exo.kernel.mc-integration/exo.kernel.mc-int-demo/pom.xml 2010-08-18 07:28:06 UTC (rev 2924) +++ kernel/branches/2.2.x/exo.kernel.mc-integration/exo.kernel.mc-int-demo/pom.xml 2010-08-18 07:57:30 UTC (rev 2925) @@ -1,36 +1,36 @@ -<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>mc-integration-parent</artifactId> - <version>2.2.3-GA-SNAPSHOT</version> - </parent> - - <artifactId>exo.kernel.mc-int-demo</artifactId> - - <name>eXo Kernel :: MC Kernel Integration :: Demo</name> - <description>MC Kernel Integration Demo</description> - - <dependencies> - <dependency> - <groupId>picocontainer</groupId> - <artifactId>picocontainer</artifactId> - </dependency> - <dependency> - <groupId>org.exoplatform.kernel</groupId> - <artifactId>exo.kernel.mc-int</artifactId> - </dependency> - <dependency> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-kernel</artifactId> - </dependency> - <dependency> - <groupId>javax.transaction</groupId> - <artifactId>jta</artifactId> - <version>1.0.1B</version> - </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>mc-integration-parent</artifactId> + <version>2.2.3-GA</version> + </parent> + + <artifactId>exo.kernel.mc-int-demo</artifactId> + + <name>eXo Kernel :: MC Kernel Integration :: Demo</name> + <description>MC Kernel Integration Demo</description> + + <dependencies> + <dependency> + <groupId>picocontainer</groupId> + <artifactId>picocontainer</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.mc-int</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.microcontainer</groupId> + <artifactId>jboss-kernel</artifactId> + </dependency> + <dependency> + <groupId>javax.transaction</groupId> + <artifactId>jta</artifactId> + <version>1.0.1B</version> + </dependency> + </dependencies> + +</project> Modified: kernel/branches/2.2.x/exo.kernel.mc-integration/exo.kernel.mc-int-tests/pom.xml =================================================================== --- kernel/branches/2.2.x/exo.kernel.mc-integration/exo.kernel.mc-int-tests/pom.xml 2010-08-18 07:28:06 UTC (rev 2924) +++ kernel/branches/2.2.x/exo.kernel.mc-integration/exo.kernel.mc-int-tests/pom.xml 2010-08-18 07:57:30 UTC (rev 2925) @@ -1,352 +1,352 @@ -<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>mc-integration-parent</artifactId> - <version>2.2.3-GA-SNAPSHOT</version> - </parent> - - <artifactId>exo.kernel.mc-int-tests</artifactId> - <packaging>war</packaging> - - <name>eXo Kernel :: MC Kernel Integration :: Tests</name> - <description>MC Kernel Integration Tests</description> - - <dependencies> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.7</version> - </dependency> - <dependency> - <groupId>org.exoplatform.kernel</groupId> - <artifactId>exo.kernel.container</artifactId> - </dependency> - <dependency> - <groupId>org.exoplatform.kernel</groupId> - <artifactId>exo.kernel.mc-int-demo</artifactId> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <artifactId>maven-war-plugin</artifactId> - <configuration> -  -  - <packagingIncludes>WEB-INF/lib/junit-*.jar,WEB-INF/classes/**</packagingIncludes> - <archive> - <manifest> - <addClasspath>false</addClasspath> -  -  - </manifest> - </archive> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <skip>true</skip> - </configuration> - </plugin> - </plugins> - </build> - - <profiles> - <profile> - <id>tests</id> - <build> - <finalName>eXo-kernel-integration-tests-${project.version}</finalName> - <defaultGoal>integration-test</defaultGoal> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <excludes> - <exclude>**/it/Test*.java</exclude> - </excludes> - </configuration> - <executions> - <execution> - <id>integration-tests</id> - <phase>integration-test</phase> - <goals> - <goal>test</goal> - </goals> - <configuration> - <skip>false</skip> - <excludes> - <exclude>none</exclude> - </excludes> - <includes> - <include>**/it/Test*.java</include> - </includes> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - - <profile> - <id>tests-with-jboss</id> - <build> - <finalName>eXo-kernel-integration-tests-${project.version}</finalName> - <defaultGoal>integration-test</defaultGoal> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-enforcer-plugin</artifactId> - <executions> - <execution> - <id>jbossas-check-environment-ready</id> - <goals> - <goal>enforce</goal> - </goals> - <configuration> - <rules> - <requireProperty> - <property>jboss.home</property> - <message>"You must define the property jboss.home to give the path to the package/pkg built GateIn JBoss instance"</message> - </requireProperty> - <requireFilesExist> - <files> - <file>${jboss.home}</file> - </files> - <message>"JBossAS directory doesn't exist : ${jboss.home}"</message> - </requireFilesExist> - <requireFilesExist> - <files> - <file>${jboss.home}/server/${jboss.conf}/deploy/gatein.ear</file> - </files> - <message>"JBossAS directory has no gatein.ear deployed: ${jboss.home}/server/${jboss.conf}/deploy/gatein.ear"</message> - </requireFilesExist> - </rules> - <fail>true</fail> - </configuration> - </execution> - </executions> - </plugin> - - <plugin> - <groupId>org.codehaus.cargo</groupId> - <artifactId>cargo-maven2-plugin</artifactId> - <version>1.0</version> - <configuration> - <wait>false</wait> - <container> - <containerId>jboss5x</containerId> - <type>installed</type> - <home>${jboss.home}</home> - <timeout>300000</timeout> - <output>${jboss.home}/server/${jboss.conf}/log/output.log</output> - </container> - <configuration> - <type>existing</type> - <home>${jboss.home}/server/${jboss.conf}</home> - <properties> - <cargo.jboss.configuration>${jboss.conf}</cargo.jboss.configuration> - <cargo.servlet.port>${jboss.port}</cargo.servlet.port> - <cargo.rmi.port>1099</cargo.rmi.port> - <cargo.jvmargs>-Xmx768m -XX:MaxPermSize=128m</cargo.jvmargs> - </properties> -  -  - </configuration> - </configuration> - - <executions> - <execution> - <id>start-container</id> - <phase>pre-integration-test</phase> - <goals> - <goal>start</goal> - </goals> - </execution> - <execution> - <id>stop-container</id> - <phase>post-integration-test</phase> - <goals> - <goal>stop</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <excludes> - <exclude>**/it/Test*.java</exclude> - </excludes> - </configuration> - <executions> - <execution> - <id>integration-tests</id> - <phase>integration-test</phase> - <goals> - <goal>test</goal> - </goals> - <configuration> - <skip>false</skip> - <excludes> - <exclude>none</exclude> - </excludes> - <includes> - <include>**/it/Test*.java</include> - </includes> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - <properties> - <jboss.conf>default</jboss.conf> - <jboss.port>8080</jboss.port> - </properties> - </profile> - - <profile> - <id>tests-with-tomcat</id> - <build> - <finalName>eXo-kernel-integration-tests-${project.version}</finalName> - <defaultGoal>integration-test</defaultGoal> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-enforcer-plugin</artifactId> - <executions> - <execution> - <id>tomcat-check-environment-ready</id> - <goals> - <goal>enforce</goal> - </goals> - <configuration> - <rules> - <requireProperty> - <property>tomcat.home</property> - <message>"You must define the property tomcat.home to give the path to the package/pkg built GateIn Tomcat instance"</message> - </requireProperty> - <requireFilesExist> - <files> - <file>${tomcat.home}</file> - </files> - <message>"Tomcat directory doesn't exist : ${tomcat.home}"</message> - </requireFilesExist> - <requireFilesExist> - <files> - <file>${tomcat.home}/webapps/portal.war</file> - </files> - <message>"Tomcat directory has no portal.war deployed: ${tomcat.home}/webapps/portal.war"</message> - </requireFilesExist> - </rules> - <fail>true</fail> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.codehaus.cargo</groupId> - <artifactId>cargo-maven2-plugin</artifactId> - <version>1.0</version> - <configuration> - <wait>false</wait> - <container> - <containerId>tomcat6x</containerId> - <type>installed</type> - <home>${tomcat.home}</home> - <timeout>300000</timeout> - <output>${tomcat.home}/logs/output.log</output> - </container> - <configuration> - <type>existing</type> - <home>${tomcat.home}</home> - <properties> - <cargo.servlet.port>${tomcat.port}</cargo.servlet.port> - <cargo.jvmargs>-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager -Xmx512m -XX:MaxPermSize=128m</cargo.jvmargs> - <cargo.logging>low</cargo.logging> - </properties> -  - </configuration> - </configuration> - - <executions> - <execution> - <id>start-container</id> - <phase>pre-integration-test</phase> - <goals> - <goal>start</goal> - </goals> - </execution> - <execution> - <id>stop-container</id> - <phase>post-integration-test</phase> - <goals> - <goal>stop</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <excludes> - <exclude>**/it/Test*.java</exclude> - </excludes> - </configuration> - <executions> - <execution> - <id>integration-tests</id> - <phase>integration-test</phase> - <goals> - <goal>test</goal> - </goals> - <configuration> - <skip>false</skip> - <excludes> - <exclude>none</exclude> - </excludes> - <includes> - <include>**/it/Test*.java</include> - </includes> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - <properties> - <tomcat.port>8080</tomcat.port> - </properties> - </profile> - </profiles> -</project> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>mc-integration-parent</artifactId> + <version>2.2.3-GA</version> + </parent> + + <artifactId>exo.kernel.mc-int-tests</artifactId> + <packaging>war</packaging> + + <name>eXo Kernel :: MC Kernel Integration :: Tests</name> + <description>MC Kernel Integration Tests</description> + + <dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.7</version> + </dependency> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.container</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.mc-int-demo</artifactId> + </dependency> + </dependencies> + + <build> + <plugins> + <plugin> + <artifactId>maven-war-plugin</artifactId> + <configuration> +  +  + <packagingIncludes>WEB-INF/lib/junit-*.jar,WEB-INF/classes/**</packagingIncludes> + <archive> + <manifest> + <addClasspath>false</addClasspath> +  +  + </manifest> + </archive> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <skip>true</skip> + </configuration> + </plugin> + </plugins> + </build> + + <profiles> + <profile> + <id>tests</id> + <build> + <finalName>eXo-kernel-integration-tests-${project.version}</finalName> + <defaultGoal>integration-test</defaultGoal> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <excludes> + <exclude>**/it/Test*.java</exclude> + </excludes> + </configuration> + <executions> + <execution> + <id>integration-tests</id> + <phase>integration-test</phase> + <goals> + <goal>test</goal> + </goals> + <configuration> + <skip>false</skip> + <excludes> + <exclude>none</exclude> + </excludes> + <includes> + <include>**/it/Test*.java</include> + </includes> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + + <profile> + <id>tests-with-jboss</id> + <build> + <finalName>eXo-kernel-integration-tests-${project.version}</finalName> + <defaultGoal>integration-test</defaultGoal> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-enforcer-plugin</artifactId> + <executions> + <execution> + <id>jbossas-check-environment-ready</id> + <goals> + <goal>enforce</goal> + </goals> + <configuration> + <rules> + <requireProperty> + <property>jboss.home</property> + <message>"You must define the property jboss.home to give the path to the package/pkg built GateIn JBoss instance"</message> + </requireProperty> + <requireFilesExist> + <files> + <file>${jboss.home}</file> + </files> + <message>"JBossAS directory doesn't exist : ${jboss.home}"</message> + </requireFilesExist> + <requireFilesExist> + <files> + <file>${jboss.home}/server/${jboss.conf}/deploy/gatein.ear</file> + </files> + <message>"JBossAS directory has no gatein.ear deployed: ${jboss.home}/server/${jboss.conf}/deploy/gatein.ear"</message> + </requireFilesExist> + </rules> + <fail>true</fail> + </configuration> + </execution> + </executions> + </plugin> + + <plugin> + <groupId>org.codehaus.cargo</groupId> + <artifactId>cargo-maven2-plugin</artifactId> + <version>1.0</version> + <configuration> + <wait>false</wait> + <container> + <containerId>jboss5x</containerId> + <type>installed</type> + <home>${jboss.home}</home> + <timeout>300000</timeout> + <output>${jboss.home}/server/${jboss.conf}/log/output.log</output> + </container> + <configuration> + <type>existing</type> + <home>${jboss.home}/server/${jboss.conf}</home> + <properties> + <cargo.jboss.configuration>${jboss.conf}</cargo.jboss.configuration> + <cargo.servlet.port>${jboss.port}</cargo.servlet.port> + <cargo.rmi.port>1099</cargo.rmi.port> + <cargo.jvmargs>-Xmx768m -XX:MaxPermSize=128m</cargo.jvmargs> + </properties> +  +  + </configuration> + </configuration> + + <executions> + <execution> + <id>start-container</id> + <phase>pre-integration-test</phase> + <goals> + <goal>start</goal> + </goals> + </execution> + <execution> + <id>stop-container</id> + <phase>post-integration-test</phase> + <goals> + <goal>stop</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <excludes> + <exclude>**/it/Test*.java</exclude> + </excludes> + </configuration> + <executions> + <execution> + <id>integration-tests</id> + <phase>integration-test</phase> + <goals> + <goal>test</goal> + </goals> + <configuration> + <skip>false</skip> + <excludes> + <exclude>none</exclude> + </excludes> + <includes> + <include>**/it/Test*.java</include> + </includes> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + <properties> + <jboss.conf>default</jboss.conf> + <jboss.port>8080</jboss.port> + </properties> + </profile> + + <profile> + <id>tests-with-tomcat</id> + <build> + <finalName>eXo-kernel-integration-tests-${project.version}</finalName> + <defaultGoal>integration-test</defaultGoal> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-enforcer-plugin</artifactId> + <executions> + <execution> + <id>tomcat-check-environment-ready</id> + <goals> + <goal>enforce</goal> + </goals> + <configuration> + <rules> + <requireProperty> + <property>tomcat.home</property> + <message>"You must define the property tomcat.home to give the path to the package/pkg built GateIn Tomcat instance"</message> + </requireProperty> + <requireFilesExist> + <files> + <file>${tomcat.home}</file> + </files> + <message>"Tomcat directory doesn't exist : ${tomcat.home}"</message> + </requireFilesExist> + <requireFilesExist> + <files> + <file>${tomcat.home}/webapps/portal.war</file> + </files> + <message>"Tomcat directory has no portal.war deployed: ${tomcat.home}/webapps/portal.war"</message> + </requireFilesExist> + </rules> + <fail>true</fail> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.codehaus.cargo</groupId> + <artifactId>cargo-maven2-plugin</artifactId> + <version>1.0</version> + <configuration> + <wait>false</wait> + <container> + <containerId>tomcat6x</containerId> + <type>installed</type> + <home>${tomcat.home}</home> + <timeout>300000</timeout> + <output>${tomcat.home}/logs/output.log</output> + </container> + <configuration> + <type>existing</type> + <home>${tomcat.home}</home> + <properties> + <cargo.servlet.port>${tomcat.port}</cargo.servlet.port> + <cargo.jvmargs>-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager -Xmx512m -XX:MaxPermSize=128m</cargo.jvmargs> + <cargo.logging>low</cargo.logging> + </properties> +  + </configuration> + </configuration> + + <executions> + <execution> + <id>start-container</id> + <phase>pre-integration-test</phase> + <goals> + <goal>start</goal> + </goals> + </execution> + <execution> + <id>stop-container</id> + <phase>post-integration-test</phase> + <goals> + <goal>stop</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <excludes> + <exclude>**/it/Test*.java</exclude> + </excludes> + </configuration> + <executions> + <execution> + <id>integration-tests</id> + <phase>integration-test</phase> + <goals> + <goal>test</goal> + </goals> + <configuration> + <skip>false</skip> + <excludes> + <exclude>none</exclude> + </excludes> + <includes> + <include>**/it/Test*.java</include> + </includes> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + <properties> + <tomcat.port>8080</tomcat.port> + </properties> + </profile> + </profiles> +</project> Modified: kernel/branches/2.2.x/exo.kernel.mc-integration/exo.kernel.mc-kernel-extras/pom.xml =================================================================== --- kernel/branches/2.2.x/exo.kernel.mc-integration/exo.kernel.mc-kernel-extras/pom.xml 2010-08-18 07:28:06 UTC (rev 2924) +++ kernel/branches/2.2.x/exo.kernel.mc-integration/exo.kernel.mc-kernel-extras/pom.xml 2010-08-18 07:57:30 UTC (rev 2925) @@ -1,23 +1,23 @@ - -<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>mc-integration-parent</artifactId> - <version>2.2.3-GA-SNAPSHOT</version> - </parent> - - <artifactId>exo.kernel.mc-kernel-extras</artifactId> - - <name>eXo Kernel :: MC Kernel Extras</name> - <description>MC Kernel 2.2.0 classes that aren't available in mc-kernel 2.0.6.GA</description> - - <dependencies> - <dependency> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-kernel</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>mc-integration-parent</artifactId> + <version>2.2.3-GA</version> + </parent> + + <artifactId>exo.kernel.mc-kernel-extras</artifactId> + + <name>eXo Kernel :: MC Kernel Extras</name> + <description>MC Kernel 2.2.0 classes that aren't available in mc-kernel 2.0.6.GA</description> + + <dependencies> + <dependency> + <groupId>org.jboss.microcontainer</groupId> + <artifactId>jboss-kernel</artifactId> + </dependency> + </dependencies> +</project> Modified: kernel/branches/2.2.x/exo.kernel.mc-integration/pom.xml =================================================================== --- kernel/branches/2.2.x/exo.kernel.mc-integration/pom.xml 2010-08-18 07:28:06 UTC (rev 2924) +++ kernel/branches/2.2.x/exo.kernel.mc-integration/pom.xml 2010-08-18 07:57:30 UTC (rev 2925) @@ -1,92 +1,92 @@ - -<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.3-GA-SNAPSHOT</version> - </parent> - - <artifactId>mc-integration-parent</artifactId> - <packaging>pom</packaging> - - <name>eXo Kernel :: MC Kernel Integration</name> - <description>MC Kernel Integration</description> - - <properties> -  - <version.jboss.mc>2.0.6.GA</version.jboss.mc> - <version.jboss.mc-int>2.2.0.Alpha2</version.jboss.mc-int> - <version.jboss.classloader>2.0.7.GA</version.jboss.classloader> - - </properties> - <modules> - <module>exo.kernel.mc-int</module> - <module>exo.kernel.mc-kernel-extras</module> - <module>exo.kernel.mc-int-demo</module> - <module>exo.kernel.mc-int-tests</module> - </modules> - - <dependencyManagement> - <dependencies> - <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.container</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.exoplatform.kernel</groupId> - <artifactId>exo.kernel.mc-int</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.exoplatform.kernel</groupId> - <artifactId>exo.kernel.mc-int-demo</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.exoplatform.kernel</groupId> - <artifactId>exo.kernel.mc-kernel-extras</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-dependency</artifactId> - <version>${version.jboss.mc}</version> - </dependency> - <dependency> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-kernel</artifactId> - <version>${version.jboss.mc}</version> - </dependency> - <dependency> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-aop-mc-int</artifactId> - <version>${version.jboss.mc}</version> - </dependency> - <dependency> - <groupId>org.jboss.mc-int</groupId> - <artifactId>jboss-mc-int-common</artifactId> - <version>${version.jboss.mc-int}</version> - </dependency> - <dependency> - <groupId>org.jboss.mc-int</groupId> - <artifactId>jboss-mc-int-servlet</artifactId> - <version>${version.jboss.mc-int}</version> - </dependency> - <dependency> - <groupId>org.jboss.cl</groupId> - <artifactId>jboss-classloader</artifactId> - <version>${version.jboss.classloader}</version> - </dependency> - </dependencies> - </dependencyManagement> - -</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.3-GA</version> + </parent> + + <artifactId>mc-integration-parent</artifactId> + <packaging>pom</packaging> + + <name>eXo Kernel :: MC Kernel Integration</name> + <description>MC Kernel Integration</description> + + <properties> +  + <version.jboss.mc>2.0.6.GA</version.jboss.mc> + <version.jboss.mc-int>2.2.0.Alpha2</version.jboss.mc-int> + <version.jboss.classloader>2.0.7.GA</version.jboss.classloader> + + </properties> + <modules> + <module>exo.kernel.mc-int</module> + <module>exo.kernel.mc-kernel-extras</module> + <module>exo.kernel.mc-int-demo</module> + <module>exo.kernel.mc-int-tests</module> + </modules> + + <dependencyManagement> + <dependencies> + <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.container</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.mc-int</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.mc-int-demo</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.mc-kernel-extras</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.jboss.microcontainer</groupId> + <artifactId>jboss-dependency</artifactId> + <version>${version.jboss.mc}</version> + </dependency> + <dependency> + <groupId>org.jboss.microcontainer</groupId> + <artifactId>jboss-kernel</artifactId> + <version>${version.jboss.mc}</version> + </dependency> + <dependency> + <groupId>org.jboss.microcontainer</groupId> + <artifactId>jboss-aop-mc-int</artifactId> + <version>${version.jboss.mc}</version> + </dependency> + <dependency> + <groupId>org.jboss.mc-int</groupId> + <artifactId>jboss-mc-int-common</artifactId> + <version>${version.jboss.mc-int}</version> + </dependency> + <dependency> + <groupId>org.jboss.mc-int</groupId> + <artifactId>jboss-mc-int-servlet</artifactId> + <version>${version.jboss.mc-int}</version> + </dependency> + <dependency> + <groupId>org.jboss.cl</groupId> + <artifactId>jboss-classloader</artifactId> + <version>${version.jboss.classloader}</version> + </dependency> + </dependencies> + </dependencyManagement> + +</project> Modified: kernel/branches/2.2.x/packaging/module/pom.xml =================================================================== --- kernel/branches/2.2.x/packaging/module/pom.xml 2010-08-18 07:28:06 UTC (rev 2924) +++ kernel/branches/2.2.x/packaging/module/pom.xml 2010-08-18 07:57:30 UTC (rev 2925) @@ -1,67 +1,67 @@ -<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.kernel</groupId> - <artifactId>kernel-parent</artifactId> - <version>2.2.3-GA-SNAPSHOT</version> - </parent> - - <modelVersion>4.0.0</modelVersion> - <artifactId>kernel.packaging.module</artifactId> - <packaging>pom</packaging> - <name>eXo Kernel Build module</name> - - <properties> - <exobuild.name>kernel</exobuild.name> - <exobuild.type>module</exobuild.type> - <enforcer.skip>true</enforcer.skip> - </properties> - - <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> +<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.kernel</groupId> + <artifactId>kernel-parent</artifactId> + <version>2.2.3-GA</version> + </parent> + + <modelVersion>4.0.0</modelVersion> + <artifactId>kernel.packaging.module</artifactId> + <packaging>pom</packaging> + <name>eXo Kernel Build module</name> + + <properties> + <exobuild.name>kernel</exobuild.name> + <exobuild.type>module</exobuild.type> + <enforcer.skip>true</enforcer.skip> + </properties> + + <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> Modified: kernel/branches/2.2.x/pom.xml =================================================================== --- kernel/branches/2.2.x/pom.xml 2010-08-18 07:28:06 UTC (rev 2924) +++ kernel/branches/2.2.x/pom.xml 2010-08-18 07:57:30 UTC (rev 2925) @@ -1,215 +1,215 @@ - -<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>7</version> - </parent> - - <groupId>org.exoplatform.kernel</groupId> - <artifactId>kernel-parent</artifactId> - <version>2.2.3-GA-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> - <org.exoplatform.framework.junit.version>1.2.1-GA</org.exoplatform.framework.junit.version> - <forkMode>always</forkMode> - </properties> - - <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/exo-jcr/kernel/branches/2.2.x/</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/exo-jcr/kernel/branches/2.2.x/</developerConnection> - <url>http://fisheye.jboss.org/browse/exo-jcr/kernel/branches/2.2.x</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.ext.cache.impl.jboss.v3</module> - <module>exo.kernel.component.command</module> - <module>exo.kernel.mc-integration</module> - <module>packaging/module</module> - </modules> - - <dependencyManagement> - <dependencies> - <dependency> - <groupId>org.exoplatform.tool</groupId> - <artifactId>exo.tool.framework.junit</artifactId> - <version>${org.exoplatform.framework.junit.version}</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>org.exoplatform.kernel</groupId> - <artifactId>exo.kernel.component.cache</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.1</version> - </dependency> - <dependency> - <groupId>commons-beanutils</groupId> - <artifactId>commons-beanutils</artifactId> - <version>1.8.0</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.8.1</version> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - <version>1.5.8</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <version>1.5.8</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.14</version> - <scope>test</scope> - </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.2</version> - </dependency> - <dependency> - <groupId>javax.mail</groupId> - <artifactId>mail</artifactId> - <version>1.4.2</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.13.GA</version> - </dependency> - <dependency> - <groupId>org.jboss.cache</groupId> - <artifactId>jbosscache-core</artifactId> - <version>3.2.4.GA</version> - </dependency> - <dependency> - <groupId>org.jibx</groupId> - <artifactId>jibx-bind</artifactId> - <version>${version.jibx.plugin}</version> - </dependency> - <dependency> - <groupId>org.jibx</groupId> - <artifactId>jibx-extras</artifactId> - <version>${version.jibx.plugin}</version> - </dependency> - <dependency> - <groupId>org.jibx</groupId> - <artifactId>jibx-run</artifactId> - <version>${version.jibx.plugin}</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>7</version> + </parent> + + <groupId>org.exoplatform.kernel</groupId> + <artifactId>kernel-parent</artifactId> + <version>2.2.3-GA</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> + <org.exoplatform.framework.junit.version>1.2.1-GA</org.exoplatform.framework.junit.version> + <forkMode>always</forkMode> + </properties> + + <scm> + <connection>scm:svn:http://anonsvn.jboss.org/repos/exo-jcr/kernel/tags/2.2.3-GA</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/exo-jcr/kernel/tags/2.2.3-GA</developerConnection> + <url>http://fisheye.jboss.org/browse/exo-jcr/kernel/tags/2.2.3-GA</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.ext.cache.impl.jboss.v3</module> + <module>exo.kernel.component.command</module> + <module>exo.kernel.mc-integration</module> + <module>packaging/module</module> + </modules> + + <dependencyManagement> + <dependencies> + <dependency> + <groupId>org.exoplatform.tool</groupId> + <artifactId>exo.tool.framework.junit</artifactId> + <version>${org.exoplatform.framework.junit.version}</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>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.component.cache</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.1</version> + </dependency> + <dependency> + <groupId>commons-beanutils</groupId> + <artifactId>commons-beanutils</artifactId> + <version>1.8.0</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.8.1</version> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>1.5.8</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <version>1.5.8</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.2.14</version> + <scope>test</scope> + </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.2</version> + </dependency> + <dependency> + <groupId>javax.mail</groupId> + <artifactId>mail</artifactId> + <version>1.4.2</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.13.GA</version> + </dependency> + <dependency> + <groupId>org.jboss.cache</groupId> + <artifactId>jbosscache-core</artifactId> + <version>3.2.4.GA</version> + </dependency> + <dependency> + <groupId>org.jibx</groupId> + <artifactId>jibx-bind</artifactId> + <version>${version.jibx.plugin}</version> + </dependency> + <dependency> + <groupId>org.jibx</groupId> + <artifactId>jibx-extras</artifactId> + <version>${version.jibx.plugin}</version> + </dependency> + <dependency> + <groupId>org.jibx</groupId> + <artifactId>jibx-run</artifactId> + <version>${version.jibx.plugin}</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>

13 years, 10 months

1
0
0 / 0

exo-jcr SVN: r2924 - jcr/branches/1.12.x/exo.jcr.component.core/src/test/resources/conf/standalone.

by do-not-reply＠jboss.org

Author: areshetnyak Date: 2010-08-18 03:28:06 -0400 (Wed, 18 Aug 2010) New Revision: 2924 Modified: jcr/branches/1.12.x/exo.jcr.component.core/src/test/resources/conf/standalone/test-configuration-sjdbc.xml Log: EXOJCR-897 : Registration node types for TestImport to single DB was added. Modified: jcr/branches/1.12.x/exo.jcr.component.core/src/test/resources/conf/standalone/test-configuration-sjdbc.xml =================================================================== --- jcr/branches/1.12.x/exo.jcr.component.core/src/test/resources/conf/standalone/test-configuration-sjdbc.xml 2010-08-17 14:29:17 UTC (rev 2923) +++ jcr/branches/1.12.x/exo.jcr.component.core/src/test/resources/conf/standalone/test-configuration-sjdbc.xml 2010-08-18 07:28:06 UTC (rev 2924) @@ -118,6 +118,7 @@ <property name="rma" value="http://www.rma.com/jcr/"/> <property name="metadata" value="http://www.exoplatform.com/jcr/metadata/1.1/"/> <property name="dc" value="http://purl.org/dc/elements/1.1/"/> + <property name="publication" value="http://www.exoplatform.com/jcr/publication/1.1/"/> </properties-param> </init-params> </component-plugin> @@ -133,7 +134,10 @@ <value>jar:/conf/test/nodetypes-impl.xml</value> <value>jar:/conf/test/nodetypes-usecase.xml</value> <value>jar:/conf/test/nodetypes-config.xml</value> - <value>jar:/conf/test/nodetypes-config-extended.xml</value> + <value>jar:/conf/test/nodetypes-config-extended.xml</value> + <value>jar:/conf/test/wcm-nodetypes.xml</value> + <value>jar:/conf/test/nodetypes-publication-config.xml</value> + <value>jar:/conf/test/publication-plugins-nodetypes-config.xml</value> </values-param> <values-param>

13 years, 10 months

1
0
0 / 0

exo-jcr SVN: r2923 - in jcr/trunk/docs/reference/en/src/main/docbook/en-US/modules: jcr and 1 other directories.

by do-not-reply＠jboss.org

Author: sergiykarpenko Date: 2010-08-17 10:29:17 -0400 (Tue, 17 Aug 2010) New Revision: 2923 Removed: jcr/trunk/docs/reference/en/src/main/docbook/en-US/modules/jcr/architecture.xml jcr/trunk/docs/reference/en/src/main/docbook/en-US/modules/ws/rest-framework.xml jcr/trunk/docs/reference/en/src/main/docbook/en-US/modules/ws/rest-service-tutorial.xml Modified: jcr/trunk/docs/reference/en/src/main/docbook/en-US/modules/jcr.xml jcr/trunk/docs/reference/en/src/main/docbook/en-US/modules/ws.xml Log: EXOJCR-892: few chapters removed removed Deleted: jcr/trunk/docs/reference/en/src/main/docbook/en-US/modules/jcr/architecture.xml =================================================================== --- jcr/trunk/docs/reference/en/src/main/docbook/en-US/modules/jcr/architecture.xml 2010-08-17 14:20:04 UTC (rev 2922) +++ jcr/trunk/docs/reference/en/src/main/docbook/en-US/modules/jcr/architecture.xml 2010-08-17 14:29:17 UTC (rev 2923) @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" -"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"> -<chapter id="architecture" xreflabel="architectural"> - <?dbhtml filename="ch-architecture.html"?> - <chapterinfo> - <keywordset> - <keyword>JCR</keyword> - <keyword>eXoJCR</keyword> - <keyword>etc</keyword> - </keywordset> - </chapterinfo> - <title>Basic concepts of eXoJCR</title> -</chapter> Modified: jcr/trunk/docs/reference/en/src/main/docbook/en-US/modules/jcr.xml =================================================================== --- jcr/trunk/docs/reference/en/src/main/docbook/en-US/modules/jcr.xml 2010-08-17 14:20:04 UTC (rev 2922) +++ jcr/trunk/docs/reference/en/src/main/docbook/en-US/modules/jcr.xml 2010-08-17 14:29:17 UTC (rev 2923) @@ -9,9 +9,6 @@ <xi:include href="jcr/intro.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> - <xi:include href="jcr/architecture.xml" - xmlns:xi="http://www.w3.org/2001/XInclude" /> -  <xi:include href="jcr/configuration.xml" @@ -55,14 +52,14 @@  <xi:include href="jcr/statistics.xml" - xmlns:xi="http://www.w3.org/2001/XInclude" /> - + xmlns:xi="http://www.w3.org/2001/XInclude" /> +  <xi:include href="jcr/data-container.xml" - xmlns:xi="http://www.w3.org/2001/XInclude" /> + xmlns:xi="http://www.w3.org/2001/XInclude" /> <xi:include href="jcr/data-container-howto.xml" - xmlns:xi="http://www.w3.org/2001/XInclude" /> - + xmlns:xi="http://www.w3.org/2001/XInclude" /> + </part> Deleted: jcr/trunk/docs/reference/en/src/main/docbook/en-US/modules/ws/rest-framework.xml =================================================================== --- jcr/trunk/docs/reference/en/src/main/docbook/en-US/modules/ws/rest-framework.xml 2010-08-17 14:20:04 UTC (rev 2922) +++ jcr/trunk/docs/reference/en/src/main/docbook/en-US/modules/ws/rest-framework.xml 2010-08-17 14:29:17 UTC (rev 2923) @@ -1,472 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" -"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"> -<chapter> - <?dbhtml filename="ch-ws.html"?> - - <title>REST Framework</title> - - <important> - <para>This describes REST framework before version exo-ws-2.0</para> - </important> - - <section> - <title>Requirements</title> - - <para>The purpose of eXo REST framework is to make eXo services (i.e. the - components deployed inside eXo Container) simple and transparently - accessible via HTTP in RESTful manner. In other words those services - should be viewed as a set of REST Resources - endpoints of the HTTP - request-response chain, we call those services ResourceContainers.</para> - - <para>image: Simplified working model</para> - - <para>Taking into account HTTP/REST constraints, it is considered that - Resources (naturally mapped as Java methods) contained in - ResourceContainer conform with the following conditions:</para> - - <itemizedlist> - <listitem> - <para>they are uniquely identifiable in the same way as it is - specified for HTTP i.e. using URI</para> - </listitem> - - <listitem> - <para>they can accept data from an HTTP request using all possible - mechanisms, i.e. as a part of an URL, as URI parameters, as HTTP - headers and body</para> - </listitem> - - <listitem> - <para>they can return data to an HTTP response using all possible - mechanisms, i.e. as HTTP status, headers and body</para> - </listitem> - </itemizedlist> - - <para>From the implementation point of view:</para> - - <itemizedlist> - <listitem> - <para>the framework should be as much JSR-311 compatible as possible - for the time the Specification is in draft and fully compatible after - the standard's release</para> - </listitem> - - <listitem> - <para>the ResourceContainer components should be deployable and - accessible in the same way as an ordinary service</para> - </listitem> - </itemizedlist> - </section> - - <section> - <title>Implementation</title> - - <para>In our REST architecture implementation, an HTTPServlet is the - front-end for the REST engine. In this RESTful framework, endpoints for - HTTP request are represented by java classes (ResourceContainers). All - ResourceContainers are run as components of an ExoContainer, so they are - configured within the same configuration file.</para> - - <para>ResourceBinder and ResourceDispatcher are two other important - components of the REST engine. ResourceBinder deals with binding and - unbinding ResourceContainer. ResourceDispatcher dispatches REST requests - to ResourceContainer. ResourceBinder and ResourceDispatcher are also - components of the ExoContainer</para> - - <section> - <title>ResourceContainer</title> - - <para>A ResourceContainer is an annotated java class. Annotations must - at least describe URLs and HTTP methods to be served by this container. - But they may also describe other parameters, like produced content type - or transformers. Transformers are special Java classes, used to - serialize and deserialize Java objects.</para> - - <para>A very simple ResourceContainer may look like this:</para> - - <programlisting>@HTTPMethod("GET") -@URITemplate("/test1/{param}/test2/") -public Response method1(@URIParam("param") String param) { -//... -//... - Response resp = Response.Builder.ok().build(); - return resp; -}</programlisting> - - <para>The ResourceContainer described above is very simple, it can serve - the GET HTTP method for the relative URL /test1/{param}/test2/ where - {param} can be any string value. Additionally, {param} can be used as a - method parameter of the container by annotating it as : - @URIParam("param") String param. For example, in URL /test1/myID/test2 - the method parameter "param" has the value "myID".</para> - - <para>@URITemplate may be used for annotating classes or methods. If the - TYPE scope annotation is for example @URITemplate("/testservices/") and - a METHOD scope annotation is @URITemplate("/service1/") then that method - can be called with the path /testservices/service1/. All - ResourceContainer methods return Response objects. A Response includes - HTTP status, an entity (the requested resource), HTTP headers and - OutputEntityTransformer.</para> - - <mediaobject> - <imageobject> - <imagedata fileref="images/rest-scheme.png" /> - </imageobject> - </mediaobject> - - <para>A client sends a request, after some operations, the HTTP request - is parsed into three parts: the HTTP request stream, which consists of - the body of the request, HTTP headers and query parameters. Then - ResourceDispatcher gets this request. During the start of ExoContainers - ResourceBinder collects all available ResourceContainers and after the - start passes the list of ResourceContainers to the ResourceDispatcher. - When ResourceDispatcher gets the request from a client it tries to - search for a valid ResourceContainer. For this search ResourceDispatcher - uses @HTTPMethod, @URITemplate and @ProducedMimeType annotations. The - last one is not always necessary, if it is not specified this is set in - / (all mime types). When ResourceDispatcher found the "right" - ResourceContainer it tries to call a method with some parameters. - ResourceDispatcher will send only parameters which ResourceContainer - requests. In the code example above the parameter is a part of the - requested URL between "/test1/" and "/test2/". ResourceContainer methods - can consist only of some well-defined parameters. See the next - rules:</para> - - <itemizedlist> - <listitem> - <para>Only one parameter of a method can be not annotated. This - parameter represents the body of the HTTP request.</para> - </listitem> - - <listitem> - <para>All other parameters should be of java.lang.String types or - must have a constructor with the java.lang.String parameter and must - have annotation.</para> - </listitem> - - <listitem> - <para>If the parameter which represents the HTTP request body is - present, then in the annotation @InputTransformer a java class must - be defined that can build the requested parameter from - java.io.InputStream. About transformation see below. After request - processing ResourceContainer creates Request. Request is a special - Java object which consists of HTTP status, a response header, an - entity, a transformer. The entity is a representation of the - requested resource. If Response has an entity it also must have - OutputEntityTransformer. OutputEntityTransformer can be set in a few - different ways.</para> - </listitem> - </itemizedlist> - </section> - - <section> - <title>Response</title> - - <para>Response is created by Builder. Builder is an inner static Java - class within Response. Builder has some preset ways to build Response, - for example (see code example above). The method ok() creates Builder - with status 200 (OK HTTP status) and ok() returns again a Builder - object. In this way a developer can again call other Builder methods. - For example:</para> - - <programlisting>//... -Document doc = .... -Response response = Response.Builder.ok().entity(doc, "text/xml").transformer(new XMLOutputTransformer()).build();</programlisting> - - <para>In the code example above Response has HTTP status 200, an XML - document like entity, a Content-Type header "text/xml" and - OutputEntityTransformer of type XMLOutputTransformer. The method build() - should be called at the end of process. In the same way a developer can - build some other prepared Responses, like CREATED, NO CONTENT, - FORBIDDEN, INTERNAL ERROR and other. In this example we set - OutputEntityTransformer directly. Another mechanism to do this is the - same like in the case with InputEntityTransformer.</para> - - <programlisting>//... -@HTTPMethod("GET") -@URITemplate("/test/resource1/") -(a)InputTransformer(XMLInputTransformer.class) -(a)OutputTransformer(XMLOutputTransformer.class) -public Response method1(Document inputDoc) { -//... - Document doc = .... - Response response = Response.Builder.ok(doc, "text/xml").build(); - return response; -}</programlisting> - - <para>InputEntityTransformer is described in the annotation to the - method "method1". OutputEntityTransformer is described in the annotation - to the method "method1".</para> - </section> - - <section> - <title>Transformer</title> - - <para>All transformers can be created by EntityTransformerFactory. - Transformers can be divided in two groups. Transformers from the first - one extend the abstract class InputEntityTransformer. - InputEntityTransformer implements the interface - GenericInputEntityTransformer, and GenericInputEntityTransformer extends - the interface GenericEntityTransformer. This architecture gives the - possibility to use one class EntityTransformerFactory for creating both - types of transformers (input and output). At first we will speak about - InputEntityTransformer.</para> - - <para><command>InputEntityTransformer</command></para> - - <para>All classes which extend the abstract class InputEntitytransformer - must override the method ObjectreadFrom(InputStream entityDataStream). - This method must return an object with the same type as - ResourceContainer requires in method parameters (one not annotated - parameter). This mechanism works in the following way. For example, a - class which extends InputEntityTransformer will be called - SimpleInputTransformer. So, SimpleInputTransformer must have a simple - constructor (without any parameters). SimpleInputTransformer also has - two methods void setType(Class entityType) and Class getType(). Those - methods are described in InputEntityTransformer. And, as we said above, - SimpleInputTransformer must override the abstract method Object - readFrom(InputStream entityDataStream). So, a developer needs to create - a class which can build a Java Object from InputStream and then create - annotation to ResourceContainer or some method in ResourceContainer. - This annotation must define the type of InputEntityTransformer. Here is - the code of the annotation InputTransformer.</para> - - <programlisting>//... -@Retention(RUNTIME) -@Target({TYPE, METHOD}) -public @interface InputTransformer { - Class<? extends InputEntityTransformer> value(); -}</programlisting> - - <para>Then ResourceDispatcher gets InputTransformer from the factory - during runtime then builds an Object from stream and adds it to the - parameter array. See the code below.</para> - - <programlisting>//... - InputEntityTransformer transformer = (InputEntityTransformer) factory_.newTransformer(resource.getInputTransformerType()); - transformer.setType(methodParameters[i]); - params[i] = transformer.readFrom(request.getEntityStream()); -//... - Response response = (Response) resource.getServer().invoke(resource.getResourceContainer(), params);</programlisting> - - <para>A developer can find some prepared transformers in the package - "org.exoplatform.services.rest.transformer".</para> - - <para><command>OutputEntityTransformer</command></para> - - <para>OutputEntityTransformer can be used to serialize the Object which - represents the requested resource to OutputStream. - OutputEntityTransformer, in future we will call it - SimpleOutputTransformer, can be defined in a few ways.</para> - - <para>Now some more words about transformation. The RESTful framework - has two multi-purpose input/output transformers. One of them is - JAXB(Input/Output)Transformer, and another one is - Serializable(Input/Output)Transformer. The first one uses JAXB API for - serializing and deserializing an object. Serializable - (Input/Output)Transformer uses the own methods of an entity for - serialization and deserialization. Here is an example:</para> - - <programlisting>/... -public class SimpleSerializableEntity implements SerializableEntity { - - String data; - - public SimpleSerializableEntity() { - } - - public void readObject(InputStream in) throws IOException { - StringBuffer sb = new StringBuffer(); - int rd = -1; - while((rd = in.read()) != -1) - sb.append((char)rd); - data = sb.toString(); - } - - public void writeObject(OutputStream out) throws IOException { - out.write(data.getBytes()); - } -}</programlisting> - - <para>SerializableInputTransformer will try to use the method void - readObject(InputStream in) and SerializableOutputTransformer will try to - use the method void writeObject(OutputStream in).</para> - </section> - - <section> - <title>Binding and unbinding components (ResourceContainers)</title> - - <para>ResourceBinder takes care of binding and unbinding components - which represent ResourceContainer. All ResourceContainers must be - defined as ExoContainer components in configuration files, for - example:</para> - - <programlisting><component> - <type>org.exoplatform.services.rest.samples.RESTSampleService</type> -</component></programlisting> - - <para>ResourceBinder is an ExoContainer component and implements the - interface org.picocontainer.Startable (see the picocontainer - documentation). So at the start of ExoContainer ResourceBinder collects - all available ResourceContainers. ResourceBinder makes validation for - all ResourceContainers. At least each ResourceContainer must have the - @HTTPMethod annotation and @URITemplate annotation. Other annotations - are not obligatory. It's not allowed to have few ResourceContainers or - methods with the same @HTTPMethod and @URITemplate annotation value. For - example, if one container/method has the following code:</para> - - <programlisting>public class SimpleResourceContainer implements ResourceContainer { - @HTTPMethod("GET") - @URITemplate("/services/{id}/service1/") - @InputTransformer(StringInputTransformer.class) - @OutputTransformer(StringOutputTransformer.class) - public Response method1(String data, @URIParam("id") String param) { - // ... - } -}</programlisting> - - <para>than another component with @HTTPMethod("GET") and - @URITemplate("/services/service1/{id}/") can't be bound. And now we'll - try to explain this situation. On the one hand URITemplate is defined by - value /services/{id}/service1/, instead of {id} there can be any other - string value, so the combination /services/service1/service1/ is - possible and valid. On the other hand another URITemplate - /services/service1/{id}/ can have the string service1 instead of {id}, - so for this resource the combination /services/service1/service1/ is - possible and valid. And now we have two resources with the same - URITemplate and the same HTTPMethod. This situation is not obligatory, - we can't say what method we must call! In this case ResourceBinder - generates InvalidResourceDescriptorException. Binder also checks the - method parameters. In parameters only one parameter without annotation - and of free type is allowed. All other parameters must have String type - (or have a constructor with String) and be annotated. In other cases - InvalidResourceDescriptorException* is generated. If all components have - the "right" @HTTPMethod and @URITemplate annotations they should be - bound without any problems. ResourceDispather gets a collection of - ResourceContainers during the start and everything is ready to serve a - request.</para> - - <para>Note: within the scope of one component (one class) validation for - URI templates is not implemented, so a developer must take care of - @URITemplate and @HTTPMethod. Both of them must not be the same for - different methods. Except if @QueryTemplate or/and @ProducedMimeTypes - annotation is used.</para> - </section> - - <section> - <title>ResourceDispatcher</title> - - <para>Now let's talk about the features of ResourceDispatcher. - ResourceDispatcher is the main part of the RESTful engine. Above we said - some words about transformation and the role of ResourceDispatcher in - this process. Now we are ready to talk about annotated method - parameters. In one of the code examples above you could see the next - construction</para> - - <programlisting>public Response method1(String data, @URIParam("id") String param) {</programlisting> - - <para>The method method1 is described with two parameters. The first - parameter String data is built from the entity body (InputStream). The - second one - String param is annotated by a special type Annotation. - This Annotation has the following code:</para> - - <programlisting>@Target(value={PARAMETER}) -@Retention(RUNTIME) -public @interface URIParam { - String value(); -}</programlisting> - - <para>How does it work? After having found the right method - ResourceDispatcher gets the list of method parameters and starts - handling them. Dispatcher tries to find the not annotated parameter - (this entity body) and addresses InputEntityTransformer in order to - build the required Object from InputStream. When dispatcher finds an - annotated parameter it checks the type of annotation. It is possible to - have four types of annotation: @URIParam, @HeaderParam, @QueryParam and - @ContextParameter. If dispatcher has found the annotation - @URIParam("id") then it takes the parameter with the key "id" from - ResourceDescription and adds it into the parameter array. The same - situation is with header, context and query parameters. So within the - method a developer gets only the necessary parameters from header, query - and uri. Some more information about @ContextParameters. - @ContextParameters can be set in the configuration file of a - component:</para> - - <programlisting><component> -<type>org.exoplatform.services.rest.ResourceDispatcher</type> - <init-params> - <properties-param> - <name>context-params</name> - <property name="test" value="test_1"/> - </properties-param> - </init-params> -</component></programlisting> - - <para>In this case any service can use this parameter, for - example:</para> - - <programlisting>...method(@ContextParam("test") String p) { - System.out.println(p); -}</programlisting> - - <para>After its execution you should see "test_1" in console.</para> - - <para>And in each service the next context parameters can be used. The - name of these parameters are described in ResourceDispatcher:</para> - - <programlisting>public static final String CONTEXT_PARAM_HOST = "host"; -public static final String CONTEXT_PARAM_BASE_URI = "baseURI"; -public static final String CONTEXT_PARAM_REL_URI = "relURI"; -public static final String CONTEXT_PARAM_ABSLOCATION = "absLocation";</programlisting> - - <para>After that dispatcher finishes collecting parameters that the - method requires, invokes this method and passes the result to the client - as it is described above.</para> - - <para>This part of code can explain how this mechanism works:</para> - - <programlisting>//... - for (int i = 0; i < methodParametersAnnotations.length; i++) { - if (methodParametersAnnotations[i] == null) { - InputEntityTransformer transformer = (InputEntityTransformer) factory - .newTransformer(resource.getInputTransformerType()); - transformer.setType(methodParameters[i]); - params[i] = transformer.readFrom(request.getEntityStream()); - } else { - Constructor<?> constructor = methodParameters[i].getConstructor(String.class); - String constructorParam = null; - Annotation a = methodParametersAnnotations[i]; - if (a.annotationType().isAssignableFrom(URIParam.class)) { - URIParam u = (URIParam) a; - constructorParam = request.getResourceIdentifier().getParameters().get(u.value()); - } else if (a.annotationType().isAssignableFrom(HeaderParam.class)) { - HeaderParam h = (HeaderParam) a; - constructorParam = request.getHeaderParams().get(h.value()); - } else if (a.annotationType().isAssignableFrom(QueryParam.class)) { - QueryParam q = (QueryParam) a; - constructorParam = request.getQueryParams().get(q.value()); - } else if (a.annotationType().isAssignableFrom(ContextParam.class)) { - ContextParam c = (ContextParam) a; - constructorParam = contextHolder_.get().get(c.value()); - } - if (methodParameters[i].isAssignableFrom(String.class)) { - params[i] = constructorParam; - } else { - params[i] = (constructorParam != null) ? constructor.newInstance(constructorParam) : null; - } - } - } - Response resp = (Response) resource.getServer().invoke(resource.getResourceContainer(), params); -//...</programlisting> - - <para>The more detailed schema looks like this:</para> - - <mediaobject> - <imageobject> - <imagedata fileref="images/rest-scheme-detailed.png" /> - </imageobject> - </mediaobject> - </section> - </section> -</chapter> Deleted: jcr/trunk/docs/reference/en/src/main/docbook/en-US/modules/ws/rest-service-tutorial.xml =================================================================== --- jcr/trunk/docs/reference/en/src/main/docbook/en-US/modules/ws/rest-service-tutorial.xml 2010-08-17 14:20:04 UTC (rev 2922) +++ jcr/trunk/docs/reference/en/src/main/docbook/en-US/modules/ws/rest-service-tutorial.xml 2010-08-17 14:29:17 UTC (rev 2923) @@ -1,221 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" -"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"> -<chapter> - <?dbhtml filename="ch-ws.html"?> - - <title>REST Service Tutorial</title> - - <important> - <para>This article describes REST framework before version - exo-ws-2.0.</para> - </important> - - <section> - <title>Introduction</title> - - <para>This HOW-TO explains how to create your own REST based services. In - this HOW-TO we will create a simple calculator, which can do basic - operations with integers.</para> - </section> - - <section> - <title>Source code</title> - - <programlisting>// ... -@URITemplate("/calculator/{item1}/{item2}/") -public class Calculator implements ResourceContainer { -}</programlisting> - - <para>Writing <command>@URITemplate</command> before the class definition - gives you the possibility not to set it for each method. Furthermore the - class must implement the interface <command>ResourceContainer</command>. - This interface doesn't have any methods, it is just an indication for the - <command>ResourceBinder</command>. Add the code for adding two - integers.</para> - - <programlisting>// ... -@URITemplate("/calculator/{item1}/{item2}/") -public class Calculator implements ResourceContainer { - @QueryTemplate("operation=add") - @OutputTransformer(StringOutputTransformer.class) - @HTTPMethod("GET") - public Response add(@URIParam("item1") Integer item1, - @URIParam("item2") Integer item2) { - StringBuffer sb = new StringBuffer(); - sb.append(item1).append(" + ").append(item2).append(" = ").append(item1 + item2); - return Response.Builder.ok(sb.toString(), "text/plain").build(); - } -}</programlisting> - - <para>@QueryTemplate("operation=add") - only requests with query - parameters "operation=add" can reach this method; - @OutputTransformer(StringOutputTransformer.class) - the output - transformer; @HTTPMethod("GET") - the HTTP method "GET".</para> - - <para>Write the code for other operations in the same way. Then the result - should look like:</para> - - <programlisting>package org.exoplatform.services.rest.example; - -import org.exoplatform.services.rest.HTTPMethod; -import org.exoplatform.services.rest.OutputTransformer; -import org.exoplatform.services.rest.QueryTemplate; -import org.exoplatform.services.rest.Response; -import org.exoplatform.services.rest.URIParam; -import org.exoplatform.services.rest.URITemplate; -import org.exoplatform.services.rest.container.ResourceContainer; -import org.exoplatform.services.rest.transformer.StringOutputTransformer; - -@URITemplate("/calculator/{item1}/{item2}/") -(a)OutputTransformer(StringOutputTransformer.class) -public class Calculator implements ResourceContainer { - - @QueryTemplate("operation=add") - @HTTPMethod("GET") - public Response add(@URIParam("item1") Integer item1, @URIParam("item2") Integer item2) { - StringBuffer sb = new StringBuffer(); - sb.append(item1).append(" + ").append(item2).append(" = ").append(item1 + item2); - return Response.Builder.ok(sb.toString(), "text/plain").build(); - } - - @QueryTemplate("operation=subtract") - @HTTPMethod("GET") - public Response subtract(@URIParam("item1") Integer item1, @URIParam("item2") Integer item2) { - StringBuffer sb = new StringBuffer(); - sb.append(item1).append(" - ").append(item2).append(" = ").append(item1 - item2); - return Response.Builder.ok(sb.toString(), "text/plain").build(); - } - - @QueryTemplate("operation=multiply") - @HTTPMethod("GET") - public Response multiply(@URIParam("item1") Integer item1, @URIParam("item2") Integer item2) { - StringBuffer sb = new StringBuffer(); - sb.append(item1).append(" * ").append(item2).append(" = ").append(item1 * item2); - return Response.Builder.ok(sb.toString(), "text/plain").build(); - } - - @QueryTemplate("operation=divide") - @HTTPMethod("GET") - public Response divide(@URIParam("item1") Integer item1, @URIParam("item2") Integer item2) { - StringBuffer sb = new StringBuffer(); - sb.append(item1).append(" / ").append(item2).append(" = ").append(item1 / item2); - return Response.Builder.ok(sb.toString(), "text/plain").build(); - } -}</programlisting> - - <para>So we are done with the source code.</para> - </section> - - <section> - <title>Configuration</title> - - <para>Create the directory conf/portal and create the file - configuration.xml in it. Add the following code to this file:</para> - - <programlisting><?xml version="1.0" encoding="ISO-8859-1"?> -<configuration> - <component> - <type>org.exoplatform.services.rest.example.Calculator</type> - </component> -</configuration></programlisting> - </section> - - <section> - <title>Build</title> - - <para>Now we must create the following directory structure to get the - possibility to build the source code using maven.</para> - - <mediaobject> - <imageobject> - <imagedata fileref="images/rest-build-process.png" /> - </imageobject> - </mediaobject> - - <para>Then create the file pom.xml using the following:</para> - - <programlisting><project> - <parent> - <groupId>org.exoplatform.ws</groupId> - <artifactId>config</artifactId> - <version>trunk</version> - </parent> - - <modelVersion&#624;.0.0</modelVersion> - <groupId>org.exoplatform.ws.rest</groupId> - <artifactId>simple.calculator</artifactId> - <packaging>jar</packaging> - <version>trunk</version> - <description>Simple REST service</description> - - <dependencies> - <dependency> - <groupId>org.exoplatform.ws.rest</groupId> - <artifactId>exo.rest.core</artifactId> - <version>trunk</version> - </dependency> - </dependencies> -</project></programlisting> - - <para>Build this by executing the command:</para> - - <programlisting>andrew@ubu:~/workspace/calculator$ mvn clean install</programlisting> - </section> - - <section> - <title>Deploy</title> - - <para>We have done all now. Then copy the jar file from the target - directory of project exo-tomcat into the server with all prepared stuff - for REST services. (You can download it here: <link - linkend="???">http://forge.objectweb.org/project/download.php?group_id=151&file_id=...</link>)</para> - - <para>So just put the jar file into the lib directory of the tomcat and - restart it. In the console you should see this message:</para> - - <programlisting>[INFO] ResourceBinder - Bind new ResourceContainer: org.exoplatform.services.rest.example.Calculator@19846fd</programlisting> - - <para>This message indicates that our service was found, bound and is - ready to work</para> - </section> - - <section> - <title>Usage</title> - - <para>Open your browser and type the following URL: <link - linkend="???">http://localhost:8080/rest/calculator/12/5/?operation=add</link> - and you should see the next page:</para> - - <mediaobject> - <imageobject> - <imagedata fileref="images/rest-run-process.png" /> - </imageobject> - </mediaobject> - - <para>The service is working. This is a very simple example, but it should - help developers use the REST framework.</para> - - <para>Try to check other URLs.</para> - - <itemizedlist> - <listitem> - <para><link - linkend="???">http://localhost:8080/rest/calculator/12/5/?operation=subtract</link> - - must give "12 - 5 = 7";</para> - </listitem> - - <listitem> - <para><link - linkend="???">http://localhost:8080/rest/calculator/12/5/?operation=multiply</link> - - must give "12 * 5 = 60";</para> - </listitem> - - <listitem> - <para><link - linkend="???">http://localhost:8080/rest/calculator/12/5/?operation=divide</link>- - must give "12 / 5 = 2" (we are working with integers!);</para> - </listitem> - </itemizedlist> - </section> -</chapter> Modified: jcr/trunk/docs/reference/en/src/main/docbook/en-US/modules/ws.xml =================================================================== --- jcr/trunk/docs/reference/en/src/main/docbook/en-US/modules/ws.xml 2010-08-17 14:20:04 UTC (rev 2922) +++ jcr/trunk/docs/reference/en/src/main/docbook/en-US/modules/ws.xml 2010-08-17 14:29:17 UTC (rev 2923) @@ -8,53 +8,47 @@ <xi:include href="ws/ws.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> - - <xi:include href="ws/introduction-to-rest.xml" + + <xi:include href="ws/introduction-to-rest.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> - - <xi:include href="ws/rest-service-tutorial.xml" + + <xi:include href="ws/rest-migration-to-jsr311.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> - - <xi:include href="ws/rest-migration-to-jsr311.xml" + + <xi:include href="ws/groovy-scripts-as-rest-services.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> - - <xi:include href="ws/groovy-scripts-as-rest-services.xml" + + <xi:include href="ws/soap-service-tutorial.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> - - <xi:include href="ws/rest-framework.xml" + + <xi:include href="ws/central-authentication-service-configuration.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> - - <xi:include href="ws/soap-service-tutorial.xml" + + <xi:include href="ws/kerberos-sso-on-active-directory.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> - - <xi:include href="ws/central-authentication-service-configuration.xml" + + <xi:include href="ws/oauth.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> - - <xi:include href="ws/kerberos-sso-on-active-directory.xml" + + <xi:include href="ws/cometd.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> - - <xi:include href="ws/oauth.xml" + + <xi:include href="ws/cometd-cluster.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> - - <xi:include href="ws/cometd.xml" + + <xi:include href="ws/framework-for-cross-domain-ajax.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> - - <xi:include href="ws/cometd-cluster.xml" + + <xi:include href="ws/cometd-cluster-bench.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> - - <xi:include href="ws/framework-for-cross-domain-ajax.xml" + + <xi:include href="ws/javascript-webdav-library.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> - - <xi:include href="ws/cometd-cluster-bench.xml" + + <xi:include href="ws/exo-ws-2-0.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> - - <xi:include href="ws/javascript-webdav-library.xml" + + <xi:include href="ws/exo-ws-2-0-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> - - <xi:include href="ws/exo-ws-2-0.xml" - xmlns:xi="http://www.w3.org/2001/XInclude" /> - - <xi:include href="ws/exo-ws-2-0-1.xml" - xmlns:xi="http://www.w3.org/2001/XInclude" /> - + </part>

13 years, 10 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

exo-jcr-commits August 2010