[exo-jcr-commits] exo-jcr SVN: r744 - in jcr/trunk: applications/java/exo.jcr.applications.backupconsole and 12 other directories.

Author: dkatayev Date: 2009-11-18 05:36:41 -0500 (Wed, 18 Nov 2009) New Revision: 744 Modified: jcr/trunk/applications/java/exo.jcr.applications.backupconsole/pom.xml jcr/trunk/applications/java/exo.jcr.applications.browser/pom.xml jcr/trunk/applications/java/exo.jcr.applications.fckeditor/pom.xml jcr/trunk/applications/java/exo.jcr.applications.rest/pom.xml jcr/trunk/applications/java/exo.jcr.ear/pom.xml jcr/trunk/exo.jcr.component.core/pom.xml jcr/trunk/exo.jcr.component.ext/pom.xml jcr/trunk/exo.jcr.component.ftp/pom.xml jcr/trunk/exo.jcr.component.webdav/pom.xml jcr/trunk/exo.jcr.connectors.localadapter/pom.xml jcr/trunk/exo.jcr.framework.command/pom.xml jcr/trunk/exo.jcr.framework.ftpclient/pom.xml jcr/trunk/exo.jcr.framework.web/pom.xml jcr/trunk/pom.xml Log: EXOJCR-162 Modules dependencies cleaned Modified: jcr/trunk/applications/java/exo.jcr.applications.backupconsole/pom.xml =================================================================== --- jcr/trunk/applications/java/exo.jcr.applications.backupconsole/pom.xml 2009-11-18 10:06:51 UTC (rev 743) +++ jcr/trunk/applications/java/exo.jcr.applications.backupconsole/pom.xml 2009-11-18 10:36:41 UTC (rev 744) @@ -39,26 +39,30 @@ <dependencies> <dependency> + <groupId>org.exoplatform.jcr</groupId> + <artifactId>exo.jcr.component.core</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.jcr</groupId> + <artifactId>exo.jcr.component.ext</artifactId> + </dependency> + <dependency> <groupId>org.exoplatform.ws</groupId> <artifactId>exo.ws.commons</artifactId> </dependency> - <dependency> - <groupId>org.apache.ws.commons</groupId> - <artifactId>ws-commons-util</artifactId> - <exclusions> - <exclusion> - <groupId>xml-apis</groupId> - <artifactId>xml-apis</artifactId> - </exclusion> - </exclusions> - </dependency> - + <groupId>org.exoplatform.ws</groupId> + <artifactId>exo.ws.frameworks.json</artifactId> + <version>${org.exoplatform.ws.version}</version> + </dependency> <dependency> - <groupId>org.exoplatform.jcr</groupId> - <artifactId>exo.jcr.component.ext</artifactId> + <groupId>org.jibx</groupId> + <artifactId>jibx-run</artifactId> + </dependency> + <dependency> + <groupId>javax.ws.rs</groupId> + <artifactId>jsr311-api</artifactId> </dependency> - </dependencies> <build> Modified: jcr/trunk/applications/java/exo.jcr.applications.browser/pom.xml =================================================================== --- jcr/trunk/applications/java/exo.jcr.applications.browser/pom.xml 2009-11-18 10:06:51 UTC (rev 743) +++ jcr/trunk/applications/java/exo.jcr.applications.browser/pom.xml 2009-11-18 10:36:41 UTC (rev 744) @@ -34,19 +34,46 @@ <name>eXo JCR :: Application :: Browser Demo</name> <dependencies> - <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.container</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.commons</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.exoplatform.core</groupId> + <artifactId>exo.core.component.security.core</artifactId> + <scope>provided</scope> + </dependency> + <dependency> <groupId>org.exoplatform.jcr</groupId> <artifactId>exo.jcr.component.core</artifactId> <scope>provided</scope> </dependency> - <dependency> <groupId>org.exoplatform.jcr</groupId> + <artifactId>exo.jcr.component.ext</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.exoplatform.jcr</groupId> <artifactId>exo.jcr.framework.web</artifactId> <scope>provided</scope> </dependency> - + <dependency> + <groupId>javax.jcr</groupId> + <artifactId>jcr</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <scope>provided</scope> + </dependency> </dependencies> <build> Modified: jcr/trunk/applications/java/exo.jcr.applications.fckeditor/pom.xml =================================================================== --- jcr/trunk/applications/java/exo.jcr.applications.fckeditor/pom.xml 2009-11-18 10:06:51 UTC (rev 743) +++ jcr/trunk/applications/java/exo.jcr.applications.fckeditor/pom.xml 2009-11-18 10:36:41 UTC (rev 744) @@ -35,19 +35,16 @@ <description>eXo simple CMS web app</description> <dependencies> - <dependency> <groupId>org.exoplatform.jcr</groupId> <artifactId>exo.jcr.component.core</artifactId> <scope>provided</scope> </dependency> - <dependency> <groupId>org.exoplatform.jcr</groupId> <artifactId>exo.jcr.framework.web</artifactId> <scope>provided</scope> </dependency> - </dependencies> <build> Modified: jcr/trunk/applications/java/exo.jcr.applications.rest/pom.xml =================================================================== --- jcr/trunk/applications/java/exo.jcr.applications.rest/pom.xml 2009-11-18 10:06:51 UTC (rev 743) +++ jcr/trunk/applications/java/exo.jcr.applications.rest/pom.xml 2009-11-18 10:36:41 UTC (rev 744) @@ -35,13 +35,11 @@ <description>eXo JCR Rest web application</description> <dependencies> - <dependency> <groupId>org.exoplatform.jcr</groupId> <artifactId>exo.jcr.framework.web</artifactId> <scope>provided</scope> </dependency> - </dependencies> <build> Modified: jcr/trunk/applications/java/exo.jcr.ear/pom.xml =================================================================== --- jcr/trunk/applications/java/exo.jcr.ear/pom.xml 2009-11-18 10:06:51 UTC (rev 743) +++ jcr/trunk/applications/java/exo.jcr.ear/pom.xml 2009-11-18 10:36:41 UTC (rev 744) @@ -40,28 +40,24 @@ <type>rar</type> <scope>runtime</scope> </dependency> - <dependency> <groupId>org.exoplatform.jcr</groupId> <artifactId>exo.jcr.applications.rest</artifactId> <type>war</type> <scope>runtime</scope> </dependency> - <dependency> <groupId>org.exoplatform.jcr</groupId> <artifactId>exo.jcr.applications.browser</artifactId> <type>war</type> <scope>runtime</scope> </dependency> - <dependency> <groupId>org.exoplatform.jcr</groupId> <artifactId>exo.jcr.applications.fckeditor</artifactId> <type>war</type> <scope>runtime</scope> </dependency> - <dependency> <groupId>org.exoplatform.jcr</groupId> <artifactId>exo.jcr.component.webdav</artifactId> Modified: jcr/trunk/exo.jcr.component.core/pom.xml =================================================================== --- jcr/trunk/exo.jcr.component.core/pom.xml 2009-11-18 10:06:51 UTC (rev 743) +++ jcr/trunk/exo.jcr.component.core/pom.xml 2009-11-18 10:36:41 UTC (rev 744) @@ -43,72 +43,54 @@ <groupId>javax.jcr</groupId> <artifactId>jcr</artifactId> </dependency> - - <!-- eXo dependencies (eXo JCR API) --> <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.command</artifactId> </dependency> - <dependency> <groupId>org.exoplatform.kernel</groupId> <artifactId>exo.kernel.component.common</artifactId> </dependency> - - <!-- eXo dependencies (eXo JCR Impl) --> - <dependency> <groupId>org.exoplatform.kernel</groupId> <artifactId>exo.kernel.component.cache</artifactId> </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.document</artifactId> </dependency> - <dependency> <groupId>org.exoplatform.core</groupId> <artifactId>exo.core.component.security.core</artifactId> </dependency> - - <!-- Third party dependencies (eXo JCR Impl) --> - <dependency> <groupId>org.apache.lucene</groupId> <artifactId>lucene-core</artifactId> </dependency> - <dependency> <groupId>org.apache.lucene</groupId> <artifactId>lucene-spellchecker</artifactId> </dependency> - <dependency> <groupId>org.apache.lucene</groupId> <artifactId>lucene-memory</artifactId> </dependency> - <dependency> - <groupId>javax.xml.stream</groupId> - <artifactId>stax-api</artifactId> - </dependency> - - <dependency> <groupId>com.sun.xml.stream</groupId> <artifactId>sjsxp</artifactId> </dependency> - <dependency> <groupId>commons-dbcp</groupId> <artifactId>commons-dbcp</artifactId> @@ -119,40 +101,51 @@ </exclusion> </exclusions> </dependency> - - <!-- JOTM comes from exo.kernel.component.common --> - - <!-- - dependency> <groupId>jotm</groupId> <artifactId>jotm</artifactId> <scope>compile</scope> <exclusions> <exclusion> <groupId>javax.resource</groupId> - <artifactId>connector</artifactId> </exclusion> <exclusion> <groupId>log4j</groupId> <artifactId>log4j</artifactId> </exclusion> </exclusions> - </dependency --> - <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + </dependency> + <dependency> + <groupId>commons-chain</groupId> + <artifactId>commons-chain</artifactId> + </dependency> + <dependency> + <groupId>xml-apis</groupId> + <artifactId>xml-apis</artifactId> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </dependency> + <dependency> + <groupId>stax</groupId> + <artifactId>stax-api</artifactId> + </dependency> + <dependency> + <groupId>org.jibx</groupId> + <artifactId>jibx-run</artifactId> + </dependency> + <dependency> + <groupId>picocontainer</groupId> + <artifactId>picocontainer</artifactId> + </dependency> + <dependency> <groupId>javax.resource</groupId> <artifactId>connector-api</artifactId> </dependency> - <dependency> <groupId>javax.transaction</groupId> <artifactId>jta</artifactId> </dependency> - <dependency> <groupId>concurrent</groupId> <artifactId>concurrent</artifactId> </dependency> - <dependency> <groupId>commons-collections</groupId> <artifactId>commons-collections</artifactId> </dependency> - <dependency> - <groupId>commons-codec</groupId> - <artifactId>commons-codec</artifactId> - </dependency> - - <dependency> <groupId>org.apache.ws.commons</groupId> <artifactId>ws-commons-util</artifactId> <exclusions> @@ -166,7 +159,6 @@ </exclusion> </exclusions> </dependency> - <!-- TCK binaries and deps for repo stub, some eXo API test --> <dependency> <groupId>org.apache.jackrabbit</groupId> @@ -184,15 +176,12 @@ <artifactId>slf4j-log4j12</artifactId> <scope>test</scope> </dependency> - <!-- ===== Databases JDBC support for tests ===== --> - <dependency> <groupId>hsqldb</groupId> <artifactId>hsqldb</artifactId> <scope>test</scope> </dependency> - <!-- For MySQL support --> <dependency> <groupId>mysql</groupId> @@ -200,7 +189,6 @@ <version>5.0.5</version> <scope>test</scope> </dependency> - <!-- For PostgresSQL support --> <dependency> <groupId>postgresql</groupId> @@ -208,7 +196,6 @@ <version>8.2-504.jdbc3</version> <scope>test</scope> </dependency> - <!-- For Oracle 10g support (local-jcr repository) --> <!-- dependency> <groupId>ojdbc</groupId> @@ -222,7 +209,6 @@ <version>14</version> <scope>test</scope> </dependency --> - <!-- For IBM DB2 support (local-jcr repository) --> <!-- dependency> <groupId>com.ibm.db2</groupId> @@ -236,7 +222,6 @@ <version>9.1</version> <scope>test</scope> </dependency --> - <!-- For MS SQL 7/2000/2005 and Sybase ASE/Anywhere support (jTDS driver) --> <dependency> <groupId>net.sourceforge.jtds</groupId> @@ -244,7 +229,6 @@ <version>1.2</version> <scope>test</scope> </dependency> - <!-- For MS SQL 2005 support (Microsoft JDBC driver) (local-jcr repository) --> <!-- dependency> <groupId>com.microsoft.sqlserver</groupId> @@ -252,7 +236,6 @@ <version>9.0</version> <scope>test</scope> </dependency --> - <!-- For Apache Derby support (aka JavaDB) --> <dependency> <groupId>org.apache.derby</groupId> @@ -260,7 +243,6 @@ <version>10.2.2.0</version> <scope>test</scope> </dependency> - <!-- H2 Database --> <!-- dependency> <groupId>com.h2database</groupId> @@ -268,7 +250,6 @@ <version>1.0.74</version> <scope>test</scope> </dependency --> - <!-- Ingres Database (local repository) --> <!-- dependency> <groupId>com.ingres.jdbc</groupId> @@ -276,7 +257,6 @@ <version>9.2</version> <scope>test</scope> </dependency --> - <!-- For Sybase ASE/Anywhere support (jConnect driver) (local-jcr repository) --> <!-- dependency> <groupId>com.sybase.jdbc3.jdbc</groupId> @@ -284,7 +264,6 @@ <version>6.05</version> <scope>test</scope> </dependency --> - <!-- ======================================================================= --> </dependencies> Modified: jcr/trunk/exo.jcr.component.ext/pom.xml =================================================================== --- jcr/trunk/exo.jcr.component.ext/pom.xml 2009-11-18 10:06:51 UTC (rev 743) +++ jcr/trunk/exo.jcr.component.ext/pom.xml 2009-11-18 10:36:41 UTC (rev 744) @@ -35,6 +35,30 @@ <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.exoplatform.kernel</groupId> + <artifactId>exo.kernel.component.command</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.core</groupId> + <artifactId>exo.core.component.document</artifactId> + </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.security.core</artifactId> + </dependency> + <dependency> <groupId>org.exoplatform.jcr</groupId> <artifactId>exo.jcr.component.core</artifactId> <exclusions> @@ -61,6 +85,22 @@ <artifactId>exo.ws.commons</artifactId> </dependency> <dependency> + <groupId>org.exoplatform.ws</groupId> + <artifactId>exo.ws.frameworks.json</artifactId> + </dependency> + <dependency> + <groupId>javax.jcr</groupId> + <artifactId>jcr</artifactId> + </dependency> + <dependency> + <groupId>javax.annotation</groupId> + <artifactId>jsr250-api</artifactId> + </dependency> + <dependency> + <groupId>stax</groupId> + <artifactId>stax-api</artifactId> + </dependency> + <dependency> <groupId>commons-chain</groupId> <artifactId>commons-chain</artifactId> </dependency> @@ -77,6 +117,18 @@ <artifactId>commons-fileupload</artifactId> </dependency> <dependency> + <groupId>picocontainer</groupId> + <artifactId>picocontainer</artifactId> + </dependency> + <dependency> + <groupId>jtidy</groupId> + <artifactId>jtidy</artifactId> + </dependency> + <dependency> + <groupId>xml-apis</groupId> + <artifactId>xml-apis</artifactId> + </dependency> + <dependency> <groupId>hsqldb</groupId> <artifactId>hsqldb</artifactId> <scope>test</scope> Modified: jcr/trunk/exo.jcr.component.ftp/pom.xml =================================================================== --- jcr/trunk/exo.jcr.component.ftp/pom.xml 2009-11-18 10:06:51 UTC (rev 743) +++ jcr/trunk/exo.jcr.component.ftp/pom.xml 2009-11-18 10:36:41 UTC (rev 744) @@ -38,24 +38,53 @@ </properties> <dependencies> - <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.commons</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.component.command</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.container</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.core</groupId> + <artifactId>exo.core.component.security.core</artifactId> + <version>${org.exoplatform.core.version}</version> + </dependency> + <dependency> <groupId>org.exoplatform.jcr</groupId> + <artifactId>exo.jcr.component.ext</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.jcr</groupId> <artifactId>exo.jcr.component.core</artifactId> </dependency> - <dependency> <groupId>org.exoplatform.jcr</groupId> <artifactId>exo.jcr.framework.command</artifactId> <scope>provided</scope> </dependency> - <dependency> + <groupId>javax.jcr</groupId> + <artifactId>jcr</artifactId> + </dependency> + <dependency> + <groupId>commons-chain</groupId> + <artifactId>commons-chain</artifactId> + </dependency> + <dependency> + <groupId>picocontainer</groupId> + <artifactId>picocontainer</artifactId> + </dependency> + <dependency> <groupId>hsqldb</groupId> <artifactId>hsqldb</artifactId> <scope>test</scope> </dependency> - </dependencies> <build> Modified: jcr/trunk/exo.jcr.component.webdav/pom.xml =================================================================== --- jcr/trunk/exo.jcr.component.webdav/pom.xml 2009-11-18 10:06:51 UTC (rev 743) +++ jcr/trunk/exo.jcr.component.webdav/pom.xml 2009-11-18 10:36:41 UTC (rev 744) @@ -35,6 +35,18 @@ <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.core</groupId> + <artifactId>exo.core.component.security.core</artifactId> + </dependency> + <dependency> <groupId>org.exoplatform.ws</groupId> <artifactId>exo.ws.rest.core</artifactId> </dependency> @@ -55,6 +67,30 @@ <artifactId>exo.jcr.component.core</artifactId> </dependency> <dependency> + <groupId>javax.ws.rs</groupId> + <artifactId>jsr311-api</artifactId> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + </dependency> + <dependency> + <groupId>javax.jcr</groupId> + <artifactId>jcr</artifactId> + </dependency> + <dependency> + <groupId>stax</groupId> + <artifactId>stax-api</artifactId> + </dependency> + <dependency> + <groupId>xml-apis</groupId> + <artifactId>xml-apis</artifactId> + </dependency> + <dependency> + <groupId>jtidy</groupId> + <artifactId>jtidy</artifactId> + </dependency> + <dependency> <groupId>hsqldb</groupId> <artifactId>hsqldb</artifactId> <scope>test</scope> @@ -72,7 +108,6 @@ </includes> <excludes> <exclude>**/TestUtils.java</exclude> - <exclude>**/TestUtils.java</exclude> <!-- Related issue: http://jira.exoplatform.org/browse/JCR-1149 --> <exclude>**/TestEncoding.java</exclude> <exclude>**/TestPropFindContent.java</exclude> Modified: jcr/trunk/exo.jcr.connectors.localadapter/pom.xml =================================================================== --- jcr/trunk/exo.jcr.connectors.localadapter/pom.xml 2009-11-18 10:06:51 UTC (rev 743) +++ jcr/trunk/exo.jcr.connectors.localadapter/pom.xml 2009-11-18 10:36:41 UTC (rev 744) @@ -50,72 +50,70 @@ </exclusions> <scope>runtime</scope> </dependency> - <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.commons</artifactId> + <version>${org.exoplatform.kernel.version}</version> + </dependency> + <dependency> <groupId>org.exoplatform.jcr</groupId> <artifactId>exo.jcr.component.ext</artifactId> <scope>runtime</scope> </dependency> - <dependency> <groupId>org.exoplatform.jcr</groupId> <artifactId>exo.jcr.component.webdav</artifactId> <scope>runtime</scope> </dependency> - <dependency> <groupId>org.exoplatform.jcr</groupId> <artifactId>exo.jcr.component.ftp</artifactId> <scope>runtime</scope> </dependency> - <dependency> <groupId>org.exoplatform.jcr</groupId> <artifactId>exo.jcr.framework.command</artifactId> <scope>runtime</scope> </dependency> - <dependency> <groupId>org.exoplatform.jcr</groupId> <artifactId>exo.jcr.framework.ftpclient</artifactId> <scope>runtime</scope> </dependency> - <dependency> <groupId>org.exoplatform.jcr</groupId> <artifactId>exo.jcr.framework.web</artifactId> <scope>runtime</scope> </dependency> - <dependency> <groupId>org.exoplatform.ws</groupId> <artifactId>exo.ws.frameworks.servlet</artifactId> <scope>runtime</scope> </dependency> - <dependency> <groupId>com.sun.xml.bind</groupId> <artifactId>jaxb-impl</artifactId> <scope>runtime</scope> </dependency> - <dependency> <groupId>commons-collections</groupId> <artifactId>commons-collections</artifactId> <scope>runtime</scope> </dependency> - <dependency> <groupId>javax.resource</groupId> <artifactId>connector</artifactId> </dependency> - <dependency> - <groupId>org.exoplatform.kernel</groupId> - <artifactId>exo.kernel.component.common</artifactId> + <groupId>javax.transaction</groupId> + <artifactId>jta</artifactId> </dependency> - <dependency> + <groupId>javax.resource</groupId> + <artifactId>connector-api</artifactId> + <version>1.5</version> + </dependency> + <dependency> <groupId>org.exoplatform.kernel</groupId> <artifactId>exo.kernel.container</artifactId> <exclusions> Modified: jcr/trunk/exo.jcr.framework.command/pom.xml =================================================================== --- jcr/trunk/exo.jcr.framework.command/pom.xml 2009-11-18 10:06:51 UTC (rev 743) +++ jcr/trunk/exo.jcr.framework.command/pom.xml 2009-11-18 10:36:41 UTC (rev 744) @@ -34,39 +34,65 @@ <description>eXo JCR command framework</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> + <version>${org.exoplatform.kernel.version}</version> + </dependency> + <dependency> <groupId>org.exoplatform.jcr</groupId> <artifactId>exo.jcr.component.core</artifactId> </dependency> - <dependency> <groupId>org.exoplatform.jcr</groupId> <artifactId>exo.jcr.component.ext</artifactId> </dependency> - <dependency> <groupId>org.exoplatform.kernel</groupId> <artifactId>exo.kernel.component.command</artifactId> </dependency> - <dependency> + <groupId>org.exoplatform.core</groupId> + <artifactId>exo.core.component.security.core</artifactId> + </dependency> + <dependency> <groupId>commons-fileupload</groupId> <artifactId>commons-fileupload</artifactId> </dependency> - <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + </dependency> + <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> <scope>provided</scope> </dependency> - <dependency> + <groupId>javax.jcr</groupId> + <artifactId>jcr</artifactId> + </dependency> + <dependency> + <groupId>commons-chain</groupId> + <artifactId>commons-chain</artifactId> + </dependency> + <dependency> + <groupId>jtidy</groupId> + <artifactId>jtidy</artifactId> + </dependency> + <dependency> + <groupId>xml-apis</groupId> + <artifactId>xml-apis</artifactId> + </dependency> + <dependency> <groupId>hsqldb</groupId> <artifactId>hsqldb</artifactId> <scope>test</scope> </dependency> - </dependencies> <build> Modified: jcr/trunk/exo.jcr.framework.ftpclient/pom.xml =================================================================== --- jcr/trunk/exo.jcr.framework.ftpclient/pom.xml 2009-11-18 10:06:51 UTC (rev 743) +++ jcr/trunk/exo.jcr.framework.ftpclient/pom.xml 2009-11-18 10:36:41 UTC (rev 744) @@ -38,12 +38,10 @@ </properties> <dependencies> - <dependency> <groupId>org.exoplatform.kernel</groupId> - <artifactId>exo.kernel.component.command</artifactId> + <artifactId>exo.kernel.commons</artifactId> </dependency> - </dependencies> <build> Modified: jcr/trunk/exo.jcr.framework.web/pom.xml =================================================================== --- jcr/trunk/exo.jcr.framework.web/pom.xml 2009-11-18 10:06:51 UTC (rev 743) +++ jcr/trunk/exo.jcr.framework.web/pom.xml 2009-11-18 10:36:41 UTC (rev 744) @@ -35,7 +35,19 @@ <dependencies> <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.commons</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.component.command</artifactId> + </dependency> + <dependency> <groupId>org.exoplatform.jcr</groupId> + <artifactId>exo.jcr.component.core</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.jcr</groupId> <artifactId>exo.jcr.component.ext</artifactId> </dependency> <dependency> @@ -48,15 +60,23 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>org.exoplatform.kernel</groupId> - <artifactId>exo.kernel.component.common</artifactId> - <scope>provided</scope> + <groupId>org.exoplatform.core</groupId> + <artifactId>exo.core.component.security.core</artifactId> + </dependency> + <dependency> + <groupId>javax.jcr</groupId> + <artifactId>jcr</artifactId> + <version>1.0</version> </dependency> <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> <scope>provided</scope> </dependency> + <dependency> + <groupId>commons-chain</groupId> + <artifactId>commons-chain</artifactId> + </dependency> </dependencies> <build> Modified: jcr/trunk/pom.xml =================================================================== --- jcr/trunk/pom.xml 2009-11-18 10:06:51 UTC (rev 743) +++ jcr/trunk/pom.xml 2009-11-18 10:36:41 UTC (rev 744) @@ -38,9 +38,9 @@ <properties> <exo.product.name>exo-jcr</exo.product.name> <exo.product.specification>1.12</exo.product.specification> - <org.exoplatform.kernel.version>2.2.0-Beta03</org.exoplatform.kernel.version> - <org.exoplatform.core.version>2.3.0-Beta03</org.exoplatform.core.version> - <org.exoplatform.ws.version>2.1.0-Beta03</org.exoplatform.ws.version> + <org.exoplatform.kernel.version>2.2.0-Beta04-SNAPSHOT</org.exoplatform.kernel.version> + <org.exoplatform.core.version>2.3.0-Beta04-SNAPSHOT</org.exoplatform.core.version> + <org.exoplatform.ws.version>2.1.0-Beta04-SNAPSHOT</org.exoplatform.ws.version> </properties> <scm> @@ -72,253 +72,313 @@ </modules> <dependencyManagement> - <dependencies> - + <dependencies> <dependency> - <groupId>org.exoplatform.jcr</groupId> - <artifactId>exo.jcr.applications.fckeditor</artifactId> - <version>${project.version}</version> - <type>war</type> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.commons</artifactId> + <version>${org.exoplatform.kernel.version}</version> </dependency> - <dependency> - <groupId>org.exoplatform.jcr</groupId> - <artifactId>exo.jcr.applications.browser</artifactId> - <version>${project.version}</version> - <type>war</type> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.component.command</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.common</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.document</artifactId> + <version>${org.exoplatform.core.version}</version> + </dependency> + <dependency> + <groupId>org.exoplatform.core</groupId> + <artifactId>exo.core.component.organization.api</artifactId> + <version>${org.exoplatform.core.version}</version> + </dependency> + <dependency> + <groupId>org.exoplatform.core</groupId> + <artifactId>exo.core.component.security.core</artifactId> + <version>${org.exoplatform.core.version}</version> + </dependency> + <dependency> + <groupId>org.exoplatform.core</groupId> + <artifactId>exo.core.component.script.groovy</artifactId> + <version>${org.exoplatform.core.version}</version> + </dependency> + <dependency> + <groupId>org.exoplatform.ws</groupId> + <artifactId>exo.ws.rest.core</artifactId> + <version>${org.exoplatform.ws.version}</version> + </dependency> + <dependency> + <groupId>org.exoplatform.ws</groupId> + <artifactId>exo.ws.rest.ext</artifactId> + <version>${org.exoplatform.ws.version}</version> + </dependency> + <dependency> + <groupId>org.exoplatform.ws</groupId> + <artifactId>exo.ws.commons</artifactId> + <version>${org.exoplatform.ws.version}</version> + </dependency> + <dependency> + <groupId>org.exoplatform.ws</groupId> + <artifactId>exo.ws.frameworks.json</artifactId> + <version>${org.exoplatform.ws.version}</version> + </dependency> + <dependency> + <groupId>org.exoplatform.ws</groupId> + <artifactId>exo.ws.frameworks.servlet</artifactId> + <version>${org.exoplatform.ws.version}</version> + </dependency> + <dependency> <groupId>org.exoplatform.jcr</groupId> - <artifactId>exo.jcr.applications.rest</artifactId> + <artifactId>exo.jcr.component.ext</artifactId> <version>${project.version}</version> - <type>war</type> </dependency> - <dependency> <groupId>org.exoplatform.jcr</groupId> <artifactId>exo.jcr.component.core</artifactId> <version>${project.version}</version> </dependency> - <dependency> <groupId>org.exoplatform.jcr</groupId> - <artifactId>exo.jcr.component.ext</artifactId> + <artifactId>exo.jcr.framework.command</artifactId> <version>${project.version}</version> </dependency> - <dependency> <groupId>org.exoplatform.jcr</groupId> <artifactId>exo.jcr.component.ftp</artifactId> <version>${project.version}</version> - </dependency> - + </dependency> <dependency> <groupId>org.exoplatform.jcr</groupId> <artifactId>exo.jcr.component.webdav</artifactId> <version>${project.version}</version> </dependency> - <dependency> <groupId>org.exoplatform.jcr</groupId> - <artifactId>exo.jcr.framework.command</artifactId> + <artifactId>exo.jcr.framework.web</artifactId> <version>${project.version}</version> </dependency> - <dependency> <groupId>org.exoplatform.jcr</groupId> - <artifactId>exo.jcr.framework.web</artifactId> + <artifactId>exo.jcr.framework.ftpclient</artifactId> <version>${project.version}</version> </dependency> - <dependency> <groupId>org.exoplatform.jcr</groupId> - <artifactId>exo.jcr.framework.ftpclient</artifactId> + <artifactId>exo.jcr.applications.fckeditor</artifactId> <version>${project.version}</version> + <type>war</type> </dependency> - - <dependency> <groupId>org.exoplatform.jcr</groupId> - <artifactId>exo.jcr.connectors.localadapter</artifactId> - <type>rar</type> + <artifactId>exo.jcr.applications.browser</artifactId> <version>${project.version}</version> + <type>war</type> </dependency> - <dependency> - <groupId>org.exoplatform.kernel</groupId> - <artifactId>exo.kernel.container</artifactId> - <version>${org.exoplatform.kernel.version}</version> + <groupId>org.exoplatform.jcr</groupId> + <artifactId>exo.jcr.applications.rest</artifactId> + <version>${project.version}</version> + <type>war</type> </dependency> - <dependency> - <groupId>org.exoplatform.kernel</groupId> - <artifactId>exo.kernel.component.command</artifactId> - <version>${org.exoplatform.kernel.version}</version> - </dependency> - + <groupId>org.exoplatform.jcr</groupId> + <artifactId>exo.jcr.connectors.localadapter</artifactId> + <type>rar</type> + <version>${project.version}</version> + </dependency> <dependency> - <groupId>org.exoplatform.kernel</groupId> - <artifactId>exo.kernel.component.common</artifactId> - <version>${org.exoplatform.kernel.version}</version> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + <version>2.3</version> </dependency> - <dependency> - <groupId>org.exoplatform.kernel</groupId> - <artifactId>exo.kernel.component.cache</artifactId> - <version>${org.exoplatform.kernel.version}</version> + <groupId>commons-chain</groupId> + <artifactId>commons-chain</artifactId> + <version>1.0</version> </dependency> - <dependency> - <groupId>org.exoplatform.core</groupId> - <artifactId>exo.core.component.organization.api</artifactId> - <version>${org.exoplatform.core.version}</version> + <groupId>org.jibx</groupId> + <artifactId>jibx-run</artifactId> + <version>1.2.1</version> </dependency> - <dependency> - <groupId>org.exoplatform.core</groupId> - <artifactId>exo.core.component.document</artifactId> - <version>${org.exoplatform.core.version}</version> + <groupId>picocontainer</groupId> + <artifactId>picocontainer</artifactId> + <version>1.1</version> </dependency> - <dependency> - <groupId>org.exoplatform.core</groupId> - <artifactId>exo.core.component.security.core</artifactId> - <version>${org.exoplatform.core.version}</version> + <groupId>xml-apis</groupId> + <artifactId>xml-apis</artifactId> + <version>1.0.b2</version> </dependency> - <dependency> - <groupId>org.exoplatform.core</groupId> - <artifactId>exo.core.component.script.groovy</artifactId> - <version>${org.exoplatform.core.version}</version> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>1.5.6</version> </dependency> - <dependency> - <groupId>org.exoplatform.ws</groupId> - <artifactId>exo.ws.commons</artifactId> - <version>${org.exoplatform.ws.version}</version> - </dependency> - + <groupId>stax</groupId> + <artifactId>stax-api</artifactId> + <version>1.0.1</version> + </dependency> <dependency> - <groupId>org.exoplatform.ws</groupId> - <artifactId>exo.ws.rest.core</artifactId> - <version>${org.exoplatform.ws.version}</version> + <groupId>javax.jcr</groupId> + <artifactId>jcr</artifactId> + <version>1.0</version> </dependency> - <dependency> - <groupId>org.exoplatform.ws</groupId> - <artifactId>exo.ws.rest.ext</artifactId> - <version>${org.exoplatform.ws.version}</version> - </dependency> - + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>2.4</version> + </dependency> <dependency> - <groupId>org.exoplatform.ws</groupId> - <artifactId>exo.ws.frameworks.servlet</artifactId> - <version>${org.exoplatform.ws.version}</version> - </dependency> - - <dependency> - <groupId>javax.jcr</groupId> - <artifactId>jcr</artifactId> + <groupId>javax.annotation</groupId> + <artifactId>jsr250-api</artifactId> <version>1.0</version> </dependency> - <dependency> <groupId>javax.ws.rs</groupId> <artifactId>jsr311-api</artifactId> <version>1.0</version> </dependency> - <dependency> - <groupId>org.apache.jackrabbit</groupId> - <artifactId>jackrabbit-jcr-tests</artifactId> - <version>1.6.0</version> + <groupId>javax.transaction</groupId> + <artifactId>jta</artifactId> + <version>1.0.1B</version> </dependency> - - <!-- slf4j-log4j12 for TCK sources --> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <version>1.5.6</version> + <groupId>javax.resource</groupId> + <artifactId>connector-api</artifactId> + <version>1.5</version> + </dependency> + <dependency> + <groupId>jtidy</groupId> + <artifactId>jtidy</artifactId> + <version>4aug2000r7-dev</version> </dependency> - <dependency> <groupId>org.apache.lucene</groupId> <artifactId>lucene-core</artifactId> <version>2.4.1</version> </dependency> - <dependency> <groupId>org.apache.lucene</groupId> <artifactId>lucene-spellchecker</artifactId> <version>2.4.1</version> </dependency> - <dependency> <groupId>org.apache.lucene</groupId> <artifactId>lucene-memory</artifactId> <version>2.4.1</version> - </dependency> - + </dependency> <dependency> - <groupId>javax.xml.stream</groupId> - <artifactId>stax-api</artifactId> - <version>1.0</version> - </dependency> - - <dependency> <groupId>com.sun.xml.stream</groupId> <artifactId>sjsxp</artifactId> <version>1.0</version> + </dependency> + <dependency> + <groupId>commons-dbcp</groupId> + <artifactId>commons-dbcp</artifactId> + <version>1.2.1</version> </dependency> - <dependency> + <groupId>concurrent</groupId> + <artifactId>concurrent</artifactId> + <version>1.3.4</version> + </dependency> + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + <version>3.1</version> + </dependency> + <dependency> + <groupId>org.apache.ws.commons</groupId> + <artifactId>ws-commons-util</artifactId> + <version>1.0.1</version> + </dependency> + <dependency> + <groupId>org.apache.jackrabbit</groupId> + <artifactId>jackrabbit-jcr-tests</artifactId> + <version>1.6.0</version> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <version>1.5.6</version> + </dependency> + <dependency> <groupId>hsqldb</groupId> <artifactId>hsqldb</artifactId> <version>1.8.0.7</version> </dependency> - <dependency> - <groupId>commons-dbcp</groupId> - <artifactId>commons-dbcp</artifactId> + <groupId>jgroups</groupId> + <artifactId>jgroups</artifactId> + <version>2.6.10.GA</version> + </dependency> + <dependency> + <groupId>commons-fileupload</groupId> + <artifactId>commons-fileupload</artifactId> <version>1.2.1</version> </dependency> - <dependency> - <groupId>jotm</groupId> - <artifactId>jotm</artifactId> - <version>2.0.10</version> - <exclusions> - <exclusion> - <groupId>javax.resource</groupId> - <artifactId>connector</artifactId> - </exclusion> - </exclusions> + <groupId>com.sun.xml.bind</groupId> + <artifactId>jaxb-impl</artifactId> + <version>2.1.7</version> </dependency> - <dependency> <groupId>javax.resource</groupId> - <artifactId>connector-api</artifactId> + <artifactId>connector</artifactId> <version>1.5</version> </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + <version>1.3</version> + </dependency> + +<!-- _________________________________________________________________________________________ --> +<!-- + <dependency> - <groupId>javax.transaction</groupId> - <artifactId>jta</artifactId> - <version>1.0.1B</version> - <scope>compile</scope> + <groupId>org.exoplatform.ws</groupId> + <artifactId>exo.ws.frameworks.servlet</artifactId> + <version>${org.exoplatform.ws.version}</version> </dependency> <dependency> - <groupId>concurrent</groupId> - <artifactId>concurrent</artifactId> - <version>1.3.4</version> + <groupId>javax.xml.stream</groupId> + <artifactId>stax-api</artifactId> + <version>1.0</version> </dependency> <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - <version>3.1</version> + <groupId>jotm</groupId> + <artifactId>jotm</artifactId> + <version>2.0.10</version> + <exclusions> + <exclusion> + <groupId>javax.resource</groupId> + <artifactId>connector</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> @@ -328,30 +388,12 @@ </dependency> <dependency> - <groupId>org.apache.ws.commons</groupId> - <artifactId>ws-commons-util</artifactId> - <version>1.0.1</version> - </dependency> - - <dependency> - <groupId>jgroups</groupId> - <artifactId>jgroups</artifactId> - <version>2.6.10.GA</version> - </dependency> - - <dependency> <groupId>commons-chain</groupId> <artifactId>commons-chain</artifactId> <version>1.0</version> </dependency> <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - <version>1.3</version> - </dependency> - - <dependency> <groupId>com.amazon</groupId> <artifactId>s3</artifactId> <version>0.1</version> @@ -368,25 +410,14 @@ <artifactId>jaxb-impl</artifactId> <version>2.1.7</version> </dependency> - <dependency> - <groupId>commons-fileupload</groupId> - <artifactId>commons-fileupload</artifactId> - <version>1.2.1</version> - </dependency> - - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>2.4</version> - </dependency> - - <dependency> <groupId>javax.resource</groupId> <artifactId>connector</artifactId> <version>1.5</version> </dependency> + +--> </dependencies> </dependencyManagement>