December 2011 - exo-jcr-commits - Jboss List Archives

exo-jcr SVN: r5393 - in core/trunk: exo.core.component.database and 11 other directories.

by do-not-reply＠jboss.org

Author: tolusha Date: 2011-12-30 02:12:26 -0500 (Fri, 30 Dec 2011) New Revision: 5393 Modified: core/trunk/exo.core.component.database/pom.xml core/trunk/exo.core.component.document/pom.xml core/trunk/exo.core.component.ldap/pom.xml core/trunk/exo.core.component.organization.api/pom.xml core/trunk/exo.core.component.organization.jdbc/pom.xml core/trunk/exo.core.component.organization.ldap/pom.xml core/trunk/exo.core.component.organization.tests/pom.xml core/trunk/exo.core.component.script.groovy/pom.xml core/trunk/exo.core.component.security.core/pom.xml core/trunk/exo.core.component.web.css/pom.xml core/trunk/exo.core.component.xml-processing/pom.xml core/trunk/packaging/module/pom.xml core/trunk/pom.xml Log: [maven-release-plugin] prepare branch 2.5.x Modified: core/trunk/exo.core.component.database/pom.xml =================================================================== --- core/trunk/exo.core.component.database/pom.xml 2011-12-30 07:06:47 UTC (rev 5392) +++ core/trunk/exo.core.component.database/pom.xml 2011-12-30 07:12:26 UTC (rev 5393) @@ -25,7 +25,7 @@ <parent> <groupId>org.exoplatform.core</groupId> <artifactId>core-parent</artifactId> - <version>2.4.6-GA-SNAPSHOT</version> + <version>2.5.0-Beta01-SNAPSHOT</version> </parent> <artifactId>exo.core.component.database</artifactId> Modified: core/trunk/exo.core.component.document/pom.xml =================================================================== --- core/trunk/exo.core.component.document/pom.xml 2011-12-30 07:06:47 UTC (rev 5392) +++ core/trunk/exo.core.component.document/pom.xml 2011-12-30 07:12:26 UTC (rev 5393) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.core</groupId> <artifactId>core-parent</artifactId> - <version>2.4.6-GA-SNAPSHOT</version> + <version>2.5.0-Beta01-SNAPSHOT</version> </parent> <artifactId>exo.core.component.document</artifactId> <name>eXo Core :: Component :: Demo Service</name> Modified: core/trunk/exo.core.component.ldap/pom.xml =================================================================== --- core/trunk/exo.core.component.ldap/pom.xml 2011-12-30 07:06:47 UTC (rev 5392) +++ core/trunk/exo.core.component.ldap/pom.xml 2011-12-30 07:12:26 UTC (rev 5393) @@ -25,7 +25,7 @@ <parent> <groupId>org.exoplatform.core</groupId> <artifactId>core-parent</artifactId> - <version>2.4.6-GA-SNAPSHOT</version> + <version>2.5.0-Beta01-SNAPSHOT</version> </parent> <artifactId>exo.core.component.ldap</artifactId> Modified: core/trunk/exo.core.component.organization.api/pom.xml =================================================================== --- core/trunk/exo.core.component.organization.api/pom.xml 2011-12-30 07:06:47 UTC (rev 5392) +++ core/trunk/exo.core.component.organization.api/pom.xml 2011-12-30 07:12:26 UTC (rev 5393) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.core</groupId> <artifactId>core-parent</artifactId> - <version>2.4.6-GA-SNAPSHOT</version> + <version>2.5.0-Beta01-SNAPSHOT</version> </parent> <artifactId>exo.core.component.organization.api</artifactId> <name>eXo Core :: Component :: Organization Service API</name> Modified: core/trunk/exo.core.component.organization.jdbc/pom.xml =================================================================== --- core/trunk/exo.core.component.organization.jdbc/pom.xml 2011-12-30 07:06:47 UTC (rev 5392) +++ core/trunk/exo.core.component.organization.jdbc/pom.xml 2011-12-30 07:12:26 UTC (rev 5393) @@ -25,7 +25,7 @@ <parent> <groupId>org.exoplatform.core</groupId> <artifactId>core-parent</artifactId> - <version>2.4.6-GA-SNAPSHOT</version> + <version>2.5.0-Beta01-SNAPSHOT</version> </parent> <artifactId>exo.core.component.organization.jdbc</artifactId> Modified: core/trunk/exo.core.component.organization.ldap/pom.xml =================================================================== --- core/trunk/exo.core.component.organization.ldap/pom.xml 2011-12-30 07:06:47 UTC (rev 5392) +++ core/trunk/exo.core.component.organization.ldap/pom.xml 2011-12-30 07:12:26 UTC (rev 5393) @@ -25,7 +25,7 @@ <parent> <groupId>org.exoplatform.core</groupId> <artifactId>core-parent</artifactId> - <version>2.4.6-GA-SNAPSHOT</version> + <version>2.5.0-Beta01-SNAPSHOT</version> </parent> <artifactId>exo.core.component.organization.ldap</artifactId> Modified: core/trunk/exo.core.component.organization.tests/pom.xml =================================================================== --- core/trunk/exo.core.component.organization.tests/pom.xml 2011-12-30 07:06:47 UTC (rev 5392) +++ core/trunk/exo.core.component.organization.tests/pom.xml 2011-12-30 07:12:26 UTC (rev 5393) @@ -25,7 +25,7 @@ <parent> <groupId>org.exoplatform.core</groupId> <artifactId>core-parent</artifactId> - <version>2.4.6-GA-SNAPSHOT</version> + <version>2.5.0-Beta01-SNAPSHOT</version> </parent> <artifactId>exo.core.component.organization.tests</artifactId> Modified: core/trunk/exo.core.component.script.groovy/pom.xml =================================================================== --- core/trunk/exo.core.component.script.groovy/pom.xml 2011-12-30 07:06:47 UTC (rev 5392) +++ core/trunk/exo.core.component.script.groovy/pom.xml 2011-12-30 07:12:26 UTC (rev 5393) @@ -25,7 +25,7 @@ <parent> <groupId>org.exoplatform.core</groupId> <artifactId>core-parent</artifactId> - <version>2.4.6-GA-SNAPSHOT</version> + <version>2.5.0-Beta01-SNAPSHOT</version> </parent> <artifactId>exo.core.component.script.groovy</artifactId> Modified: core/trunk/exo.core.component.security.core/pom.xml =================================================================== --- core/trunk/exo.core.component.security.core/pom.xml 2011-12-30 07:06:47 UTC (rev 5392) +++ core/trunk/exo.core.component.security.core/pom.xml 2011-12-30 07:12:26 UTC (rev 5393) @@ -16,7 +16,7 @@ <parent> <groupId>org.exoplatform.core</groupId> <artifactId>core-parent</artifactId> - <version>2.4.6-GA-SNAPSHOT</version> + <version>2.5.0-Beta01-SNAPSHOT</version> </parent> <artifactId>exo.core.component.security.core</artifactId> Modified: core/trunk/exo.core.component.web.css/pom.xml =================================================================== --- core/trunk/exo.core.component.web.css/pom.xml 2011-12-30 07:06:47 UTC (rev 5392) +++ core/trunk/exo.core.component.web.css/pom.xml 2011-12-30 07:12:26 UTC (rev 5393) @@ -25,7 +25,7 @@ <parent> <groupId>org.exoplatform.core</groupId> <artifactId>core-parent</artifactId> - <version>2.4.6-GA-SNAPSHOT</version> + <version>2.5.0-Beta01-SNAPSHOT</version> </parent> <artifactId>exo.core.component.web.css</artifactId> Modified: core/trunk/exo.core.component.xml-processing/pom.xml =================================================================== --- core/trunk/exo.core.component.xml-processing/pom.xml 2011-12-30 07:06:47 UTC (rev 5392) +++ core/trunk/exo.core.component.xml-processing/pom.xml 2011-12-30 07:12:26 UTC (rev 5393) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.core</groupId> <artifactId>core-parent</artifactId> - <version>2.4.6-GA-SNAPSHOT</version> + <version>2.5.0-Beta01-SNAPSHOT</version> </parent> <artifactId>exo.core.component.xml-processing</artifactId> <name>eXo Core :: Component :: XML Processing Service</name> Modified: core/trunk/packaging/module/pom.xml =================================================================== --- core/trunk/packaging/module/pom.xml 2011-12-30 07:06:47 UTC (rev 5392) +++ core/trunk/packaging/module/pom.xml 2011-12-30 07:12:26 UTC (rev 5393) @@ -2,7 +2,7 @@ <parent> <groupId>org.exoplatform.core</groupId> <artifactId>core-parent</artifactId> - <version>2.4.6-GA-SNAPSHOT</version> + <version>2.5.0-Beta01-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> @@ -19,13 +19,13 @@  <dependencies> - <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.database</artifactId><version>2.4.6-GA-SNAPSHOT</version></dependency> - <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.document</artifactId><version>2.4.6-GA-SNAPSHOT</version></dependency> - <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.organization.api</artifactId><version>2.4.6-GA-SNAPSHOT</version></dependency> - <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.organization.ldap</artifactId><version>2.4.6-GA-SNAPSHOT</version></dependency> - <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.security.core</artifactId><version>2.4.6-GA-SNAPSHOT</version></dependency> - <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.xml-processing</artifactId><version>2.4.6-GA-SNAPSHOT</version></dependency> - <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.script.groovy</artifactId><version>2.4.6-GA-SNAPSHOT</version></dependency> + <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.database</artifactId><version>2.5.0-Beta01-SNAPSHOT</version></dependency> + <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.document</artifactId><version>2.5.0-Beta01-SNAPSHOT</version></dependency> + <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.organization.api</artifactId><version>2.5.0-Beta01-SNAPSHOT</version></dependency> + <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.organization.ldap</artifactId><version>2.5.0-Beta01-SNAPSHOT</version></dependency> + <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.security.core</artifactId><version>2.5.0-Beta01-SNAPSHOT</version></dependency> + <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.xml-processing</artifactId><version>2.5.0-Beta01-SNAPSHOT</version></dependency> + <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.script.groovy</artifactId><version>2.5.0-Beta01-SNAPSHOT</version></dependency> </dependencies> <build> Modified: core/trunk/pom.xml =================================================================== --- core/trunk/pom.xml 2011-12-30 07:06:47 UTC (rev 5392) +++ core/trunk/pom.xml 2011-12-30 07:12:26 UTC (rev 5393) @@ -29,7 +29,7 @@ <groupId>org.exoplatform.core</groupId> <artifactId>core-parent</artifactId> - <version>2.4.6-GA-SNAPSHOT</version> + <version>2.5.0-Beta01-SNAPSHOT</version> <packaging>pom</packaging> <name>eXo Core</name> @@ -46,9 +46,9 @@ </properties> <scm> - <connection>scm:svn:https://anonsvn.jboss.org/repos/exo-jcr/core/trunk/</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/exo-jcr/core/trunk/</developerConnection> - <url>http://fisheye.jboss.org/browse/exo-jcr/core/trunk</url> + <connection>scm:svn:https://anonsvn.jboss.org/repos/exo-jcr/core/branches/2.5.x</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/exo-jcr/core/branches/2.5.x</developerConnection> + <url>http://fisheye.jboss.org/browse/exo-jcr/core/branches/2.5.x</url> </scm> <modules>

12 years, 4 months

1
0
0 / 0

exo-jcr SVN: r5392 - in kernel/trunk: exo.kernel.commons and 14 other directories.

by do-not-reply＠jboss.org

Author: tolusha Date: 2011-12-30 02:06:47 -0500 (Fri, 30 Dec 2011) New Revision: 5392 Modified: kernel/trunk/exo.kernel.commons.test/pom.xml kernel/trunk/exo.kernel.commons/pom.xml kernel/trunk/exo.kernel.component.cache/pom.xml kernel/trunk/exo.kernel.component.command/pom.xml kernel/trunk/exo.kernel.component.common/pom.xml kernel/trunk/exo.kernel.component.ext.cache.impl.infinispan.v5/pom.xml kernel/trunk/exo.kernel.component.ext.cache.impl.jboss.v3/pom.xml kernel/trunk/exo.kernel.component.ext.rpc.impl.jgroups.v3/pom.xml kernel/trunk/exo.kernel.container/pom.xml kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int-demo/pom.xml kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int-tests/pom.xml kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int/pom.xml kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-kernel-extras/pom.xml kernel/trunk/exo.kernel.mc-integration/pom.xml kernel/trunk/packaging/module/pom.xml kernel/trunk/pom.xml Log: [maven-release-plugin] prepare release 2.4.x Modified: kernel/trunk/exo.kernel.commons/pom.xml =================================================================== --- kernel/trunk/exo.kernel.commons/pom.xml 2011-12-30 07:06:32 UTC (rev 5391) +++ kernel/trunk/exo.kernel.commons/pom.xml 2011-12-30 07:06:47 UTC (rev 5392) @@ -16,7 +16,7 @@ <parent> <groupId>org.exoplatform.kernel</groupId> <artifactId>kernel-parent</artifactId> - <version>2.4.0-Beta01-SNAPSHOT</version> + <version>2.3.6-GA-SNAPSHOT</version> </parent> <artifactId>exo.kernel.commons</artifactId> Modified: kernel/trunk/exo.kernel.commons.test/pom.xml =================================================================== --- kernel/trunk/exo.kernel.commons.test/pom.xml 2011-12-30 07:06:32 UTC (rev 5391) +++ kernel/trunk/exo.kernel.commons.test/pom.xml 2011-12-30 07:06:47 UTC (rev 5392) @@ -16,7 +16,7 @@ <parent> <groupId>org.exoplatform.kernel</groupId> <artifactId>kernel-parent</artifactId> - <version>2.4.0-Beta01-SNAPSHOT</version> + <version>2.3.6-GA-SNAPSHOT</version> </parent> <artifactId>exo.kernel.commons.test</artifactId> Modified: kernel/trunk/exo.kernel.component.cache/pom.xml =================================================================== --- kernel/trunk/exo.kernel.component.cache/pom.xml 2011-12-30 07:06:32 UTC (rev 5391) +++ kernel/trunk/exo.kernel.component.cache/pom.xml 2011-12-30 07:06:47 UTC (rev 5392) @@ -25,7 +25,7 @@ <parent> <groupId>org.exoplatform.kernel</groupId> <artifactId>kernel-parent</artifactId> - <version>2.4.0-Beta01-SNAPSHOT</version> + <version>2.3.6-GA-SNAPSHOT</version> </parent> <artifactId>exo.kernel.component.cache</artifactId> Modified: kernel/trunk/exo.kernel.component.command/pom.xml =================================================================== --- kernel/trunk/exo.kernel.component.command/pom.xml 2011-12-30 07:06:32 UTC (rev 5391) +++ kernel/trunk/exo.kernel.component.command/pom.xml 2011-12-30 07:06:47 UTC (rev 5392) @@ -25,7 +25,7 @@ <parent> <groupId>org.exoplatform.kernel</groupId> <artifactId>kernel-parent</artifactId> - <version>2.4.0-Beta01-SNAPSHOT</version> + <version>2.3.6-GA-SNAPSHOT</version> </parent> <artifactId>exo.kernel.component.command</artifactId> Modified: kernel/trunk/exo.kernel.component.common/pom.xml =================================================================== --- kernel/trunk/exo.kernel.component.common/pom.xml 2011-12-30 07:06:32 UTC (rev 5391) +++ kernel/trunk/exo.kernel.component.common/pom.xml 2011-12-30 07:06:47 UTC (rev 5392) @@ -25,7 +25,7 @@ <parent> <groupId>org.exoplatform.kernel</groupId> <artifactId>kernel-parent</artifactId> - <version>2.4.0-Beta01-SNAPSHOT</version> + <version>2.3.6-GA-SNAPSHOT</version> </parent> <artifactId>exo.kernel.component.common</artifactId> Modified: kernel/trunk/exo.kernel.component.ext.cache.impl.infinispan.v5/pom.xml =================================================================== --- kernel/trunk/exo.kernel.component.ext.cache.impl.infinispan.v5/pom.xml 2011-12-30 07:06:32 UTC (rev 5391) +++ kernel/trunk/exo.kernel.component.ext.cache.impl.infinispan.v5/pom.xml 2011-12-30 07:06:47 UTC (rev 5392) @@ -9,7 +9,7 @@ <parent> <groupId>org.exoplatform.kernel</groupId> <artifactId>kernel-parent</artifactId> - <version>2.4.0-Beta01-SNAPSHOT</version> + <version>2.3.6-GA-SNAPSHOT</version> </parent> <artifactId>exo.kernel.component.ext.cache.impl.infinispan.v5</artifactId> <name>eXo Kernel :: Cache Extension :: Infinispan Implementation</name> Modified: kernel/trunk/exo.kernel.component.ext.cache.impl.jboss.v3/pom.xml =================================================================== --- kernel/trunk/exo.kernel.component.ext.cache.impl.jboss.v3/pom.xml 2011-12-30 07:06:32 UTC (rev 5391) +++ kernel/trunk/exo.kernel.component.ext.cache.impl.jboss.v3/pom.xml 2011-12-30 07:06:47 UTC (rev 5392) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.kernel</groupId> <artifactId>kernel-parent</artifactId> - <version>2.4.0-Beta01-SNAPSHOT</version> + <version>2.3.6-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/trunk/exo.kernel.component.ext.rpc.impl.jgroups.v3/pom.xml =================================================================== --- kernel/trunk/exo.kernel.component.ext.rpc.impl.jgroups.v3/pom.xml 2011-12-30 07:06:32 UTC (rev 5391) +++ kernel/trunk/exo.kernel.component.ext.rpc.impl.jgroups.v3/pom.xml 2011-12-30 07:06:47 UTC (rev 5392) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.kernel</groupId> <artifactId>kernel-parent</artifactId> - <version>2.4.0-Beta01-SNAPSHOT</version> + <version>2.3.6-GA-SNAPSHOT</version> </parent> <artifactId>exo.kernel.component.ext.rpc.impl.jgroups.v3</artifactId> <name>eXo Kernel :: RPC Service Extension :: JGroups 3 Implementation</name> Modified: kernel/trunk/exo.kernel.container/pom.xml =================================================================== --- kernel/trunk/exo.kernel.container/pom.xml 2011-12-30 07:06:32 UTC (rev 5391) +++ kernel/trunk/exo.kernel.container/pom.xml 2011-12-30 07:06:47 UTC (rev 5392) @@ -12,7 +12,7 @@ <parent> <groupId>org.exoplatform.kernel</groupId> <artifactId>kernel-parent</artifactId> - <version>2.4.0-Beta01-SNAPSHOT</version> + <version>2.3.6-GA-SNAPSHOT</version> </parent> <artifactId>exo.kernel.container</artifactId> <name>eXo Kernel :: Container</name> Modified: kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int/pom.xml =================================================================== --- kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int/pom.xml 2011-12-30 07:06:32 UTC (rev 5391) +++ kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int/pom.xml 2011-12-30 07:06:47 UTC (rev 5392) @@ -6,7 +6,7 @@ <parent> <groupId>org.exoplatform.kernel</groupId> <artifactId>mc-integration-parent</artifactId> - <version>2.4.0-Beta01-SNAPSHOT</version> + <version>2.3.6-GA-SNAPSHOT</version> </parent> <artifactId>exo.kernel.mc-int</artifactId> Modified: kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int-demo/pom.xml =================================================================== --- kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int-demo/pom.xml 2011-12-30 07:06:32 UTC (rev 5391) +++ kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int-demo/pom.xml 2011-12-30 07:06:47 UTC (rev 5392) @@ -5,7 +5,7 @@ <parent> <groupId>org.exoplatform.kernel</groupId> <artifactId>mc-integration-parent</artifactId> - <version>2.4.0-Beta01-SNAPSHOT</version> + <version>2.3.6-GA-SNAPSHOT</version> </parent> <artifactId>exo.kernel.mc-int-demo</artifactId> Modified: kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int-tests/pom.xml =================================================================== --- kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int-tests/pom.xml 2011-12-30 07:06:32 UTC (rev 5391) +++ kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int-tests/pom.xml 2011-12-30 07:06:47 UTC (rev 5392) @@ -5,7 +5,7 @@ <parent> <groupId>org.exoplatform.kernel</groupId> <artifactId>mc-integration-parent</artifactId> - <version>2.4.0-Beta01-SNAPSHOT</version> + <version>2.3.6-GA-SNAPSHOT</version> </parent> <artifactId>exo.kernel.mc-int-tests</artifactId> Modified: kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-kernel-extras/pom.xml =================================================================== --- kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-kernel-extras/pom.xml 2011-12-30 07:06:32 UTC (rev 5391) +++ kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-kernel-extras/pom.xml 2011-12-30 07:06:47 UTC (rev 5392) @@ -6,7 +6,7 @@ <parent> <groupId>org.exoplatform.kernel</groupId> <artifactId>mc-integration-parent</artifactId> - <version>2.4.0-Beta01-SNAPSHOT</version> + <version>2.3.6-GA-SNAPSHOT</version> </parent> <artifactId>exo.kernel.mc-kernel-extras</artifactId> Modified: kernel/trunk/exo.kernel.mc-integration/pom.xml =================================================================== --- kernel/trunk/exo.kernel.mc-integration/pom.xml 2011-12-30 07:06:32 UTC (rev 5391) +++ kernel/trunk/exo.kernel.mc-integration/pom.xml 2011-12-30 07:06:47 UTC (rev 5392) @@ -6,7 +6,7 @@ <parent> <groupId>org.exoplatform.kernel</groupId> <artifactId>kernel-parent</artifactId> - <version>2.4.0-Beta01-SNAPSHOT</version> + <version>2.3.6-GA-SNAPSHOT</version> </parent> <artifactId>mc-integration-parent</artifactId> Modified: kernel/trunk/packaging/module/pom.xml =================================================================== --- kernel/trunk/packaging/module/pom.xml 2011-12-30 07:06:32 UTC (rev 5391) +++ kernel/trunk/packaging/module/pom.xml 2011-12-30 07:06:47 UTC (rev 5392) @@ -2,7 +2,7 @@ <parent> <groupId>org.exoplatform.kernel</groupId> <artifactId>kernel-parent</artifactId> - <version>2.4.0-Beta01-SNAPSHOT</version> + <version>2.3.6-GA-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: kernel/trunk/pom.xml =================================================================== --- kernel/trunk/pom.xml 2011-12-30 07:06:32 UTC (rev 5391) +++ kernel/trunk/pom.xml 2011-12-30 07:06:47 UTC (rev 5392) @@ -30,7 +30,7 @@ <groupId>org.exoplatform.kernel</groupId> <artifactId>kernel-parent</artifactId> - <version>2.4.0-Beta01-SNAPSHOT</version> + <version>2.3.6-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/branches/2.4.x</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/exo-jcr/kernel/branches/2.4.x</developerConnection> - <url>http://fisheye.jboss.org/browse/exo-jcr/kernel/branches/2.4.x</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/exo-jcr/kernel/trunk</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/exo-jcr/kernel/trunk</developerConnection> + <url>http://fisheye.jboss.org/browse/exo-jcr/kernel/trunk</url> </scm> <modules>

12 years, 4 months

1
0
0 / 0

exo-jcr SVN: r5391 - in kernel/branches: 2.4.x and 15 other directories.

by do-not-reply＠jboss.org

Author: tolusha Date: 2011-12-30 02:06:32 -0500 (Fri, 30 Dec 2011) New Revision: 5391 Added: kernel/branches/2.4.x/ kernel/branches/2.4.x/exo.kernel.commons.test/pom.xml kernel/branches/2.4.x/exo.kernel.commons/pom.xml kernel/branches/2.4.x/exo.kernel.component.cache/pom.xml kernel/branches/2.4.x/exo.kernel.component.command/pom.xml kernel/branches/2.4.x/exo.kernel.component.common/pom.xml kernel/branches/2.4.x/exo.kernel.component.ext.cache.impl.infinispan.v5/pom.xml kernel/branches/2.4.x/exo.kernel.component.ext.cache.impl.jboss.v3/pom.xml kernel/branches/2.4.x/exo.kernel.component.ext.rpc.impl.jgroups.v3/pom.xml kernel/branches/2.4.x/exo.kernel.container/pom.xml kernel/branches/2.4.x/exo.kernel.mc-integration/exo.kernel.mc-int-demo/pom.xml kernel/branches/2.4.x/exo.kernel.mc-integration/exo.kernel.mc-int-tests/pom.xml kernel/branches/2.4.x/exo.kernel.mc-integration/exo.kernel.mc-int/pom.xml kernel/branches/2.4.x/exo.kernel.mc-integration/exo.kernel.mc-kernel-extras/pom.xml kernel/branches/2.4.x/exo.kernel.mc-integration/pom.xml kernel/branches/2.4.x/packaging/module/pom.xml kernel/branches/2.4.x/pom.xml Removed: kernel/branches/2.4.x/exo.kernel.commons.test/pom.xml kernel/branches/2.4.x/exo.kernel.commons/pom.xml kernel/branches/2.4.x/exo.kernel.component.cache/pom.xml kernel/branches/2.4.x/exo.kernel.component.command/pom.xml kernel/branches/2.4.x/exo.kernel.component.common/pom.xml kernel/branches/2.4.x/exo.kernel.component.ext.cache.impl.infinispan.v5/pom.xml kernel/branches/2.4.x/exo.kernel.component.ext.cache.impl.jboss.v3/pom.xml kernel/branches/2.4.x/exo.kernel.component.ext.rpc.impl.jgroups.v3/pom.xml kernel/branches/2.4.x/exo.kernel.container/pom.xml kernel/branches/2.4.x/exo.kernel.mc-integration/exo.kernel.mc-int-demo/pom.xml kernel/branches/2.4.x/exo.kernel.mc-integration/exo.kernel.mc-int-tests/pom.xml kernel/branches/2.4.x/exo.kernel.mc-integration/exo.kernel.mc-int/pom.xml kernel/branches/2.4.x/exo.kernel.mc-integration/exo.kernel.mc-kernel-extras/pom.xml kernel/branches/2.4.x/exo.kernel.mc-integration/pom.xml kernel/branches/2.4.x/packaging/module/pom.xml kernel/branches/2.4.x/pom.xml Log: [maven-release-plugin] copy for branch 2.4.x Deleted: kernel/branches/2.4.x/exo.kernel.commons/pom.xml =================================================================== --- kernel/trunk/exo.kernel.commons/pom.xml 2011-12-29 15:14:53 UTC (rev 5389) +++ kernel/branches/2.4.x/exo.kernel.commons/pom.xml 2011-12-30 07:06:32 UTC (rev 5391) @@ -1,116 +0,0 @@ - -  -<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.3.6-GA-SNAPSHOT</version> - </parent> - - <artifactId>exo.kernel.commons</artifactId> - - <name>eXo Kernel :: Commons Utils</name> - <description>eXo Commons</description> - - <dependencies> - <dependency> - <groupId>eu.medsea.mimeutil</groupId> - <artifactId>mime-util</artifactId> - </dependency> - <dependency> - <groupId>xpp3</groupId> - <artifactId>xpp3</artifactId> - </dependency> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </dependency> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </dependency> - <dependency> - <groupId>org.exoplatform.kernel</groupId> - <artifactId>exo.kernel.commons.test</artifactId> - </dependency> - </dependencies> - - <build> - <testResources> - <testResource> - <directory>src/test/resources</directory> - <includes> - <include>**/*.properties</include> - <include>**/test*</include> - </includes> - </testResource> - </testResources> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <argLine>${env.MAVEN_OPTS} -Djava.security.manager=org.exoplatform.commons.test.TestSecurityManager -Djava.security.policy=${project.build.directory}/test-classes/test.policy</argLine> - </configuration> - </plugin> - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <id>prepare-test-policy</id> - <phase>process-test-resources</phase> - <configuration> - <tasks> - <echo>Creating Access Policy for tests</echo> - <makeurl file="${settings.localRepository}" property="localRepositoryURL" /> - <makeurl file="${project.build.outputDirectory}" property="outputDirectoryURL" /> - <makeurl file="${project.build.testOutputDirectory}" property="testOutputDirectoryURL" /> - <copy todir="${project.build.testOutputDirectory}" overwrite="true"> - <fileset dir="${project.basedir}/src/test/resources/"> - <include name="test.policy" /> - </fileset> - <filterset> - <filter token="MAVEN_REPO" value="${localRepositoryURL}" /> - <filter token="MAIN_CLASSES" value="${outputDirectoryURL}" /> - <filter token="TEST_CLASSES" value="${testOutputDirectoryURL}" /> - </filterset> - </copy> - </tasks> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - </executions> - <dependencies> - <dependency> - <groupId>ant</groupId> - <artifactId>ant-optional</artifactId> - <version>1.5.3-1</version> - </dependency> - </dependencies> - </plugin> - </plugins> - </build> -</project> Copied: kernel/branches/2.4.x/exo.kernel.commons/pom.xml (from rev 5390, kernel/trunk/exo.kernel.commons/pom.xml) =================================================================== --- kernel/branches/2.4.x/exo.kernel.commons/pom.xml (rev 0) +++ kernel/branches/2.4.x/exo.kernel.commons/pom.xml 2011-12-30 07:06:32 UTC (rev 5391) @@ -0,0 +1,116 @@ + +  +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>kernel-parent</artifactId> + <version>2.4.0-Beta01-SNAPSHOT</version> + </parent> + + <artifactId>exo.kernel.commons</artifactId> + + <name>eXo Kernel :: Commons Utils</name> + <description>eXo Commons</description> + + <dependencies> + <dependency> + <groupId>eu.medsea.mimeutil</groupId> + <artifactId>mime-util</artifactId> + </dependency> + <dependency> + <groupId>xpp3</groupId> + <artifactId>xpp3</artifactId> + </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.commons.test</artifactId> + </dependency> + </dependencies> + + <build> + <testResources> + <testResource> + <directory>src/test/resources</directory> + <includes> + <include>**/*.properties</include> + <include>**/test*</include> + </includes> + </testResource> + </testResources> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <argLine>${env.MAVEN_OPTS} -Djava.security.manager=org.exoplatform.commons.test.TestSecurityManager -Djava.security.policy=${project.build.directory}/test-classes/test.policy</argLine> + </configuration> + </plugin> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <id>prepare-test-policy</id> + <phase>process-test-resources</phase> + <configuration> + <tasks> + <echo>Creating Access Policy for tests</echo> + <makeurl file="${settings.localRepository}" property="localRepositoryURL" /> + <makeurl file="${project.build.outputDirectory}" property="outputDirectoryURL" /> + <makeurl file="${project.build.testOutputDirectory}" property="testOutputDirectoryURL" /> + <copy todir="${project.build.testOutputDirectory}" overwrite="true"> + <fileset dir="${project.basedir}/src/test/resources/"> + <include name="test.policy" /> + </fileset> + <filterset> + <filter token="MAVEN_REPO" value="${localRepositoryURL}" /> + <filter token="MAIN_CLASSES" value="${outputDirectoryURL}" /> + <filter token="TEST_CLASSES" value="${testOutputDirectoryURL}" /> + </filterset> + </copy> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + <dependencies> + <dependency> + <groupId>ant</groupId> + <artifactId>ant-optional</artifactId> + <version>1.5.3-1</version> + </dependency> + </dependencies> + </plugin> + </plugins> + </build> +</project> Deleted: kernel/branches/2.4.x/exo.kernel.commons.test/pom.xml =================================================================== --- kernel/trunk/exo.kernel.commons.test/pom.xml 2011-12-29 15:14:53 UTC (rev 5389) +++ kernel/branches/2.4.x/exo.kernel.commons.test/pom.xml 2011-12-30 07:06:32 UTC (rev 5391) @@ -1,27 +0,0 @@ - -  -<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.3.6-GA-SNAPSHOT</version> - </parent> - - <artifactId>exo.kernel.commons.test</artifactId> - - <name>eXo Kernel :: Commons :: Test Util</name> - <description>eXo Commons Test Util</description> - -</project> Copied: kernel/branches/2.4.x/exo.kernel.commons.test/pom.xml (from rev 5390, kernel/trunk/exo.kernel.commons.test/pom.xml) =================================================================== --- kernel/branches/2.4.x/exo.kernel.commons.test/pom.xml (rev 0) +++ kernel/branches/2.4.x/exo.kernel.commons.test/pom.xml 2011-12-30 07:06:32 UTC (rev 5391) @@ -0,0 +1,27 @@ + +  +<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.4.0-Beta01-SNAPSHOT</version> + </parent> + + <artifactId>exo.kernel.commons.test</artifactId> + + <name>eXo Kernel :: Commons :: Test Util</name> + <description>eXo Commons Test Util</description> + +</project> Deleted: kernel/branches/2.4.x/exo.kernel.component.cache/pom.xml =================================================================== --- kernel/trunk/exo.kernel.component.cache/pom.xml 2011-12-29 15:14:53 UTC (rev 5389) +++ kernel/branches/2.4.x/exo.kernel.component.cache/pom.xml 2011-12-30 07:06:32 UTC (rev 5391) @@ -1,107 +0,0 @@ - -<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.3.6-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.exoplatform.kernel</groupId> - <artifactId>exo.kernel.commons.test</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> - <argLine>${env.MAVEN_OPTS} -Djava.security.manager=org.exoplatform.commons.test.TestSecurityManager -Djava.security.policy=${project.build.directory}/test-classes/test.policy</argLine> - </configuration> - </plugin> - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <id>prepare-test-policy</id> - <phase>process-test-resources</phase> - <configuration> - <tasks> - <echo>Creating Access Policy for tests</echo> - <makeurl file="${settings.localRepository}" property="localRepositoryURL" /> - <makeurl file="${project.build.outputDirectory}" property="outputDirectoryURL" /> - <makeurl file="${project.build.testOutputDirectory}" property="testOutputDirectoryURL" /> - <copy todir="${project.build.testOutputDirectory}" overwrite="true"> - <fileset dir="${project.basedir}/src/test/resources/"> - <include name="test.policy" /> - </fileset> - <filterset> - <filter token="MAVEN_REPO" value="${localRepositoryURL}" /> - <filter token="MAIN_CLASSES" value="${outputDirectoryURL}" /> - <filter token="TEST_CLASSES" value="${testOutputDirectoryURL}" /> - </filterset> - </copy> - </tasks> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - </executions> - <dependencies> - <dependency> - <groupId>ant</groupId> - <artifactId>ant-optional</artifactId> - <version>1.5.3-1</version> - </dependency> - </dependencies> - </plugin> - </plugins> - </build> - -</project> \ No newline at end of file Copied: kernel/branches/2.4.x/exo.kernel.component.cache/pom.xml (from rev 5390, kernel/trunk/exo.kernel.component.cache/pom.xml) =================================================================== --- kernel/branches/2.4.x/exo.kernel.component.cache/pom.xml (rev 0) +++ kernel/branches/2.4.x/exo.kernel.component.cache/pom.xml 2011-12-30 07:06:32 UTC (rev 5391) @@ -0,0 +1,107 @@ + +<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.4.0-Beta01-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.exoplatform.kernel</groupId> + <artifactId>exo.kernel.commons.test</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> + <argLine>${env.MAVEN_OPTS} -Djava.security.manager=org.exoplatform.commons.test.TestSecurityManager -Djava.security.policy=${project.build.directory}/test-classes/test.policy</argLine> + </configuration> + </plugin> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <id>prepare-test-policy</id> + <phase>process-test-resources</phase> + <configuration> + <tasks> + <echo>Creating Access Policy for tests</echo> + <makeurl file="${settings.localRepository}" property="localRepositoryURL" /> + <makeurl file="${project.build.outputDirectory}" property="outputDirectoryURL" /> + <makeurl file="${project.build.testOutputDirectory}" property="testOutputDirectoryURL" /> + <copy todir="${project.build.testOutputDirectory}" overwrite="true"> + <fileset dir="${project.basedir}/src/test/resources/"> + <include name="test.policy" /> + </fileset> + <filterset> + <filter token="MAVEN_REPO" value="${localRepositoryURL}" /> + <filter token="MAIN_CLASSES" value="${outputDirectoryURL}" /> + <filter token="TEST_CLASSES" value="${testOutputDirectoryURL}" /> + </filterset> + </copy> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + <dependencies> + <dependency> + <groupId>ant</groupId> + <artifactId>ant-optional</artifactId> + <version>1.5.3-1</version> + </dependency> + </dependencies> + </plugin> + </plugins> + </build> + +</project> \ No newline at end of file Deleted: kernel/branches/2.4.x/exo.kernel.component.command/pom.xml =================================================================== --- kernel/trunk/exo.kernel.component.command/pom.xml 2011-12-29 15:14:53 UTC (rev 5389) +++ kernel/branches/2.4.x/exo.kernel.component.command/pom.xml 2011-12-30 07:06:32 UTC (rev 5391) @@ -1,121 +0,0 @@ - -<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.3.6-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>org.exoplatform.kernel</groupId> - <artifactId>exo.kernel.commons.test</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> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <scope>test</scope> - </dependency> - </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <argLine>${env.MAVEN_OPTS} -Djava.security.manager=org.exoplatform.commons.test.TestSecurityManager -Djava.security.policy=${project.build.directory}/test-classes/test.policy</argLine> - </configuration> - </plugin> - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <id>prepare-test-policy</id> - <phase>process-test-resources</phase> - <configuration> - <tasks> - <echo>Creating Access Policy for tests</echo> - <makeurl file="${settings.localRepository}" property="localRepositoryURL" /> - <makeurl file="${project.build.outputDirectory}" property="outputDirectoryURL" /> - <makeurl file="${project.build.testOutputDirectory}" property="testOutputDirectoryURL" /> - <copy todir="${project.build.testOutputDirectory}" overwrite="true"> - <fileset dir="${project.basedir}/src/test/resources/"> - <include name="test.policy" /> - </fileset> - <filterset> - <filter token="MAVEN_REPO" value="${localRepositoryURL}" /> - <filter token="MAIN_CLASSES" value="${outputDirectoryURL}" /> - <filter token="TEST_CLASSES" value="${testOutputDirectoryURL}" /> - </filterset> - </copy> - </tasks> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - </executions> - <dependencies> - <dependency> - <groupId>ant</groupId> - <artifactId>ant-optional</artifactId> - <version>1.5.3-1</version> - </dependency> - </dependencies> - </plugin> - </plugins> - </build> -</project> Copied: kernel/branches/2.4.x/exo.kernel.component.command/pom.xml (from rev 5390, kernel/trunk/exo.kernel.component.command/pom.xml) =================================================================== --- kernel/branches/2.4.x/exo.kernel.component.command/pom.xml (rev 0) +++ kernel/branches/2.4.x/exo.kernel.component.command/pom.xml 2011-12-30 07:06:32 UTC (rev 5391) @@ -0,0 +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.kernel</groupId> + <artifactId>kernel-parent</artifactId> + <version>2.4.0-Beta01-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>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.commons.test</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> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <scope>test</scope> + </dependency> + </dependencies> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <argLine>${env.MAVEN_OPTS} -Djava.security.manager=org.exoplatform.commons.test.TestSecurityManager -Djava.security.policy=${project.build.directory}/test-classes/test.policy</argLine> + </configuration> + </plugin> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <id>prepare-test-policy</id> + <phase>process-test-resources</phase> + <configuration> + <tasks> + <echo>Creating Access Policy for tests</echo> + <makeurl file="${settings.localRepository}" property="localRepositoryURL" /> + <makeurl file="${project.build.outputDirectory}" property="outputDirectoryURL" /> + <makeurl file="${project.build.testOutputDirectory}" property="testOutputDirectoryURL" /> + <copy todir="${project.build.testOutputDirectory}" overwrite="true"> + <fileset dir="${project.basedir}/src/test/resources/"> + <include name="test.policy" /> + </fileset> + <filterset> + <filter token="MAVEN_REPO" value="${localRepositoryURL}" /> + <filter token="MAIN_CLASSES" value="${outputDirectoryURL}" /> + <filter token="TEST_CLASSES" value="${testOutputDirectoryURL}" /> + </filterset> + </copy> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + <dependencies> + <dependency> + <groupId>ant</groupId> + <artifactId>ant-optional</artifactId> + <version>1.5.3-1</version> + </dependency> + </dependencies> + </plugin> + </plugins> + </build> +</project> Deleted: kernel/branches/2.4.x/exo.kernel.component.common/pom.xml =================================================================== --- kernel/trunk/exo.kernel.component.common/pom.xml 2011-12-29 15:14:53 UTC (rev 5389) +++ kernel/branches/2.4.x/exo.kernel.component.common/pom.xml 2011-12-30 07:06:32 UTC (rev 5391) @@ -1,175 +0,0 @@ - -<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.3.6-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>org.exoplatform.kernel</groupId> - <artifactId>exo.kernel.commons.test</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>org.ow2.jotm</groupId> - <artifactId>jotm-core</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> - <dependency> - <groupId>org.jgroups</groupId> - <artifactId>jgroups</artifactId> - </dependency> - <dependency> - <groupId>com.atomikos</groupId> - <artifactId>transactions-jta</artifactId> - <scope>provided</scope> - </dependency> - </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <argLine>${env.MAVEN_OPTS} -Djava.security.manager=org.exoplatform.commons.test.TestSecurityManager -Djava.security.policy=${project.build.directory}/test-classes/test.policy</argLine> - <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> - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <id>prepare-test-policy</id> - <phase>process-test-resources</phase> - <configuration> - <tasks> - <echo>Creating Access Policy for tests</echo> - <makeurl file="${settings.localRepository}" property="localRepositoryURL" /> - <makeurl file="${project.build.outputDirectory}" property="outputDirectoryURL" /> - <makeurl file="${project.build.testOutputDirectory}" property="testOutputDirectoryURL" /> - <copy todir="${project.build.testOutputDirectory}" overwrite="true"> - <fileset dir="${project.basedir}/src/test/resources/"> - <include name="test.policy" /> - </fileset> - <filterset> - <filter token="MAVEN_REPO" value="${localRepositoryURL}" /> - <filter token="MAIN_CLASSES" value="${outputDirectoryURL}" /> - <filter token="TEST_CLASSES" value="${testOutputDirectoryURL}" /> - </filterset> - </copy> - </tasks> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - </executions> - <dependencies> - <dependency> - <groupId>ant</groupId> - <artifactId>ant-optional</artifactId> - <version>1.5.3-1</version> - </dependency> - </dependencies> - </plugin> - </plugins> - </build> -</project> Copied: kernel/branches/2.4.x/exo.kernel.component.common/pom.xml (from rev 5390, kernel/trunk/exo.kernel.component.common/pom.xml) =================================================================== --- kernel/branches/2.4.x/exo.kernel.component.common/pom.xml (rev 0) +++ kernel/branches/2.4.x/exo.kernel.component.common/pom.xml 2011-12-30 07:06:32 UTC (rev 5391) @@ -0,0 +1,175 @@ + +<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.4.0-Beta01-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>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.commons.test</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>org.ow2.jotm</groupId> + <artifactId>jotm-core</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> + <dependency> + <groupId>org.jgroups</groupId> + <artifactId>jgroups</artifactId> + </dependency> + <dependency> + <groupId>com.atomikos</groupId> + <artifactId>transactions-jta</artifactId> + <scope>provided</scope> + </dependency> + </dependencies> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <argLine>${env.MAVEN_OPTS} -Djava.security.manager=org.exoplatform.commons.test.TestSecurityManager -Djava.security.policy=${project.build.directory}/test-classes/test.policy</argLine> + <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> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <id>prepare-test-policy</id> + <phase>process-test-resources</phase> + <configuration> + <tasks> + <echo>Creating Access Policy for tests</echo> + <makeurl file="${settings.localRepository}" property="localRepositoryURL" /> + <makeurl file="${project.build.outputDirectory}" property="outputDirectoryURL" /> + <makeurl file="${project.build.testOutputDirectory}" property="testOutputDirectoryURL" /> + <copy todir="${project.build.testOutputDirectory}" overwrite="true"> + <fileset dir="${project.basedir}/src/test/resources/"> + <include name="test.policy" /> + </fileset> + <filterset> + <filter token="MAVEN_REPO" value="${localRepositoryURL}" /> + <filter token="MAIN_CLASSES" value="${outputDirectoryURL}" /> + <filter token="TEST_CLASSES" value="${testOutputDirectoryURL}" /> + </filterset> + </copy> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + <dependencies> + <dependency> + <groupId>ant</groupId> + <artifactId>ant-optional</artifactId> + <version>1.5.3-1</version> + </dependency> + </dependencies> + </plugin> + </plugins> + </build> +</project> Deleted: kernel/branches/2.4.x/exo.kernel.component.ext.cache.impl.infinispan.v5/pom.xml =================================================================== --- kernel/trunk/exo.kernel.component.ext.cache.impl.infinispan.v5/pom.xml 2011-12-29 15:14:53 UTC (rev 5389) +++ kernel/branches/2.4.x/exo.kernel.component.ext.cache.impl.infinispan.v5/pom.xml 2011-12-30 07:06:32 UTC (rev 5391) @@ -1,108 +0,0 @@ - - -<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.3.6-GA-SNAPSHOT</version> - </parent> - <artifactId>exo.kernel.component.ext.cache.impl.infinispan.v5</artifactId> - <name>eXo Kernel :: Cache Extension :: Infinispan Implementation</name> - <description>Infinispan Implementation for the Cache Service</description> - <dependencies> - <dependency> - <groupId>org.exoplatform.kernel</groupId> - <artifactId>exo.kernel.commons.test</artifactId> - </dependency> - <dependency> - <groupId>org.exoplatform.kernel</groupId> - <artifactId>exo.kernel.component.cache</artifactId> - </dependency> - <dependency> - <groupId>org.infinispan</groupId> - <artifactId>infinispan-core</artifactId> - </dependency> - <dependency> - <groupId>org.jgroups</groupId> - <artifactId>jgroups</artifactId> - <version>3.0.0.Final</version> - </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> - <argLine>${env.MAVEN_OPTS} -Djava.security.manager=org.exoplatform.commons.test.TestSecurityManager -Djava.security.policy=${project.build.directory}/test-classes/test.policy</argLine> - <systemProperties> -  - <property> - <name>java.net.preferIPv4Stack</name> - <value>true</value> - </property> -  - <property> - <name>jgroups.bind_addr</name> - <value>127.0.0.1</value> - </property> - </systemProperties> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.6</source> - <target>1.6</target> - </configuration> - </plugin> - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <id>prepare-test-policy</id> - <phase>process-test-resources</phase> - <configuration> - <tasks> - <echo>Creating Access Policy for tests</echo> - <makeurl file="${settings.localRepository}" property="localRepositoryURL" /> - <makeurl file="${project.build.outputDirectory}" property="outputDirectoryURL" /> - <makeurl file="${project.build.testOutputDirectory}" property="testOutputDirectoryURL" /> - <copy todir="${project.build.testOutputDirectory}" overwrite="true"> - <fileset dir="${project.basedir}/src/test/resources/"> - <include name="test.policy" /> - </fileset> - <filterset> - <filter token="MAVEN_REPO" value="${localRepositoryURL}" /> - <filter token="MAIN_CLASSES" value="${outputDirectoryURL}" /> - <filter token="TEST_CLASSES" value="${testOutputDirectoryURL}" /> - </filterset> - </copy> - </tasks> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - </executions> - <dependencies> - <dependency> - <groupId>ant</groupId> - <artifactId>ant-optional</artifactId> - <version>1.5.3-1</version> - </dependency> - </dependencies> - </plugin> - </plugins> - </build> -</project> Copied: kernel/branches/2.4.x/exo.kernel.component.ext.cache.impl.infinispan.v5/pom.xml (from rev 5390, kernel/trunk/exo.kernel.component.ext.cache.impl.infinispan.v5/pom.xml) =================================================================== --- kernel/branches/2.4.x/exo.kernel.component.ext.cache.impl.infinispan.v5/pom.xml (rev 0) +++ kernel/branches/2.4.x/exo.kernel.component.ext.cache.impl.infinispan.v5/pom.xml 2011-12-30 07:06:32 UTC (rev 5391) @@ -0,0 +1,108 @@ + + +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>kernel-parent</artifactId> + <version>2.4.0-Beta01-SNAPSHOT</version> + </parent> + <artifactId>exo.kernel.component.ext.cache.impl.infinispan.v5</artifactId> + <name>eXo Kernel :: Cache Extension :: Infinispan Implementation</name> + <description>Infinispan Implementation for the Cache Service</description> + <dependencies> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.commons.test</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.component.cache</artifactId> + </dependency> + <dependency> + <groupId>org.infinispan</groupId> + <artifactId>infinispan-core</artifactId> + </dependency> + <dependency> + <groupId>org.jgroups</groupId> + <artifactId>jgroups</artifactId> + <version>3.0.0.Final</version> + </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> + <argLine>${env.MAVEN_OPTS} -Djava.security.manager=org.exoplatform.commons.test.TestSecurityManager -Djava.security.policy=${project.build.directory}/test-classes/test.policy</argLine> + <systemProperties> +  + <property> + <name>java.net.preferIPv4Stack</name> + <value>true</value> + </property> +  + <property> + <name>jgroups.bind_addr</name> + <value>127.0.0.1</value> + </property> + </systemProperties> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>1.6</source> + <target>1.6</target> + </configuration> + </plugin> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <id>prepare-test-policy</id> + <phase>process-test-resources</phase> + <configuration> + <tasks> + <echo>Creating Access Policy for tests</echo> + <makeurl file="${settings.localRepository}" property="localRepositoryURL" /> + <makeurl file="${project.build.outputDirectory}" property="outputDirectoryURL" /> + <makeurl file="${project.build.testOutputDirectory}" property="testOutputDirectoryURL" /> + <copy todir="${project.build.testOutputDirectory}" overwrite="true"> + <fileset dir="${project.basedir}/src/test/resources/"> + <include name="test.policy" /> + </fileset> + <filterset> + <filter token="MAVEN_REPO" value="${localRepositoryURL}" /> + <filter token="MAIN_CLASSES" value="${outputDirectoryURL}" /> + <filter token="TEST_CLASSES" value="${testOutputDirectoryURL}" /> + </filterset> + </copy> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + <dependencies> + <dependency> + <groupId>ant</groupId> + <artifactId>ant-optional</artifactId> + <version>1.5.3-1</version> + </dependency> + </dependencies> + </plugin> + </plugins> + </build> +</project> Deleted: kernel/branches/2.4.x/exo.kernel.component.ext.cache.impl.jboss.v3/pom.xml =================================================================== --- kernel/trunk/exo.kernel.component.ext.cache.impl.jboss.v3/pom.xml 2011-12-29 15:14:53 UTC (rev 5389) +++ kernel/branches/2.4.x/exo.kernel.component.ext.cache.impl.jboss.v3/pom.xml 2011-12-30 07:06:32 UTC (rev 5391) @@ -1,134 +0,0 @@ - -<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.3.6-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.commons.test</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> - <dependency> - <groupId>org.jgroups</groupId> - <artifactId>jgroups</artifactId> - </dependency> - </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <argLine>${env.MAVEN_OPTS} -Djava.security.manager=org.exoplatform.commons.test.TestSecurityManager -Djava.security.policy=${project.build.directory}/test-classes/test.policy</argLine> - <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> - <property> - <name>allow.shareable.cache</name> - <value>true</value> - </property> - </systemProperties> - </configuration> - </plugin> - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <id>prepare-test-policy</id> - <phase>process-test-resources</phase> - <configuration> - <tasks> - <echo>Creating Access Policy for tests</echo> - <makeurl file="${settings.localRepository}" property="localRepositoryURL" /> - <makeurl file="${project.build.outputDirectory}" property="outputDirectoryURL" /> - <makeurl file="${project.build.testOutputDirectory}" property="testOutputDirectoryURL" /> - <copy todir="${project.build.testOutputDirectory}" overwrite="true"> - <fileset dir="${project.basedir}/src/test/resources/"> - <include name="test.policy" /> - </fileset> - <filterset> - <filter token="MAVEN_REPO" value="${localRepositoryURL}" /> - <filter token="MAIN_CLASSES" value="${outputDirectoryURL}" /> - <filter token="TEST_CLASSES" value="${testOutputDirectoryURL}" /> - </filterset> - </copy> - </tasks> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - </executions> - <dependencies> - <dependency> - <groupId>ant</groupId> - <artifactId>ant-optional</artifactId> - <version>1.5.3-1</version> - </dependency> - </dependencies> - </plugin> - </plugins> - </build> -</project> Copied: kernel/branches/2.4.x/exo.kernel.component.ext.cache.impl.jboss.v3/pom.xml (from rev 5390, kernel/trunk/exo.kernel.component.ext.cache.impl.jboss.v3/pom.xml) =================================================================== --- kernel/branches/2.4.x/exo.kernel.component.ext.cache.impl.jboss.v3/pom.xml (rev 0) +++ kernel/branches/2.4.x/exo.kernel.component.ext.cache.impl.jboss.v3/pom.xml 2011-12-30 07:06:32 UTC (rev 5391) @@ -0,0 +1,134 @@ + +<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.4.0-Beta01-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.commons.test</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> + <dependency> + <groupId>org.jgroups</groupId> + <artifactId>jgroups</artifactId> + </dependency> + </dependencies> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <argLine>${env.MAVEN_OPTS} -Djava.security.manager=org.exoplatform.commons.test.TestSecurityManager -Djava.security.policy=${project.build.directory}/test-classes/test.policy</argLine> + <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> + <property> + <name>allow.shareable.cache</name> + <value>true</value> + </property> + </systemProperties> + </configuration> + </plugin> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <id>prepare-test-policy</id> + <phase>process-test-resources</phase> + <configuration> + <tasks> + <echo>Creating Access Policy for tests</echo> + <makeurl file="${settings.localRepository}" property="localRepositoryURL" /> + <makeurl file="${project.build.outputDirectory}" property="outputDirectoryURL" /> + <makeurl file="${project.build.testOutputDirectory}" property="testOutputDirectoryURL" /> + <copy todir="${project.build.testOutputDirectory}" overwrite="true"> + <fileset dir="${project.basedir}/src/test/resources/"> + <include name="test.policy" /> + </fileset> + <filterset> + <filter token="MAVEN_REPO" value="${localRepositoryURL}" /> + <filter token="MAIN_CLASSES" value="${outputDirectoryURL}" /> + <filter token="TEST_CLASSES" value="${testOutputDirectoryURL}" /> + </filterset> + </copy> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + <dependencies> + <dependency> + <groupId>ant</groupId> + <artifactId>ant-optional</artifactId> + <version>1.5.3-1</version> + </dependency> + </dependencies> + </plugin> + </plugins> + </build> +</project> Deleted: kernel/branches/2.4.x/exo.kernel.component.ext.rpc.impl.jgroups.v3/pom.xml =================================================================== --- kernel/trunk/exo.kernel.component.ext.rpc.impl.jgroups.v3/pom.xml 2011-12-29 15:14:53 UTC (rev 5389) +++ kernel/branches/2.4.x/exo.kernel.component.ext.rpc.impl.jgroups.v3/pom.xml 2011-12-30 07:06:32 UTC (rev 5391) @@ -1,115 +0,0 @@ - -<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.3.6-GA-SNAPSHOT</version> - </parent> - <artifactId>exo.kernel.component.ext.rpc.impl.jgroups.v3</artifactId> - <name>eXo Kernel :: RPC Service Extension :: JGroups 3 Implementation</name> - <description>The JGroups 3 implementation of the RPC service</description> - <dependencies> - <dependency> - <groupId>org.exoplatform.kernel</groupId> - <artifactId>exo.kernel.commons.test</artifactId> - </dependency> - <dependency> - <groupId>org.exoplatform.kernel</groupId> - <artifactId>exo.kernel.component.common</artifactId> - </dependency> - <dependency> - <groupId>org.jgroups</groupId> - <artifactId>jgroups</artifactId> - <version>3.0.0.Final</version> - </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> - <argLine>${env.MAVEN_OPTS} -Djava.security.manager=org.exoplatform.commons.test.TestSecurityManager -Djava.security.policy=${project.build.directory}/test-classes/test.policy</argLine> - <systemProperties> -  - <property> - <name>java.net.preferIPv4Stack</name> - <value>true</value> - </property> -  - <property> - <name>jgroups.bind_addr</name> - <value>127.0.0.1</value> - </property> - <property> - <name>jgroups.stack</name> - <value>udp</value> - </property> - </systemProperties> - </configuration> - </plugin> - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <id>prepare-test-policy</id> - <phase>process-test-resources</phase> - <configuration> - <tasks> - <echo>Creating Access Policy for tests</echo> - <makeurl file="${settings.localRepository}" property="localRepositoryURL" /> - <makeurl file="${project.build.outputDirectory}" property="outputDirectoryURL" /> - <makeurl file="${project.build.testOutputDirectory}" property="testOutputDirectoryURL" /> - <copy todir="${project.build.testOutputDirectory}" overwrite="true"> - <fileset dir="${project.basedir}/src/test/resources/"> - <include name="test.policy" /> - </fileset> - <filterset> - <filter token="MAVEN_REPO" value="${localRepositoryURL}" /> - <filter token="MAIN_CLASSES" value="${outputDirectoryURL}" /> - <filter token="TEST_CLASSES" value="${testOutputDirectoryURL}" /> - </filterset> - </copy> - </tasks> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - </executions> - <dependencies> - <dependency> - <groupId>ant</groupId> - <artifactId>ant-optional</artifactId> - <version>1.5.3-1</version> - </dependency> - </dependencies> - </plugin> - </plugins> - </build> -</project> Copied: kernel/branches/2.4.x/exo.kernel.component.ext.rpc.impl.jgroups.v3/pom.xml (from rev 5390, kernel/trunk/exo.kernel.component.ext.rpc.impl.jgroups.v3/pom.xml) =================================================================== --- kernel/branches/2.4.x/exo.kernel.component.ext.rpc.impl.jgroups.v3/pom.xml (rev 0) +++ kernel/branches/2.4.x/exo.kernel.component.ext.rpc.impl.jgroups.v3/pom.xml 2011-12-30 07:06:32 UTC (rev 5391) @@ -0,0 +1,115 @@ + +<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.4.0-Beta01-SNAPSHOT</version> + </parent> + <artifactId>exo.kernel.component.ext.rpc.impl.jgroups.v3</artifactId> + <name>eXo Kernel :: RPC Service Extension :: JGroups 3 Implementation</name> + <description>The JGroups 3 implementation of the RPC service</description> + <dependencies> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.commons.test</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.component.common</artifactId> + </dependency> + <dependency> + <groupId>org.jgroups</groupId> + <artifactId>jgroups</artifactId> + <version>3.0.0.Final</version> + </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> + <argLine>${env.MAVEN_OPTS} -Djava.security.manager=org.exoplatform.commons.test.TestSecurityManager -Djava.security.policy=${project.build.directory}/test-classes/test.policy</argLine> + <systemProperties> +  + <property> + <name>java.net.preferIPv4Stack</name> + <value>true</value> + </property> +  + <property> + <name>jgroups.bind_addr</name> + <value>127.0.0.1</value> + </property> + <property> + <name>jgroups.stack</name> + <value>udp</value> + </property> + </systemProperties> + </configuration> + </plugin> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <id>prepare-test-policy</id> + <phase>process-test-resources</phase> + <configuration> + <tasks> + <echo>Creating Access Policy for tests</echo> + <makeurl file="${settings.localRepository}" property="localRepositoryURL" /> + <makeurl file="${project.build.outputDirectory}" property="outputDirectoryURL" /> + <makeurl file="${project.build.testOutputDirectory}" property="testOutputDirectoryURL" /> + <copy todir="${project.build.testOutputDirectory}" overwrite="true"> + <fileset dir="${project.basedir}/src/test/resources/"> + <include name="test.policy" /> + </fileset> + <filterset> + <filter token="MAVEN_REPO" value="${localRepositoryURL}" /> + <filter token="MAIN_CLASSES" value="${outputDirectoryURL}" /> + <filter token="TEST_CLASSES" value="${testOutputDirectoryURL}" /> + </filterset> + </copy> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + <dependencies> + <dependency> + <groupId>ant</groupId> + <artifactId>ant-optional</artifactId> + <version>1.5.3-1</version> + </dependency> + </dependencies> + </plugin> + </plugins> + </build> +</project> Deleted: kernel/branches/2.4.x/exo.kernel.container/pom.xml =================================================================== --- kernel/trunk/exo.kernel.container/pom.xml 2011-12-29 15:14:53 UTC (rev 5389) +++ kernel/branches/2.4.x/exo.kernel.container/pom.xml 2011-12-30 07:06:32 UTC (rev 5391) @@ -1,144 +0,0 @@ - -  -<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.3.6-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.kernel</groupId> - <artifactId>exo.kernel.commons.test</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.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <argLine>${env.MAVEN_OPTS} -Djava.security.manager=org.exoplatform.commons.test.TestSecurityManager -Djava.security.policy=${project.build.directory}/test-classes/test.policy</argLine> - </configuration> - </plugin> - <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> - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <id>prepare-test-policy</id> - <phase>process-test-resources</phase> - <configuration> - <tasks> - <echo>Creating Access Policy for tests</echo> - <makeurl file="${settings.localRepository}" property="localRepositoryURL" /> - <makeurl file="${project.build.outputDirectory}" property="outputDirectoryURL" /> - <makeurl file="${project.build.testOutputDirectory}" property="testOutputDirectoryURL" /> - <copy todir="${project.build.testOutputDirectory}" overwrite="true"> - <fileset dir="${project.basedir}/src/test/resources/"> - <include name="test.policy" /> - </fileset> - <filterset> - <filter token="MAVEN_REPO" value="${localRepositoryURL}" /> - <filter token="MAIN_CLASSES" value="${outputDirectoryURL}" /> - <filter token="TEST_CLASSES" value="${testOutputDirectoryURL}" /> - </filterset> - </copy> - </tasks> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - </executions> - <dependencies> - <dependency> - <groupId>ant</groupId> - <artifactId>ant-optional</artifactId> - <version>1.5.3-1</version> - </dependency> - </dependencies> - </plugin> - </plugins> - </build> -</project> Copied: kernel/branches/2.4.x/exo.kernel.container/pom.xml (from rev 5390, kernel/trunk/exo.kernel.container/pom.xml) =================================================================== --- kernel/branches/2.4.x/exo.kernel.container/pom.xml (rev 0) +++ kernel/branches/2.4.x/exo.kernel.container/pom.xml 2011-12-30 07:06:32 UTC (rev 5391) @@ -0,0 +1,144 @@ + +  +<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.4.0-Beta01-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.kernel</groupId> + <artifactId>exo.kernel.commons.test</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.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <argLine>${env.MAVEN_OPTS} -Djava.security.manager=org.exoplatform.commons.test.TestSecurityManager -Djava.security.policy=${project.build.directory}/test-classes/test.policy</argLine> + </configuration> + </plugin> + <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> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <id>prepare-test-policy</id> + <phase>process-test-resources</phase> + <configuration> + <tasks> + <echo>Creating Access Policy for tests</echo> + <makeurl file="${settings.localRepository}" property="localRepositoryURL" /> + <makeurl file="${project.build.outputDirectory}" property="outputDirectoryURL" /> + <makeurl file="${project.build.testOutputDirectory}" property="testOutputDirectoryURL" /> + <copy todir="${project.build.testOutputDirectory}" overwrite="true"> + <fileset dir="${project.basedir}/src/test/resources/"> + <include name="test.policy" /> + </fileset> + <filterset> + <filter token="MAVEN_REPO" value="${localRepositoryURL}" /> + <filter token="MAIN_CLASSES" value="${outputDirectoryURL}" /> + <filter token="TEST_CLASSES" value="${testOutputDirectoryURL}" /> + </filterset> + </copy> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + <dependencies> + <dependency> + <groupId>ant</groupId> + <artifactId>ant-optional</artifactId> + <version>1.5.3-1</version> + </dependency> + </dependencies> + </plugin> + </plugins> + </build> +</project> Deleted: kernel/branches/2.4.x/exo.kernel.mc-integration/exo.kernel.mc-int/pom.xml =================================================================== --- kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int/pom.xml 2011-12-29 15:14:53 UTC (rev 5389) +++ kernel/branches/2.4.x/exo.kernel.mc-integration/exo.kernel.mc-int/pom.xml 2011-12-30 07:06:32 UTC (rev 5391) @@ -1,59 +0,0 @@ - -<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.3.6-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> Copied: kernel/branches/2.4.x/exo.kernel.mc-integration/exo.kernel.mc-int/pom.xml (from rev 5390, kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int/pom.xml) =================================================================== --- kernel/branches/2.4.x/exo.kernel.mc-integration/exo.kernel.mc-int/pom.xml (rev 0) +++ kernel/branches/2.4.x/exo.kernel.mc-integration/exo.kernel.mc-int/pom.xml 2011-12-30 07:06:32 UTC (rev 5391) @@ -0,0 +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.4.0-Beta01-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> Deleted: kernel/branches/2.4.x/exo.kernel.mc-integration/exo.kernel.mc-int-demo/pom.xml =================================================================== --- kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int-demo/pom.xml 2011-12-29 15:14:53 UTC (rev 5389) +++ kernel/branches/2.4.x/exo.kernel.mc-integration/exo.kernel.mc-int-demo/pom.xml 2011-12-30 07:06:32 UTC (rev 5391) @@ -1,36 +0,0 @@ -<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.3.6-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> Copied: kernel/branches/2.4.x/exo.kernel.mc-integration/exo.kernel.mc-int-demo/pom.xml (from rev 5390, kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int-demo/pom.xml) =================================================================== --- kernel/branches/2.4.x/exo.kernel.mc-integration/exo.kernel.mc-int-demo/pom.xml (rev 0) +++ kernel/branches/2.4.x/exo.kernel.mc-integration/exo.kernel.mc-int-demo/pom.xml 2011-12-30 07:06:32 UTC (rev 5391) @@ -0,0 +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.4.0-Beta01-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> Deleted: kernel/branches/2.4.x/exo.kernel.mc-integration/exo.kernel.mc-int-tests/pom.xml =================================================================== --- kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int-tests/pom.xml 2011-12-29 15:14:53 UTC (rev 5389) +++ kernel/branches/2.4.x/exo.kernel.mc-integration/exo.kernel.mc-int-tests/pom.xml 2011-12-30 07:06:32 UTC (rev 5391) @@ -1,397 +0,0 @@ -<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.3.6-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.commons.test</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> - <argLine>${env.MAVEN_OPTS} -Djava.security.manager=org.exoplatform.commons.test.TestSecurityManager -Djava.security.policy=${project.build.directory}/test-classes/test.policy</argLine> - <skip>true</skip> - </configuration> - </plugin> - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <id>prepare-test-policy</id> - <phase>process-test-resources</phase> - <configuration> - <tasks> - <echo>Creating Access Policy for tests</echo> - <makeurl file="${settings.localRepository}" property="localRepositoryURL" /> - <makeurl file="${project.build.outputDirectory}" property="outputDirectoryURL" /> - <makeurl file="${project.build.testOutputDirectory}" property="testOutputDirectoryURL" /> - <copy todir="${project.build.testOutputDirectory}" overwrite="true"> - <fileset dir="${project.basedir}/src/test/resources/"> - <include name="test.policy" /> - </fileset> - <filterset> - <filter token="MAVEN_REPO" value="${localRepositoryURL}" /> - <filter token="MAIN_CLASSES" value="${outputDirectoryURL}" /> - <filter token="TEST_CLASSES" value="${testOutputDirectoryURL}" /> - </filterset> - </copy> - </tasks> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - </executions> - <dependencies> - <dependency> - <groupId>ant</groupId> - <artifactId>ant-optional</artifactId> - <version>1.5.3-1</version> - </dependency> - </dependencies> - </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> - <argLine>${env.MAVEN_OPTS} -Djava.security.manager=org.exoplatform.commons.test.TestSecurityManager -Djava.security.policy=${project.build.directory}/test-classes/test.policy</argLine> - <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> - <argLine>${env.MAVEN_OPTS} -Djava.security.manager=org.exoplatform.commons.test.TestSecurityManager -Djava.security.policy=${project.build.directory}/test-classes/test.policy</argLine> - <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> - <argLine>${env.MAVEN_OPTS} -Djava.security.manager=org.exoplatform.commons.test.TestSecurityManager -Djava.security.policy=${project.build.directory}/test-classes/test.policy</argLine> - <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> Copied: kernel/branches/2.4.x/exo.kernel.mc-integration/exo.kernel.mc-int-tests/pom.xml (from rev 5390, kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int-tests/pom.xml) =================================================================== --- kernel/branches/2.4.x/exo.kernel.mc-integration/exo.kernel.mc-int-tests/pom.xml (rev 0) +++ kernel/branches/2.4.x/exo.kernel.mc-integration/exo.kernel.mc-int-tests/pom.xml 2011-12-30 07:06:32 UTC (rev 5391) @@ -0,0 +1,397 @@ +<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.4.0-Beta01-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.commons.test</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> + <argLine>${env.MAVEN_OPTS} -Djava.security.manager=org.exoplatform.commons.test.TestSecurityManager -Djava.security.policy=${project.build.directory}/test-classes/test.policy</argLine> + <skip>true</skip> + </configuration> + </plugin> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <id>prepare-test-policy</id> + <phase>process-test-resources</phase> + <configuration> + <tasks> + <echo>Creating Access Policy for tests</echo> + <makeurl file="${settings.localRepository}" property="localRepositoryURL" /> + <makeurl file="${project.build.outputDirectory}" property="outputDirectoryURL" /> + <makeurl file="${project.build.testOutputDirectory}" property="testOutputDirectoryURL" /> + <copy todir="${project.build.testOutputDirectory}" overwrite="true"> + <fileset dir="${project.basedir}/src/test/resources/"> + <include name="test.policy" /> + </fileset> + <filterset> + <filter token="MAVEN_REPO" value="${localRepositoryURL}" /> + <filter token="MAIN_CLASSES" value="${outputDirectoryURL}" /> + <filter token="TEST_CLASSES" value="${testOutputDirectoryURL}" /> + </filterset> + </copy> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + <dependencies> + <dependency> + <groupId>ant</groupId> + <artifactId>ant-optional</artifactId> + <version>1.5.3-1</version> + </dependency> + </dependencies> + </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> + <argLine>${env.MAVEN_OPTS} -Djava.security.manager=org.exoplatform.commons.test.TestSecurityManager -Djava.security.policy=${project.build.directory}/test-classes/test.policy</argLine> + <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> + <argLine>${env.MAVEN_OPTS} -Djava.security.manager=org.exoplatform.commons.test.TestSecurityManager -Djava.security.policy=${project.build.directory}/test-classes/test.policy</argLine> + <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> + <argLine>${env.MAVEN_OPTS} -Djava.security.manager=org.exoplatform.commons.test.TestSecurityManager -Djava.security.policy=${project.build.directory}/test-classes/test.policy</argLine> + <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> Deleted: kernel/branches/2.4.x/exo.kernel.mc-integration/exo.kernel.mc-kernel-extras/pom.xml =================================================================== --- kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-kernel-extras/pom.xml 2011-12-29 15:14:53 UTC (rev 5389) +++ kernel/branches/2.4.x/exo.kernel.mc-integration/exo.kernel.mc-kernel-extras/pom.xml 2011-12-30 07:06:32 UTC (rev 5391) @@ -1,23 +0,0 @@ - -<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.3.6-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> Copied: kernel/branches/2.4.x/exo.kernel.mc-integration/exo.kernel.mc-kernel-extras/pom.xml (from rev 5390, kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-kernel-extras/pom.xml) =================================================================== --- kernel/branches/2.4.x/exo.kernel.mc-integration/exo.kernel.mc-kernel-extras/pom.xml (rev 0) +++ kernel/branches/2.4.x/exo.kernel.mc-integration/exo.kernel.mc-kernel-extras/pom.xml 2011-12-30 07:06:32 UTC (rev 5391) @@ -0,0 +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.4.0-Beta01-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> Deleted: kernel/branches/2.4.x/exo.kernel.mc-integration/pom.xml =================================================================== --- kernel/trunk/exo.kernel.mc-integration/pom.xml 2011-12-29 15:14:53 UTC (rev 5389) +++ kernel/branches/2.4.x/exo.kernel.mc-integration/pom.xml 2011-12-30 07:06:32 UTC (rev 5391) @@ -1,92 +0,0 @@ - -<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.3.6-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> Copied: kernel/branches/2.4.x/exo.kernel.mc-integration/pom.xml (from rev 5390, kernel/trunk/exo.kernel.mc-integration/pom.xml) =================================================================== --- kernel/branches/2.4.x/exo.kernel.mc-integration/pom.xml (rev 0) +++ kernel/branches/2.4.x/exo.kernel.mc-integration/pom.xml 2011-12-30 07:06:32 UTC (rev 5391) @@ -0,0 +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.4.0-Beta01-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> Deleted: kernel/branches/2.4.x/packaging/module/pom.xml =================================================================== --- kernel/trunk/packaging/module/pom.xml 2011-12-29 15:14:53 UTC (rev 5389) +++ kernel/branches/2.4.x/packaging/module/pom.xml 2011-12-30 07:06:32 UTC (rev 5391) @@ -1,68 +0,0 @@ -<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.3.6-GA-SNAPSHOT</version> - <relativePath>../../pom.xml</relativePath> - </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> Copied: kernel/branches/2.4.x/packaging/module/pom.xml (from rev 5390, kernel/trunk/packaging/module/pom.xml) =================================================================== --- kernel/branches/2.4.x/packaging/module/pom.xml (rev 0) +++ kernel/branches/2.4.x/packaging/module/pom.xml 2011-12-30 07:06:32 UTC (rev 5391) @@ -0,0 +1,68 @@ +<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.4.0-Beta01-SNAPSHOT</version> + <relativePath>../../pom.xml</relativePath> + </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> Deleted: kernel/branches/2.4.x/pom.xml =================================================================== --- kernel/trunk/pom.xml 2011-12-29 15:14:53 UTC (rev 5389) +++ kernel/branches/2.4.x/pom.xml 2011-12-30 07:06:32 UTC (rev 5391) @@ -1,290 +0,0 @@ - -<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>9</version> - </parent> - - <groupId>org.exoplatform.kernel</groupId> - <artifactId>kernel-parent</artifactId> - <version>2.3.6-GA-SNAPSHOT</version> - <packaging>pom</packaging> - - <name>eXo Kernel</name> - - <properties> - <exo.product.name>exo-kernel</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> - <forkMode>always</forkMode> - </properties> - - <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/exo-jcr/kernel/trunk</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/exo-jcr/kernel/trunk</developerConnection> - <url>http://fisheye.jboss.org/browse/exo-jcr/kernel/trunk</url> - </scm> - - <modules> - <module>exo.kernel.container</module> - <module>exo.kernel.commons</module> - <module>exo.kernel.commons.test</module> - <module>exo.kernel.component.common</module> - <module>exo.kernel.component.ext.rpc.impl.jgroups.v3</module> - <module>exo.kernel.component.cache</module> - <module>exo.kernel.component.ext.cache.impl.jboss.v3</module> - <module>exo.kernel.component.ext.cache.impl.infinispan.v5</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.commons.test</artifactId> - <version>${project.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.exoplatform.kernel</groupId> - <artifactId>exo.kernel.component.common</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.exoplatform.kernel</groupId> - <artifactId>exo.kernel.component.cache</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>xpp3</groupId> - <artifactId>xpp3</artifactId> - <version>1.1.4c</version> - </dependency> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <version>1.1.1</version> - </dependency> - <dependency> - <groupId>commons-beanutils</groupId> - <artifactId>commons-beanutils</artifactId> - <version>1.8.3</version> - </dependency> - <dependency> - <groupId>commons-chain</groupId> - <artifactId>commons-chain</artifactId> - <version>1.2</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.16</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>xml-apis</groupId> - <artifactId>xml-apis</artifactId> - <version>1.0.b2</version> - </dependency> - <dependency> - <groupId>eu.medsea.mimeutil</groupId> - <artifactId>mime-util</artifactId> - <version>2.1.3</version> - <exclusions> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> - </exclusions> - </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.4</version> - </dependency> - <dependency> - <groupId>javax.activation</groupId> - <artifactId>activation</artifactId> - <version>1.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.1</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>org.jgroups</groupId> - <artifactId>jgroups</artifactId> - <version>2.6.20.Final</version> - </dependency> - <dependency> - <groupId>org.jboss.cache</groupId> - <artifactId>jbosscache-core</artifactId> - <version>3.2.7.GA</version> - <exclusions> - <exclusion> - <groupId>jgroups</groupId> - <artifactId>jgroups</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.infinispan</groupId> - <artifactId>infinispan-core</artifactId> - <version>5.1.0.CR1</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>org.ow2.jotm</groupId> - <artifactId>jotm-core</artifactId> - <version>2.1.9</version> - </dependency> - <dependency> - <groupId>com.atomikos</groupId> - <artifactId>transactions-jta</artifactId> - <version>3.7.0</version> - </dependency> - </dependencies> - </dependencyManagement> - - <dependencies> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> - </dependencies> - - <profiles> - <profile> - <id>release</id> - <build> - <plugins> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <dependencies> - <dependency> - <groupId>org.apache.apache.resources</groupId> - <artifactId>apache-source-release-assembly-descriptor</artifactId> - <version>1.0.2</version> - </dependency> - </dependencies> - <executions> - <execution> - <id>source-release-assembly</id> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - <configuration> - <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot> - <descriptorRefs> - <descriptorRef>source-release</descriptorRef> - </descriptorRefs> - <tarLongFileFormat>gnu</tarLongFileFormat> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - </profiles> - -</project> Copied: kernel/branches/2.4.x/pom.xml (from rev 5390, kernel/trunk/pom.xml) =================================================================== --- kernel/branches/2.4.x/pom.xml (rev 0) +++ kernel/branches/2.4.x/pom.xml 2011-12-30 07:06:32 UTC (rev 5391) @@ -0,0 +1,290 @@ + +<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>9</version> + </parent> + + <groupId>org.exoplatform.kernel</groupId> + <artifactId>kernel-parent</artifactId> + <version>2.4.0-Beta01-SNAPSHOT</version> + <packaging>pom</packaging> + + <name>eXo Kernel</name> + + <properties> + <exo.product.name>exo-kernel</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> + <forkMode>always</forkMode> + </properties> + + <scm> + <connection>scm:svn:http://anonsvn.jboss.org/repos/exo-jcr/kernel/branches/2.4.x</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/exo-jcr/kernel/branches/2.4.x</developerConnection> + <url>http://fisheye.jboss.org/browse/exo-jcr/kernel/branches/2.4.x</url> + </scm> + + <modules> + <module>exo.kernel.container</module> + <module>exo.kernel.commons</module> + <module>exo.kernel.commons.test</module> + <module>exo.kernel.component.common</module> + <module>exo.kernel.component.ext.rpc.impl.jgroups.v3</module> + <module>exo.kernel.component.cache</module> + <module>exo.kernel.component.ext.cache.impl.jboss.v3</module> + <module>exo.kernel.component.ext.cache.impl.infinispan.v5</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.commons.test</artifactId> + <version>${project.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.component.common</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.component.cache</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>xpp3</groupId> + <artifactId>xpp3</artifactId> + <version>1.1.4c</version> + </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>1.1.1</version> + </dependency> + <dependency> + <groupId>commons-beanutils</groupId> + <artifactId>commons-beanutils</artifactId> + <version>1.8.3</version> + </dependency> + <dependency> + <groupId>commons-chain</groupId> + <artifactId>commons-chain</artifactId> + <version>1.2</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.16</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>xml-apis</groupId> + <artifactId>xml-apis</artifactId> + <version>1.0.b2</version> + </dependency> + <dependency> + <groupId>eu.medsea.mimeutil</groupId> + <artifactId>mime-util</artifactId> + <version>2.1.3</version> + <exclusions> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </exclusion> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + </exclusions> + </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.4</version> + </dependency> + <dependency> + <groupId>javax.activation</groupId> + <artifactId>activation</artifactId> + <version>1.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.1</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>org.jgroups</groupId> + <artifactId>jgroups</artifactId> + <version>2.6.20.Final</version> + </dependency> + <dependency> + <groupId>org.jboss.cache</groupId> + <artifactId>jbosscache-core</artifactId> + <version>3.2.7.GA</version> + <exclusions> + <exclusion> + <groupId>jgroups</groupId> + <artifactId>jgroups</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.infinispan</groupId> + <artifactId>infinispan-core</artifactId> + <version>5.1.0.CR1</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>org.ow2.jotm</groupId> + <artifactId>jotm-core</artifactId> + <version>2.1.9</version> + </dependency> + <dependency> + <groupId>com.atomikos</groupId> + <artifactId>transactions-jta</artifactId> + <version>3.7.0</version> + </dependency> + </dependencies> + </dependencyManagement> + + <dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + </dependencies> + + <profiles> + <profile> + <id>release</id> + <build> + <plugins> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <dependencies> + <dependency> + <groupId>org.apache.apache.resources</groupId> + <artifactId>apache-source-release-assembly-descriptor</artifactId> + <version>1.0.2</version> + </dependency> + </dependencies> + <executions> + <execution> + <id>source-release-assembly</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + <configuration> + <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot> + <descriptorRefs> + <descriptorRef>source-release</descriptorRef> + </descriptorRefs> + <tarLongFileFormat>gnu</tarLongFileFormat> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> + +</project>

12 years, 4 months

1
0
0 / 0

exo-jcr SVN: r5390 - in kernel/trunk: exo.kernel.commons and 14 other directories.

by do-not-reply＠jboss.org

Author: tolusha Date: 2011-12-30 02:06:02 -0500 (Fri, 30 Dec 2011) New Revision: 5390 Modified: kernel/trunk/exo.kernel.commons.test/pom.xml kernel/trunk/exo.kernel.commons/pom.xml kernel/trunk/exo.kernel.component.cache/pom.xml kernel/trunk/exo.kernel.component.command/pom.xml kernel/trunk/exo.kernel.component.common/pom.xml kernel/trunk/exo.kernel.component.ext.cache.impl.infinispan.v5/pom.xml kernel/trunk/exo.kernel.component.ext.cache.impl.jboss.v3/pom.xml kernel/trunk/exo.kernel.component.ext.rpc.impl.jgroups.v3/pom.xml kernel/trunk/exo.kernel.container/pom.xml kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int-demo/pom.xml kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int-tests/pom.xml kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int/pom.xml kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-kernel-extras/pom.xml kernel/trunk/exo.kernel.mc-integration/pom.xml kernel/trunk/packaging/module/pom.xml kernel/trunk/pom.xml Log: [maven-release-plugin] prepare branch 2.4.x Modified: kernel/trunk/exo.kernel.commons/pom.xml =================================================================== --- kernel/trunk/exo.kernel.commons/pom.xml 2011-12-29 15:14:53 UTC (rev 5389) +++ kernel/trunk/exo.kernel.commons/pom.xml 2011-12-30 07:06:02 UTC (rev 5390) @@ -16,7 +16,7 @@ <parent> <groupId>org.exoplatform.kernel</groupId> <artifactId>kernel-parent</artifactId> - <version>2.3.6-GA-SNAPSHOT</version> + <version>2.4.0-Beta01-SNAPSHOT</version> </parent> <artifactId>exo.kernel.commons</artifactId> Modified: kernel/trunk/exo.kernel.commons.test/pom.xml =================================================================== --- kernel/trunk/exo.kernel.commons.test/pom.xml 2011-12-29 15:14:53 UTC (rev 5389) +++ kernel/trunk/exo.kernel.commons.test/pom.xml 2011-12-30 07:06:02 UTC (rev 5390) @@ -16,7 +16,7 @@ <parent> <groupId>org.exoplatform.kernel</groupId> <artifactId>kernel-parent</artifactId> - <version>2.3.6-GA-SNAPSHOT</version> + <version>2.4.0-Beta01-SNAPSHOT</version> </parent> <artifactId>exo.kernel.commons.test</artifactId> Modified: kernel/trunk/exo.kernel.component.cache/pom.xml =================================================================== --- kernel/trunk/exo.kernel.component.cache/pom.xml 2011-12-29 15:14:53 UTC (rev 5389) +++ kernel/trunk/exo.kernel.component.cache/pom.xml 2011-12-30 07:06:02 UTC (rev 5390) @@ -25,7 +25,7 @@ <parent> <groupId>org.exoplatform.kernel</groupId> <artifactId>kernel-parent</artifactId> - <version>2.3.6-GA-SNAPSHOT</version> + <version>2.4.0-Beta01-SNAPSHOT</version> </parent> <artifactId>exo.kernel.component.cache</artifactId> Modified: kernel/trunk/exo.kernel.component.command/pom.xml =================================================================== --- kernel/trunk/exo.kernel.component.command/pom.xml 2011-12-29 15:14:53 UTC (rev 5389) +++ kernel/trunk/exo.kernel.component.command/pom.xml 2011-12-30 07:06:02 UTC (rev 5390) @@ -25,7 +25,7 @@ <parent> <groupId>org.exoplatform.kernel</groupId> <artifactId>kernel-parent</artifactId> - <version>2.3.6-GA-SNAPSHOT</version> + <version>2.4.0-Beta01-SNAPSHOT</version> </parent> <artifactId>exo.kernel.component.command</artifactId> Modified: kernel/trunk/exo.kernel.component.common/pom.xml =================================================================== --- kernel/trunk/exo.kernel.component.common/pom.xml 2011-12-29 15:14:53 UTC (rev 5389) +++ kernel/trunk/exo.kernel.component.common/pom.xml 2011-12-30 07:06:02 UTC (rev 5390) @@ -25,7 +25,7 @@ <parent> <groupId>org.exoplatform.kernel</groupId> <artifactId>kernel-parent</artifactId> - <version>2.3.6-GA-SNAPSHOT</version> + <version>2.4.0-Beta01-SNAPSHOT</version> </parent> <artifactId>exo.kernel.component.common</artifactId> Modified: kernel/trunk/exo.kernel.component.ext.cache.impl.infinispan.v5/pom.xml =================================================================== --- kernel/trunk/exo.kernel.component.ext.cache.impl.infinispan.v5/pom.xml 2011-12-29 15:14:53 UTC (rev 5389) +++ kernel/trunk/exo.kernel.component.ext.cache.impl.infinispan.v5/pom.xml 2011-12-30 07:06:02 UTC (rev 5390) @@ -9,7 +9,7 @@ <parent> <groupId>org.exoplatform.kernel</groupId> <artifactId>kernel-parent</artifactId> - <version>2.3.6-GA-SNAPSHOT</version> + <version>2.4.0-Beta01-SNAPSHOT</version> </parent> <artifactId>exo.kernel.component.ext.cache.impl.infinispan.v5</artifactId> <name>eXo Kernel :: Cache Extension :: Infinispan Implementation</name> Modified: kernel/trunk/exo.kernel.component.ext.cache.impl.jboss.v3/pom.xml =================================================================== --- kernel/trunk/exo.kernel.component.ext.cache.impl.jboss.v3/pom.xml 2011-12-29 15:14:53 UTC (rev 5389) +++ kernel/trunk/exo.kernel.component.ext.cache.impl.jboss.v3/pom.xml 2011-12-30 07:06:02 UTC (rev 5390) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.kernel</groupId> <artifactId>kernel-parent</artifactId> - <version>2.3.6-GA-SNAPSHOT</version> + <version>2.4.0-Beta01-SNAPSHOT</version> </parent> <artifactId>exo.kernel.component.ext.cache.impl.jboss.v3</artifactId> <name>eXo Kernel :: Cache Extension :: JBoss Cache Implementation</name> Modified: kernel/trunk/exo.kernel.component.ext.rpc.impl.jgroups.v3/pom.xml =================================================================== --- kernel/trunk/exo.kernel.component.ext.rpc.impl.jgroups.v3/pom.xml 2011-12-29 15:14:53 UTC (rev 5389) +++ kernel/trunk/exo.kernel.component.ext.rpc.impl.jgroups.v3/pom.xml 2011-12-30 07:06:02 UTC (rev 5390) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.kernel</groupId> <artifactId>kernel-parent</artifactId> - <version>2.3.6-GA-SNAPSHOT</version> + <version>2.4.0-Beta01-SNAPSHOT</version> </parent> <artifactId>exo.kernel.component.ext.rpc.impl.jgroups.v3</artifactId> <name>eXo Kernel :: RPC Service Extension :: JGroups 3 Implementation</name> Modified: kernel/trunk/exo.kernel.container/pom.xml =================================================================== --- kernel/trunk/exo.kernel.container/pom.xml 2011-12-29 15:14:53 UTC (rev 5389) +++ kernel/trunk/exo.kernel.container/pom.xml 2011-12-30 07:06:02 UTC (rev 5390) @@ -12,7 +12,7 @@ <parent> <groupId>org.exoplatform.kernel</groupId> <artifactId>kernel-parent</artifactId> - <version>2.3.6-GA-SNAPSHOT</version> + <version>2.4.0-Beta01-SNAPSHOT</version> </parent> <artifactId>exo.kernel.container</artifactId> <name>eXo Kernel :: Container</name> Modified: kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int/pom.xml =================================================================== --- kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int/pom.xml 2011-12-29 15:14:53 UTC (rev 5389) +++ kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int/pom.xml 2011-12-30 07:06:02 UTC (rev 5390) @@ -6,7 +6,7 @@ <parent> <groupId>org.exoplatform.kernel</groupId> <artifactId>mc-integration-parent</artifactId> - <version>2.3.6-GA-SNAPSHOT</version> + <version>2.4.0-Beta01-SNAPSHOT</version> </parent> <artifactId>exo.kernel.mc-int</artifactId> Modified: kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int-demo/pom.xml =================================================================== --- kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int-demo/pom.xml 2011-12-29 15:14:53 UTC (rev 5389) +++ kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int-demo/pom.xml 2011-12-30 07:06:02 UTC (rev 5390) @@ -5,7 +5,7 @@ <parent> <groupId>org.exoplatform.kernel</groupId> <artifactId>mc-integration-parent</artifactId> - <version>2.3.6-GA-SNAPSHOT</version> + <version>2.4.0-Beta01-SNAPSHOT</version> </parent> <artifactId>exo.kernel.mc-int-demo</artifactId> Modified: kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int-tests/pom.xml =================================================================== --- kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int-tests/pom.xml 2011-12-29 15:14:53 UTC (rev 5389) +++ kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int-tests/pom.xml 2011-12-30 07:06:02 UTC (rev 5390) @@ -5,7 +5,7 @@ <parent> <groupId>org.exoplatform.kernel</groupId> <artifactId>mc-integration-parent</artifactId> - <version>2.3.6-GA-SNAPSHOT</version> + <version>2.4.0-Beta01-SNAPSHOT</version> </parent> <artifactId>exo.kernel.mc-int-tests</artifactId> Modified: kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-kernel-extras/pom.xml =================================================================== --- kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-kernel-extras/pom.xml 2011-12-29 15:14:53 UTC (rev 5389) +++ kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-kernel-extras/pom.xml 2011-12-30 07:06:02 UTC (rev 5390) @@ -6,7 +6,7 @@ <parent> <groupId>org.exoplatform.kernel</groupId> <artifactId>mc-integration-parent</artifactId> - <version>2.3.6-GA-SNAPSHOT</version> + <version>2.4.0-Beta01-SNAPSHOT</version> </parent> <artifactId>exo.kernel.mc-kernel-extras</artifactId> Modified: kernel/trunk/exo.kernel.mc-integration/pom.xml =================================================================== --- kernel/trunk/exo.kernel.mc-integration/pom.xml 2011-12-29 15:14:53 UTC (rev 5389) +++ kernel/trunk/exo.kernel.mc-integration/pom.xml 2011-12-30 07:06:02 UTC (rev 5390) @@ -6,7 +6,7 @@ <parent> <groupId>org.exoplatform.kernel</groupId> <artifactId>kernel-parent</artifactId> - <version>2.3.6-GA-SNAPSHOT</version> + <version>2.4.0-Beta01-SNAPSHOT</version> </parent> <artifactId>mc-integration-parent</artifactId> Modified: kernel/trunk/packaging/module/pom.xml =================================================================== --- kernel/trunk/packaging/module/pom.xml 2011-12-29 15:14:53 UTC (rev 5389) +++ kernel/trunk/packaging/module/pom.xml 2011-12-30 07:06:02 UTC (rev 5390) @@ -2,7 +2,7 @@ <parent> <groupId>org.exoplatform.kernel</groupId> <artifactId>kernel-parent</artifactId> - <version>2.3.6-GA-SNAPSHOT</version> + <version>2.4.0-Beta01-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: kernel/trunk/pom.xml =================================================================== --- kernel/trunk/pom.xml 2011-12-29 15:14:53 UTC (rev 5389) +++ kernel/trunk/pom.xml 2011-12-30 07:06:02 UTC (rev 5390) @@ -30,7 +30,7 @@ <groupId>org.exoplatform.kernel</groupId> <artifactId>kernel-parent</artifactId> - <version>2.3.6-GA-SNAPSHOT</version> + <version>2.4.0-Beta01-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/trunk</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/exo-jcr/kernel/trunk</developerConnection> - <url>http://fisheye.jboss.org/browse/exo-jcr/kernel/trunk</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/exo-jcr/kernel/branches/2.4.x</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/exo-jcr/kernel/branches/2.4.x</developerConnection> + <url>http://fisheye.jboss.org/browse/exo-jcr/kernel/branches/2.4.x</url> </scm> <modules>

12 years, 4 months

1
0
0 / 0

exo-jcr SVN: r5389 - in jcr/trunk: exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/registration and 9 other directories.

by do-not-reply＠jboss.org

Author: andrew.plotnikov Date: 2011-12-29 10:14:53 -0500 (Thu, 29 Dec 2011) New Revision: 5389 Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/NodeTypeDataManagerImpl.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/registration/PropertyDefinitionComparator.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/QueryImpl.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/Util.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/version/ItemDataMergeVisitor.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/CQJDBCWorkspaceDataContainer.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/update/StorageUpdateManager.java jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/RepositoryBackupChainLog.java jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/replication/AbstractWorkspaceDataReceiver.java jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/replication/test/ReplicationTestService.java jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/WebDavConst.java Log: EXOJCR-1687: Fixed new sonar violations in project Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/NodeTypeDataManagerImpl.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/NodeTypeDataManagerImpl.java 2011-12-29 15:10:05 UTC (rev 5388) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/NodeTypeDataManagerImpl.java 2011-12-29 15:14:53 UTC (rev 5389) @@ -874,15 +874,14 @@ final Set<String> nodes = this.indexSearcherHolder.getNodesByNodeType(nodeTypeName); if (nodes.size() > 0) { - String message = - "Can not remove " + nodeTypeName.getAsString() - + " nodetype, because the following node types is used in nodes with uuid: "; + StringBuilder message = + new StringBuilder("Can not remove ").append(nodeTypeName.getAsString()).append( + " nodetype, because the following node types is used in nodes with uuid: "); for (final String uuids : nodes) { - message += uuids + " "; + message.append(uuids).append(" "); } - throw new RepositoryException(message); - + throw new RepositoryException(message.toString()); } this.nodeTypeRepository.unregisterNodeType(nodeType); } Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/registration/PropertyDefinitionComparator.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/registration/PropertyDefinitionComparator.java 2011-12-29 15:10:05 UTC (rev 5388) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/registration/PropertyDefinitionComparator.java 2011-12-29 15:14:53 UTC (rev 5389) @@ -548,14 +548,14 @@ getNodes(nodesData, new InternalQName[]{removePropertyDefinitionData.getName()}, new InternalQName[]{}); if (nodes.size() > 0) { - String message = - "Can not remove " + removePropertyDefinitionData.getName().getAsString() - + " PropertyDefinitionData, because the following nodes have these properties: "; + StringBuilder message = + new StringBuilder("Can not remove ").append(removePropertyDefinitionData.getName().getAsString()) + .append(" PropertyDefinitionData, because the following nodes have these properties: "); for (NodeData nodeData : nodes) { - message += nodeData.getQPath().getAsString() + " "; + message.append(nodeData.getQPath().getAsString()).append(" "); } - throw new ConstraintViolationException(message); + throw new ConstraintViolationException(message.toString()); } } Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/QueryImpl.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/QueryImpl.java 2011-12-29 15:10:05 UTC (rev 5388) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/QueryImpl.java 2011-12-29 15:14:53 UTC (rev 5389) @@ -65,7 +65,6 @@ * A string constant representing the JCR-SQL2 query language. * * @since JCR 2.0 - * TODO: REMOVE WHEN JSR 283 IS FINAL!! */ public static final String JCR_SQL2 = "JCR-SQL2"; @@ -73,7 +72,6 @@ * A string constant representing the JCR-JQOM query language. * * @since JCR 2.0 - * TODO: REMOVE WHEN JSR 283 IS FINAL!! */ public static final String JCR_JQOM = "JCR-JQOM"; Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/Util.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/Util.java 2011-12-29 15:10:05 UTC (rev 5388) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/Util.java 2011-12-29 15:14:53 UTC (rev 5389) @@ -192,7 +192,6 @@ case PropertyType.REFERENCE : case PropertyType.STRING : return ValueDataConvertor.readString(value); - // TODO: JSR 283 now node types default : return null; } Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/version/ItemDataMergeVisitor.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/version/ItemDataMergeVisitor.java 2011-12-29 15:10:05 UTC (rev 5388) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/version/ItemDataMergeVisitor.java 2011-12-29 15:14:53 UTC (rev 5389) @@ -88,7 +88,7 @@ private final QPath path; - private VersionableState(QPath path, int result) //NOSONAR + private VersionableState(QPath path, int result) // NOSONAR { this.path = path; this.result = result; @@ -156,7 +156,7 @@ } } - private class VersionableStateComparator implements Comparator<VersionableState> //NOSONAR + private class VersionableStateComparator implements Comparator<VersionableState> // NOSONAR { public int compare(VersionableState nc1, VersionableState nc2) { Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/CQJDBCWorkspaceDataContainer.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/CQJDBCWorkspaceDataContainer.java 2011-12-29 15:10:05 UTC (rev 5388) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/CQJDBCWorkspaceDataContainer.java 2011-12-29 15:14:53 UTC (rev 5389) @@ -151,8 +151,8 @@ if (dbDialect == DBConstants.DB_DIALECT_MYSQL_MYISAM || dbDialect == DBConstants.DB_DIALECT_MYSQL_MYISAM_UTF8) { LOG.warn("MyISAM is not supported due to its lack of transaction support and integrity check, so use it only" - + " if you don't expect any support and performances in read accesses are more important than the consistency" - + " in your use-case. This dialect is only dedicated to the community."); + + " if you don't expect any support and performances in read accesses are more important than the consistency" + + " in your use-case. This dialect is only dedicated to the community."); } if (dbSourceName != null) { Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/update/StorageUpdateManager.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/update/StorageUpdateManager.java 2011-12-29 15:10:05 UTC (rev 5388) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/update/StorageUpdateManager.java 2011-12-29 15:14:53 UTC (rev 5389) @@ -219,7 +219,7 @@ } } - private class Updater100 extends Updater //NOSONAR + private class Updater100 extends Updater // NOSONAR { @Override @@ -230,7 +230,7 @@ } } - private class Updater101 extends Updater //NOSONAR + private class Updater101 extends Updater // NOSONAR { @Override Modified: jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/RepositoryBackupChainLog.java =================================================================== --- jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/RepositoryBackupChainLog.java 2011-12-29 15:10:05 UTC (rev 5388) +++ jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/RepositoryBackupChainLog.java 2011-12-29 15:14:53 UTC (rev 5389) @@ -26,19 +26,12 @@ import org.exoplatform.services.jcr.impl.util.JCRDateFormat; import org.exoplatform.services.log.ExoLogger; import org.exoplatform.services.log.Log; -import org.exoplatform.ws.frameworks.json.JsonHandler; -import org.exoplatform.ws.frameworks.json.JsonParser; -import org.exoplatform.ws.frameworks.json.impl.BeanBuilder; -import org.exoplatform.ws.frameworks.json.impl.JsonDefaultHandler; -import org.exoplatform.ws.frameworks.json.impl.JsonParserImpl; -import org.exoplatform.ws.frameworks.json.value.JsonValue; import org.jibx.runtime.BindingDirectory; import org.jibx.runtime.IBindingFactory; import org.jibx.runtime.IMarshallingContext; import org.jibx.runtime.IUnmarshallingContext; import org.jibx.runtime.JiBXException; -import java.io.ByteArrayInputStream; import java.io.File; import java.io.FileNotFoundException; import java.io.FileOutputStream; @@ -425,28 +418,6 @@ return conf.getRepositoryConfiguration(getBackupConfig().getRepository()); } - /** - * Will be created the Object from JSON binary data. - * - * @param cl - * Class - * @param data - * binary data (JSON) - * @return Object - * @throws Exception - * will be generated Exception - */ - private Object getObject(Class cl, byte[] data) throws Exception - { - JsonHandler jsonHandler = new JsonDefaultHandler(); - JsonParser jsonParser = new JsonParserImpl(); - InputStream inputStream = new ByteArrayInputStream(data); - jsonParser.parse(inputStream, jsonHandler); - JsonValue jsonValue = jsonHandler.getJsonObject(); - - return new BeanBuilder().createObject(cl, jsonValue); - } - private List<String> readWorkspaceBackupInfo() throws XMLStreamException, IOException { List<String> wsBackupInfo = new ArrayList<String>(); Modified: jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/replication/AbstractWorkspaceDataReceiver.java =================================================================== --- jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/replication/AbstractWorkspaceDataReceiver.java 2011-12-29 15:10:05 UTC (rev 5388) +++ jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/replication/AbstractWorkspaceDataReceiver.java 2011-12-29 15:14:53 UTC (rev 5389) @@ -120,7 +120,6 @@ */ public AbstractWorkspaceDataReceiver() throws RepositoryConfigurationException { - // TODO: need to use FileCleaner from FileCleanerHolder this.fileCleaner = new FileCleaner(ReplicationService.FILE_CLEANRE_TIMEOUT); mapPendingBinaryFile = new HashMap<String, PendingBinaryFile>(); Modified: jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/replication/test/ReplicationTestService.java =================================================================== --- jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/replication/test/ReplicationTestService.java 2011-12-29 15:10:05 UTC (rev 5388) +++ jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/replication/test/ReplicationTestService.java 2011-12-29 15:14:53 UTC (rev 5389) @@ -206,7 +206,7 @@ /** * OperationType constructor. */ - private OperationType() //NOSONAR + private OperationType() // NOSONAR { } @@ -215,7 +215,7 @@ /** * Constants constructor. */ - private Constants() //NOSONAR + private Constants() // NOSONAR { } } Modified: jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/WebDavConst.java =================================================================== --- jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/WebDavConst.java 2011-12-29 15:10:05 UTC (rev 5388) +++ jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/WebDavConst.java 2011-12-29 15:14:53 UTC (rev 5389) @@ -115,7 +115,7 @@ /** * Private constructor. */ - private DavDocument() //NOSONAR + private DavDocument() // NOSONAR { } @@ -199,7 +199,7 @@ /** * Private constructor. */ - private DavProperty() //NOSONAR + private DavProperty() // NOSONAR { } @@ -244,7 +244,7 @@ /** * Private constructor. */ - private ResourceType() //NOSONAR + private ResourceType() // NOSONAR { } @@ -271,7 +271,7 @@ /** * Private constructor. */ - private CacheConstants() //NOSONAR + private CacheConstants() // NOSONAR { } @@ -293,7 +293,7 @@ /** * Private constructor. */ - private Lock() //NOSONAR + private Lock() // NOSONAR { } @@ -329,7 +329,7 @@ /** * Private constructor. */ - private NodeTypes() //NOSONAR + private NodeTypes() // NOSONAR { } @@ -450,9 +450,8 @@ /** * Private constructor. */ - private DateFormat() //NOSONAR + private DateFormat() // NOSONAR { - } /**

12 years, 4 months

1
0
0 / 0

exo-jcr SVN: r5388 - in jcr/trunk: exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc and 7 other directories.

by do-not-reply＠jboss.org

Author: areshetnyak Date: 2011-12-29 10:10:05 -0500 (Thu, 29 Dec 2011) New Revision: 5388 Modified: jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/java/org/exoplatform/services/jcr/impl/core/query/ispn/AbstractIndexerCacheStore.java jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/java/org/exoplatform/services/transaction/infinispan/JBossStandaloneJTAManagerLookup.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/NodeTypeDataManagerImpl.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCWorkspaceDataContainerChecker.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/SingleDbJDBCConnection.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/CQJDBCWorkspaceDataContainer.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db/OracleMultiDbJDBCConnection.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db/OracleSingleDbJDBCConnection.java jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/PendingChangesLog.java jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/replication/Packet.java Log: EXOJCR-1687 : Fix new sonar violations in JCR project. Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/NodeTypeDataManagerImpl.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/NodeTypeDataManagerImpl.java 2011-12-29 13:02:55 UTC (rev 5387) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/NodeTypeDataManagerImpl.java 2011-12-29 15:10:05 UTC (rev 5388) @@ -862,7 +862,9 @@ final Set<InternalQName> descendantNt = this.nodeTypeRepository.getSubtypes(nodeTypeName); if (descendantNt.size() > 0) { - StringBuilder message = new StringBuilder("Can not remove ").append(nodeTypeName.getAsString()).append("nodetype, because the following node types depend on it: "); + StringBuilder message = + new StringBuilder("Can not remove ").append(nodeTypeName.getAsString()).append( + "nodetype, because the following node types depend on it: "); for (final InternalQName internalQName : descendantNt) { message.append(internalQName.getAsString()).append(" "); Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCWorkspaceDataContainerChecker.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCWorkspaceDataContainerChecker.java 2011-12-29 13:02:55 UTC (rev 5387) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCWorkspaceDataContainerChecker.java 2011-12-29 15:10:05 UTC (rev 5388) @@ -182,8 +182,8 @@ + jdbcDataContainer.containerName + "' AND ((STORAGE_DESC is null and DATA is null) or (STORAGE_DESC is not null and DATA is not null))"; } - queries - .add(new InspectionQuery(statement, new String[]{DBConstants.COLUMN_ID}, "Incorrect JCR_VALUE records", InspectionStatus.ERR)); + queries.add(new InspectionQuery(statement, new String[]{DBConstants.COLUMN_ID}, "Incorrect JCR_VALUE records", + InspectionStatus.ERR)); queries.add(new InspectionQuery(jdbcDataContainer.multiDb ? "select * from JCR_MITEM P where P.P_TYPE=9 and NOT EXISTS " + "(select * from JCR_MREF R where P.ID=R.PROPERTY_ID)" Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/SingleDbJDBCConnection.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/SingleDbJDBCConnection.java 2011-12-29 13:02:55 UTC (rev 5387) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/SingleDbJDBCConnection.java 2011-12-29 15:10:05 UTC (rev 5388) @@ -588,7 +588,8 @@ { removeValuesStatement = dbConnection - .prepareStatement("DELETE FROM JCR_SVALUE WHERE PROPERTY_ID IN (SELECT ID FROM JCR_SITEM WHERE CONTAINER_NAME = ? AND " + .prepareStatement("DELETE FROM JCR_SVALUE WHERE PROPERTY_ID " + + "IN (SELECT ID FROM JCR_SITEM WHERE CONTAINER_NAME = ? AND " + "(NAME = '[http://www.jcp.org/jcr/1.0]lockIsDeep' OR NAME = '[http://www.jcp.org/jcr/1.0]lockOwner'))"); removeValuesStatement.setString(1, containerName); Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/CQJDBCWorkspaceDataContainer.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/CQJDBCWorkspaceDataContainer.java 2011-12-29 13:02:55 UTC (rev 5387) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/CQJDBCWorkspaceDataContainer.java 2011-12-29 15:10:05 UTC (rev 5388) @@ -150,9 +150,9 @@ { if (dbDialect == DBConstants.DB_DIALECT_MYSQL_MYISAM || dbDialect == DBConstants.DB_DIALECT_MYSQL_MYISAM_UTF8) { - LOG.warn("MyISAM is not supported due to its lack of transaction support and integrity check, so use it only" + - " if you don't expect any support and performances in read accesses are more important than the consistency" + - " in your use-case. This dialect is only dedicated to the community."); + LOG.warn("MyISAM is not supported due to its lack of transaction support and integrity check, so use it only" + + " if you don't expect any support and performances in read accesses are more important than the consistency" + + " in your use-case. This dialect is only dedicated to the community."); } if (dbSourceName != null) { Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db/OracleMultiDbJDBCConnection.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db/OracleMultiDbJDBCConnection.java 2011-12-29 13:02:55 UTC (rev 5387) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db/OracleMultiDbJDBCConnection.java 2011-12-29 15:10:05 UTC (rev 5388) @@ -103,7 +103,8 @@ FIND_NODES_BY_PARENTID_LAZILY_CQ .replaceFirst( "select", - "select /*+ USE_NL(V) INDEX(I JCR_IDX_MITEM_N_ORDER_NUM) INDEX(P JCR_IDX_MITEM_PARENT_FK) INDEX(V JCR_IDX_MVALUE_PROPERTY) */"); + "select /*+ USE_NL(V) INDEX(I JCR_IDX_MITEM_N_ORDER_NUM) INDEX(P JCR_IDX_MITEM_PARENT_FK)" + + " INDEX(V JCR_IDX_MVALUE_PROPERTY) */"); } /** Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db/OracleSingleDbJDBCConnection.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db/OracleSingleDbJDBCConnection.java 2011-12-29 13:02:55 UTC (rev 5387) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db/OracleSingleDbJDBCConnection.java 2011-12-29 15:10:05 UTC (rev 5388) @@ -88,8 +88,8 @@ FIND_ITEM_QPATH_BY_ID_CQ = FIND_ITEM_QPATH_BY_ID_CQ_QUERY; FIND_PROPERTIES_BY_PARENTID_AND_PATTERN_CQ_TEMPLATE = "select /*+ INDEX(I JCR_FK_SITEM_PARENT) INDEX(V JCR_IDX_SVALUE_PROPERTY)*/" - + " I.ID, I.PARENT_ID, I.NAME, I.VERSION, I.I_CLASS, I.I_INDEX, I.N_ORDER_NUM, I.P_TYPE, I.P_MULTIVALUED, V.ORDER_NUM," - + " V.DATA, V.STORAGE_DESC from JCR_SITEM I LEFT OUTER JOIN JCR_SVALUE V ON (V.PROPERTY_ID=I.ID)"; + + " I.ID, I.PARENT_ID, I.NAME, I.VERSION, I.I_CLASS, I.I_INDEX, I.N_ORDER_NUM, I.P_TYPE, I.P_MULTIVALUED," + + " V.ORDER_NUM, V.DATA, V.STORAGE_DESC from JCR_SITEM I LEFT OUTER JOIN JCR_SVALUE V ON (V.PROPERTY_ID=I.ID)"; FIND_NODES_AND_PROPERTIES = "select J.*, P.ID AS P_ID, P.NAME AS P_NAME, P.VERSION AS P_VERSION, P.P_TYPE, P.P_MULTIVALUED," @@ -104,7 +104,8 @@ FIND_NODES_BY_PARENTID_LAZILY_CQ .replaceFirst( "select", - "select /*+ USE_NL(V) INDEX(I JCR_IDX_SITEM_N_ORDER_NUM) INDEX(P JCR_IDX_SITEM_PARENT_FK) INDEX(V JCR_IDX_SVALUE_PROPERTY) */ "); + "select /*+ USE_NL(V) INDEX(I JCR_IDX_SITEM_N_ORDER_NUM) INDEX(P JCR_IDX_SITEM_PARENT_FK)" + + " INDEX(V JCR_IDX_SVALUE_PROPERTY) */ "); } /** Modified: jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/java/org/exoplatform/services/jcr/impl/core/query/ispn/AbstractIndexerCacheStore.java =================================================================== --- jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/java/org/exoplatform/services/jcr/impl/core/query/ispn/AbstractIndexerCacheStore.java 2011-12-29 13:02:55 UTC (rev 5387) +++ jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/java/org/exoplatform/services/jcr/impl/core/query/ispn/AbstractIndexerCacheStore.java 2011-12-29 15:10:05 UTC (rev 5388) @@ -148,7 +148,8 @@ { public void run() { - cache.getAdvancedCache().withFlags(Flag.SKIP_LOCKING, Flag.FORCE_ASYNCHRONOUS, Flag.SKIP_REMOTE_LOOKUP).removeAsync(key); + cache.getAdvancedCache().withFlags(Flag.SKIP_LOCKING, Flag.FORCE_ASYNCHRONOUS, + Flag.SKIP_REMOTE_LOOKUP).removeAsync(key); } }); } Modified: jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/java/org/exoplatform/services/transaction/infinispan/JBossStandaloneJTAManagerLookup.java =================================================================== --- jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/java/org/exoplatform/services/transaction/infinispan/JBossStandaloneJTAManagerLookup.java 2011-12-29 13:02:55 UTC (rev 5387) +++ jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/java/org/exoplatform/services/transaction/infinispan/JBossStandaloneJTAManagerLookup.java 2011-12-29 15:10:05 UTC (rev 5388) @@ -48,7 +48,8 @@ /** * The logger */ - private static final Log LOG = ExoLogger.getLogger("exo.jcr.component.core.impl.infinispan.v5.JBossStandaloneJTAManagerLookup"); + private static final Log LOG = + ExoLogger.getLogger("exo.jcr.component.core.impl.infinispan.v5.JBossStandaloneJTAManagerLookup"); private Method manager, user; Modified: jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/PendingChangesLog.java =================================================================== --- jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/PendingChangesLog.java 2011-12-29 13:02:55 UTC (rev 5387) +++ jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/PendingChangesLog.java 2011-12-29 15:10:05 UTC (rev 5388) @@ -77,7 +77,7 @@ /** * Empty constructor. */ - private Type() //NOSONAR + private Type() // NOSONAR { } } Modified: jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/replication/Packet.java =================================================================== --- jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/replication/Packet.java 2011-12-29 13:02:55 UTC (rev 5387) +++ jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/replication/Packet.java 2011-12-29 15:10:05 UTC (rev 5388) @@ -205,7 +205,7 @@ /** * Private PacketType constructor. */ - private PacketType() //NOSONAR + private PacketType() // NOSONAR { } }

12 years, 4 months

1
0
0 / 0

exo-jcr SVN: r5387 - in jcr/trunk: exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/core/nodetype and 14 other directories.

by do-not-reply＠jboss.org

Author: andrew.plotnikov Date: 2011-12-29 08:02:55 -0500 (Thu, 29 Dec 2011) New Revision: 5387 Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/core/ComponentPersister.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/core/nodetype/NodeTypeData.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/dataflow/persistent/PersistedPropertyData.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/dataflow/serialization/ObjectReader.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/datamodel/QPath.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/NamespaceRegistryImpl.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/FileSystemLockPersister.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/LockPersister.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/NodeTypeRepository.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/registration/NodeDefinitionAccessProvider.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/registration/NodeTypeDataPersister.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/registration/NodeTypeDefinitionAccessProvider.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/DefaultHighlighter.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/JcrQuery.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/spell/LuceneSpellChecker.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/xpath/XPathQueryBuilder.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/cas/ValueContentAddressStorage.java jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/BackupChain.java jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/BackupConfig.java jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/registry/RegistryService.java jcr/trunk/exo.jcr.framework.ftpclient/src/main/java/org/exoplatform/frameworks/ftpclient/data/FtpSlowInputStream1.java jcr/trunk/exo.jcr.framework.ftpclient/src/main/java/org/exoplatform/frameworks/ftpclient/data/FtpSlowOutputStream.java Log: EXOJCR-1687: Fixed new sonar violations in project Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/core/ComponentPersister.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/core/ComponentPersister.java 2011-12-29 12:12:38 UTC (rev 5386) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/core/ComponentPersister.java 2011-12-29 13:02:55 UTC (rev 5387) @@ -20,8 +20,6 @@ import org.picocontainer.Startable; -import javax.jcr.RepositoryException; - /** * Created by The eXo Platform SAS. * @@ -34,7 +32,6 @@ * Indicate what storage filled with some data. * * @return isStorageFilled flag. - * @throws RepositoryException */ public boolean isStorageFilled(); Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/core/nodetype/NodeTypeData.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/core/nodetype/NodeTypeData.java 2011-12-29 12:12:38 UTC (rev 5386) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/core/nodetype/NodeTypeData.java 2011-12-29 13:02:55 UTC (rev 5387) @@ -19,10 +19,7 @@ package org.exoplatform.services.jcr.core.nodetype; import org.exoplatform.services.jcr.datamodel.InternalQName; -import org.exoplatform.services.jcr.impl.core.nodetype.registration.NodeTypeReadException; -import javax.jcr.RepositoryException; - /** * @author <a href="mailto:Sergey.Kabashnyuk@exoplatform.org">Sergey Kabashnyuk</a> * @version $Id$ @@ -31,59 +28,17 @@ public interface NodeTypeData { - /** - * - * @return - * @throws RepositoryException - * @throws NodeTypeReadException - */ - public NodeDefinitionData[] getDeclaredChildNodeDefinitions();; + public NodeDefinitionData[] getDeclaredChildNodeDefinitions(); - /** - * - * @return - * @throws RepositoryException - * @throws NodeTypeReadException - */ public PropertyDefinitionData[] getDeclaredPropertyDefinitions(); - /** - * - * @return - * @throws RepositoryException - * @throws NodeTypeReadException - */ public InternalQName[] getDeclaredSupertypeNames(); - /** - * - * @return - * @throws RepositoryException - * @throws NodeTypeReadException - */ public InternalQName getPrimaryItemName(); - /** - * - * @return - * @throws RepositoryException - * @throws NodeTypeReadException - */ public InternalQName getName(); - /** - * - * @return - * @throws RepositoryException - * @throws NodeTypeReadException - */ public boolean hasOrderableChildNodes(); - /** - * - * @return - * @throws RepositoryException - * @throws NodeTypeReadException - */ public boolean isMixin(); } \ No newline at end of file Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/dataflow/persistent/PersistedPropertyData.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/dataflow/persistent/PersistedPropertyData.java 2011-12-29 12:12:38 UTC (rev 5386) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/dataflow/persistent/PersistedPropertyData.java 2011-12-29 13:02:55 UTC (rev 5387) @@ -22,9 +22,6 @@ import org.exoplatform.services.jcr.datamodel.PropertyData; import org.exoplatform.services.jcr.datamodel.QPath; import org.exoplatform.services.jcr.datamodel.ValueData; -import org.exoplatform.services.jcr.impl.dataflow.AbstractPersistedValueData; -import org.exoplatform.services.jcr.impl.dataflow.TransientItemData; -import org.exoplatform.services.jcr.impl.dataflow.TransientPropertyData; import java.io.Externalizable; import java.io.IOException; Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/dataflow/serialization/ObjectReader.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/dataflow/serialization/ObjectReader.java 2011-12-29 12:12:38 UTC (rev 5386) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/dataflow/serialization/ObjectReader.java 2011-12-29 13:02:55 UTC (rev 5387) @@ -18,7 +18,7 @@ */ package org.exoplatform.services.jcr.dataflow.serialization; -import java.io.EOFException; +import java.io.EOFException; //NOSONAR import java.io.IOException; import java.io.OutputStream; Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/datamodel/QPath.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/datamodel/QPath.java 2011-12-29 12:12:38 UTC (rev 5386) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/datamodel/QPath.java 2011-12-29 13:02:55 UTC (rev 5387) @@ -26,7 +26,6 @@ import java.util.List; import javax.jcr.PathNotFoundException; -import javax.jcr.RepositoryException; /** * Created by The eXo Platform SAS. @@ -350,7 +349,7 @@ * @param qPath * - String to be parsed * @return QPath - * @throws RepositoryException + * @throws IllegalPathException * - if string is invalid */ public static QPath parse(String qPath) throws IllegalPathException Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/NamespaceRegistryImpl.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/NamespaceRegistryImpl.java 2011-12-29 12:12:38 UTC (rev 5386) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/NamespaceRegistryImpl.java 2011-12-29 13:02:55 UTC (rev 5387) @@ -27,7 +27,6 @@ import org.exoplatform.services.log.Log; import org.picocontainer.Startable; -import java.io.IOException; import java.util.HashMap; import java.util.HashSet; import java.util.Map; @@ -171,7 +170,6 @@ * @param nodeType * @return * @throws RepositoryException - * @throws IOException */ @Deprecated public Set<String> getNodes(String uri) throws RepositoryException Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/FileSystemLockPersister.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/FileSystemLockPersister.java 2011-12-29 12:12:38 UTC (rev 5386) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/FileSystemLockPersister.java 2011-12-29 13:02:55 UTC (rev 5387) @@ -20,7 +20,6 @@ import org.exoplatform.commons.utils.PrivilegedFileHelper; import org.exoplatform.commons.utils.SecurityHelper; -import org.exoplatform.services.jcr.access.SystemIdentity; import org.exoplatform.services.jcr.config.LockPersisterEntry; import org.exoplatform.services.jcr.config.RepositoryConfigurationException; import org.exoplatform.services.jcr.config.WorkspaceEntry; Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/LockPersister.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/LockPersister.java 2011-12-29 12:12:38 UTC (rev 5386) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/LockPersister.java 2011-12-29 13:02:55 UTC (rev 5387) @@ -20,7 +20,6 @@ import org.picocontainer.Startable; -import javax.jcr.RepositoryException; import javax.jcr.lock.LockException; /** @@ -35,7 +34,7 @@ * Add lock information to the persistent storage * * @param lock - * @throws RepositoryException + * @throws LockException */ void add(LockData lock) throws LockException; @@ -43,14 +42,14 @@ * Remove lock from persistent storage * * @param lock - * @throws RepositoryException + * @throws LockException */ void remove(LockData lock) throws LockException; /** * Remove all locks from persistent storage * - * @throws RepositoryException + * @throws LockException */ void removeAll() throws LockException; Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/NodeTypeRepository.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/NodeTypeRepository.java 2011-12-29 12:12:38 UTC (rev 5386) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/NodeTypeRepository.java 2011-12-29 13:02:55 UTC (rev 5387) @@ -25,7 +25,6 @@ import org.exoplatform.services.jcr.core.nodetype.PropertyDefinitionDatas; import org.exoplatform.services.jcr.datamodel.InternalQName; -import java.io.IOException; import java.util.List; import java.util.Map; import java.util.Set; @@ -136,8 +135,6 @@ * @param os output stream * @param nodeTypes * @throws RepositoryException - * @throws IOException - * @throws RepositoryException */ void registerNodeType(final List<NodeTypeData> nodeTypes, final NodeTypeDataManager nodeTypeDataManager, final String accessControlPolicy, final int alreadyExistsBehaviour) throws RepositoryException; Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/registration/NodeDefinitionAccessProvider.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/registration/NodeDefinitionAccessProvider.java 2011-12-29 12:12:38 UTC (rev 5386) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/registration/NodeDefinitionAccessProvider.java 2011-12-29 13:02:55 UTC (rev 5387) @@ -22,15 +22,11 @@ import org.exoplatform.services.jcr.dataflow.DataManager; import org.exoplatform.services.jcr.dataflow.ItemState; import org.exoplatform.services.jcr.dataflow.PlainChangesLog; -import org.exoplatform.services.jcr.datamodel.IllegalNameException; import org.exoplatform.services.jcr.datamodel.InternalQName; import org.exoplatform.services.jcr.datamodel.NodeData; import org.exoplatform.services.jcr.impl.Constants; import org.exoplatform.services.jcr.impl.dataflow.TransientNodeData; -import java.io.IOException; -import java.io.UnsupportedEncodingException; - import javax.jcr.RepositoryException; import javax.jcr.version.OnParentVersionAction; @@ -57,10 +53,7 @@ * @return * @throws RepositoryException * @throws NodeTypeReadException - * @throws IOException - * @throws IllegalNameException * @throws RepositoryException - * @throws UnsupportedEncodingException */ public NodeDefinitionData read(NodeData childDefinition, InternalQName declaringNodeType) throws NodeTypeReadException, RepositoryException Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/registration/NodeTypeDataPersister.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/registration/NodeTypeDataPersister.java 2011-12-29 12:12:38 UTC (rev 5386) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/registration/NodeTypeDataPersister.java 2011-12-29 13:02:55 UTC (rev 5387) @@ -20,10 +20,8 @@ import org.exoplatform.services.jcr.core.ComponentPersister; import org.exoplatform.services.jcr.core.nodetype.NodeTypeData; -import org.exoplatform.services.jcr.datamodel.IllegalNameException; import org.exoplatform.services.jcr.datamodel.InternalQName; -import java.io.IOException; import java.util.List; import javax.jcr.RepositoryException; @@ -59,7 +57,6 @@ * * @param os output stream * @param nodeTypes - * @throws IOException * @throws RepositoryException */ public void addNodeTypes(List<NodeTypeData> nodeTypes) throws RepositoryException; @@ -79,7 +76,6 @@ * @param is input stream * @return * @throws RepositoryException - * @throws IllegalNameException */ public List<NodeTypeData> getAllNodeTypes() throws RepositoryException; @@ -97,7 +93,6 @@ * * @param os output stream * @param nodeTypes - * @throws IOException * @throws RepositoryException */ public void update(List<NodeTypeData> nodeTypes, UpdateNodeTypeObserver observer) throws RepositoryException; Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/registration/NodeTypeDefinitionAccessProvider.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/registration/NodeTypeDefinitionAccessProvider.java 2011-12-29 12:12:38 UTC (rev 5386) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/registration/NodeTypeDefinitionAccessProvider.java 2011-12-29 13:02:55 UTC (rev 5387) @@ -25,14 +25,11 @@ import org.exoplatform.services.jcr.dataflow.DataManager; import org.exoplatform.services.jcr.dataflow.ItemState; import org.exoplatform.services.jcr.dataflow.PlainChangesLog; -import org.exoplatform.services.jcr.datamodel.IllegalNameException; import org.exoplatform.services.jcr.datamodel.InternalQName; import org.exoplatform.services.jcr.datamodel.NodeData; import org.exoplatform.services.jcr.impl.Constants; import org.exoplatform.services.jcr.impl.dataflow.TransientNodeData; -import java.io.IOException; -import java.io.UnsupportedEncodingException; import java.util.ArrayList; import java.util.List; @@ -72,10 +69,7 @@ /** * @param nodeData * @return - * @throws IOException - * @throws IllegalNameException * @throws RepositoryException - * @throws UnsupportedEncodingException */ public NodeTypeData readNow(NodeData nodeData) throws RepositoryException @@ -118,10 +112,7 @@ * @return * @throws RepositoryException * @throws NodeTypeReadException - * @throws UnsupportedEncodingException * @throws RepositoryException - * @throws IllegalNameException - * @throws IOException */ public NodeDefinitionData[] readNodeDefinitions(NodeData nodeData) throws NodeTypeReadException, RepositoryException { @@ -153,10 +144,7 @@ * @return * @throws RepositoryException * @throws NodeTypeReadException - * @throws UnsupportedEncodingException * @throws RepositoryException - * @throws IllegalNameException - * @throws IOException */ public PropertyDefinitionData[] readPropertyDefinitions(NodeData nodeData) throws NodeTypeReadException, RepositoryException Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/DefaultHighlighter.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/DefaultHighlighter.java 2011-12-29 12:12:38 UTC (rev 5386) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/DefaultHighlighter.java 2011-12-29 13:02:55 UTC (rev 5387) @@ -24,7 +24,7 @@ import java.util.Iterator; import java.util.Set; -import org.apache.lucene.document.Field; +import org.apache.lucene.document.Field; //NOSONAR import org.apache.lucene.index.Term; import org.apache.lucene.index.TermPositionVector; import org.apache.lucene.index.TermVectorOffsetInfo; Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/JcrQuery.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/JcrQuery.java 2011-12-29 12:12:38 UTC (rev 5386) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/JcrQuery.java 2011-12-29 13:02:55 UTC (rev 5387) @@ -18,7 +18,7 @@ import java.io.IOException; -import org.apache.lucene.search.Query; +import org.apache.lucene.search.Query; //NOSONAR import org.apache.lucene.search.Sort; import org.exoplatform.services.jcr.impl.core.SessionImpl; Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/spell/LuceneSpellChecker.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/spell/LuceneSpellChecker.java 2011-12-29 12:12:38 UTC (rev 5386) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/spell/LuceneSpellChecker.java 2011-12-29 13:02:55 UTC (rev 5387) @@ -24,8 +24,6 @@ import org.apache.lucene.search.spell.SpellChecker; import org.apache.lucene.store.AlreadyClosedException; import org.apache.lucene.store.Directory; -import org.apache.lucene.store.FSDirectory; -import org.apache.lucene.store.NativeFSLockFactory; import org.exoplatform.commons.utils.SecurityHelper; import org.exoplatform.services.jcr.impl.core.query.QueryHandler; import org.exoplatform.services.jcr.impl.core.query.QueryRootNode; @@ -34,11 +32,9 @@ import org.exoplatform.services.jcr.impl.core.query.lucene.FieldNames; import org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex; import org.exoplatform.services.jcr.impl.core.query.lucene.Util; -import org.exoplatform.services.jcr.impl.core.query.lucene.directory.DirectoryManager; import org.exoplatform.services.log.ExoLogger; import org.exoplatform.services.log.Log; -import java.io.File; import java.io.IOException; import java.io.StringReader; import java.security.PrivilegedExceptionAction; Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/xpath/XPathQueryBuilder.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/xpath/XPathQueryBuilder.java 2011-12-29 12:12:38 UTC (rev 5386) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/xpath/XPathQueryBuilder.java 2011-12-29 13:02:55 UTC (rev 5387) @@ -16,20 +16,8 @@ */ package org.exoplatform.services.jcr.impl.core.query.xpath; -import java.io.StringReader; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.List; -import java.util.Map; - -import javax.jcr.NamespaceException; -import javax.jcr.RepositoryException; -import javax.jcr.query.InvalidQueryException; - import org.apache.commons.collections.map.ReferenceMap; - import org.exoplatform.commons.utils.ISO8601; -import org.exoplatform.services.jcr.datamodel.IllegalNameException; import org.exoplatform.services.jcr.datamodel.InternalQName; import org.exoplatform.services.jcr.datamodel.QPath; import org.exoplatform.services.jcr.datamodel.QPathEntry; @@ -52,7 +40,17 @@ import org.exoplatform.services.jcr.impl.core.query.TextsearchQueryNode; import org.exoplatform.services.jcr.impl.util.ISO9075; +import java.io.StringReader; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.List; +import java.util.Map; +import javax.jcr.NamespaceException; +import javax.jcr.RepositoryException; +import javax.jcr.query.InvalidQueryException; + + /** * Query builder that translates a XPath statement into a query tree structure. */ Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/cas/ValueContentAddressStorage.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/cas/ValueContentAddressStorage.java 2011-12-29 12:12:38 UTC (rev 5386) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/cas/ValueContentAddressStorage.java 2011-12-29 13:02:55 UTC (rev 5387) @@ -20,7 +20,6 @@ import org.exoplatform.services.jcr.config.RepositoryConfigurationException; -import java.io.IOException; import java.util.List; import java.util.Properties; @@ -115,7 +114,7 @@ * Initializes values CAS. * * @param props - * @throws IOException + * @throws VCASException */ void init(Properties props) throws RepositoryConfigurationException, VCASException; } Modified: jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/BackupChain.java =================================================================== --- jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/BackupChain.java 2011-12-29 12:12:38 UTC (rev 5386) +++ jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/BackupChain.java 2011-12-29 13:02:55 UTC (rev 5387) @@ -18,7 +18,6 @@ */ package org.exoplatform.services.jcr.ext.backup; -import java.util.Calendar; import java.util.List; /** Modified: jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/BackupConfig.java =================================================================== --- jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/BackupConfig.java 2011-12-29 12:12:38 UTC (rev 5386) +++ jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/BackupConfig.java 2011-12-29 13:02:55 UTC (rev 5387) @@ -18,8 +18,6 @@ */ package org.exoplatform.services.jcr.ext.backup; -import java.io.File; - /** * Created by The eXo Platform SARL .<br/> * Modified: jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/registry/RegistryService.java =================================================================== --- jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/registry/RegistryService.java 2011-12-29 12:12:38 UTC (rev 5386) +++ jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/registry/RegistryService.java 2011-12-29 13:02:55 UTC (rev 5387) @@ -40,7 +40,6 @@ import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; -import java.io.FileNotFoundException; import java.io.IOException; import java.io.InputStream; import java.security.PrivilegedAction; @@ -122,7 +121,6 @@ * @param repositoryService * @throws RepositoryConfigurationException * @throws RepositoryException - * @throws FileNotFoundException */ public RegistryService(InitParams params, RepositoryService repositoryService) throws RepositoryConfigurationException Modified: jcr/trunk/exo.jcr.framework.ftpclient/src/main/java/org/exoplatform/frameworks/ftpclient/data/FtpSlowInputStream1.java =================================================================== --- jcr/trunk/exo.jcr.framework.ftpclient/src/main/java/org/exoplatform/frameworks/ftpclient/data/FtpSlowInputStream1.java 2011-12-29 12:12:38 UTC (rev 5386) +++ jcr/trunk/exo.jcr.framework.ftpclient/src/main/java/org/exoplatform/frameworks/ftpclient/data/FtpSlowInputStream1.java 2011-12-29 13:02:55 UTC (rev 5387) @@ -18,7 +18,6 @@ */ package org.exoplatform.frameworks.ftpclient.data; -import org.exoplatform.frameworks.ftpclient.FtpConst; import org.exoplatform.services.log.ExoLogger; import org.exoplatform.services.log.Log; Modified: jcr/trunk/exo.jcr.framework.ftpclient/src/main/java/org/exoplatform/frameworks/ftpclient/data/FtpSlowOutputStream.java =================================================================== --- jcr/trunk/exo.jcr.framework.ftpclient/src/main/java/org/exoplatform/frameworks/ftpclient/data/FtpSlowOutputStream.java 2011-12-29 12:12:38 UTC (rev 5386) +++ jcr/trunk/exo.jcr.framework.ftpclient/src/main/java/org/exoplatform/frameworks/ftpclient/data/FtpSlowOutputStream.java 2011-12-29 13:02:55 UTC (rev 5387) @@ -18,7 +18,6 @@ */ package org.exoplatform.frameworks.ftpclient.data; -import org.exoplatform.frameworks.ftpclient.FtpConst; import org.exoplatform.services.log.ExoLogger; import org.exoplatform.services.log.Log;

12 years, 4 months

1
0
0 / 0

exo-jcr SVN: r5386 - in core/trunk: packaging/module and 1 other directories.

by do-not-reply＠jboss.org

Author: tolusha Date: 2011-12-29 07:12:38 -0500 (Thu, 29 Dec 2011) New Revision: 5386 Removed: core/trunk/packaging/module/dependencies.txt Modified: core/trunk/packaging/module/src/main/javascript/core.packaging.module.js core/trunk/pom.xml Log: EXOJCR-1692: Update pdfBox to 1.6.0 Deleted: core/trunk/packaging/module/dependencies.txt =================================================================== --- core/trunk/packaging/module/dependencies.txt 2011-12-29 10:46:13 UTC (rev 5385) +++ core/trunk/packaging/module/dependencies.txt 2011-12-29 12:12:38 UTC (rev 5386) @@ -1,85 +0,0 @@ -Generated during core-2.3.0-Beta02 release -org.exoplatform.core:exo.core.packaging.module:pom:2.3.0-SNAPSHOT -+- org.exoplatform.core:exo.core.component.database:jar:2.3.0-SNAPSHOT:compile -| +- org.exoplatform.kernel:exo.kernel.component.common:jar:2.2.0-Beta01:compile -| | +- javax.activation:activation:jar:1.1:compile -| | +- jotm:jotm:jar:2.0.10:compile -| | | +- jotm:jotm_jrmp_stubs:jar:2.0.10:compile -| | | +- org.objectweb.carol:carol:jar:2.0.5:compile -| | | \- howl:howl-logger:jar:0.1.11:compile -| | +- quartz:quartz:jar:1.5.0-RC2:compile -| | +- javax.mail:mail:jar:1.4:compile -| | \- javax.transaction:jta:jar:1.0.1B:compile -| +- org.exoplatform.kernel:exo.kernel.component.cache:jar:2.2.0-Beta01:compile -| | \- org.exoplatform.kernel:exo.kernel.component.remote:jar:2.2.0-Beta01:compile -| | \- jgroups:jgroups:jar:2.6.10.GA:compile -| +- hsqldb:hsqldb:jar:1.8.0.7:runtime -| +- com.experlog:xapool:jar:1.5.0:compile -| +- c3p0:c3p0:jar:0.9.1.2:runtime -| +- org.hibernate:hibernate-core:jar:3.3.1.GA:compile -| | +- antlr:antlr:jar:2.7.6:compile -| | +- commons-collections:commons-collections:jar:3.1:compile -| | \- dom4j:dom4j:jar:1.6.1:compile -| | +- jaxme:jaxme-api:jar:0.3:compile -| | +- jaxen:jaxen:jar:1.1-beta-6:compile -| | +- msv:xsdlib:jar:20030807:compile -| | +- msv:relaxngDatatype:jar:20030807:compile -| | +- pull-parser:pull-parser:jar:2:compile -| | +- xpp3:xpp3:jar:1.1.3.3:compile -| | +- stax:stax-api:jar:1.0:compile -| | \- xml-apis:xml-apis:jar:1.0.b2:compile -| +- xdoclet:xdoclet-hibernate-module:jar:1.2.3:compile -| | \- commons-logging:commons-logging:jar:1.1:compile -| | +- log4j:log4j:jar:1.2.12:compile -| | +- logkit:logkit:jar:1.0.1:compile -| | \- avalon-framework:avalon-framework:jar:4.1.3:compile -| +- xdoclet:xdoclet:jar:1.2.3:compile -| +- xdoclet:xdoclet-xdoclet-module:jar:1.2:compile -| +- xdoclet:xjavadoc:jar:1.0.3:compile -| +- javassist:javassist:jar:3.4.GA:compile -| \- org.hibernate:hibernate-annotations:jar:3.4.0.GA:compile -| +- org.hibernate:ejb3-persistence:jar:1.0.2.GA:compile -| \- org.hibernate:hibernate-commons-annotations:jar:3.1.0.GA:compile -+- org.exoplatform.core:exo.core.component.document:jar:2.3.0-SNAPSHOT:compile -| +- pdfbox:pdfbox:jar:0.7.3:compile -| | +- org.fontbox:fontbox:jar:0.1.0:compile -| | +- org.jempbox:jempbox:jar:0.2.0:compile -| | +- bouncycastle:bcmail-jdk14:jar:136:compile -| | \- bouncycastle:bcprov-jdk14:jar:136:compile -| +- com.lowagie:itext:jar:2.1.0:compile -| +- org.htmlparser:htmlparser:jar:1.6:compile -| | \- com.sun:tools:jar:1.5.0:system -| +- org.apache.poi:poi:jar:3.0.2-FINAL:compile -| \- org.apache.poi:poi-scratchpad:jar:3.0.2-FINAL:compile -+- org.exoplatform.core:exo.core.component.organization.api:jar:2.3.0-SNAPSHOT:compile -| +- org.exoplatform.kernel:exo.kernel.container:jar:2.2.0-Beta01:compile -| | +- org.exoplatform.kernel:exo.kernel.commons:jar:2.2.0-Beta01:compile -| | | +- commons-lang:commons-lang:jar:2.3:compile -| | | +- org.slf4j:slf4j-api:jar:1.5.6:compile -| | | \- org.slf4j:slf4j-log4j12:jar:1.5.6:compile -| | +- org.exoplatform.tool:exo.tool.framework.junit:jar:1.2.0:compile -| | | +- javax.portlet:portlet-api:jar:2.0:compile -| | | \- javax.faces:jsf-api:jar:1.2:compile -| | +- javax.servlet:servlet-api:jar:2.4:compile -| | +- picocontainer:picocontainer:jar:1.1:compile -| | | +- jmock:jmock:jar:1.0.1:compile -| | | \- xstream:xstream:jar:1.0.2:compile -| | +- commons-beanutils:commons-beanutils:jar:1.6:compile -| | +- org.jibx:jibx-run:jar:1.2.1:compile -| | +- org.jibx:jibx-bind:jar:1.2.1:compile -| | | \- bcel:bcel:jar:5.1:compile -| | \- org.jibx:jibx-extras:jar:1.2.1:compile -| \- javax.ejb:ejb:jar:2.1:compile -+- org.exoplatform.core:exo.core.component.organization.ldap:jar:2.3.0-SNAPSHOT:compile -| +- org.exoplatform.core:exo.core.component.ldap:jar:2.3.0-SNAPSHOT:compile -| \- org.exoplatform.core:exo.core.component.organization.jdbc:jar:2.3.0-SNAPSHOT:compile -+- org.exoplatform.core:exo.core.component.security.core:jar:2.3.0-SNAPSHOT:compile -+- org.exoplatform.core:exo.core.component.xml-processing:jar:2.3.0-SNAPSHOT:compile -| +- jtidy:jtidy:jar:4aug2000r7-dev:compile -| \- xml-resolver:xml-resolver:jar:1.1:compile -+- org.exoplatform.core:exo.core.component.script.groovy:jar:2.3.0-SNAPSHOT:compile -| \- org.codehaus.groovy:groovy-all:jar:1.5.7:compile -| +- org.apache.ant:ant:jar:1.7.0:compile -| | \- org.apache.ant:ant-launcher:jar:1.7.0:compile -| \- jline:jline:jar:0.9.94:compile -\- junit:junit:jar:3.8.2:test (scope not updated to compile) Modified: core/trunk/packaging/module/src/main/javascript/core.packaging.module.js =================================================================== --- core/trunk/packaging/module/src/main/javascript/core.packaging.module.js 2011-12-29 10:46:13 UTC (rev 5385) +++ core/trunk/packaging/module/src/main/javascript/core.packaging.module.js 2011-12-29 12:12:38 UTC (rev 5386) @@ -29,9 +29,9 @@ module.component.documents = new Project("org.exoplatform.core", "exo.core.component.document", "jar", module.version). - addDependency(new Project("org.apache.pdfbox", "pdfbox", "jar", "1.4.0")). - addDependency(new Project("org.apache.pdfbox", "fontbox", "jar", "1.4.0")). - addDependency(new Project("org.apache.pdfbox", "jempbox", "jar", "1.4.0")). + addDependency(new Project("org.apache.pdfbox", "pdfbox", "jar", "1.6.0")). + addDependency(new Project("org.apache.pdfbox", "fontbox", "jar", "1.6.0")). + addDependency(new Project("org.apache.pdfbox", "jempbox", "jar", "1.6.0")). addDependency(new Project("org.bouncycastle", "bcmail-jdk15", "jar", "1.45")). addDependency(new Project("org.bouncycastle", "bcprov-jdk15", "jar", "1.45")). addDependency(new Project("org.apache.commons", "commons-compress", "jar", "1.0")). Modified: core/trunk/pom.xml =================================================================== --- core/trunk/pom.xml 2011-12-29 10:46:13 UTC (rev 5385) +++ core/trunk/pom.xml 2011-12-29 12:12:38 UTC (rev 5386) @@ -281,7 +281,7 @@ <dependency> <groupId>org.apache.pdfbox</groupId> <artifactId>pdfbox</artifactId> - <version>1.4.0</version> + <version>1.6.0</version> </dependency> <dependency> <groupId>org.htmlparser</groupId>

12 years, 4 months

1
0
0 / 0

exo-jcr SVN: r5385 - in jcr/trunk: exo.jcr.framework.ftpclient/src/main/java/org/exoplatform/frameworks/ftpclient/data and 1 other directory.

by do-not-reply＠jboss.org

Author: tolusha Date: 2011-12-29 05:46:13 -0500 (Thu, 29 Dec 2011) New Revision: 5385 Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SessionDataManager.java jcr/trunk/exo.jcr.framework.ftpclient/src/main/java/org/exoplatform/frameworks/ftpclient/data/FtpFileInfoImpl.java Log: EXOJCR-1687: fix sonar violations Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SessionDataManager.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SessionDataManager.java 2011-12-29 10:44:13 UTC (rev 5384) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SessionDataManager.java 2011-12-29 10:46:13 UTC (rev 5385) @@ -2037,7 +2037,7 @@ removedIter.remove(); } - if (exceptions.toString().length() > 0 && log.isDebugEnabled()) + if (exceptions.length() > 0 && log.isDebugEnabled()) { log.warn(exceptions); } Modified: jcr/trunk/exo.jcr.framework.ftpclient/src/main/java/org/exoplatform/frameworks/ftpclient/data/FtpFileInfoImpl.java =================================================================== --- jcr/trunk/exo.jcr.framework.ftpclient/src/main/java/org/exoplatform/frameworks/ftpclient/data/FtpFileInfoImpl.java 2011-12-29 10:44:13 UTC (rev 5384) +++ jcr/trunk/exo.jcr.framework.ftpclient/src/main/java/org/exoplatform/frameworks/ftpclient/data/FtpFileInfoImpl.java 2011-12-29 10:46:13 UTC (rev 5385) @@ -163,7 +163,7 @@ String _name = fileL; - this.name = _name.toString(); + this.name = _name; this.date = _date.toString(); this.time = _time.toString(); this.size = new Long(_size.toString()); @@ -268,7 +268,7 @@ String _name = fileL; this.name = _name; - this.date = _month + " " + _day; + this.date = _month.toString() + " " + _day.toString(); this.time = _time.toString(); this.size = new Long(_size.toString());

12 years, 4 months

1
0
0 / 0

exo-jcr SVN: r5384 - in jcr/trunk: exo.jcr.framework.command/src/main/java/org/exoplatform/frameworks/jcr/cli and 1 other directories.

by do-not-reply＠jboss.org

Author: andrew.plotnikov Date: 2011-12-29 05:44:13 -0500 (Thu, 29 Dec 2011) New Revision: 5384 Modified: jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/client/FtpClientCommandThread.java jcr/trunk/exo.jcr.framework.command/src/main/java/org/exoplatform/frameworks/jcr/cli/GetNodesCommand.java jcr/trunk/exo.jcr.framework.command/src/main/java/org/exoplatform/frameworks/jcr/cli/HelpCommand.java jcr/trunk/exo.jcr.framework.web/src/main/java/org/exoplatform/frameworks/jcr/web/fckeditor/FCKeditor.java Log: EXOJCR-1687: Fixed new sonar violations in project Modified: jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/client/FtpClientCommandThread.java =================================================================== --- jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/client/FtpClientCommandThread.java 2011-12-29 10:29:54 UTC (rev 5383) +++ jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/client/FtpClientCommandThread.java 2011-12-29 10:44:13 UTC (rev 5384) @@ -78,13 +78,10 @@ if (!"".equals(command)) { - String logStr = ""; String[] comms = command.split(" "); FtpCommand curCommand = clientSession.getFtpServer().getCommand(comms[0].toUpperCase()); - logStr = comms[0].toUpperCase(); - if (curCommand != null) { if (comms.length > 1) @@ -100,8 +97,6 @@ comms[1] += " " + comms[i]; //NOSONAR } } - - logStr += " " + comms[1]; } FtpContext ftpContext = new FtpContext(clientSession, comms); Modified: jcr/trunk/exo.jcr.framework.command/src/main/java/org/exoplatform/frameworks/jcr/cli/GetNodesCommand.java =================================================================== --- jcr/trunk/exo.jcr.framework.command/src/main/java/org/exoplatform/frameworks/jcr/cli/GetNodesCommand.java 2011-12-29 10:29:54 UTC (rev 5383) +++ jcr/trunk/exo.jcr.framework.command/src/main/java/org/exoplatform/frameworks/jcr/cli/GetNodesCommand.java 2011-12-29 10:44:13 UTC (rev 5384) @@ -36,37 +36,37 @@ @Override public boolean perform(CliAppContext ctx) { - String output = ""; + StringBuilder output = new StringBuilder(); try { if (ctx.getCurrentItem().isNode()) { Node currentNode = (Node)ctx.getCurrentItem(); PropertyIterator propertyIterator = currentNode.getProperties(); - output += "Properties list for " + currentNode.getPath() + ":\n"; + output.append("Properties list for ").append(currentNode.getPath()).append(":\n"); while (propertyIterator.hasNext()) { Property property = propertyIterator.nextProperty(); - output += property.getName() + "\n"; + output.append(property.getName()).append("\n"); } NodeIterator nodeIterator = currentNode.getNodes(); - output += "Nodes list for " + currentNode.getPath() + ":\n"; + output.append("Nodes list for ").append(currentNode.getPath()).append(":\n"); while (nodeIterator.hasNext()) { Node node = nodeIterator.nextNode(); - output += node.getPath() + "\n"; + output.append(node.getPath()).append("\n"); } } else { - output += "Current item is property: " + ((Property)ctx.getCurrentItem()).getName() + "\n"; + output.append("Current item is property: ").append(((Property)ctx.getCurrentItem()).getName()).append("\n"); } } catch (Exception e) { - output = "Can't execute command - " + e.getMessage() + "\n"; + output = new StringBuilder("Can't execute command - ").append(e.getMessage()).append("\n"); } - ctx.setOutput(output); + ctx.setOutput(output.toString()); return false; } } Modified: jcr/trunk/exo.jcr.framework.command/src/main/java/org/exoplatform/frameworks/jcr/cli/HelpCommand.java =================================================================== --- jcr/trunk/exo.jcr.framework.command/src/main/java/org/exoplatform/frameworks/jcr/cli/HelpCommand.java 2011-12-29 10:29:54 UTC (rev 5383) +++ jcr/trunk/exo.jcr.framework.command/src/main/java/org/exoplatform/frameworks/jcr/cli/HelpCommand.java 2011-12-29 10:44:13 UTC (rev 5384) @@ -69,7 +69,7 @@ @Override public boolean perform(CliAppContext ctx) { - String output = ""; + StringBuilder output = new StringBuilder(); try { String findHelpCommand = null; @@ -92,24 +92,25 @@ if (findHelpCommand.equals(currentHelpCommand)) { // begin format output string (adding spaces) - String findHelpCommandFormatted = currentHelpCommand; + StringBuilder findHelpCommandFormatted = new StringBuilder(currentHelpCommand); + int commandLength = currentHelpCommand.length(); if (commandLength < WORD_LENGTH) { for (int i = currentHelpCommand.length(); i < WORD_LENGTH; i++) { - findHelpCommandFormatted += " "; + findHelpCommandFormatted.append(" "); } } // end format - output += findHelpCommandFormatted + " - " + map.get(findHelpCommand) + "\n"; + output.append(findHelpCommandFormatted).append(" - ").append(map.get(findHelpCommand)).append("\n"); found = true; break; } } if (found == false) { - output += "Can't find help for the: " + findHelpCommand + " command\n"; + output.append("Can't find help for the: ").append(findHelpCommand).append(" command\n"); } } else @@ -120,25 +121,26 @@ { String currentHelpCommand = (String)(iterator.next()); // begin format output string (adding spaces) - String currentHelpCommandFormatted = currentHelpCommand; + StringBuilder currentHelpCommandFormatted = new StringBuilder(currentHelpCommand); int commandLength = currentHelpCommand.length(); if (commandLength < WORD_LENGTH) { for (int i = currentHelpCommand.length(); i < WORD_LENGTH; i++) { - currentHelpCommandFormatted += " "; + currentHelpCommandFormatted.append(" "); } } // end format - output += currentHelpCommandFormatted + " - " + map.get(currentHelpCommand) + "\n"; + output.append(currentHelpCommandFormatted).append(" - ").append(map.get(currentHelpCommand)) + .append("\n"); } } } catch (Exception e) { - output = "Can't execute command - " + e.getMessage() + "\n"; + output = new StringBuilder("Can't execute command - ").append(e.getMessage()).append("\n"); } - ctx.setOutput(output); + ctx.setOutput(output.toString()); return false; } } Modified: jcr/trunk/exo.jcr.framework.web/src/main/java/org/exoplatform/frameworks/jcr/web/fckeditor/FCKeditor.java =================================================================== --- jcr/trunk/exo.jcr.framework.web/src/main/java/org/exoplatform/frameworks/jcr/web/fckeditor/FCKeditor.java 2011-12-29 10:29:54 UTC (rev 5383) +++ jcr/trunk/exo.jcr.framework.web/src/main/java/org/exoplatform/frameworks/jcr/web/fckeditor/FCKeditor.java 2011-12-29 10:44:13 UTC (rev 5384) @@ -369,14 +369,16 @@ private String createIFrameHTML() { - String sLink = basePath + "editor/fckeditor.html?InstanceName=" + instanceName; + StringBuilder sLink = + new StringBuilder(basePath).append("editor/fckeditor.html?InstanceName=").append(instanceName); if (!toolbarSet.equals("")) - sLink += "&Toolbar=" + toolbarSet; + { + sLink.append("&Toolbar=").append(toolbarSet); + } - return "<iframe id=\"" + instanceName + "___Frame\" src=\"" + sLink + "\" width=\"" + width + "\" height=\"" - + height + "\" frameborder=\"no\" scrolling=\"no\"></iframe>"; - + return "<iframe id=\"" + instanceName + "___Frame\" src=\"" + sLink.toString() + "\" width=\"" + width + + "\" height=\"" + height + "\" frameborder=\"no\" scrolling=\"no\"></iframe>"; } /**

12 years, 4 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

exo-jcr-commits December 2011