Author: julien(a)jboss.com Date: 2008-01-10 15:37:38 -0500 (Thu, 10 Jan 2008) New Revision: 9476 Modified: modules/web/trunk/build/pom.xml modules/web/trunk/pom.xml modules/web/trunk/web/pom.xml modules/web/trunk/web/src/test/build.xml Log: normalize artifact ids Modified: modules/web/trunk/build/pom.xml =================================================================== --- modules/web/trunk/build/pom.xml 2008-01-10 20:37:26 UTC (rev 9475) +++ modules/web/trunk/build/pom.xml 2008-01-10 20:37:38 UTC (rev 9476) @@ -17,7 +17,7 @@ </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.portal.web</groupId> - <artifactId>jboss-portal-modules-web</artifactId> + <artifactId>module-parent</artifactId> <version>1.2.0-SNAPSHOT</version> <packaging>pom</packaging> <name>JBoss Portal Test Module</name> @@ -94,7 +94,7 @@ </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> @@ -120,7 +120,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/web/trunk/pom.xml =================================================================== --- modules/web/trunk/pom.xml 2008-01-10 20:37:26 UTC (rev 9475) +++ modules/web/trunk/pom.xml 2008-01-10 20:37:38 UTC (rev 9476) @@ -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.web</groupId> - <artifactId>jboss-portal-modules-web-aggregator</artifactId> + <artifactId>module-aggregator</artifactId> <packaging>pom</packaging> <name>JBoss Portal Web Module</name> <version>1.2.0-SNAPSHOT</version> Modified: modules/web/trunk/web/pom.xml =================================================================== --- modules/web/trunk/web/pom.xml 2008-01-10 20:37:26 UTC (rev 9475) +++ modules/web/trunk/web/pom.xml 2008-01-10 20:37:38 UTC (rev 9476) @@ -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.web</groupId> - <artifactId>jboss-portal-modules-web</artifactId> + <artifactId>module-parent</artifactId> <version>1.2.0-SNAPSHOT</version> <relativePath>../build/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> - <artifactId>portal-web</artifactId> + <artifactId>web-web</artifactId> <packaging>jar</packaging> <name>JBoss Unit</name> @@ -20,7 +20,7 @@ </dependency> <dependency> <groupId>org.jboss.portal.common</groupId> - <artifactId>jboss-portal-modules-common</artifactId> + <artifactId>common-common</artifactId> </dependency> <dependency> <groupId>sun-servlet</groupId> @@ -40,7 +40,7 @@ </dependency> <dependency> <groupId>org.jboss.portal.common</groupId> - <artifactId>jboss-portal-modules-common-mc</artifactId> + <artifactId>common-mc</artifactId> <scope>test</scope> </dependency> <dependency> @@ -339,8 +339,8 @@ <property name="dependency.xml-apis.jar" value="${maven.dependency.apache-xerces.xml-apis.jar.path}"/> <property name="dependency.jbossxb.jar" value="${maven.dependency.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-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-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}"/> Modified: modules/web/trunk/web/src/test/build.xml =================================================================== --- modules/web/trunk/web/src/test/build.xml 2008-01-10 20:37:26 UTC (rev 9475) +++ modules/web/trunk/web/src/test/build.xml 2008-01-10 20:37:38 UTC (rev 9476) @@ -401,7 +401,7 @@ <path location="${dependency.portal-common.jar}"/> <path location="${dependency.jboss-unit.jar}"/> <path location="${dependency.jboss-unit-remote.jar}"/> - <path location="${target}/portal-web-${project.version}.jar"/> + <path location="${target}/web-web-${project.version}.jar"/> </sharedClasspath> <configuration> @@ -514,7 +514,7 @@ <path location="${dependency.activation.jar}"/> <path location="${dependency.junit.jar}"/> - <path location="${target}/portal-web-${project.version}.jar"/> + <path location="${target}/web-web-${project.version}.jar"/> </sharedClasspath> <configuration>