Author: maschmid Date: 2012-04-13 07:37:04 -0400 (Fri, 13 Apr 2012) New Revision: 14569 Modified: branches/community/Seam_2_3/examples-ee6/contactlist/contactlist-ear/pom.xml branches/community/Seam_2_3/examples-ee6/contactlist/contactlist-ejb/pom.xml branches/community/Seam_2_3/examples-ee6/contactlist/contactlist-tests/pom.xml branches/community/Seam_2_3/examples-ee6/contactlist/contactlist-web/pom.xml branches/community/Seam_2_3/examples-ee6/contactlist/pom.xml Log: contactlist example consistency Modified: branches/community/Seam_2_3/examples-ee6/contactlist/contactlist-ear/pom.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/contactlist/contactlist-ear/pom.xml 2012-04-13 11:05:42 UTC (rev 14568) +++ branches/community/Seam_2_3/examples-ee6/contactlist/contactlist-ear/pom.xml 2012-04-13 11:37:04 UTC (rev 14569) @@ -8,7 +8,7 @@ <relativePath>../pom.xml</relativePath> </parent> - <groupId>org.jboss.seam.examples-ee6</groupId> + <groupId>org.jboss.seam.examples-ee6.contactlist</groupId> <artifactId>contactlist-ear</artifactId> <packaging>ear</packaging> <name>Contact List EAR Module (EE6)</name> @@ -20,13 +20,13 @@ <dependencies> <dependency> - <groupId>org.jboss.seam.examples-ee6</groupId> + <groupId>org.jboss.seam.examples-ee6.contactlist</groupId> <artifactId>contactlist-web</artifactId> <version>${project.version}</version> <type>war</type> </dependency> <dependency> - <groupId>org.jboss.seam.examples-ee6</groupId> + <groupId>org.jboss.seam.examples-ee6.contactlist</groupId> <artifactId>contactlist-ejb</artifactId> <version>${project.version}</version> <type>ejb</type> @@ -36,16 +36,6 @@ <artifactId>jboss-seam</artifactId> <type>ejb</type> <scope>compile</scope> - <exclusions> - <exclusion> - <groupId>com.thoughtworks.xstream</groupId> - <artifactId>xstream</artifactId> - </exclusion> - <exclusion> - <groupId>xpp3</groupId> - <artifactId>xpp3_min</artifactId> - </exclusion> - </exclusions> </dependency> </dependencies> @@ -55,30 +45,30 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-ear-plugin</artifactId> - <version>2.3.2</version> <configuration> - <version>5</version> + <version>6</version> <defaultLibBundleDir>lib</defaultLibBundleDir> <!-- Exclude eclipse generated application.xml and manually modified jboss-app.xml during mvn build --> <earSourceExcludes>**/application.xml, **/jboss-app.xml</earSourceExcludes> <!-- use maven generated application.xml instead --> <generateApplicationXml>true</generateApplicationXml> - <jboss> - <version>5</version> - <loader-repository>seam.jboss.org:loader=seam-contactlist.ear</loader-repository> - </jboss> <modules> <webModule> - <groupId>org.jboss.seam.examples-ee6</groupId> + <groupId>org.jboss.seam.examples-ee6.contactlist</groupId> <artifactId>contactlist-web</artifactId> <contextRoot>/seam-contactlist</contextRoot> <bundleFileName>contactlist-web.war</bundleFileName> </webModule> <ejbModule> - <groupId>org.jboss.seam.examples-ee6</groupId> + <groupId>org.jboss.seam.examples-ee6.contactlist</groupId> <artifactId>contactlist-ejb</artifactId> <bundleFileName>contactlist-ejb.jar</bundleFileName> </ejbModule> + <ejbModule> + <groupId>org.jboss.seam</groupId> + <artifactId>jboss-seam</artifactId> + <bundleFileName>jboss-seam.jar</bundleFileName> + </ejbModule> </modules> </configuration> </plugin> @@ -103,21 +93,21 @@ <configuration> <artifactItems> <artifactItem> - <groupId>org.jboss.seam.examples-ee6</groupId> + <groupId>org.jboss.seam.examples-ee6.contactlist</groupId> <artifactId>contactlist-ear</artifactId> <type>ear</type> <overWrite>true</overWrite> <outputDirectory>${project.build.directory}/${project.build.finalName}-exploded/${project.build.finalName}.ear</outputDirectory> </artifactItem> <artifactItem> - <groupId>org.jboss.seam.examples-ee6</groupId> + <groupId>org.jboss.seam.examples-ee6.contactlist</groupId> <artifactId>contactlist-web</artifactId> <type>war</type> <overWrite>true</overWrite> <outputDirectory>${project.build.directory}/${project.build.finalName}-exploded/${project.build.finalName}.ear/${example.name}-web.war</outputDirectory> </artifactItem> <artifactItem> - <groupId>org.jboss.seam.examples-ee6</groupId> + <groupId>org.jboss.seam.examples-ee6.contactlist</groupId> <artifactId>contactlist-ejb</artifactId> <type>jar</type> <overWrite>true</overWrite> @@ -128,17 +118,6 @@ </execution> </executions> </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>jboss-maven-plugin</artifactId> - <configuration> - <jbossHome>${jboss.home}</jbossHome> - <serverName>${jboss.domain}</serverName> - <fileNames> - <directory>${project.build.directory}/${project.build.finalName}-exploded/${project.build.finalName}.ear</directory> - </fileNames> - </configuration> - </plugin> </plugins> </build> </profile> Modified: branches/community/Seam_2_3/examples-ee6/contactlist/contactlist-ejb/pom.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/contactlist/contactlist-ejb/pom.xml 2012-04-13 11:05:42 UTC (rev 14568) +++ branches/community/Seam_2_3/examples-ee6/contactlist/contactlist-ejb/pom.xml 2012-04-13 11:37:04 UTC (rev 14569) @@ -8,7 +8,7 @@ <relativePath>../pom.xml</relativePath> </parent> - <groupId>org.jboss.seam.examples-ee6</groupId> + <groupId>org.jboss.seam.examples-ee6.contactlist</groupId> <artifactId>contactlist-ejb</artifactId> <packaging>ejb</packaging> <name>Contact List EJB Module (EE6)</name> Modified: branches/community/Seam_2_3/examples-ee6/contactlist/contactlist-tests/pom.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/contactlist/contactlist-tests/pom.xml 2012-04-13 11:05:42 UTC (rev 14568) +++ branches/community/Seam_2_3/examples-ee6/contactlist/contactlist-tests/pom.xml 2012-04-13 11:37:04 UTC (rev 14569) @@ -9,14 +9,14 @@ <relativePath>../pom.xml</relativePath> </parent> - <groupId>org.jboss.seam.examples-ee6</groupId> + <groupId>org.jboss.seam.examples-ee6.contactlist</groupId> <artifactId>contactlist-tests</artifactId> <name>Contact List Integration Tests Module (EE6)</name> <dependencies> <dependency> - <groupId>org.jboss.seam.examples-ee6</groupId> + <groupId>org.jboss.seam.examples-ee6.contactlist</groupId> <artifactId>contactlist-ejb</artifactId> <type>ejb</type> <scope>test</scope> @@ -77,17 +77,6 @@ </dependency> <dependency> - <groupId>org.jboss.shrinkwrap.resolver</groupId> - <artifactId>shrinkwrap-resolver-api-maven</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.jboss.shrinkwrap.resolver</groupId> - <artifactId>shrinkwrap-resolver-impl-maven</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.jboss.spec.javax.el</groupId> <artifactId>jboss-el-api_2.2_spec</artifactId> </dependency> @@ -175,17 +164,6 @@ <plugins> <plugin> <groupId>org.codehaus.mojo</groupId> - <artifactId>jboss-maven-plugin</artifactId> - <configuration> - <jbossHome>${jboss.home}</jbossHome> - <serverName>${jboss.domain}</serverName> - <fileNames> - <param>${basedir}/../contactlist-ear/target/seam-contactlist.ear</param> - </fileNames> - </configuration> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> <artifactId>selenium-maven-plugin</artifactId> </plugin> <plugin> Modified: branches/community/Seam_2_3/examples-ee6/contactlist/contactlist-web/pom.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/contactlist/contactlist-web/pom.xml 2012-04-13 11:05:42 UTC (rev 14568) +++ branches/community/Seam_2_3/examples-ee6/contactlist/contactlist-web/pom.xml 2012-04-13 11:37:04 UTC (rev 14569) @@ -8,7 +8,7 @@ <relativePath>../pom.xml</relativePath> </parent> - <groupId>org.jboss.seam.examples-ee6</groupId> + <groupId>org.jboss.seam.examples-ee6.contactlist</groupId> <artifactId>contactlist-web</artifactId> <packaging>war</packaging> <name>Contact List Web Module (EE6)</name> @@ -21,7 +21,7 @@ <dependencies> <dependency> - <groupId>org.jboss.seam.examples-ee6</groupId> + <groupId>org.jboss.seam.examples-ee6.contactlist</groupId> <artifactId>contactlist-ejb</artifactId> <type>ejb</type> <scope>provided</scope> @@ -100,7 +100,7 @@ </properties> <dependencies> <dependency> - <groupId>org.jboss.seam.examples</groupId> + <groupId>org.jboss.seam.examples-ee6.contactlist</groupId> <artifactId>contactlist-ejb</artifactId> <type>ejb</type> <scope>compile</scope> Modified: branches/community/Seam_2_3/examples-ee6/contactlist/pom.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/contactlist/pom.xml 2012-04-13 11:05:42 UTC (rev 14568) +++ branches/community/Seam_2_3/examples-ee6/contactlist/pom.xml 2012-04-13 11:37:04 UTC (rev 14569) @@ -26,19 +26,19 @@ <dependencyManagement> <dependencies> <dependency> - <groupId>org.jboss.seam.examples-ee6</groupId> + <groupId>org.jboss.seam.examples-ee6.contactlist</groupId> <artifactId>contactlist-ejb</artifactId> <version>${project.version}</version> <type>ejb</type> </dependency> <dependency> - <groupId>org.jboss.seam.examples-ee6</groupId> + <groupId>org.jboss.seam.examples-ee6.contactlist</groupId> <artifactId>contactlist-web</artifactId> <version>${project.version}</version> <type>war</type> </dependency> <dependency> - <groupId>org.jboss.seam.examples-ee6</groupId> + <groupId>org.jboss.seam.examples-ee6.contactlist</groupId> <artifactId>contactlist-ear</artifactId> <version>${project.version}</version> </dependency>