[seam-commits] Seam SVN: r14534 - in branches/community/Seam_2_3/examples-ee6/dvdstore: dvdstore-ear and 4 other directories.
seam-commits at lists.jboss.org
seam-commits at lists.jboss.org
Fri Apr 6 11:33:49 EDT 2012
Author: maschmid
Date: 2012-04-06 11:33:47 -0400 (Fri, 06 Apr 2012)
New Revision: 14534
Modified:
branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-ear/pom.xml
branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-ear/src/main/application/META-INF/jboss-deployment-structure.xml
branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-ejb/pom.xml
branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-tests/pom.xml
branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-web/pom.xml
branches/community/Seam_2_3/examples-ee6/dvdstore/pom.xml
Log:
cleanup of the dvdstore example
Modified: branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-ear/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-ear/pom.xml 2012-04-06 14:46:26 UTC (rev 14533)
+++ branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-ear/pom.xml 2012-04-06 15:33:47 UTC (rev 14534)
@@ -11,13 +11,8 @@
<groupId>org.jboss.seam.examples-ee6.dvdstore</groupId>
<artifactId>dvdstore-ear</artifactId>
<packaging>ear</packaging>
- <name>Dvdstore EAR Module</name>
+ <name>Dvdstore EAR Module (EE6)</name>
- <properties>
- <jboss.home>${env.JBOSS_HOME}</jboss.home>
- <jboss.domain>default</jboss.domain>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.jboss.seam.examples-ee6.dvdstore</groupId>
@@ -36,14 +31,6 @@
<scope>compile</scope>
<exclusions>
<exclusion>
- <groupId>com.thoughtworks.xstream</groupId>
- <artifactId>xstream</artifactId>
- </exclusion>
- <exclusion>
- <groupId>xpp3</groupId>
- <artifactId>xpp3_min</artifactId>
- </exclusion>
- <exclusion>
<artifactId>testng</artifactId>
<groupId>org.testng</groupId>
</exclusion>
@@ -61,7 +48,8 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-ear-plugin</artifactId>
- <configuration>
+ <configuration>
+ <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>
@@ -88,18 +76,6 @@
</modules>
</configuration>
</plugin>
- <plugin>
- <groupId>org.jboss.as.plugins</groupId>
- <artifactId>jboss-as-maven-plugin</artifactId>
- <executions>
- <execution>
- <phase></phase>
- <goals>
- <goal>deploy</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
Modified: branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-ear/src/main/application/META-INF/jboss-deployment-structure.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-ear/src/main/application/META-INF/jboss-deployment-structure.xml 2012-04-06 14:46:26 UTC (rev 14533)
+++ branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-ear/src/main/application/META-INF/jboss-deployment-structure.xml 2012-04-06 15:33:47 UTC (rev 14534)
@@ -1,8 +1,5 @@
<jboss-deployment-structure xmlns="urn:jboss:deployment-structure:1.0">
<deployment>
- <exclusions>
- <module name="org.hibernate" slot="main"/>
- </exclusions>
<dependencies>
<module name="org.apache.log4j" export="true"/>
<module name="org.dom4j" export="true"/>
@@ -15,12 +12,4 @@
<module name="com.sun.jsf-impl" export="true"/>
</dependencies>
</deployment>
- <sub-deployment name="dvdstore-web.war">
-
- </sub-deployment>
-
- <sub-deployment name="dvdstore-ejb.jar">
-
- </sub-deployment>
-
-</jboss-deployment-structure>
\ No newline at end of file
+</jboss-deployment-structure>
Modified: branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-ejb/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-ejb/pom.xml 2012-04-06 14:46:26 UTC (rev 14533)
+++ branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-ejb/pom.xml 2012-04-06 15:33:47 UTC (rev 14534)
@@ -11,7 +11,7 @@
<groupId>org.jboss.seam.examples-ee6.dvdstore</groupId>
<artifactId>dvdstore-ejb</artifactId>
<packaging>ejb</packaging>
- <name>Dvdstore EJB Module EE6</name>
+ <name>Dvdstore EJB Module (EE6)</name>
<dependencies>
<dependency>
@@ -19,15 +19,7 @@
<artifactId>jboss-seam</artifactId>
<type>ejb</type>
<exclusions>
- <exclusion>
- <groupId>xpp3</groupId>
- <artifactId>xpp3_min</artifactId>
- </exclusion>
<exclusion>
- <groupId>com.thoughtworks.xstream</groupId>
- <artifactId>xstream</artifactId>
- </exclusion>
- <exclusion>
<artifactId>testng</artifactId>
<groupId>org.testng</groupId>
</exclusion>
@@ -51,8 +43,8 @@
</dependency>
<dependency>
- <groupId>javax.ejb</groupId>
- <artifactId>ejb-api</artifactId>
+ <groupId>org.jboss.spec.javax.ejb</groupId>
+ <artifactId>jboss-ejb-api_3.1_spec</artifactId>
<scope>provided</scope>
</dependency>
@@ -88,12 +80,14 @@
</exclusion>
</exclusions>
</dependency>
+
+ <dependency>
+ <groupId>org.jboss.spec.javax.faces</groupId>
+ <artifactId>jboss-jsf-api_2.0_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
<dependency>
- <groupId>com.sun.faces</groupId>
- <artifactId>jsf-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>org.jbpm.jbpm3</groupId>
<artifactId>jbpm-jpdl</artifactId>
<exclusions>
Modified: branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-tests/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-tests/pom.xml 2012-04-06 14:46:26 UTC (rev 14533)
+++ branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-tests/pom.xml 2012-04-06 15:33:47 UTC (rev 14534)
@@ -10,7 +10,7 @@
<groupId>org.jboss.seam.examples-ee6.dvdstore</groupId>
<artifactId>dvdstore-tests</artifactId>
- <name>Dvdstore Integration Tests Module</name>
+ <name>Dvdstore Integration Tests Module (EE6)</name>
<dependencies>
<dependency>
@@ -31,8 +31,9 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>com.sun.faces</groupId>
- <artifactId>jsf-api</artifactId>
+ <groupId>org.jboss.spec.javax.faces</groupId>
+ <artifactId>jboss-jsf-api_2.0_spec</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.seleniumhq.selenium.server</groupId>
@@ -49,11 +50,10 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>javax.persistence</groupId>
- <artifactId>persistence-api</artifactId>
- <scope>provided</scope>
+ <groupId>org.hibernate.javax.persistence</groupId>
+ <artifactId>hibernate-jpa-2.0-api</artifactId>
+ <scope>provided</scope>
</dependency>
-
<dependency>
<groupId>org.jboss.arquillian.junit</groupId>
<artifactId>arquillian-junit-container</artifactId>
@@ -67,25 +67,16 @@
</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>log4j</groupId>
<artifactId>log4j</artifactId>
<scope>test</scope>
</dependency>
+
<dependency>
- <groupId>javax.transaction</groupId>
- <artifactId>jta</artifactId>
+ <groupId>org.jboss.spec.javax.el</groupId>
+ <artifactId>jboss-el-api_2.2_spec</artifactId>
</dependency>
+
</dependencies>
<build>
Modified: branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-web/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-web/pom.xml 2012-04-06 14:46:26 UTC (rev 14533)
+++ branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-web/pom.xml 2012-04-06 15:33:47 UTC (rev 14534)
@@ -11,7 +11,7 @@
<groupId>org.jboss.seam.examples-ee6.dvdstore</groupId>
<artifactId>dvdstore-web</artifactId>
<packaging>war</packaging>
- <name>Dvdstore Web Module</name>
+ <name>Dvdstore Web Module (EE6)</name>
<properties>
<!-- filtering property for components.xml -->
@@ -29,16 +29,7 @@
<groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam</artifactId>
<type>ejb</type>
- <exclusions>
- <exclusion>
- <groupId>com.thoughtworks.xstream</groupId>
- <artifactId>xstream</artifactId>
- </exclusion>
- <exclusion>
- <groupId>xpp3</groupId>
- <artifactId>xpp3_min</artifactId>
- </exclusion>
- </exclusions>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.seam</groupId>
Modified: branches/community/Seam_2_3/examples-ee6/dvdstore/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/dvdstore/pom.xml 2012-04-06 14:46:26 UTC (rev 14533)
+++ branches/community/Seam_2_3/examples-ee6/dvdstore/pom.xml 2012-04-06 15:33:47 UTC (rev 14534)
@@ -10,7 +10,7 @@
<groupId>org.jboss.seam.examples-ee6</groupId>
<artifactId>dvdstore</artifactId>
<packaging>pom</packaging>
- <name>Dvdstore Example</name>
+ <name>Dvdstore Example (EE6)</name>
<modules>
<module>dvdstore-ejb</module>
More information about the seam-commits
mailing list