Author: aheritier Date: 2009-08-30 21:40:33 -0400 (Sun, 30 Aug 2009) New Revision: 140 Modified: components/pc/trunk/api/pom.xml components/pc/trunk/bridge/pom.xml components/pc/trunk/build/pom.xml components/pc/trunk/controller/pom.xml components/pc/trunk/docs/pom.xml components/pc/trunk/docs/user-guide/pom.xml components/pc/trunk/federation/pom.xml components/pc/trunk/jsr168api/pom.xml components/pc/trunk/management/pom.xml components/pc/trunk/mc/pom.xml components/pc/trunk/pom.xml components/pc/trunk/portal/pom.xml components/pc/trunk/portlet/pom.xml components/pc/trunk/samples/pom.xml components/pc/trunk/test/pom.xml Log: Cleanup (Maven) Modified: components/pc/trunk/api/pom.xml =================================================================== --- components/pc/trunk/api/pom.xml 2009-08-31 00:08:50 UTC (rev 139) +++ components/pc/trunk/api/pom.xml 2009-08-31 01:40:33 UTC (rev 140) @@ -3,15 +3,14 @@ <parent> <groupId>org.gatein.pc</groupId> <artifactId>module-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>2.1.0-SNAPSHOT</version> <relativePath>../build/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.gatein.pc</groupId> <artifactId>pc-api</artifactId> <packaging>jar</packaging> - <name>portlet-api</name> - <url>http://maven.apache.org</url> + <name>GateIn - Portlet Container (api)</name> <dependencies> <dependency> Modified: components/pc/trunk/bridge/pom.xml =================================================================== --- components/pc/trunk/bridge/pom.xml 2009-08-31 00:08:50 UTC (rev 139) +++ components/pc/trunk/bridge/pom.xml 2009-08-31 01:40:33 UTC (rev 140) @@ -3,13 +3,13 @@ <parent> <groupId>org.gatein.pc</groupId> <artifactId>module-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>2.1.0-SNAPSHOT</version> <relativePath>../build/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>pc-bridge</artifactId> <packaging>jar</packaging> - <name>bridge</name> + <name>GateIn - Portlet Container (bridge)</name> <dependencies> <dependency> Modified: components/pc/trunk/build/pom.xml =================================================================== --- components/pc/trunk/build/pom.xml 2009-08-31 00:08:50 UTC (rev 139) +++ components/pc/trunk/build/pom.xml 2009-08-31 01:40:33 UTC (rev 140) @@ -18,10 +18,9 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.gatein.pc</groupId> <artifactId>module-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>2.1.0-SNAPSHOT</version> <packaging>pom</packaging> - <name>JBoss Portal Portlet Module</name> - <description>JBoss Portal Portlet Module</description> + <name>GateIn - Portlet Container (parent)</name> <properties> <version.apache.portals.bridges>1.0.4</version.apache.portals.bridges> @@ -33,8 +32,8 @@ <version.jboss-logging>2.0.4.GA</version.jboss-logging> <version.jbossxb>2.0.0.GA</version.jbossxb> <version.jboss-remoting>2.2.1.GA</version.jboss-remoting> - <version.jboss.portal.common>3.0.0-SNAPSHOT</version.jboss.portal.common> - <version.jboss.portal.web>3.0.0-SNAPSHOT</version.jboss.portal.web> + <version.gatein.common>2.0.0-SNAPSHOT</version.gatein.common> + <version.gatein.wci>2.0.0-SNAPSHOT</version.gatein.wci> <version.jboss.unit>1.2.3</version.jboss.unit> <version.log4j>1.2.14</version.log4j> <version.apache.commons-logging>1.1.1</version.apache.commons-logging> @@ -195,23 +194,23 @@ <dependency> <groupId>org.gatein.common</groupId> <artifactId>common-common</artifactId> - <version>${version.jboss.portal.common}</version> + <version>${version.gatein.common}</version> </dependency> <dependency> <groupId>org.gatein.common</groupId> <artifactId>common-mc</artifactId> - <version>${version.jboss.portal.common}</version> + <version>${version.gatein.common}</version> </dependency> <dependency> <groupId>org.gatein.common</groupId> <artifactId>common-mc</artifactId> - <version>${version.jboss.portal.common}</version> + <version>${version.gatein.common}</version> </dependency> <dependency> <groupId>org.gatein.wci</groupId> <artifactId>wci-wci</artifactId> - <version>${version.jboss.portal.web}</version> + <version>${version.gatein.wci}</version> </dependency> <dependency> Modified: components/pc/trunk/controller/pom.xml =================================================================== --- components/pc/trunk/controller/pom.xml 2009-08-31 00:08:50 UTC (rev 139) +++ components/pc/trunk/controller/pom.xml 2009-08-31 01:40:33 UTC (rev 140) @@ -3,13 +3,13 @@ <parent> <groupId>org.gatein.pc</groupId> <artifactId>module-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>2.1.0-SNAPSHOT</version> <relativePath>../build/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>pc-controller</artifactId> <packaging>jar</packaging> - <name>Portlet controller</name> + <name>GateIn - Portlet Container (controller)</name> <dependencies> Modified: components/pc/trunk/docs/pom.xml =================================================================== --- components/pc/trunk/docs/pom.xml 2009-08-31 00:08:50 UTC (rev 139) +++ components/pc/trunk/docs/pom.xml 2009-08-31 01:40:33 UTC (rev 140) @@ -4,14 +4,12 @@ <parent> <groupId>org.gatein.pc</groupId> <artifactId>module-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>2.1.0-SNAPSHOT</version> <relativePath>../build/pom.xml</relativePath> </parent> <artifactId>docs-aggregator</artifactId> <packaging>pom</packaging> - <name>JBoss Portal Portlet Docs Aggregator</name> - <version>3.0.0-SNAPSHOT</version> - <url>http://labs.jboss.com/jbossportal</url> + <name>GateIn - Portlet Container (docs-aggregator)</name> <modules> <module>user-guide</module> Modified: components/pc/trunk/docs/user-guide/pom.xml =================================================================== --- components/pc/trunk/docs/user-guide/pom.xml 2009-08-31 00:08:50 UTC (rev 139) +++ components/pc/trunk/docs/user-guide/pom.xml 2009-08-31 01:40:33 UTC (rev 140) @@ -11,9 +11,9 @@ </parent> <groupId>org.gatein.pc</groupId> <artifactId>user-guide-${translation}</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>2.1.0-SNAPSHOT</version> <packaging>jdocbook</packaging> - <name>User_Guide_(${translation})</name> + <name>GateIn - Portlet Container (User Guide ${translation})</name> <repositories> Modified: components/pc/trunk/federation/pom.xml =================================================================== --- components/pc/trunk/federation/pom.xml 2009-08-31 00:08:50 UTC (rev 139) +++ components/pc/trunk/federation/pom.xml 2009-08-31 01:40:33 UTC (rev 140) @@ -3,13 +3,13 @@ <parent> <groupId>org.gatein.pc</groupId> <artifactId>module-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>2.1.0-SNAPSHOT</version> <relativePath>../build/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>pc-federation</artifactId> <packaging>jar</packaging> - <name>federation</name> + <name>GateIn - Portlet Container (federation)</name> <dependencies> <dependency> @@ -31,7 +31,7 @@ <version>${project.version}</version> <type>test-jar</type> <scope>test</scope> - </dependency> + </dependency> </dependencies> <build> <plugins> Modified: components/pc/trunk/jsr168api/pom.xml =================================================================== --- components/pc/trunk/jsr168api/pom.xml 2009-08-31 00:08:50 UTC (rev 139) +++ components/pc/trunk/jsr168api/pom.xml 2009-08-31 01:40:33 UTC (rev 140) @@ -3,13 +3,13 @@ <parent> <groupId>org.gatein.pc</groupId> <artifactId>module-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>2.1.0-SNAPSHOT</version> <relativePath>../build/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>pc-jsr168api</artifactId> <packaging>jar</packaging> - <name>JSR 168 API</name> + <name>GateIn - Portlet Container (JSR 168 API)</name> <dependencies> Modified: components/pc/trunk/management/pom.xml =================================================================== --- components/pc/trunk/management/pom.xml 2009-08-31 00:08:50 UTC (rev 139) +++ components/pc/trunk/management/pom.xml 2009-08-31 01:40:33 UTC (rev 140) @@ -3,13 +3,13 @@ <parent> <groupId>org.gatein.pc</groupId> <artifactId>module-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>2.1.0-SNAPSHOT</version> <relativePath>../build/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>pc-management</artifactId> <packaging>jar</packaging> - <name>management</name> + <name>GateIn - Portlet Container (management)</name> <dependencies> <dependency> Modified: components/pc/trunk/mc/pom.xml =================================================================== --- components/pc/trunk/mc/pom.xml 2009-08-31 00:08:50 UTC (rev 139) +++ components/pc/trunk/mc/pom.xml 2009-08-31 01:40:33 UTC (rev 140) @@ -3,13 +3,13 @@ <parent> <groupId>org.gatein.pc</groupId> <artifactId>module-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>2.1.0-SNAPSHOT</version> <relativePath>../build/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>pc-mc</artifactId> <packaging>jar</packaging> - <name>Portlet Container / JBoss MC integration</name> + <name>GateIn - Portlet Container (mc)</name> <dependencies> <dependency> Modified: components/pc/trunk/pom.xml =================================================================== --- components/pc/trunk/pom.xml 2009-08-31 00:08:50 UTC (rev 139) +++ components/pc/trunk/pom.xml 2009-08-31 01:40:33 UTC (rev 140) @@ -4,12 +4,9 @@ <groupId>org.gatein.pc</groupId> <artifactId>module-aggregator</artifactId> <packaging>pom</packaging> - <name>JBoss Portal Portlet Module Aggregator</name> - <version>3.0.0-SNAPSHOT</version> - <url>http://labs.jboss.com/jbossportal</url> + <name>GateIn - Portlet Container (aggregator)</name> + <version>2.1.0-SNAPSHOT</version> - <dependencies/> - <distributionManagement> <repository> <!-- Copy the distribution jar file to a local checkout of the maven repository --> Modified: components/pc/trunk/portal/pom.xml =================================================================== --- components/pc/trunk/portal/pom.xml 2009-08-31 00:08:50 UTC (rev 139) +++ components/pc/trunk/portal/pom.xml 2009-08-31 01:40:33 UTC (rev 140) @@ -3,13 +3,13 @@ <parent> <groupId>org.gatein.pc</groupId> <artifactId>module-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>2.1.0-SNAPSHOT</version> <relativePath>../build/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>pc-portal</artifactId> <packaging>jar</packaging> - <name>Portlet Container Simple Portal</name> + <name>GateIn - Portlet Container (portal)</name> <dependencies> Modified: components/pc/trunk/portlet/pom.xml =================================================================== --- components/pc/trunk/portlet/pom.xml 2009-08-31 00:08:50 UTC (rev 139) +++ components/pc/trunk/portlet/pom.xml 2009-08-31 01:40:33 UTC (rev 140) @@ -3,13 +3,13 @@ <parent> <groupId>org.gatein.pc</groupId> <artifactId>module-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>2.1.0-SNAPSHOT</version> <relativePath>../build/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>pc-portlet</artifactId> <packaging>jar</packaging> - <name>portlet</name> + <name>GateIn - Portlet Container (pc)</name> <dependencies> <!-- Modified: components/pc/trunk/samples/pom.xml =================================================================== --- components/pc/trunk/samples/pom.xml 2009-08-31 00:08:50 UTC (rev 139) +++ components/pc/trunk/samples/pom.xml 2009-08-31 01:40:33 UTC (rev 140) @@ -3,13 +3,13 @@ <parent> <groupId>org.gatein.pc</groupId> <artifactId>module-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>2.1.0-SNAPSHOT</version> <relativePath>../build/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>pc-samples</artifactId> <packaging>jar</packaging> - <name>Portlet Samples</name> + <name>GateIn - Portlet Container (samples)</name> <dependencies> <dependency> Modified: components/pc/trunk/test/pom.xml =================================================================== --- components/pc/trunk/test/pom.xml 2009-08-31 00:08:50 UTC (rev 139) +++ components/pc/trunk/test/pom.xml 2009-08-31 01:40:33 UTC (rev 140) @@ -3,13 +3,13 @@ <parent> <groupId>org.gatein.pc</groupId> <artifactId>module-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>2.1.0-SNAPSHOT</version> <relativePath>../build/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>pc-test</artifactId> <packaging>jar</packaging> - <name>Portlet container test</name> + <name>GateIn - Portlet Container (test)</name> <dependencies>