[gatein-commits] gatein SVN: r6698 - in portal/trunk: component and 81 other directories.

Author: bdaw Date: 2011-06-21 19:23:41 -0400 (Tue, 21 Jun 2011) New Revision: 6698 Modified: portal/trunk/component/application-registry/pom.xml portal/trunk/component/common/pom.xml portal/trunk/component/identity/pom.xml portal/trunk/component/management/pom.xml portal/trunk/component/pc/pom.xml portal/trunk/component/pom.xml portal/trunk/component/portal/pom.xml portal/trunk/component/resources/pom.xml portal/trunk/component/scripting/pom.xml portal/trunk/component/test/core/pom.xml portal/trunk/component/test/jcr/pom.xml portal/trunk/component/test/organization/pom.xml portal/trunk/component/test/pom.xml portal/trunk/component/web/api/pom.xml portal/trunk/component/web/controller/pom.xml portal/trunk/component/web/pom.xml portal/trunk/component/web/resources/pom.xml portal/trunk/component/web/security/pom.xml portal/trunk/component/web/server/pom.xml portal/trunk/examples/extension/config/pom.xml portal/trunk/examples/extension/ear/pom.xml portal/trunk/examples/extension/jar/pom.xml portal/trunk/examples/extension/pom.xml portal/trunk/examples/extension/war/pom.xml portal/trunk/examples/pom.xml portal/trunk/examples/portal/config/pom.xml portal/trunk/examples/portal/ear/pom.xml portal/trunk/examples/portal/jar/pom.xml portal/trunk/examples/portal/pom.xml portal/trunk/examples/portal/rest-war/pom.xml portal/trunk/examples/portal/war/pom.xml portal/trunk/examples/portlets/api/pom.xml portal/trunk/examples/portlets/jsfhellouser/pom.xml portal/trunk/examples/portlets/jsphellouser/pom.xml portal/trunk/examples/portlets/pom.xml portal/trunk/examples/portlets/simplesthelloworld/pom.xml portal/trunk/examples/portlets/struts-jpetstore/pom.xml portal/trunk/examples/skins/pom.xml portal/trunk/examples/skins/simpleskin/pom.xml portal/trunk/gadgets/core/pom.xml portal/trunk/gadgets/eXoGadgets/pom.xml portal/trunk/gadgets/pom.xml portal/trunk/gadgets/server/pom.xml portal/trunk/packaging/jboss-as5/pkg/pom.xml portal/trunk/packaging/jboss-as5/pom.xml portal/trunk/packaging/jboss-as6/pkg/pom.xml portal/trunk/packaging/jboss-as6/pom.xml portal/trunk/packaging/jetty/pkg/pom.xml portal/trunk/packaging/jetty/pom.xml portal/trunk/packaging/pom.xml portal/trunk/packaging/tomcat/integration/pom.xml portal/trunk/packaging/tomcat/pkg/pom.xml portal/trunk/packaging/tomcat/pkg/tc6/pom.xml portal/trunk/packaging/tomcat/pkg/tc7/pom.xml portal/trunk/packaging/tomcat/pom.xml portal/trunk/pom.xml portal/trunk/portlet/dashboard/pom.xml portal/trunk/portlet/exoadmin/pom.xml portal/trunk/portlet/pom.xml portal/trunk/portlet/web/pom.xml portal/trunk/starter/ear/pom.xml portal/trunk/starter/pom.xml portal/trunk/starter/war/pom.xml portal/trunk/testsuite/pom.xml portal/trunk/testsuite/selenium-snifftests/pom.xml portal/trunk/testsuite/webuibasedsamples/pom.xml portal/trunk/web/eXoResources/pom.xml portal/trunk/web/pom.xml portal/trunk/web/portal/pom.xml portal/trunk/web/rest/pom.xml portal/trunk/webui/core/pom.xml portal/trunk/webui/dashboard/pom.xml portal/trunk/webui/eXo/pom.xml portal/trunk/webui/framework/pom.xml portal/trunk/webui/pom.xml portal/trunk/webui/portal/pom.xml portal/trunk/webui/portlet/pom.xml portal/trunk/wsrp-integration/extension-component/pom.xml portal/trunk/wsrp-integration/extension-config/pom.xml portal/trunk/wsrp-integration/extension-ear-as5/pom.xml portal/trunk/wsrp-integration/extension-ear-as6/pom.xml portal/trunk/wsrp-integration/extension-war/pom.xml portal/trunk/wsrp-integration/pom.xml Log: [maven-release-plugin] prepare release 3.2.0-M01 Modified: portal/trunk/component/application-registry/pom.xml =================================================================== --- portal/trunk/component/application-registry/pom.xml 2011-06-21 22:50:45 UTC (rev 6697) +++ portal/trunk/component/application-registry/pom.xml 2011-06-21 23:23:41 UTC (rev 6698) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>3.2.0-M01-SNAPSHOT</version> + <version>3.2.0-M01</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: portal/trunk/component/common/pom.xml =================================================================== --- portal/trunk/component/common/pom.xml 2011-06-21 22:50:45 UTC (rev 6697) +++ portal/trunk/component/common/pom.xml 2011-06-21 23:23:41 UTC (rev 6698) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>3.2.0-M01-SNAPSHOT</version> + <version>3.2.0-M01</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>exo.portal.component.common</artifactId> Modified: portal/trunk/component/identity/pom.xml =================================================================== --- portal/trunk/component/identity/pom.xml 2011-06-21 22:50:45 UTC (rev 6697) +++ portal/trunk/component/identity/pom.xml 2011-06-21 23:23:41 UTC (rev 6698) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>3.2.0-M01-SNAPSHOT</version> + <version>3.2.0-M01</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: portal/trunk/component/management/pom.xml =================================================================== --- portal/trunk/component/management/pom.xml 2011-06-21 22:50:45 UTC (rev 6697) +++ portal/trunk/component/management/pom.xml 2011-06-21 23:23:41 UTC (rev 6698) @@ -21,7 +21,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>3.2.0-M01-SNAPSHOT</version> + <version>3.2.0-M01</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: portal/trunk/component/pc/pom.xml =================================================================== --- portal/trunk/component/pc/pom.xml 2011-06-21 22:50:45 UTC (rev 6697) +++ portal/trunk/component/pc/pom.xml 2011-06-21 23:23:41 UTC (rev 6698) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>3.2.0-M01-SNAPSHOT</version> + <version>3.2.0-M01</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: portal/trunk/component/pom.xml =================================================================== --- portal/trunk/component/pom.xml 2011-06-21 22:50:45 UTC (rev 6697) +++ portal/trunk/component/pom.xml 2011-06-21 23:23:41 UTC (rev 6698) @@ -26,7 +26,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>3.2.0-M01-SNAPSHOT</version> + <version>3.2.0-M01</version> </parent> <artifactId>exo.portal.component</artifactId> Modified: portal/trunk/component/portal/pom.xml =================================================================== --- portal/trunk/component/portal/pom.xml 2011-06-21 22:50:45 UTC (rev 6697) +++ portal/trunk/component/portal/pom.xml 2011-06-21 23:23:41 UTC (rev 6698) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>3.2.0-M01-SNAPSHOT</version> + <version>3.2.0-M01</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: portal/trunk/component/resources/pom.xml =================================================================== --- portal/trunk/component/resources/pom.xml 2011-06-21 22:50:45 UTC (rev 6697) +++ portal/trunk/component/resources/pom.xml 2011-06-21 23:23:41 UTC (rev 6698) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>3.2.0-M01-SNAPSHOT</version> + <version>3.2.0-M01</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: portal/trunk/component/scripting/pom.xml =================================================================== --- portal/trunk/component/scripting/pom.xml 2011-06-21 22:50:45 UTC (rev 6697) +++ portal/trunk/component/scripting/pom.xml 2011-06-21 23:23:41 UTC (rev 6698) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>3.2.0-M01-SNAPSHOT</version> + <version>3.2.0-M01</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: portal/trunk/component/test/core/pom.xml =================================================================== --- portal/trunk/component/test/core/pom.xml 2011-06-21 22:50:45 UTC (rev 6697) +++ portal/trunk/component/test/core/pom.xml 2011-06-21 23:23:41 UTC (rev 6698) @@ -22,7 +22,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.test</artifactId> - <version>3.2.0-M01-SNAPSHOT</version> + <version>3.2.0-M01</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: portal/trunk/component/test/jcr/pom.xml =================================================================== --- portal/trunk/component/test/jcr/pom.xml 2011-06-21 22:50:45 UTC (rev 6697) +++ portal/trunk/component/test/jcr/pom.xml 2011-06-21 23:23:41 UTC (rev 6698) @@ -22,7 +22,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.test</artifactId> - <version>3.2.0-M01-SNAPSHOT</version> + <version>3.2.0-M01</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: portal/trunk/component/test/organization/pom.xml =================================================================== --- portal/trunk/component/test/organization/pom.xml 2011-06-21 22:50:45 UTC (rev 6697) +++ portal/trunk/component/test/organization/pom.xml 2011-06-21 23:23:41 UTC (rev 6698) @@ -22,7 +22,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.test</artifactId> - <version>3.2.0-M01-SNAPSHOT</version> + <version>3.2.0-M01</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: portal/trunk/component/test/pom.xml =================================================================== --- portal/trunk/component/test/pom.xml 2011-06-21 22:50:45 UTC (rev 6697) +++ portal/trunk/component/test/pom.xml 2011-06-21 23:23:41 UTC (rev 6698) @@ -22,7 +22,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>3.2.0-M01-SNAPSHOT</version> + <version>3.2.0-M01</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: portal/trunk/component/web/api/pom.xml =================================================================== --- portal/trunk/component/web/api/pom.xml 2011-06-21 22:50:45 UTC (rev 6697) +++ portal/trunk/component/web/api/pom.xml 2011-06-21 23:23:41 UTC (rev 6698) @@ -21,7 +21,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.web</artifactId> - <version>3.2.0-M01-SNAPSHOT</version> + <version>3.2.0-M01</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: portal/trunk/component/web/controller/pom.xml =================================================================== --- portal/trunk/component/web/controller/pom.xml 2011-06-21 22:50:45 UTC (rev 6697) +++ portal/trunk/component/web/controller/pom.xml 2011-06-21 23:23:41 UTC (rev 6698) @@ -21,7 +21,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.web</artifactId> - <version>3.2.0-M01-SNAPSHOT</version> + <version>3.2.0-M01</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: portal/trunk/component/web/pom.xml =================================================================== --- portal/trunk/component/web/pom.xml 2011-06-21 22:50:45 UTC (rev 6697) +++ portal/trunk/component/web/pom.xml 2011-06-21 23:23:41 UTC (rev 6698) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>3.2.0-M01-SNAPSHOT</version> + <version>3.2.0-M01</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: portal/trunk/component/web/resources/pom.xml =================================================================== --- portal/trunk/component/web/resources/pom.xml 2011-06-21 22:50:45 UTC (rev 6697) +++ portal/trunk/component/web/resources/pom.xml 2011-06-21 23:23:41 UTC (rev 6698) @@ -21,7 +21,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.web</artifactId> - <version>3.2.0-M01-SNAPSHOT</version> + <version>3.2.0-M01</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: portal/trunk/component/web/security/pom.xml =================================================================== --- portal/trunk/component/web/security/pom.xml 2011-06-21 22:50:45 UTC (rev 6697) +++ portal/trunk/component/web/security/pom.xml 2011-06-21 23:23:41 UTC (rev 6698) @@ -21,7 +21,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.web</artifactId> - <version>3.2.0-M01-SNAPSHOT</version> + <version>3.2.0-M01</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: portal/trunk/component/web/server/pom.xml =================================================================== --- portal/trunk/component/web/server/pom.xml 2011-06-21 22:50:45 UTC (rev 6697) +++ portal/trunk/component/web/server/pom.xml 2011-06-21 23:23:41 UTC (rev 6698) @@ -21,7 +21,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.web</artifactId> - <version>3.2.0-M01-SNAPSHOT</version> + <version>3.2.0-M01</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: portal/trunk/examples/extension/config/pom.xml =================================================================== --- portal/trunk/examples/extension/config/pom.xml 2011-06-21 22:50:45 UTC (rev 6697) +++ portal/trunk/examples/extension/config/pom.xml 2011-06-21 23:23:41 UTC (rev 6698) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>3.2.0-M01-SNAPSHOT</version> + <version>3.2.0-M01</version> <relativePath>../../../pom.xml</relativePath> </parent> Modified: portal/trunk/examples/extension/ear/pom.xml =================================================================== --- portal/trunk/examples/extension/ear/pom.xml 2011-06-21 22:50:45 UTC (rev 6697) +++ portal/trunk/examples/extension/ear/pom.xml 2011-06-21 23:23:41 UTC (rev 6698) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>3.2.0-M01-SNAPSHOT</version> + <version>3.2.0-M01</version> <relativePath>../../../pom.xml</relativePath> </parent> @@ -38,23 +38,23 @@ <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.sample.extension.config</artifactId> - <version>3.2.0-M01-SNAPSHOT</version> + <version>3.2.0-M01</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.sample.extension.jar</artifactId> - <version>3.2.0-M01-SNAPSHOT</version> + <version>3.2.0-M01</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.web.api</artifactId> - <version>3.2.0-M01-SNAPSHOT</version> + <version>3.2.0-M01</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.sample.extension.war</artifactId> - <version>3.2.0-M01-SNAPSHOT</version> + <version>3.2.0-M01</version> <type>war</type> </dependency> </dependencies> Modified: portal/trunk/examples/extension/jar/pom.xml =================================================================== --- portal/trunk/examples/extension/jar/pom.xml 2011-06-21 22:50:45 UTC (rev 6697) +++ portal/trunk/examples/extension/jar/pom.xml 2011-06-21 23:23:41 UTC (rev 6698) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>3.2.0-M01-SNAPSHOT</version> + <version>3.2.0-M01</version> <relativePath>../../../pom.xml</relativePath> </parent> Modified: portal/trunk/examples/extension/pom.xml =================================================================== --- portal/trunk/examples/extension/pom.xml 2011-06-21 22:50:45 UTC (rev 6697) +++ portal/trunk/examples/extension/pom.xml 2011-06-21 23:23:41 UTC (rev 6698) @@ -24,7 +24,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>3.2.0-M01-SNAPSHOT</version> + <version>3.2.0-M01</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: portal/trunk/examples/extension/war/pom.xml =================================================================== --- portal/trunk/examples/extension/war/pom.xml 2011-06-21 22:50:45 UTC (rev 6697) +++ portal/trunk/examples/extension/war/pom.xml 2011-06-21 23:23:41 UTC (rev 6698) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>3.2.0-M01-SNAPSHOT</version> + <version>3.2.0-M01</version> <relativePath>../../../pom.xml</relativePath> </parent> Modified: portal/trunk/examples/pom.xml =================================================================== --- portal/trunk/examples/pom.xml 2011-06-21 22:50:45 UTC (rev 6697) +++ portal/trunk/examples/pom.xml 2011-06-21 23:23:41 UTC (rev 6698) @@ -26,7 +26,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>3.2.0-M01-SNAPSHOT</version> + <version>3.2.0-M01</version> </parent> <artifactId>exo.portal.sample</artifactId> Modified: portal/trunk/examples/portal/config/pom.xml =================================================================== --- portal/trunk/examples/portal/config/pom.xml 2011-06-21 22:50:45 UTC (rev 6697) +++ portal/trunk/examples/portal/config/pom.xml 2011-06-21 23:23:41 UTC (rev 6698) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>3.2.0-M01-SNAPSHOT</version> + <version>3.2.0-M01</version> <relativePath>../../../pom.xml</relativePath> </parent> Modified: portal/trunk/examples/portal/ear/pom.xml =================================================================== --- portal/trunk/examples/portal/ear/pom.xml 2011-06-21 22:50:45 UTC (rev 6697) +++ portal/trunk/examples/portal/ear/pom.xml 2011-06-21 23:23:41 UTC (rev 6698) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>3.2.0-M01-SNAPSHOT</version> + <version>3.2.0-M01</version> <relativePath>../../../pom.xml</relativePath> </parent> @@ -38,29 +38,29 @@ <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.sample.portal.config</artifactId> - <version>3.2.0-M01-SNAPSHOT</version> + <version>3.2.0-M01</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.sample.portal.jar</artifactId> - <version>3.2.0-M01-SNAPSHOT</version> + <version>3.2.0-M01</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.web.api</artifactId> - <version>3.2.0-M01-SNAPSHOT</version> + <version>3.2.0-M01</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.sample.portal.war</artifactId> - <version>3.2.0-M01-SNAPSHOT</version> + <version>3.2.0-M01</version> <type>war</type> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.sample.portal.rest-war</artifactId> - <version>3.2.0-M01-SNAPSHOT</version> + <version>3.2.0-M01</version> <type>war</type> </dependency> </dependencies> Modified: portal/trunk/examples/portal/jar/pom.xml =================================================================== --- portal/trunk/examples/portal/jar/pom.xml 2011-06-21 22:50:45 UTC (rev 6697) +++ portal/trunk/examples/portal/jar/pom.xml 2011-06-21 23:23:41 UTC (rev 6698) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>3.2.0-M01-SNAPSHOT</version> + <version>3.2.0-M01</version> <relativePath>../../../pom.xml</relativePath> </parent> Modified: portal/trunk/examples/portal/pom.xml =================================================================== --- portal/trunk/examples/portal/pom.xml 2011-06-21 22:50:45 UTC (rev 6697) +++ portal/trunk/examples/portal/pom.xml 2011-06-21 23:23:41 UTC (rev 6698) @@ -24,7 +24,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>3.2.0-M01-SNAPSHOT</version> + <version>3.2.0-M01</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: portal/trunk/examples/portal/rest-war/pom.xml =================================================================== --- portal/trunk/examples/portal/rest-war/pom.xml 2011-06-21 22:50:45 UTC (rev 6697) +++ portal/trunk/examples/portal/rest-war/pom.xml 2011-06-21 23:23:41 UTC (rev 6698) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>3.2.0-M01-SNAPSHOT</version> + <version>3.2.0-M01</version> <relativePath>../../../pom.xml</relativePath> </parent> Modified: portal/trunk/examples/portal/war/pom.xml =================================================================== --- portal/trunk/examples/portal/war/pom.xml 2011-06-21 22:50:45 UTC (rev 6697) +++ portal/trunk/examples/portal/war/pom.xml 2011-06-21 23:23:41 UTC (rev 6698) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>3.2.0-M01-SNAPSHOT</version> + <version>3.2.0-M01</version> <relativePath>../../../pom.xml</relativePath> </parent> Modified: portal/trunk/examples/portlets/api/pom.xml =================================================================== --- portal/trunk/examples/portlets/api/pom.xml 2011-06-21 22:50:45 UTC (rev 6697) +++ portal/trunk/examples/portlets/api/pom.xml 2011-06-21 23:23:41 UTC (rev 6698) @@ -9,7 +9,7 @@ <parent> <groupId>org.gatein.portal.examples.portlets</groupId> <artifactId>parent</artifactId> - <version>3.2.0-M01-SNAPSHOT</version> + <version>3.2.0-M01</version> </parent> <artifactId>gatein-api</artifactId> Modified: portal/trunk/examples/portlets/jsfhellouser/pom.xml =================================================================== --- portal/trunk/examples/portlets/jsfhellouser/pom.xml 2011-06-21 22:50:45 UTC (rev 6697) +++ portal/trunk/examples/portlets/jsfhellouser/pom.xml 2011-06-21 23:23:41 UTC (rev 6698) @@ -9,7 +9,7 @@ <parent> <groupId>org.gatein.portal.examples.portlets</groupId> <artifactId>parent</artifactId> - <version>3.2.0-M01-SNAPSHOT</version> + <version>3.2.0-M01</version> </parent> <artifactId>gatein-jsf-hellouser</artifactId> Modified: portal/trunk/examples/portlets/jsphellouser/pom.xml =================================================================== --- portal/trunk/examples/portlets/jsphellouser/pom.xml 2011-06-21 22:50:45 UTC (rev 6697) +++ portal/trunk/examples/portlets/jsphellouser/pom.xml 2011-06-21 23:23:41 UTC (rev 6698) @@ -9,7 +9,7 @@ <parent> <groupId>org.gatein.portal.examples.portlets</groupId> <artifactId>parent</artifactId> - <version>3.2.0-M01-SNAPSHOT</version> + <version>3.2.0-M01</version> </parent> <artifactId>gatein-jsp-hellouser</artifactId> Modified: portal/trunk/examples/portlets/pom.xml =================================================================== --- portal/trunk/examples/portlets/pom.xml 2011-06-21 22:50:45 UTC (rev 6697) +++ portal/trunk/examples/portlets/pom.xml 2011-06-21 23:23:41 UTC (rev 6698) @@ -5,7 +5,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>3.2.0-M01-SNAPSHOT</version> + <version>3.2.0-M01</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: portal/trunk/examples/portlets/simplesthelloworld/pom.xml =================================================================== --- portal/trunk/examples/portlets/simplesthelloworld/pom.xml 2011-06-21 22:50:45 UTC (rev 6697) +++ portal/trunk/examples/portlets/simplesthelloworld/pom.xml 2011-06-21 23:23:41 UTC (rev 6698) @@ -9,7 +9,7 @@ <parent> <groupId>org.gatein.portal.examples.portlets</groupId> <artifactId>parent</artifactId> - <version>3.2.0-M01-SNAPSHOT</version> + <version>3.2.0-M01</version> </parent> <artifactId>gatein-simplest-helloworld</artifactId> Modified: portal/trunk/examples/portlets/struts-jpetstore/pom.xml =================================================================== --- portal/trunk/examples/portlets/struts-jpetstore/pom.xml 2011-06-21 22:50:45 UTC (rev 6697) +++ portal/trunk/examples/portlets/struts-jpetstore/pom.xml 2011-06-21 23:23:41 UTC (rev 6698) @@ -5,7 +5,7 @@ <parent> <groupId>org.gatein.portal.examples.portlets</groupId> <artifactId>parent</artifactId> - <version>3.2.0-M01-SNAPSHOT</version> + <version>3.2.0-M01</version> </parent> <artifactId>struts-jpetstore</artifactId> Modified: portal/trunk/examples/skins/pom.xml =================================================================== --- portal/trunk/examples/skins/pom.xml 2011-06-21 22:50:45 UTC (rev 6697) +++ portal/trunk/examples/skins/pom.xml 2011-06-21 23:23:41 UTC (rev 6698) @@ -5,7 +5,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>3.2.0-M01-SNAPSHOT</version> + <version>3.2.0-M01</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: portal/trunk/examples/skins/simpleskin/pom.xml =================================================================== --- portal/trunk/examples/skins/simpleskin/pom.xml 2011-06-21 22:50:45 UTC (rev 6697) +++ portal/trunk/examples/skins/simpleskin/pom.xml 2011-06-21 23:23:41 UTC (rev 6698) @@ -25,7 +25,7 @@ <parent> <groupId>org.gatein.portal.examples.skins</groupId> <artifactId>parent</artifactId> - <version>3.2.0-M01-SNAPSHOT</version> + <version>3.2.0-M01</version> </parent> <artifactId>gatein-sample-skin</artifactId> Modified: portal/trunk/gadgets/core/pom.xml =================================================================== --- portal/trunk/gadgets/core/pom.xml 2011-06-21 22:50:45 UTC (rev 6697) +++ portal/trunk/gadgets/core/pom.xml 2011-06-21 23:23:41 UTC (rev 6698) @@ -14,7 +14,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.gadgets</artifactId> - <version>3.2.0-M01-SNAPSHOT</version> + <version>3.2.0-M01</version> </parent> <artifactId>exo.portal.gadgets-core</artifactId> Modified: portal/trunk/gadgets/eXoGadgets/pom.xml =================================================================== --- portal/trunk/gadgets/eXoGadgets/pom.xml 2011-06-21 22:50:45 UTC (rev 6697) +++ portal/trunk/gadgets/eXoGadgets/pom.xml 2011-06-21 23:23:41 UTC (rev 6698) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.gadgets</artifactId> - <version>3.2.0-M01-SNAPSHOT</version> + <version>3.2.0-M01</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: portal/trunk/gadgets/pom.xml =================================================================== --- portal/trunk/gadgets/pom.xml 2011-06-21 22:50:45 UTC (rev 6697) +++ portal/trunk/gadgets/pom.xml 2011-06-21 23:23:41 UTC (rev 6698) @@ -24,7 +24,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>3.2.0-M01-SNAPSHOT</version> + <version>3.2.0-M01</version> </parent> <artifactId>exo.portal.gadgets</artifactId> Modified: portal/trunk/gadgets/server/pom.xml =================================================================== --- portal/trunk/gadgets/server/pom.xml 2011-06-21 22:50:45 UTC (rev 6697) +++ portal/trunk/gadgets/server/pom.xml 2011-06-21 23:23:41 UTC (rev 6698) @@ -25,7 +25,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.gadgets</artifactId> - <version>3.2.0-M01-SNAPSHOT</version> + <version>3.2.0-M01</version> </parent> <artifactId>exo.portal.gadgets-server</artifactId> Modified: portal/trunk/packaging/jboss-as5/pkg/pom.xml =================================================================== --- portal/trunk/packaging/jboss-as5/pkg/pom.xml 2011-06-21 22:50:45 UTC (rev 6697) +++ portal/trunk/packaging/jboss-as5/pkg/pom.xml 2011-06-21 23:23:41 UTC (rev 6698) @@ -1,14 +1,12 @@ <?xml version="1.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"> +<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.portal</groupId> <artifactId>exo.portal.packaging.jboss5</artifactId> - <version>3.2.0-M01-SNAPSHOT</version> + <version>3.2.0-M01</version> </parent> <artifactId>exo.portal.packaging.jboss5.pkg</artifactId> @@ -846,14 +844,14 @@ <!-- War files --> <dependency> - <?expand ?> + <?expand?> <?move gatein.ear/01eXoResources.war?> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.web.eXoResources</artifactId> <type>war</type> </dependency> <dependency> - <?expand ?> + <?expand?> <?move gatein.ear/02portal.war?> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.web.portal</artifactId> @@ -979,9 +977,9 @@ <configuration> <target> <ant antfile="${project.basedir}/package.xml" inheritRefs="true"> - <target name="package"/> - <property name="maven.project.basedir" value="${project.basedir}"/> - <property name="maven.project.build.directory" value="${project.build.directory}"/> + <target name="package" /> + <property name="maven.project.basedir" value="${project.basedir}" /> + <property name="maven.project.build.directory" value="${project.build.directory}" /> </ant> </target> </configuration> @@ -1119,7 +1117,7 @@ </goals> <configuration> <target> - <available property="jbossas.dir.exists" type="dir" file="${jbossas.dir}"/> + <available property="jbossas.dir.exists" type="dir" file="${jbossas.dir}" /> <fail if="jbossas.dir.exists">" Destination JBossAS directory exists already: @@ -1129,26 +1127,25 @@ " </fail> - <property name="jbossas.zip" value="${jbossas.path}/jboss-${jbossas.dist.version}.zip"/> + <property name="jbossas.zip" value="${jbossas.path}/jboss-${jbossas.dist.version}.zip" /> <!-- Autocreate servers.dir if necessary --> - <mkdir dir="${jbossas.path}"/> + <mkdir dir="${jbossas.path}" /> <!-- Download JBossAS unless already downloaded --> <ant antfile="${project.basedir}/download-jboss.xml"> - <target name="download-jboss"/> - <property name="url" - value="http://sourceforge.net/projects/jboss/files/JBoss/JBoss-${jbo... - <property name="dest" value="${jbossas.zip}"/> + <target name="download-jboss" /> + <property name="url" value="http://sourceforge.net/projects/jboss/files/JBoss/JBoss-${jbo... /> + <property name="dest" value="${jbossas.zip}" /> </ant> <!-- Extract downloaded JBossAS to servers dir --> - <unzip src="${jbossas.zip}" dest="${jbossas.path}" overwrite="false"/> + <unzip src="${jbossas.zip}" dest="${jbossas.path}" overwrite="false" /> <ant antfile="${project.basedir}/package.xml" inheritRefs="true"> - <target name="package"/> - <property name="maven.project.basedir" value="${project.basedir}"/> - <property name="maven.project.build.directory" value="${project.build.directory}"/> + <target name="package" /> + <property name="maven.project.basedir" value="${project.basedir}" /> + <property name="maven.project.build.directory" value="${project.build.directory}" /> </ant> </target> </configuration> @@ -1176,10 +1173,8 @@ </goals> <configuration> <target> - <zip destfile="${project.build.directory}/GateIn-${project.version}-jbossas.zip" - basedir="${jbossas.target.dir}"/> - <attachartifact file="${project.build.directory}/GateIn-${project.version}-jbossas.zip" - classifier="bundle" type="zip"/> + <zip destfile="${project.build.directory}/GateIn-${project.version}-jbossas.zip" basedir="${jbossas.target.dir}" /> + <attachartifact file="${project.build.directory}/GateIn-${project.version}-jbossas.zip" classifier="bundle" type="zip" /> </target> </configuration> </execution> Modified: portal/trunk/packaging/jboss-as5/pom.xml =================================================================== --- portal/trunk/packaging/jboss-as5/pom.xml 2011-06-21 22:50:45 UTC (rev 6697) +++ portal/trunk/packaging/jboss-as5/pom.xml 2011-06-21 23:23:41 UTC (rev 6698) @@ -1,11 +1,9 @@ -<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"> +<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.portal</groupId> <artifactId>exo.portal.packaging</artifactId> - <version>3.2.0-M01-SNAPSHOT</version> + <version>3.2.0-M01</version> </parent> <artifactId>exo.portal.packaging.jboss5</artifactId> Modified: portal/trunk/packaging/jboss-as6/pkg/pom.xml =================================================================== --- portal/trunk/packaging/jboss-as6/pkg/pom.xml 2011-06-21 22:50:45 UTC (rev 6697) +++ portal/trunk/packaging/jboss-as6/pkg/pom.xml 2011-06-21 23:23:41 UTC (rev 6698) @@ -1,14 +1,12 @@ <?xml version="1.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"> +<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.portal</groupId> <artifactId>exo.portal.packaging.jboss6</artifactId> - <version>3.2.0-M01-SNAPSHOT</version> + <version>3.2.0-M01</version> </parent> <artifactId>exo.portal.packaging.jboss6.pkg</artifactId> @@ -837,14 +835,14 @@ <!-- War files --> <dependency> - <?expand ?> + <?expand?> <?move gatein.ear/01eXoResources.war?> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.web.eXoResources</artifactId> <type>war</type> </dependency> <dependency> - <?expand ?> + <?expand?> <?move gatein.ear/02portal.war?> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.web.portal</artifactId> @@ -970,9 +968,9 @@ <configuration> <target> <ant antfile="${project.basedir}/package.xml" inheritRefs="true"> - <target name="package"/> - <property name="maven.project.basedir" value="${project.basedir}"/> - <property name="maven.project.build.directory" value="${project.build.directory}"/> + <target name="package" /> + <property name="maven.project.basedir" value="${project.basedir}" /> + <property name="maven.project.build.directory" value="${project.build.directory}" /> </ant> </target> </configuration> @@ -1110,7 +1108,7 @@ </goals> <configuration> <target> - <available property="jbossas.dir.exists" type="dir" file="${jbossas.dir}"/> + <available property="jbossas.dir.exists" type="dir" file="${jbossas.dir}" /> <fail if="jbossas.dir.exists">" Destination JBossAS directory exists already: @@ -1120,27 +1118,25 @@ " </fail> - <property name="jbossas.zip" - value="${jbossas.path}/jboss-as-distribution-${jbossas.dist.version}.zip"/> + <property name="jbossas.zip" value="${jbossas.path}/jboss-as-distribution-${jbossas.dist.version}.zip" /> <!-- Autocreate servers.dir if necessary --> - <mkdir dir="${jbossas.path}"/> + <mkdir dir="${jbossas.path}" /> <!-- Download JBossAS unless already downloaded --> <ant antfile="${project.basedir}/download-jboss.xml"> - <target name="download-jboss"/> - <property name="url" - value="http://sourceforge.net/projects/jboss/files/JBoss/JBoss-${jbo... - <property name="dest" value="${jbossas.zip}"/> + <target name="download-jboss" /> + <property name="url" value="http://sourceforge.net/projects/jboss/files/JBoss/JBoss-${jbo... /> + <property name="dest" value="${jbossas.zip}" /> </ant> <!-- Extract downloaded JBossAS to servers dir --> - <unzip src="${jbossas.zip}" dest="${jbossas.path}" overwrite="false"/> + <unzip src="${jbossas.zip}" dest="${jbossas.path}" overwrite="false" /> <ant antfile="${project.basedir}/package.xml" inheritRefs="true"> - <target name="package"/> - <property name="maven.project.basedir" value="${project.basedir}"/> - <property name="maven.project.build.directory" value="${project.build.directory}"/> + <target name="package" /> + <property name="maven.project.basedir" value="${project.basedir}" /> + <property name="maven.project.build.directory" value="${project.build.directory}" /> </ant> </target> </configuration> @@ -1168,10 +1164,8 @@ </goals> <configuration> <target> - <zip destfile="${project.build.directory}/GateIn-${project.version}-jbossas6.zip" - basedir="${jbossas.target.dir}"/> - <attachartifact file="${project.build.directory}/GateIn-${project.version}-jbossas6.zip" - classifier="bundle" type="zip"/> + <zip destfile="${project.build.directory}/GateIn-${project.version}-jbossas6.zip" basedir="${jbossas.target.dir}" /> + <attachartifact file="${project.build.directory}/GateIn-${project.version}-jbossas6.zip" classifier="bundle" type="zip" /> </target> </configuration> </execution> Modified: portal/trunk/packaging/jboss-as6/pom.xml =================================================================== --- portal/trunk/packaging/jboss-as6/pom.xml 2011-06-21 22:50:45 UTC (rev 6697) +++ portal/trunk/packaging/jboss-as6/pom.xml 2011-06-21 23:23:41 UTC (rev 6698) @@ -1,11 +1,9 @@ -<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"> +<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.portal</groupId> <artifactId>exo.portal.packaging</artifactId> - <version>3.2.0-M01-SNAPSHOT</version> + <version>3.2.0-M01</version> </parent> <artifactId>exo.portal.packaging.jboss6</artifactId> Modified: portal/trunk/packaging/jetty/pkg/pom.xml =================================================================== --- portal/trunk/packaging/jetty/pkg/pom.xml 2011-06-21 22:50:45 UTC (rev 6697) +++ portal/trunk/packaging/jetty/pkg/pom.xml 2011-06-21 23:23:41 UTC (rev 6698) @@ -1,14 +1,12 @@ <?xml version="1.0"?> <?rename tofile="portal.war"?> -<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"> +<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.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>3.2.0-M01-SNAPSHOT</version> + <version>3.2.0-M01</version> </parent> <artifactId>exo.portal.packaging.jetty.pkg</artifactId> <packaging>pom</packaging> @@ -835,16 +833,11 @@ <target> <!-- Copy the dependencies --> - <dependencyfilesets/> - <xslt - basedir="${project.basedir}" - destdir="${project.build.directory}" - includes="pom.xml" - extension=".xml" - style="${project.basedir}/transform.xsl"> - <param name="lib.dir" expression="${project.build.directory}/jetty/lib"/> - <param name="webapps.dir" expression="${project.build.directory}/jetty/webapps"/> - <mapper type="glob" from="pom.xml" to="copy-dependencies.xml"/> + <dependencyfilesets /> + <xslt basedir="${project.basedir}" destdir="${project.build.directory}" includes="pom.xml" extension=".xml" style="${project.basedir}/transform.xsl"> + <param name="lib.dir" expression="${project.build.directory}/jetty/lib" /> + <param name="webapps.dir" expression="${project.build.directory}/jetty/webapps" /> + <mapper type="glob" from="pom.xml" to="copy-dependencies.xml" /> </xslt> <ant antfile="${project.build.directory}/copy-dependencies.xml" inheritRefs="true"> <target name="copy-dependencies" /> @@ -853,24 +846,24 @@ <!-- Copy jetty --> <copy todir="${project.build.directory}/jetty"> <fileset dir="${jetty.dir}"> - <exclude name="webapps/**"/> - <exclude name="contexts/**"/> + <exclude name="webapps/**" /> + <exclude name="contexts/**" /> </fileset> </copy> <!-- Copy configuration --> <copy todir="${project.build.directory}/jetty" overwrite="true"> - <fileset dir="${project.basedir}/src/main/resources/jetty"/> + <fileset dir="${project.basedir}/src/main/resources/jetty" /> </copy> <!-- Copy configuration --> <copy tofile="${project.build.directory}/jetty/gatein/conf/configuration.properties"> - <fileset dir="${project.basedir}/../../../component/common/src/main/java/conf" includes="configuration-jetty.properties"/> + <fileset dir="${project.basedir}/../../../component/common/src/main/java/conf" includes="configuration-jetty.properties" /> </copy> <!-- File permissions --> - <chmod perm="0644" type="file" dir="${project.build.directory}/jetty/bin" excludes="**/*.sh"/> - <chmod perm="0755" type="file" dir="${project.build.directory}/jetty/bin" includes="**/*.sh"/> + <chmod perm="0644" type="file" dir="${project.build.directory}/jetty/bin" excludes="**/*.sh" /> + <chmod perm="0755" type="file" dir="${project.build.directory}/jetty/bin" includes="**/*.sh" /> </target> </configuration> @@ -898,8 +891,8 @@ </goals> <configuration> <target> - <zip destfile="${project.build.directory}/jetty.zip" basedir="${project.build.directory}/jetty"/> - <attachartifact file="${project.build.directory}/jetty.zip" classifier="bundle" type="zip"/> + <zip destfile="${project.build.directory}/jetty.zip" basedir="${project.build.directory}/jetty" /> + <attachartifact file="${project.build.directory}/jetty.zip" classifier="bundle" type="zip" /> </target> </configuration> </execution> Modified: portal/trunk/packaging/jetty/pom.xml =================================================================== --- portal/trunk/packaging/jetty/pom.xml 2011-06-21 22:50:45 UTC (rev 6697) +++ portal/trunk/packaging/jetty/pom.xml 2011-06-21 23:23:41 UTC (rev 6698) @@ -1,11 +1,9 @@ -<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"> +<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.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>3.2.0-M01-SNAPSHOT</version> + <version>3.2.0-M01</version> </parent> <artifactId>exo.portal.packaging.jetty</artifactId> <packaging>pom</packaging> Modified: portal/trunk/packaging/pom.xml =================================================================== --- portal/trunk/packaging/pom.xml 2011-06-21 22:50:45 UTC (rev 6697) +++ portal/trunk/packaging/pom.xml 2011-06-21 23:23:41 UTC (rev 6698) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>3.2.0-M01-SNAPSHOT</version> + <version>3.2.0-M01</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: portal/trunk/packaging/tomcat/integration/pom.xml =================================================================== --- portal/trunk/packaging/tomcat/integration/pom.xml 2011-06-21 22:50:45 UTC (rev 6697) +++ portal/trunk/packaging/tomcat/integration/pom.xml 2011-06-21 23:23:41 UTC (rev 6698) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.web</artifactId> - <version>3.2.0-M01-SNAPSHOT</version> + <version>3.2.0-M01</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: portal/trunk/packaging/tomcat/pkg/pom.xml =================================================================== --- portal/trunk/packaging/tomcat/pkg/pom.xml 2011-06-21 22:50:45 UTC (rev 6697) +++ portal/trunk/packaging/tomcat/pkg/pom.xml 2011-06-21 23:23:41 UTC (rev 6698) @@ -1,14 +1,12 @@ <?xml version="1.0"?> <?rename tofile="portal.war"?> -<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"> +<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.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>3.2.0-M01-SNAPSHOT</version> + <version>3.2.0-M01</version> </parent> <artifactId>exo.portal.packaging.tomcat.pkg</artifactId> <packaging>pom</packaging> @@ -790,7 +788,7 @@ <?rename integration.war?> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.packaging.tomcat.integration</artifactId> - <version>3.2.0-M01-SNAPSHOT</version> + <version>3.2.0-M01</version> <type>war</type> </dependency> @@ -837,16 +835,11 @@ <configuration> <target> <!-- Copy the dependencies --> - <dependencyfilesets/> - <xslt - basedir="${project.basedir}" - destdir="${project.build.directory}" - includes="pom.xml" - extension=".xml" - style="${project.basedir}/transform.xsl"> - <param name="lib.dir" expression="${project.build.directory}/tomcat/lib"/> - <param name="webapps.dir" expression="${project.build.directory}/tomcat/webapps"/> - <mapper type="glob" from="pom.xml" to="copy-dependencies.xml"/> + <dependencyfilesets /> + <xslt basedir="${project.basedir}" destdir="${project.build.directory}" includes="pom.xml" extension=".xml" style="${project.basedir}/transform.xsl"> + <param name="lib.dir" expression="${project.build.directory}/tomcat/lib" /> + <param name="webapps.dir" expression="${project.build.directory}/tomcat/webapps" /> + <mapper type="glob" from="pom.xml" to="copy-dependencies.xml" /> </xslt> <ant antfile="${project.build.directory}/copy-dependencies.xml" inheritRefs="true"> <target name="copy-dependencies" /> @@ -854,12 +847,12 @@ <!-- Copy configuration --> <copy todir="${project.build.directory}/tomcat"> - <fileset dir="${project.basedir}/src/main/resources/tomcat"/> + <fileset dir="${project.basedir}/src/main/resources/tomcat" /> </copy> <!-- Copy configuration --> <copy tofile="${project.build.directory}/tomcat/gatein/conf/configuration.properties"> - <fileset dir="${project.basedir}/../../../component/common/src/main/java/conf" includes="configuration-tomcat.properties"/> + <fileset dir="${project.basedir}/../../../component/common/src/main/java/conf" includes="configuration-tomcat.properties" /> </copy> </target> Modified: portal/trunk/packaging/tomcat/pkg/tc6/pom.xml =================================================================== --- portal/trunk/packaging/tomcat/pkg/tc6/pom.xml 2011-06-21 22:50:45 UTC (rev 6697) +++ portal/trunk/packaging/tomcat/pkg/tc6/pom.xml 2011-06-21 23:23:41 UTC (rev 6698) @@ -1,14 +1,12 @@ <?xml version="1.0"?> <?rename tofile="portal.war"?> -<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"> +<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.portal</groupId> <artifactId>exo.portal.packaging.tomcat.pkg</artifactId> - <version>3.2.0-M01-SNAPSHOT</version> + <version>3.2.0-M01</version> </parent> <artifactId>exo.portal.packaging.tomcat.pkg.tc6</artifactId> <packaging>pom</packaging> @@ -85,9 +83,9 @@ <configuration> <target> <ant antfile="${project.basedir}/package.xml" inheritRefs="true"> - <target name="package"/> - <property name="maven.project.basedir" value="${project.basedir}"/> - <property name="maven.project.build.directory" value="${project.build.directory}"/> + <target name="package" /> + <property name="maven.project.basedir" value="${project.basedir}" /> + <property name="maven.project.build.directory" value="${project.build.directory}" /> </ant> </target> </configuration> @@ -126,42 +124,29 @@ <configuration> <target> <!-- Autocreate servers.dir if necessary --> - <mkdir dir="${tomcat.path}"/> + <mkdir dir="${tomcat.path}" /> <!-- Fetch tomcat6 mirror url, then .zip --> <get dest="${project.build.directory}/mirror.xml" skipexisting="true"> - <url url="http://tomcat.apache.org/download-60.cgi"/> + <url url="http://tomcat.apache.org/download-60.cgi" /> </get> - <replaceregexp file="${project.build.directory}/mirror.xml" - match="&lt;!DOCTYPE(.*)&gt;" - replace="" - byline="true"/> + <replaceregexp file="${project.build.directory}/mirror.xml" match="&lt;!DOCTYPE(.*)&gt;" replace="" byline="true" /> - <xslt - basedir="${project.build.directory}" - destdir="${project.build.directory}" - includes="mirror.xml" - extension=".xml" - style="${project.basedir}/extract-download-urls.xsl"> + <xslt basedir="${project.build.directory}" destdir="${project.build.directory}" includes="mirror.xml" extension=".xml" style="${project.basedir}/extract-download-urls.xsl"> - <mapper type="glob" from="mirror.xml" to="download-urls.xml"/> + <mapper type="glob" from="mirror.xml" to="download-urls.xml" /> </xslt> - <replaceregexp file="${project.build.directory}/download-urls.xml" - match="&lt;dir.name&gt;(.*)/apache-tomcat-(.*).zip&lt;/dir.name&gt;" - replace="&lt;dir.name&gt;apache-tomcat-\2&lt;/dir.name&gt;" - byline="true"/> + <replaceregexp file="${project.build.directory}/download-urls.xml" match="&lt;dir.name&gt;(.*)/apache-tomcat-(.*).zip&lt;/dir.name&gt;" replace="&lt;dir.name&gt;apache-tomcat-\2&lt;/dir.name&gt;" byline="true" /> - <xmlproperty file="${project.build.directory}/download-urls.xml"/> + <xmlproperty file="${project.build.directory}/download-urls.xml" /> - <basename file="${tomcat.download.url}" property="tomcat.file.name"/> - <property name="tomcat.zip" - value="${tomcat.path}/${tomcat.file.name}"/> - <property name="tomcat.dir.effective" - value="${tomcat.path}/${tomcat.download.dir.name}"/> + <basename file="${tomcat.download.url}" property="tomcat.file.name" /> + <property name="tomcat.zip" value="${tomcat.path}/${tomcat.file.name}" /> + <property name="tomcat.dir.effective" value="${tomcat.path}/${tomcat.download.dir.name}" /> - <available property="tomcat.dir.exists" type="dir" file="${tomcat.dir.effective}"/> + <available property="tomcat.dir.exists" type="dir" file="${tomcat.dir.effective}" /> <!-- echoproperties / --> @@ -176,20 +161,20 @@ <!-- Download Tomcat unless already downloaded --> <ant antfile="${project.basedir}/download-tomcat.xml"> - <target name="download-tomcat"/> - <property name="url" value="${tomcat.download.url}"/> - <property name="md5.url" value="${tomcat.download.url.md5}"/> - <property name="dest" value="${tomcat.zip}"/> + <target name="download-tomcat" /> + <property name="url" value="${tomcat.download.url}" /> + <property name="md5.url" value="${tomcat.download.url.md5}" /> + <property name="dest" value="${tomcat.zip}" /> </ant> <!-- Extract downloaded Tomcat to servers dir --> - <unzip src="${tomcat.zip}" dest="${tomcat.path}" overwrite="false"/> + <unzip src="${tomcat.zip}" dest="${tomcat.path}" overwrite="false" /> <ant antfile="${project.basedir}/package.xml" inheritRefs="true"> - <target name="package"/> - <property name="tomcat.dir" value="${tomcat.dir.effective}"/> - <property name="maven.project.basedir" value="${project.basedir}"/> - <property name="maven.project.build.directory" value="${project.build.directory}"/> + <target name="package" /> + <property name="tomcat.dir" value="${tomcat.dir.effective}" /> + <property name="maven.project.basedir" value="${project.basedir}" /> + <property name="maven.project.build.directory" value="${project.build.directory}" /> </ant> </target> @@ -218,9 +203,8 @@ </goals> <configuration> <target> - <zip destfile="${project.build.directory}/tomcat6.zip" - basedir="${project.build.directory}/tomcat6"/> - <attachartifact file="${project.build.directory}/tomcat6.zip" classifier="bundle" type="zip"/> + <zip destfile="${project.build.directory}/tomcat6.zip" basedir="${project.build.directory}/tomcat6" /> + <attachartifact file="${project.build.directory}/tomcat6.zip" classifier="bundle" type="zip" /> </target> </configuration> </execution> Modified: portal/trunk/packaging/tomcat/pkg/tc7/pom.xml =================================================================== --- portal/trunk/packaging/tomcat/pkg/tc7/pom.xml 2011-06-21 22:50:45 UTC (rev 6697) +++ portal/trunk/packaging/tomcat/pkg/tc7/pom.xml 2011-06-21 23:23:41 UTC (rev 6698) @@ -1,14 +1,12 @@ <?xml version="1.0"?> <?rename tofile="portal.war"?> -<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"> +<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.portal</groupId> <artifactId>exo.portal.packaging.tomcat.pkg</artifactId> - <version>3.2.0-M01-SNAPSHOT</version> + <version>3.2.0-M01</version> </parent> <artifactId>exo.portal.packaging.tomcat.pkg.tc7</artifactId> <packaging>pom</packaging> @@ -85,9 +83,9 @@ <configuration> <target> <ant antfile="${project.basedir}/package.xml" inheritRefs="true"> - <target name="package"/> - <property name="maven.project.basedir" value="${project.basedir}"/> - <property name="maven.project.build.directory" value="${project.build.directory}"/> + <target name="package" /> + <property name="maven.project.basedir" value="${project.basedir}" /> + <property name="maven.project.build.directory" value="${project.build.directory}" /> </ant> </target> </configuration> @@ -126,42 +124,29 @@ <configuration> <target> <!-- Autocreate servers.dir if necessary --> - <mkdir dir="${tomcat.path}"/> + <mkdir dir="${tomcat.path}" /> <!-- Fetch tomcat7 mirror url, then .zip --> <get dest="${project.build.directory}/mirror.xml" skipexisting="true"> - <url url="http://tomcat.apache.org/download-70.cgi"/> + <url url="http://tomcat.apache.org/download-70.cgi" /> </get> - <replaceregexp file="${project.build.directory}/mirror.xml" - match="&lt;!DOCTYPE(.*)&gt;" - replace="" - byline="true"/> + <replaceregexp file="${project.build.directory}/mirror.xml" match="&lt;!DOCTYPE(.*)&gt;" replace="" byline="true" /> - <xslt - basedir="${project.build.directory}" - destdir="${project.build.directory}" - includes="mirror.xml" - extension=".xml" - style="${project.basedir}/extract-download-urls.xsl"> + <xslt basedir="${project.build.directory}" destdir="${project.build.directory}" includes="mirror.xml" extension=".xml" style="${project.basedir}/extract-download-urls.xsl"> - <mapper type="glob" from="mirror.xml" to="download-urls.xml"/> + <mapper type="glob" from="mirror.xml" to="download-urls.xml" /> </xslt> - <replaceregexp file="${project.build.directory}/download-urls.xml" - match="&lt;dir.name&gt;(.*)/apache-tomcat-(.*).zip&lt;/dir.name&gt;" - replace="&lt;dir.name&gt;apache-tomcat-\2&lt;/dir.name&gt;" - byline="true"/> + <replaceregexp file="${project.build.directory}/download-urls.xml" match="&lt;dir.name&gt;(.*)/apache-tomcat-(.*).zip&lt;/dir.name&gt;" replace="&lt;dir.name&gt;apache-tomcat-\2&lt;/dir.name&gt;" byline="true" /> - <xmlproperty file="${project.build.directory}/download-urls.xml"/> + <xmlproperty file="${project.build.directory}/download-urls.xml" /> - <basename file="${tomcat.download.url}" property="tomcat.file.name"/> - <property name="tomcat.zip" - value="${tomcat.path}/${tomcat.file.name}"/> - <property name="tomcat.dir.effective" - value="${tomcat.path}/${tomcat.download.dir.name}"/> + <basename file="${tomcat.download.url}" property="tomcat.file.name" /> + <property name="tomcat.zip" value="${tomcat.path}/${tomcat.file.name}" /> + <property name="tomcat.dir.effective" value="${tomcat.path}/${tomcat.download.dir.name}" /> - <available property="tomcat.dir.exists" type="dir" file="${tomcat.dir.effective}"/> + <available property="tomcat.dir.exists" type="dir" file="${tomcat.dir.effective}" /> <!-- echoproperties / --> @@ -176,20 +161,20 @@ <!-- Download Tomcat unless already downloaded --> <ant antfile="${project.basedir}/download-tomcat.xml"> - <target name="download-tomcat"/> - <property name="url" value="${tomcat.download.url}"/> - <property name="md5.url" value="${tomcat.download.url.md5}"/> - <property name="dest" value="${tomcat.zip}"/> + <target name="download-tomcat" /> + <property name="url" value="${tomcat.download.url}" /> + <property name="md5.url" value="${tomcat.download.url.md5}" /> + <property name="dest" value="${tomcat.zip}" /> </ant> <!-- Extract downloaded Tomcat to servers dir --> - <unzip src="${tomcat.zip}" dest="${tomcat.path}" overwrite="false"/> + <unzip src="${tomcat.zip}" dest="${tomcat.path}" overwrite="false" /> <ant antfile="${project.basedir}/package.xml" inheritRefs="true"> - <target name="package"/> - <property name="tomcat.dir" value="${tomcat.dir.effective}"/> - <property name="maven.project.basedir" value="${project.basedir}"/> - <property name="maven.project.build.directory" value="${project.build.directory}"/> + <target name="package" /> + <property name="tomcat.dir" value="${tomcat.dir.effective}" /> + <property name="maven.project.basedir" value="${project.basedir}" /> + <property name="maven.project.build.directory" value="${project.build.directory}" /> </ant> </target> @@ -218,8 +203,8 @@ </goals> <configuration> <target> - <zip destfile="${project.build.directory}/tomcat7.zip" basedir="${project.build.directory}/tomcat7"/> - <attachartifact file="${project.build.directory}/tomcat7.zip" classifier="bundle" type="zip"/> + <zip destfile="${project.build.directory}/tomcat7.zip" basedir="${project.build.directory}/tomcat7" /> + <attachartifact file="${project.build.directory}/tomcat7.zip" classifier="bundle" type="zip" /> </target> </configuration> </execution> Modified: portal/trunk/packaging/tomcat/pom.xml =================================================================== --- portal/trunk/packaging/tomcat/pom.xml 2011-06-21 22:50:45 UTC (rev 6697) +++ portal/trunk/packaging/tomcat/pom.xml 2011-06-21 23:23:41 UTC (rev 6698) @@ -1,11 +1,9 @@ -<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"> +<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.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>3.2.0-M01-SNAPSHOT</version> + <version>3.2.0-M01</version> </parent> <artifactId>exo.portal.packaging.tomcat</artifactId> <packaging>pom</packaging> Modified: portal/trunk/pom.xml =================================================================== --- portal/trunk/pom.xml 2011-06-21 22:50:45 UTC (rev 6697) +++ portal/trunk/pom.xml 2011-06-21 23:23:41 UTC (rev 6698) @@ -19,8 +19,7 @@ --> -<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"> +<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> @@ -32,7 +31,7 @@ <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>3.2.0-M01-SNAPSHOT</version> + <version>3.2.0-M01</version> <packaging>pom</packaging> <name>GateIn - Portal</name> @@ -63,9 +62,9 @@ </properties> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/portal/trunk&... - <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/portal/... - <url>http://fisheye.jboss.org/browse/gatein/portal/trunk</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/portal/tags/3... + <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/portal/... + <url>http://fisheye.jboss.org/browse/gatein/portal/tags/3.2.0-M01</u... </scm> <modules> @@ -377,145 +376,145 @@ <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.common</artifactId> - <version>3.2.0-M01-SNAPSHOT</version> + <version>3.2.0-M01</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.web</artifactId> - <version>3.2.0-M01-SNAPSHOT</version> + <version>3.2.0-M01</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.web.controller</artifactId> - <version>3.2.0-M01-SNAPSHOT</version> + <version>3.2.0-M01</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.web.security</artifactId> - <version>3.2.0-M01-SNAPSHOT</version> + <version>3.2.0-M01</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.web.server</artifactId> - <version>3.2.0-M01-SNAPSHOT</version> + <version>3.2.0-M01</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.web.api</artifactId> - <version>3.2.0-M01-SNAPSHOT</version> + <version>3.2.0-M01</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.web.resources</artifactId> - <version>3.2.0-M01-SNAPSHOT</version> + <version>3.2.0-M01</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.portal</artifactId> - <version>3.2.0-M01-SNAPSHOT</version> + <version>3.2.0-M01</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.portal</artifactId> - <version>3.2.0-M01-SNAPSHOT</version> + <version>3.2.0-M01</version> <type>test-jar</type> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.pc</artifactId> - <version>3.2.0-M01-SNAPSHOT</version> + <version>3.2.0-M01</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.identity</artifactId> - <version>3.2.0-M01-SNAPSHOT</version> + <version>3.2.0-M01</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.resources</artifactId> - <version>3.2.0-M01-SNAPSHOT</version> + <version>3.2.0-M01</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.application-registry</artifactId> - <version>3.2.0-M01-SNAPSHOT</version> + <version>3.2.0-M01</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.scripting</artifactId> - <version>3.2.0-M01-SNAPSHOT</version> + <version>3.2.0-M01</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.management</artifactId> - <version>3.2.0-M01-SNAPSHOT</version> + <version>3.2.0-M01</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.webui.framework</artifactId> - <version>3.2.0-M01-SNAPSHOT</version> + <version>3.2.0-M01</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.webui.portlet</artifactId> - <version>3.2.0-M01-SNAPSHOT</version> + <version>3.2.0-M01</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.webui.portal</artifactId> - <version>3.2.0-M01-SNAPSHOT</version> + <version>3.2.0-M01</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.webui.eXo</artifactId> - <version>3.2.0-M01-SNAPSHOT</version> + <version>3.2.0-M01</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.webui.core</artifactId> - <version>3.2.0-M01-SNAPSHOT</version> + <version>3.2.0-M01</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.webui.dashboard</artifactId> - <version>3.2.0-M01-SNAPSHOT</version> + <version>3.2.0-M01</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.gadgets-core</artifactId> - <version>3.2.0-M01-SNAPSHOT</version> + <version>3.2.0-M01</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.test.core</artifactId> - <version>3.2.0-M01-SNAPSHOT</version> + <version>3.2.0-M01</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.test.core</artifactId> - <version>3.2.0-M01-SNAPSHOT</version> + <version>3.2.0-M01</version> <type>test-jar</type> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.test.jcr</artifactId> - <version>3.2.0-M01-SNAPSHOT</version> + <version>3.2.0-M01</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.test.jcr</artifactId> - <version>3.2.0-M01-SNAPSHOT</version> + <version>3.2.0-M01</version> <type>test-jar</type> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.test.organization</artifactId> - <version>3.2.0-M01-SNAPSHOT</version> + <version>3.2.0-M01</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.test.organization</artifactId> - <version>3.2.0-M01-SNAPSHOT</version> + <version>3.2.0-M01</version> <type>test-jar</type> </dependency> <dependency> @@ -526,55 +525,55 @@ <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.web.portal</artifactId> - <version>3.2.0-M01-SNAPSHOT</version> + <version>3.2.0-M01</version> <type>war</type> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.gadgets-server</artifactId> - <version>3.2.0-M01-SNAPSHOT</version> + <version>3.2.0-M01</version> <type>war</type> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.eXoGadgets</artifactId> - <version>3.2.0-M01-SNAPSHOT</version> + <version>3.2.0-M01</version> <type>war</type> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.portlet.web</artifactId> - <version>3.2.0-M01-SNAPSHOT</version> + <version>3.2.0-M01</version> <type>war</type> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.web.rest</artifactId> - <version>3.2.0-M01-SNAPSHOT</version> + <version>3.2.0-M01</version> <type>war</type> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.portlet.exoadmin</artifactId> - <version>3.2.0-M01-SNAPSHOT</version> + <version>3.2.0-M01</version> <type>war</type> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.web.eXoResources</artifactId> - <version>3.2.0-M01-SNAPSHOT</version> + <version>3.2.0-M01</version> <type>war</type> </dependency> <dependency> <groupId>org.gatein.portal.examples.skins</groupId> <artifactId>gatein-sample-skin</artifactId> - <version>3.2.0-M01-SNAPSHOT</version> + <version>3.2.0-M01</version> <type>war</type> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.portlet.dashboard</artifactId> - <version>3.2.0-M01-SNAPSHOT</version> + <version>3.2.0-M01</version> <type>war</type> </dependency> @@ -842,12 +841,11 @@ <phase>compile</phase> <configuration> <tasks> - <copy failonerror="false" - todir="${project.build.directory}/${project.build.finalName}/WEB-INF/classes"> + <copy failonerror="false" todir="${project.build.directory}/${project.build.finalName}/WEB-INF/classes"> <fileset dir="${basedir}/src/main/webapp/WEB-INF/classes"> - <include name="**/*_en.properties"/> + <include name="**/*_en.properties" /> </fileset> - <globmapper from="*_en.properties" to="*.properties"/> + <globmapper from="*_en.properties" to="*.properties" /> </copy> </tasks> </configuration> @@ -902,7 +900,7 @@ </property> <property> <name>gatein.test.datasource.password</name> - <value/> + <value /> </property> </systemProperties> </configuration> Modified: portal/trunk/portlet/dashboard/pom.xml =================================================================== --- portal/trunk/portlet/dashboard/pom.xml 2011-06-21 22:50:45 UTC (rev 6697) +++ portal/trunk/portlet/dashboard/pom.xml 2011-06-21 23:23:41 UTC (rev 6698) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.portlet</artifactId> - <version>3.2.0-M01-SNAPSHOT</version> + <version>3.2.0-M01</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: portal/trunk/portlet/exoadmin/pom.xml =================================================================== --- portal/trunk/portlet/exoadmin/pom.xml 2011-06-21 22:50:45 UTC (rev 6697) +++ portal/trunk/portlet/exoadmin/pom.xml 2011-06-21 23:23:41 UTC (rev 6698) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.portlet</artifactId> - <version>3.2.0-M01-SNAPSHOT</version> + <version>3.2.0-M01</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: portal/trunk/portlet/pom.xml =================================================================== --- portal/trunk/portlet/pom.xml 2011-06-21 22:50:45 UTC (rev 6697) +++ portal/trunk/portlet/pom.xml 2011-06-21 23:23:41 UTC (rev 6698) @@ -26,7 +26,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>3.2.0-M01-SNAPSHOT</version> + <version>3.2.0-M01</version> </parent> <artifactId>exo.portal.portlet</artifactId> Modified: portal/trunk/portlet/web/pom.xml =================================================================== --- portal/trunk/portlet/web/pom.xml 2011-06-21 22:50:45 UTC (rev 6697) +++ portal/trunk/portlet/web/pom.xml 2011-06-21 23:23:41 UTC (rev 6698) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.portlet</artifactId> - <version>3.2.0-M01-SNAPSHOT</version> + <version>3.2.0-M01</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: portal/trunk/starter/ear/pom.xml =================================================================== --- portal/trunk/starter/ear/pom.xml 2011-06-21 22:50:45 UTC (rev 6697) +++ portal/trunk/starter/ear/pom.xml 2011-06-21 23:23:41 UTC (rev 6698) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>3.2.0-M01-SNAPSHOT</version> + <version>3.2.0-M01</version> <relativePath>../../pom.xml</relativePath> </parent> @@ -38,7 +38,7 @@ <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.starter.war</artifactId> - <version>3.2.0-M01-SNAPSHOT</version> + <version>3.2.0-M01</version> <type>war</type> </dependency> </dependencies> Modified: portal/trunk/starter/pom.xml =================================================================== --- portal/trunk/starter/pom.xml 2011-06-21 22:50:45 UTC (rev 6697) +++ portal/trunk/starter/pom.xml 2011-06-21 23:23:41 UTC (rev 6698) @@ -24,7 +24,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>3.2.0-M01-SNAPSHOT</version> + <version>3.2.0-M01</version> </parent> <artifactId>exo.portal.starter.root</artifactId> Modified: portal/trunk/starter/war/pom.xml =================================================================== --- portal/trunk/starter/war/pom.xml 2011-06-21 22:50:45 UTC (rev 6697) +++ portal/trunk/starter/war/pom.xml 2011-06-21 23:23:41 UTC (rev 6698) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>3.2.0-M01-SNAPSHOT</version> + <version>3.2.0-M01</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: portal/trunk/testsuite/pom.xml =================================================================== --- portal/trunk/testsuite/pom.xml 2011-06-21 22:50:45 UTC (rev 6697) +++ portal/trunk/testsuite/pom.xml 2011-06-21 23:23:41 UTC (rev 6698) @@ -3,7 +3,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>3.2.0-M01-SNAPSHOT</version> + <version>3.2.0-M01</version> </parent> <artifactId>exo.portal.testsuite</artifactId> Modified: portal/trunk/testsuite/selenium-snifftests/pom.xml =================================================================== --- portal/trunk/testsuite/selenium-snifftests/pom.xml 2011-06-21 22:50:45 UTC (rev 6697) +++ portal/trunk/testsuite/selenium-snifftests/pom.xml 2011-06-21 23:23:41 UTC (rev 6698) @@ -3,7 +3,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.testsuite</artifactId> - <version>3.2.0-M01-SNAPSHOT</version> + <version>3.2.0-M01</version> </parent> <artifactId>exo.portal.selenium.snifftests</artifactId> Modified: portal/trunk/testsuite/webuibasedsamples/pom.xml =================================================================== --- portal/trunk/testsuite/webuibasedsamples/pom.xml 2011-06-21 22:50:45 UTC (rev 6697) +++ portal/trunk/testsuite/webuibasedsamples/pom.xml 2011-06-21 23:23:41 UTC (rev 6698) @@ -3,7 +3,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.testsuite</artifactId> - <version>3.2.0-M01-SNAPSHOT</version> + <version>3.2.0-M01</version> </parent> <artifactId>exo.webui.based.samples</artifactId> Modified: portal/trunk/web/eXoResources/pom.xml =================================================================== --- portal/trunk/web/eXoResources/pom.xml 2011-06-21 22:50:45 UTC (rev 6697) +++ portal/trunk/web/eXoResources/pom.xml 2011-06-21 23:23:41 UTC (rev 6698) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.web</artifactId> - <version>3.2.0-M01-SNAPSHOT</version> + <version>3.2.0-M01</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: portal/trunk/web/pom.xml =================================================================== --- portal/trunk/web/pom.xml 2011-06-21 22:50:45 UTC (rev 6697) +++ portal/trunk/web/pom.xml 2011-06-21 23:23:41 UTC (rev 6698) @@ -26,7 +26,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>3.2.0-M01-SNAPSHOT</version> + <version>3.2.0-M01</version> </parent> <artifactId>exo.portal.web</artifactId> Modified: portal/trunk/web/portal/pom.xml =================================================================== --- portal/trunk/web/portal/pom.xml 2011-06-21 22:50:45 UTC (rev 6697) +++ portal/trunk/web/portal/pom.xml 2011-06-21 23:23:41 UTC (rev 6698) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.web</artifactId> - <version>3.2.0-M01-SNAPSHOT</version> + <version>3.2.0-M01</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: portal/trunk/web/rest/pom.xml =================================================================== --- portal/trunk/web/rest/pom.xml 2011-06-21 22:50:45 UTC (rev 6697) +++ portal/trunk/web/rest/pom.xml 2011-06-21 23:23:41 UTC (rev 6698) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.web</artifactId> - <version>3.2.0-M01-SNAPSHOT</version> + <version>3.2.0-M01</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: portal/trunk/webui/core/pom.xml =================================================================== --- portal/trunk/webui/core/pom.xml 2011-06-21 22:50:45 UTC (rev 6697) +++ portal/trunk/webui/core/pom.xml 2011-06-21 23:23:41 UTC (rev 6698) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.webui</artifactId> - <version>3.2.0-M01-SNAPSHOT</version> + <version>3.2.0-M01</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: portal/trunk/webui/dashboard/pom.xml =================================================================== --- portal/trunk/webui/dashboard/pom.xml 2011-06-21 22:50:45 UTC (rev 6697) +++ portal/trunk/webui/dashboard/pom.xml 2011-06-21 23:23:41 UTC (rev 6698) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.webui</artifactId> - <version>3.2.0-M01-SNAPSHOT</version> + <version>3.2.0-M01</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: portal/trunk/webui/eXo/pom.xml =================================================================== --- portal/trunk/webui/eXo/pom.xml 2011-06-21 22:50:45 UTC (rev 6697) +++ portal/trunk/webui/eXo/pom.xml 2011-06-21 23:23:41 UTC (rev 6698) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.webui</artifactId> - <version>3.2.0-M01-SNAPSHOT</version> + <version>3.2.0-M01</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: portal/trunk/webui/framework/pom.xml =================================================================== --- portal/trunk/webui/framework/pom.xml 2011-06-21 22:50:45 UTC (rev 6697) +++ portal/trunk/webui/framework/pom.xml 2011-06-21 23:23:41 UTC (rev 6698) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.webui</artifactId> - <version>3.2.0-M01-SNAPSHOT</version> + <version>3.2.0-M01</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: portal/trunk/webui/pom.xml =================================================================== --- portal/trunk/webui/pom.xml 2011-06-21 22:50:45 UTC (rev 6697) +++ portal/trunk/webui/pom.xml 2011-06-21 23:23:41 UTC (rev 6698) @@ -26,7 +26,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>3.2.0-M01-SNAPSHOT</version> + <version>3.2.0-M01</version> </parent> <artifactId>exo.portal.webui</artifactId> Modified: portal/trunk/webui/portal/pom.xml =================================================================== --- portal/trunk/webui/portal/pom.xml 2011-06-21 22:50:45 UTC (rev 6697) +++ portal/trunk/webui/portal/pom.xml 2011-06-21 23:23:41 UTC (rev 6698) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.webui</artifactId> - <version>3.2.0-M01-SNAPSHOT</version> + <version>3.2.0-M01</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: portal/trunk/webui/portlet/pom.xml =================================================================== --- portal/trunk/webui/portlet/pom.xml 2011-06-21 22:50:45 UTC (rev 6697) +++ portal/trunk/webui/portlet/pom.xml 2011-06-21 23:23:41 UTC (rev 6698) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.webui</artifactId> - <version>3.2.0-M01-SNAPSHOT</version> + <version>3.2.0-M01</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: portal/trunk/wsrp-integration/extension-component/pom.xml =================================================================== --- portal/trunk/wsrp-integration/extension-component/pom.xml 2011-06-21 22:50:45 UTC (rev 6697) +++ portal/trunk/wsrp-integration/extension-component/pom.xml 2011-06-21 23:23:41 UTC (rev 6698) @@ -22,13 +22,11 @@ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> -<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/xsd/maven-4.0.0.xsd"> +<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/xsd/maven-4.0.0.xsd"> <parent> <artifactId>gatein-wsrp-integration-parent</artifactId> <groupId>org.gatein.integration</groupId> - <version>3.2.0-M01-SNAPSHOT</version> + <version>3.2.0-M01</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: portal/trunk/wsrp-integration/extension-config/pom.xml =================================================================== --- portal/trunk/wsrp-integration/extension-config/pom.xml 2011-06-21 22:50:45 UTC (rev 6697) +++ portal/trunk/wsrp-integration/extension-config/pom.xml 2011-06-21 23:23:41 UTC (rev 6698) @@ -21,13 +21,12 @@ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> -<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"> +<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> <artifactId>gatein-wsrp-integration-parent</artifactId> <groupId>org.gatein.integration</groupId> - <version>3.2.0-M01-SNAPSHOT</version> + <version>3.2.0-M01</version> </parent> <artifactId>extension-config</artifactId> Modified: portal/trunk/wsrp-integration/extension-ear-as5/pom.xml =================================================================== --- portal/trunk/wsrp-integration/extension-ear-as5/pom.xml 2011-06-21 22:50:45 UTC (rev 6697) +++ portal/trunk/wsrp-integration/extension-ear-as5/pom.xml 2011-06-21 23:23:41 UTC (rev 6698) @@ -1,199 +1,198 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - ~ JBoss, a division of Red Hat - ~ Copyright 2011, Red Hat Middleware, LLC, and individual - ~ contributors as indicated by the @authors tag. See the - ~ copyright.txt in the distribution for a full listing of - ~ individual contributors. - ~ - ~ This is free software; you can redistribute it and/or modify it - ~ under the terms of the GNU Lesser General Public License as - ~ published by the Free Software Foundation; either version 2.1 of - ~ the License, or (at your option) any later version. - ~ - ~ This software is distributed in the hope that it will be useful, - ~ but WITHOUT ANY WARRANTY; without even the implied warranty of - ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - ~ Lesser General Public License for more details. - ~ - ~ You should have received a copy of the GNU Lesser General Public - ~ License along with this software; if not, write to the Free - ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. - --> - -<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/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.gatein.integration</groupId> +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ JBoss, a division of Red Hat + ~ Copyright 2011, Red Hat Middleware, LLC, and individual + ~ contributors as indicated by the @authors tag. See the + ~ copyright.txt in the distribution for a full listing of + ~ individual contributors. + ~ + ~ This is free software; you can redistribute it and/or modify it + ~ under the terms of the GNU Lesser General Public License as + ~ published by the Free Software Foundation; either version 2.1 of + ~ the License, or (at your option) any later version. + ~ + ~ This software is distributed in the hope that it will be useful, + ~ but WITHOUT ANY WARRANTY; without even the implied warranty of + ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + ~ Lesser General Public License for more details. + ~ + ~ You should have received a copy of the GNU Lesser General Public + ~ License along with this software; if not, write to the Free + ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. + --> + +<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/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.gatein.integration</groupId> <artifactId>gatein-wsrp-integration-parent</artifactId> - <version>3.2.0-M01-SNAPSHOT</version> - </parent> - - <artifactId>extension-ear-as5</artifactId> - <packaging>ear</packaging> - - <name>GateIn WSRP Integration extension EAR for JBoss AS 5</name> - - <dependencies> - <dependency> - <groupId>org.gatein.integration</groupId> - <artifactId>extension-config</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.gatein.integration</groupId> - <artifactId>extension-war</artifactId> - <version>${project.version}</version> - <type>war</type> - </dependency> - <dependency> - <groupId>org.gatein.integration</groupId> - <artifactId>extension-component</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-admin-gui</artifactId> - <version>${org.gatein.wsrp.version}</version> - <type>war</type> - </dependency> - <dependency> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-producer-jb5wss</artifactId> - <version>${org.gatein.wsrp.version}</version> - <type>war</type> - </dependency> - <dependency> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-producer-lib</artifactId> - </dependency> - <dependency> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-consumer</artifactId> - <exclusions> - <exclusion> - <groupId>apache-httpclient</groupId> - <artifactId>commons-httpclient</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-jcr-impl</artifactId> - </dependency> - <dependency> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-common</artifactId> - </dependency> - <dependency> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-wsrp1-ws</artifactId> - </dependency> - <dependency> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-wsrp2-ws</artifactId> - </dependency> - <dependency> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-integration-api</artifactId> - </dependency> - <dependency> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-wss-jboss5</artifactId> - </dependency> - <dependency> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-wss</artifactId> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.6</source> - <target>1.6</target> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-ear-plugin</artifactId> - <configuration> - <displayName>gatein-wsrp-integration</displayName> - <defaultLibBundleDir>lib</defaultLibBundleDir> - <modules> - <webModule> - <groupId>org.gatein.integration</groupId> - <artifactId>extension-war</artifactId> - <contextRoot>gatein-wsrp-integration</contextRoot> - </webModule> - <webModule> - <groupId>org.gatein.wsrp</groupId> + <version>3.2.0-M01</version> + </parent> + + <artifactId>extension-ear-as5</artifactId> + <packaging>ear</packaging> + + <name>GateIn WSRP Integration extension EAR for JBoss AS 5</name> + + <dependencies> + <dependency> + <groupId>org.gatein.integration</groupId> + <artifactId>extension-config</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.gatein.integration</groupId> + <artifactId>extension-war</artifactId> + <version>${project.version}</version> + <type>war</type> + </dependency> + <dependency> + <groupId>org.gatein.integration</groupId> + <artifactId>extension-component</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-admin-gui</artifactId> + <version>${org.gatein.wsrp.version}</version> + <type>war</type> + </dependency> + <dependency> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-producer-jb5wss</artifactId> + <version>${org.gatein.wsrp.version}</version> + <type>war</type> + </dependency> + <dependency> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-producer-lib</artifactId> + </dependency> + <dependency> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-consumer</artifactId> + <exclusions> + <exclusion> + <groupId>apache-httpclient</groupId> + <artifactId>commons-httpclient</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-jcr-impl</artifactId> + </dependency> + <dependency> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-common</artifactId> + </dependency> + <dependency> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-wsrp1-ws</artifactId> + </dependency> + <dependency> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-wsrp2-ws</artifactId> + </dependency> + <dependency> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-integration-api</artifactId> + </dependency> + <dependency> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-wss-jboss5</artifactId> + </dependency> + <dependency> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-wss</artifactId> + </dependency> + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>1.6</source> + <target>1.6</target> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-ear-plugin</artifactId> + <configuration> + <displayName>gatein-wsrp-integration</displayName> + <defaultLibBundleDir>lib</defaultLibBundleDir> + <modules> + <webModule> + <groupId>org.gatein.integration</groupId> + <artifactId>extension-war</artifactId> + <contextRoot>gatein-wsrp-integration</contextRoot> + </webModule> + <webModule> + <groupId>org.gatein.wsrp</groupId> <artifactId>wsrp-producer-jb5wss</artifactId> <contextRoot>wsrp-producer</contextRoot> - </webModule> - <webModule> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-admin-gui</artifactId> - <contextRoot>wsrp-admin-gui</contextRoot> - </webModule> - <jarModule> - <groupId>org.gatein.integration</groupId> - <artifactId>extension-config</artifactId> - <includeInApplicationXml>true</includeInApplicationXml> - <bundleDir>/</bundleDir> - </jarModule> - <jarModule> - <groupId>org.gatein.integration</groupId> - <artifactId>extension-component</artifactId> - <includeInApplicationXml>true</includeInApplicationXml> - <bundleDir>/</bundleDir> - </jarModule> - <jarModule> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-producer-lib</artifactId> - </jarModule> - <jarModule> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-consumer</artifactId> - </jarModule> - <jarModule> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-jcr-impl</artifactId> - </jarModule> - <jarModule> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-common</artifactId> - </jarModule> - <jarModule> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-wsrp1-ws</artifactId> - </jarModule> - <jarModule> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-wsrp2-ws</artifactId> - </jarModule> - <jarModule> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-integration-api</artifactId> - </jarModule> - <jarModule> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-wss-jboss5</artifactId> - </jarModule> - <jarModule> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-wss</artifactId> - </jarModule> - </modules> - </configuration> - </plugin> - </plugins> - <finalName>gatein-wsrp-integration</finalName> - </build> - -</project> + </webModule> + <webModule> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-admin-gui</artifactId> + <contextRoot>wsrp-admin-gui</contextRoot> + </webModule> + <jarModule> + <groupId>org.gatein.integration</groupId> + <artifactId>extension-config</artifactId> + <includeInApplicationXml>true</includeInApplicationXml> + <bundleDir>/</bundleDir> + </jarModule> + <jarModule> + <groupId>org.gatein.integration</groupId> + <artifactId>extension-component</artifactId> + <includeInApplicationXml>true</includeInApplicationXml> + <bundleDir>/</bundleDir> + </jarModule> + <jarModule> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-producer-lib</artifactId> + </jarModule> + <jarModule> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-consumer</artifactId> + </jarModule> + <jarModule> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-jcr-impl</artifactId> + </jarModule> + <jarModule> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-common</artifactId> + </jarModule> + <jarModule> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-wsrp1-ws</artifactId> + </jarModule> + <jarModule> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-wsrp2-ws</artifactId> + </jarModule> + <jarModule> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-integration-api</artifactId> + </jarModule> + <jarModule> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-wss-jboss5</artifactId> + </jarModule> + <jarModule> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-wss</artifactId> + </jarModule> + </modules> + </configuration> + </plugin> + </plugins> + <finalName>gatein-wsrp-integration</finalName> + </build> + +</project> Modified: portal/trunk/wsrp-integration/extension-ear-as6/pom.xml =================================================================== --- portal/trunk/wsrp-integration/extension-ear-as6/pom.xml 2011-06-21 22:50:45 UTC (rev 6697) +++ portal/trunk/wsrp-integration/extension-ear-as6/pom.xml 2011-06-21 23:23:41 UTC (rev 6698) @@ -23,15 +23,13 @@ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> -<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/xsd/maven-4.0.0.xsd"> +<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/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.gatein.integration</groupId> <artifactId>gatein-wsrp-integration-parent</artifactId> - <version>3.2.0-M01-SNAPSHOT</version> + <version>3.2.0-M01</version> </parent> <artifactId>extension-ear-as6</artifactId> @@ -67,49 +65,49 @@ <artifactId>wsrp-producer</artifactId> <version>${org.gatein.wsrp.version}</version> <type>war</type> - </dependency> - <dependency> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-producer-lib</artifactId> - </dependency> - <dependency> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-consumer</artifactId> - <exclusions> - <exclusion> - <groupId>apache-httpclient</groupId> - <artifactId>commons-httpclient</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-jcr-impl</artifactId> - </dependency> - <dependency> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-common</artifactId> - </dependency> - <dependency> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-wsrp1-ws</artifactId> - </dependency> - <dependency> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-wsrp2-ws</artifactId> - </dependency> - <dependency> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-integration-api</artifactId> - </dependency> - <dependency> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-wss-jboss5</artifactId> - </dependency> - <dependency> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-wss</artifactId> </dependency> + <dependency> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-producer-lib</artifactId> + </dependency> + <dependency> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-consumer</artifactId> + <exclusions> + <exclusion> + <groupId>apache-httpclient</groupId> + <artifactId>commons-httpclient</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-jcr-impl</artifactId> + </dependency> + <dependency> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-common</artifactId> + </dependency> + <dependency> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-wsrp1-ws</artifactId> + </dependency> + <dependency> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-wsrp2-ws</artifactId> + </dependency> + <dependency> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-integration-api</artifactId> + </dependency> + <dependency> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-wss-jboss5</artifactId> + </dependency> + <dependency> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-wss</artifactId> + </dependency> </dependencies> <build> @@ -127,7 +125,7 @@ <artifactId>maven-ear-plugin</artifactId> <configuration> <displayName>gatein-wsrp-integration</displayName> - <defaultLibBundleDir>lib</defaultLibBundleDir> + <defaultLibBundleDir>lib</defaultLibBundleDir> <modules> <webModule> <groupId>org.gatein.integration</groupId> @@ -155,43 +153,43 @@ <artifactId>extension-component</artifactId> <includeInApplicationXml>true</includeInApplicationXml> <bundleDir>/</bundleDir> - </jarModule> - <jarModule> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-producer-lib</artifactId> - </jarModule> - <jarModule> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-consumer</artifactId> - </jarModule> - <jarModule> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-jcr-impl</artifactId> - </jarModule> - <jarModule> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-common</artifactId> - </jarModule> - <jarModule> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-wsrp1-ws</artifactId> - </jarModule> - <jarModule> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-wsrp2-ws</artifactId> - </jarModule> - <jarModule> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-integration-api</artifactId> - </jarModule> - <jarModule> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-wss-jboss5</artifactId> - </jarModule> - <jarModule> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-wss</artifactId> </jarModule> + <jarModule> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-producer-lib</artifactId> + </jarModule> + <jarModule> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-consumer</artifactId> + </jarModule> + <jarModule> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-jcr-impl</artifactId> + </jarModule> + <jarModule> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-common</artifactId> + </jarModule> + <jarModule> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-wsrp1-ws</artifactId> + </jarModule> + <jarModule> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-wsrp2-ws</artifactId> + </jarModule> + <jarModule> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-integration-api</artifactId> + </jarModule> + <jarModule> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-wss-jboss5</artifactId> + </jarModule> + <jarModule> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-wss</artifactId> + </jarModule> </modules> </configuration> </plugin> Modified: portal/trunk/wsrp-integration/extension-war/pom.xml =================================================================== --- portal/trunk/wsrp-integration/extension-war/pom.xml 2011-06-21 22:50:45 UTC (rev 6697) +++ portal/trunk/wsrp-integration/extension-war/pom.xml 2011-06-21 23:23:41 UTC (rev 6698) @@ -1,43 +1,42 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - ~ JBoss, a division of Red Hat - ~ Copyright 2011, Red Hat Middleware, LLC, and individual - ~ contributors as indicated by the @authors tag. See the - ~ copyright.txt in the distribution for a full listing of - ~ individual contributors. - ~ - ~ This is free software; you can redistribute it and/or modify it - ~ under the terms of the GNU Lesser General Public License as - ~ published by the Free Software Foundation; either version 2.1 of - ~ the License, or (at your option) any later version. - ~ - ~ This software is distributed in the hope that it will be useful, - ~ but WITHOUT ANY WARRANTY; without even the implied warranty of - ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - ~ Lesser General Public License for more details. - ~ - ~ You should have received a copy of the GNU Lesser General Public - ~ License along with this software; if not, write to the Free - ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. - --> - -<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/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - <parent> - <artifactId>gatein-wsrp-integration-parent</artifactId> - <groupId>org.gatein.integration</groupId> - <version>3.2.0-M01-SNAPSHOT</version> - </parent> - - <artifactId>extension-war</artifactId> - <packaging>war</packaging> - - <name>GateIn WSRP Integration extension WAR</name> - - <build> - <finalName>gatein-wsrp-integration</finalName> - </build> - -</project> +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ JBoss, a division of Red Hat + ~ Copyright 2011, Red Hat Middleware, LLC, and individual + ~ contributors as indicated by the @authors tag. See the + ~ copyright.txt in the distribution for a full listing of + ~ individual contributors. + ~ + ~ This is free software; you can redistribute it and/or modify it + ~ under the terms of the GNU Lesser General Public License as + ~ published by the Free Software Foundation; either version 2.1 of + ~ the License, or (at your option) any later version. + ~ + ~ This software is distributed in the hope that it will be useful, + ~ but WITHOUT ANY WARRANTY; without even the implied warranty of + ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + ~ Lesser General Public License for more details. + ~ + ~ You should have received a copy of the GNU Lesser General Public + ~ License along with this software; if not, write to the Free + ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. + --> + +<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/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> + <artifactId>gatein-wsrp-integration-parent</artifactId> + <groupId>org.gatein.integration</groupId> + <version>3.2.0-M01</version> + </parent> + + <artifactId>extension-war</artifactId> + <packaging>war</packaging> + + <name>GateIn WSRP Integration extension WAR</name> + + <build> + <finalName>gatein-wsrp-integration</finalName> + </build> + +</project> Modified: portal/trunk/wsrp-integration/pom.xml =================================================================== --- portal/trunk/wsrp-integration/pom.xml 2011-06-21 22:50:45 UTC (rev 6697) +++ portal/trunk/wsrp-integration/pom.xml 2011-06-21 23:23:41 UTC (rev 6698) @@ -21,22 +21,21 @@ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> -<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"> +<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> <name>GateIn WSRP Integration</name> <groupId>org.gatein.integration</groupId> <artifactId>gatein-wsrp-integration-parent</artifactId> - <version>3.2.0-M01-SNAPSHOT</version> + <version>3.2.0-M01</version> <packaging>pom</packaging> <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>3.2.0-M01-SNAPSHOT</version> + <version>3.2.0-M01</version> </parent> <description>GateIn WSRP Integration extension parent</description> @@ -57,15 +56,15 @@ </profile> <profile> <id>pkg-tomcat</id> - <modules/> + <modules /> </profile> <profile> <id>pkg-tomcat7</id> - <modules/> + <modules /> </profile> <profile> <id>pkg-jetty</id> - <modules/> + <modules /> </profile> <profile> <id>pkg-jbossas</id>