Author: julien(a)jboss.com Date: 2008-01-10 15:38:01 -0500 (Thu, 10 Jan 2008) New Revision: 9478 Modified: modules/portlet/trunk/bridge/pom.xml modules/portlet/trunk/build/pom.xml modules/portlet/trunk/federation/pom.xml modules/portlet/trunk/jsr168api/pom.xml modules/portlet/trunk/management/pom.xml modules/portlet/trunk/pom.xml modules/portlet/trunk/portlet/pom.xml modules/portlet/trunk/test/pom.xml Log: normalize artifact ids Modified: modules/portlet/trunk/bridge/pom.xml =================================================================== --- modules/portlet/trunk/bridge/pom.xml 2008-01-10 20:37:49 UTC (rev 9477) +++ modules/portlet/trunk/bridge/pom.xml 2008-01-10 20:38:01 UTC (rev 9478) @@ -2,19 +2,19 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> <groupId>org.jboss.portal.portlet</groupId> - <artifactId>jboss-portal-modules-portlet</artifactId> + <artifactId>module-parent</artifactId> <version>1.2.0-SNAPSHOT</version> <relativePath>../build/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> - <artifactId>bridge</artifactId> + <artifactId>portlet-bridge</artifactId> <packaging>jar</packaging> <name>bridge</name> <dependencies> <dependency> <groupId>org.jboss.portal.portlet</groupId> - <artifactId>portlet</artifactId> + <artifactId>portlet-portlet</artifactId> <version>${project.version}</version> </dependency> <dependency> Modified: modules/portlet/trunk/build/pom.xml =================================================================== --- modules/portlet/trunk/build/pom.xml 2008-01-10 20:37:49 UTC (rev 9477) +++ modules/portlet/trunk/build/pom.xml 2008-01-10 20:38:01 UTC (rev 9478) @@ -17,7 +17,7 @@ </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.portal.portlet</groupId> - <artifactId>jboss-portal-modules-portlet</artifactId> + <artifactId>module-parent</artifactId> <version>1.2.0-SNAPSHOT</version> <packaging>pom</packaging> <name>JBoss Portal Portlet Module</name> @@ -142,22 +142,22 @@ <!--</dependency>--> <dependency> <groupId>org.jboss.portal.common</groupId> - <artifactId>jboss-portal-modules-common</artifactId> + <artifactId>common-common</artifactId> <version>${version.jboss.portal.common}</version> </dependency> <dependency> <groupId>org.jboss.portal.common</groupId> - <artifactId>jboss-portal-modules-common-portal</artifactId> + <artifactId>common-portal</artifactId> <version>${version.jboss.portal.common}</version> </dependency> <dependency> <groupId>org.jboss.portal.common</groupId> - <artifactId>jboss-portal-modules-common-mc</artifactId> + <artifactId>common-mc</artifactId> <version>${version.jboss.portal.common}</version> </dependency> <dependency> <groupId>org.jboss.portal.web</groupId> - <artifactId>portal-web</artifactId> + <artifactId>web-web</artifactId> <version>${version.jboss.portal.web}</version> </dependency> <dependency> @@ -188,7 +188,7 @@ </dependency> <dependency> <groupId>org.jboss.portal.common</groupId> - <artifactId>jboss-portal-modules-common-mc</artifactId> + <artifactId>common-mc</artifactId> <version>${version.jboss.portal.common}</version> </dependency> <dependency> Modified: modules/portlet/trunk/federation/pom.xml =================================================================== --- modules/portlet/trunk/federation/pom.xml 2008-01-10 20:37:49 UTC (rev 9477) +++ modules/portlet/trunk/federation/pom.xml 2008-01-10 20:38:01 UTC (rev 9478) @@ -2,19 +2,19 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> <groupId>org.jboss.portal.portlet</groupId> - <artifactId>jboss-portal-modules-portlet</artifactId> + <artifactId>module-parent</artifactId> <version>1.2.0-SNAPSHOT</version> <relativePath>../build/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> - <artifactId>federation</artifactId> + <artifactId>portlet-federation</artifactId> <packaging>jar</packaging> <name>federation</name> <dependencies> <dependency> <groupId>org.jboss.portal.portlet</groupId> - <artifactId>portlet</artifactId> + <artifactId>portlet-portlet</artifactId> <version>${project.version}</version> </dependency> @@ -27,7 +27,7 @@ </dependency> <dependency> <groupId>org.jboss.portal.portlet</groupId> - <artifactId>portlet</artifactId> + <artifactId>portlet-portlet</artifactId> <version>${project.version}</version> <type>test-jar</type> <scope>test</scope> Modified: modules/portlet/trunk/jsr168api/pom.xml =================================================================== --- modules/portlet/trunk/jsr168api/pom.xml 2008-01-10 20:37:49 UTC (rev 9477) +++ modules/portlet/trunk/jsr168api/pom.xml 2008-01-10 20:38:01 UTC (rev 9478) @@ -2,12 +2,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> <groupId>org.jboss.portal.portlet</groupId> - <artifactId>jboss-portal-modules-portlet</artifactId> + <artifactId>module-parent</artifactId> <version>1.2.0-SNAPSHOT</version> <relativePath>../build/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> - <artifactId>jsr168api</artifactId> + <artifactId>portlet-jsr168api</artifactId> <packaging>jar</packaging> <name>JSR 168 API</name> Modified: modules/portlet/trunk/management/pom.xml =================================================================== --- modules/portlet/trunk/management/pom.xml 2008-01-10 20:37:49 UTC (rev 9477) +++ modules/portlet/trunk/management/pom.xml 2008-01-10 20:38:01 UTC (rev 9478) @@ -2,19 +2,19 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> <groupId>org.jboss.portal.portlet</groupId> - <artifactId>jboss-portal-modules-portlet</artifactId> + <artifactId>module-parent</artifactId> <version>1.2.0-SNAPSHOT</version> <relativePath>../build/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> - <artifactId>management</artifactId> + <artifactId>portlet-management</artifactId> <packaging>jar</packaging> <name>management</name> <dependencies> <dependency> <groupId>org.jboss.portal.portlet</groupId> - <artifactId>portlet</artifactId> + <artifactId>portlet-portlet</artifactId> <version>${project.version}</version> </dependency> </dependencies> Modified: modules/portlet/trunk/pom.xml =================================================================== --- modules/portlet/trunk/pom.xml 2008-01-10 20:37:49 UTC (rev 9477) +++ modules/portlet/trunk/pom.xml 2008-01-10 20:38:01 UTC (rev 9478) @@ -2,7 +2,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.portal.portlet</groupId> - <artifactId>jboss-portal-modules-portlet-aggregator</artifactId> + <artifactId>module-aggregator</artifactId> <packaging>pom</packaging> <name>JBoss Portal Portlet Module Aggregator</name> <version>1.2.0-SNAPSHOT</version> Modified: modules/portlet/trunk/portlet/pom.xml =================================================================== --- modules/portlet/trunk/portlet/pom.xml 2008-01-10 20:37:49 UTC (rev 9477) +++ modules/portlet/trunk/portlet/pom.xml 2008-01-10 20:38:01 UTC (rev 9478) @@ -2,28 +2,28 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> <groupId>org.jboss.portal.portlet</groupId> - <artifactId>jboss-portal-modules-portlet</artifactId> + <artifactId>module-parent</artifactId> <version>1.2.0-SNAPSHOT</version> <relativePath>../build/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> - <artifactId>portlet</artifactId> + <artifactId>portlet-portlet</artifactId> <packaging>jar</packaging> <name>portlet</name> <dependencies> <dependency> <groupId>org.jboss.portal.portlet</groupId> - <artifactId>jsr168api</artifactId> + <artifactId>portlet-jsr168api</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>org.jboss.portal.common</groupId> - <artifactId>jboss-portal-modules-common-portal</artifactId> + <artifactId>common-portal</artifactId> </dependency> <dependency> <groupId>org.jboss.portal.web</groupId> - <artifactId>portal-web</artifactId> + <artifactId>web-web</artifactId> </dependency> <dependency> <groupId>sun-servlet</groupId> Modified: modules/portlet/trunk/test/pom.xml =================================================================== --- modules/portlet/trunk/test/pom.xml 2008-01-10 20:37:49 UTC (rev 9477) +++ modules/portlet/trunk/test/pom.xml 2008-01-10 20:38:01 UTC (rev 9478) @@ -2,20 +2,20 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> <groupId>org.jboss.portal.portlet</groupId> - <artifactId>jboss-portal-modules-portlet</artifactId> + <artifactId>module-parent</artifactId> <version>1.2.0-SNAPSHOT</version> <relativePath>../build/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> - <artifactId>test</artifactId> + <artifactId>portlet-test</artifactId> <packaging>jar</packaging> - <name>integration test</name> + <name>Portlet container test</name> <dependencies> <dependency> <groupId>org.jboss.portal.portlet</groupId> - <artifactId>portlet</artifactId> + <artifactId>portlet-portlet</artifactId> <version>${project.version}</version> <type>test-jar</type> </dependency> @@ -23,7 +23,7 @@ <!--TEST SCOPE--> <dependency> <groupId>org.jboss.portal.portlet</groupId> - <artifactId>portlet</artifactId> + <artifactId>portlet-portlet</artifactId> <version>${project.version}</version> </dependency> <dependency> @@ -32,7 +32,7 @@ </dependency> <dependency> <groupId>org.jboss.portal.common</groupId> - <artifactId>jboss-portal-modules-common-mc</artifactId> + <artifactId>common-mc</artifactId> </dependency> <dependency> <groupId>org.jboss</groupId> @@ -175,12 +175,12 @@ </dependency> <dependency> <groupId>org.jboss.portal.web</groupId> - <artifactId>portal-web</artifactId> + <artifactId>web-web</artifactId> <type>jar</type> </dependency> <dependency> <groupId>org.jboss.portal.portlet</groupId> - <artifactId>jsr168api</artifactId> + <artifactId>portlet-jsr168api</artifactId> <version>${project.version}</version> </dependency> @@ -259,9 +259,9 @@ <property name="dependency.xml-apis.jar" value="${maven.dependency.apache-xerces.xml-apis.jar.path}"/> <property name="dependency.jbossxb.jar" value="${maven.dependency.org.jboss.jbossxb.jar.path}"/> <property name="dependency.jboss-remoting.jar" value="${maven.dependency.jboss.jboss-remoting.jar.path}"/> - <property name="dependency.portal-common.jar" value="${maven.dependency.org.jboss.portal.common.jboss-portal-modules-common.jar.path}"/> - <property name="dependency.portal-common-portal.jar" value="${maven.dependency.org.jboss.portal.common.jboss-portal-modules-common-portal.jar.path}"/> - <property name="dependency.portal-common-mc.jar" value="${maven.dependency.org.jboss.portal.common.jboss-portal-modules-common-mc.jar.path}"/> + <property name="dependency.portal-common.jar" value="${maven.dependency.org.jboss.portal.common.common-common.jar.path}"/> + <property name="dependency.portal-common-portal.jar" value="${maven.dependency.org.jboss.portal.common.common-portal.jar.path}"/> + <property name="dependency.portal-common-mc.jar" value="${maven.dependency.org.jboss.portal.common.common-mc.jar.path}"/> <property name="dependency.jboss-unit.jar" value="${maven.dependency.org.jboss.unit.jboss-unit.jar.path}"/> <property name="dependency.jboss-unit-mc.jar" value="${maven.dependency.org.jboss.unit.jboss-unit-mc.jar.path}"/> <property name="dependency.jboss-unit-remote.jar" value="${maven.dependency.org.jboss.unit.jboss-unit-remote.jar.path}"/> @@ -273,10 +273,10 @@ <property name="dependency.activation.jar" value="${maven.dependency.javax.activation.activation.jar.path}"/> <property name="dependency.junit.jar" value="${maven.dependency.junit.junit.jar.path}"/> <property name="dependency.cargo-manager.war" value="${maven.dependency.cargo.cargo-manager.war.path}"/> - <property name="dependency.portal-web.jar" value="${maven.dependency.org.jboss.portal.web.portal-web.jar.path}"/> - <property name="dependency.jsr168api.jar" value="${maven.dependency.org.jboss.portal.portlet.jsr168api.jar.path}"/> - <property name="dependency.portal-portlet.jar" value="${maven.dependency.org.jboss.portal.portlet.portlet.jar.path}"/> - <property name="dependency.portal-portlet-tests.test-jar" value="${maven.dependency.org.jboss.portal.portlet.portlet.tests.test-jar.path}"/> + <property name="dependency.portal-web.jar" value="${maven.dependency.org.jboss.portal.web.web-web.jar.path}"/> + <property name="dependency.jsr168api.jar" value="${maven.dependency.org.jboss.portal.portlet.portlet-jsr168api.jar.path}"/> + <property name="dependency.portal-portlet.jar" value="${maven.dependency.org.jboss.portal.portlet.portlet-portlet.jar.path}"/> + <property name="dependency.portal-portlet-tests.test-jar" value="${maven.dependency.org.jboss.portal.portlet.portlet-portlet.tests.test-jar.path}"/> <property name="dependency.cargo-core-uberjar.jar" value="${maven.dependency.cargo.cargo-core-uberjar.jar.path}"/> <property name="dependency.cargo-ant.jar" value="${maven.dependency.cargo.cargo-ant.jar.path}"/> <property name="dependency.jaxb-api.jar" value="${maven.dependency.javax.xml.bind.jaxb-api.jar.path}"/> @@ -284,6 +284,7 @@ <ant antfile="${basedir}/src/test/build.xml"> <target name="tests"/> </ant> + </tasks> </configuration> <goals>