Seam SVN: r14521 - in branches/community/Seam_2_3/examples-ee6/remoting/progressbar: progressbar-ejb and 1 other directories.
by seam-commits＠lists.jboss.org
Author: maschmid
Date: 2012-04-05 07:33:49 -0400 (Thu, 05 Apr 2012)
New Revision: 14521
Modified:
branches/community/Seam_2_3/examples-ee6/remoting/progressbar/progressbar-ear/pom.xml
branches/community/Seam_2_3/examples-ee6/remoting/progressbar/progressbar-ejb/pom.xml
branches/community/Seam_2_3/examples-ee6/remoting/progressbar/progressbar-web/pom.xml
Log:
progressbar example cleanup
Modified: branches/community/Seam_2_3/examples-ee6/remoting/progressbar/progressbar-ear/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/remoting/progressbar/progressbar-ear/pom.xml 2012-04-05 11:26:11 UTC (rev 14520)
+++ branches/community/Seam_2_3/examples-ee6/remoting/progressbar/progressbar-ear/pom.xml 2012-04-05 11:33:49 UTC (rev 14521)
@@ -29,16 +29,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>
@@ -68,6 +58,11 @@
<artifactId>progressbar-ejb</artifactId>
<bundleFileName>progressbar-ejb.jar</bundleFileName>
</ejbModule>
+ <ejbModule>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>jboss-seam</artifactId>
+ <bundleFileName>jboss-seam.jar</bundleFileName>
+ </ejbModule>
</modules>
</configuration>
</plugin>
Modified: branches/community/Seam_2_3/examples-ee6/remoting/progressbar/progressbar-ejb/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/remoting/progressbar/progressbar-ejb/pom.xml 2012-04-05 11:26:11 UTC (rev 14520)
+++ branches/community/Seam_2_3/examples-ee6/remoting/progressbar/progressbar-ejb/pom.xml 2012-04-05 11:33:49 UTC (rev 14521)
@@ -27,10 +27,12 @@
<dependency>
<groupId>org.jboss.spec.javax.ejb</groupId>
<artifactId>jboss-ejb-api_3.1_spec</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.spec.javax.faces</groupId>
<artifactId>jboss-jsf-api_2.0_spec</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.seam</groupId>
Modified: branches/community/Seam_2_3/examples-ee6/remoting/progressbar/progressbar-web/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/remoting/progressbar/progressbar-web/pom.xml 2012-04-05 11:26:11 UTC (rev 14520)
+++ branches/community/Seam_2_3/examples-ee6/remoting/progressbar/progressbar-web/pom.xml 2012-04-05 11:33:49 UTC (rev 14521)
@@ -29,6 +29,7 @@
<groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam</artifactId>
<type>ejb</type>
+ <scope>provided</scope>
</dependency>
</dependencies>
12 years
Seam SVN: r14520 - in branches/community/Seam_2_3/examples-ee6/remoting/helloworld: helloworld-ejb and 1 other directories.
by seam-commits＠lists.jboss.org
Author: maschmid
Date: 2012-04-05 07:26:11 -0400 (Thu, 05 Apr 2012)
New Revision: 14520
Modified:
branches/community/Seam_2_3/examples-ee6/remoting/helloworld/helloworld-ear/pom.xml
branches/community/Seam_2_3/examples-ee6/remoting/helloworld/helloworld-ejb/pom.xml
branches/community/Seam_2_3/examples-ee6/remoting/helloworld/helloworld-web/pom.xml
Log:
helloworld example cleanup
Modified: branches/community/Seam_2_3/examples-ee6/remoting/helloworld/helloworld-ear/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/remoting/helloworld/helloworld-ear/pom.xml 2012-04-05 11:20:35 UTC (rev 14519)
+++ branches/community/Seam_2_3/examples-ee6/remoting/helloworld/helloworld-ear/pom.xml 2012-04-05 11:26:11 UTC (rev 14520)
@@ -29,16 +29,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>
@@ -68,6 +58,11 @@
<artifactId>helloworld-ejb</artifactId>
<bundleFileName>helloworld-ejb.jar</bundleFileName>
</ejbModule>
+ <ejbModule>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>jboss-seam</artifactId>
+ <bundleFileName>jboss-seam.jar</bundleFileName>
+ </ejbModule>
</modules>
</configuration>
</plugin>
Modified: branches/community/Seam_2_3/examples-ee6/remoting/helloworld/helloworld-ejb/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/remoting/helloworld/helloworld-ejb/pom.xml 2012-04-05 11:20:35 UTC (rev 14519)
+++ branches/community/Seam_2_3/examples-ee6/remoting/helloworld/helloworld-ejb/pom.xml 2012-04-05 11:26:11 UTC (rev 14520)
@@ -27,10 +27,12 @@
<dependency>
<groupId>org.jboss.spec.javax.ejb</groupId>
<artifactId>jboss-ejb-api_3.1_spec</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.spec.javax.faces</groupId>
<artifactId>jboss-jsf-api_2.0_spec</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.seam</groupId>
Modified: branches/community/Seam_2_3/examples-ee6/remoting/helloworld/helloworld-web/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/remoting/helloworld/helloworld-web/pom.xml 2012-04-05 11:20:35 UTC (rev 14519)
+++ branches/community/Seam_2_3/examples-ee6/remoting/helloworld/helloworld-web/pom.xml 2012-04-05 11:26:11 UTC (rev 14520)
@@ -29,6 +29,7 @@
<groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam</artifactId>
<type>ejb</type>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.seam</groupId>
12 years
Seam SVN: r14519 - in branches/community/Seam_2_3/examples-ee6/remoting/gwt: gwt-ejb and 1 other directory.
by seam-commits＠lists.jboss.org
Author: maschmid
Date: 2012-04-05 07:20:35 -0400 (Thu, 05 Apr 2012)
New Revision: 14519
Modified:
branches/community/Seam_2_3/examples-ee6/remoting/gwt/gwt-ear/pom.xml
branches/community/Seam_2_3/examples-ee6/remoting/gwt/gwt-ejb/pom.xml
Log:
cleanup gwt example
Modified: branches/community/Seam_2_3/examples-ee6/remoting/gwt/gwt-ear/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/remoting/gwt/gwt-ear/pom.xml 2012-04-05 11:12:27 UTC (rev 14518)
+++ branches/community/Seam_2_3/examples-ee6/remoting/gwt/gwt-ear/pom.xml 2012-04-05 11:20:35 UTC (rev 14519)
@@ -29,16 +29,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>
<dependency>
<groupId>org.jboss.seam</groupId>
@@ -76,6 +66,11 @@
<artifactId>gwt-ejb</artifactId>
<bundleFileName>gwt-ejb.jar</bundleFileName>
</ejbModule>
+ <ejbModule>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>jboss-seam</artifactId>
+ <bundleFileName>jboss-seam.jar</bundleFileName>
+ </ejbModule>
</modules>
</configuration>
</plugin>
Modified: branches/community/Seam_2_3/examples-ee6/remoting/gwt/gwt-ejb/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/remoting/gwt/gwt-ejb/pom.xml 2012-04-05 11:12:27 UTC (rev 14518)
+++ branches/community/Seam_2_3/examples-ee6/remoting/gwt/gwt-ejb/pom.xml 2012-04-05 11:20:35 UTC (rev 14519)
@@ -52,10 +52,12 @@
<dependency>
<groupId>org.jboss.spec.javax.ejb</groupId>
<artifactId>jboss-ejb-api_3.1_spec</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.spec.javax.faces</groupId>
<artifactId>jboss-jsf-api_2.0_spec</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.seam</groupId>
12 years
Seam SVN: r14518 - in branches/community/Seam_2_3/examples-ee6/remoting/chatroom: chatroom-ejb and 1 other directories.
by seam-commits＠lists.jboss.org
Author: maschmid
Date: 2012-04-05 07:12:27 -0400 (Thu, 05 Apr 2012)
New Revision: 14518
Modified:
branches/community/Seam_2_3/examples-ee6/remoting/chatroom/chatroom-ear/pom.xml
branches/community/Seam_2_3/examples-ee6/remoting/chatroom/chatroom-ejb/pom.xml
branches/community/Seam_2_3/examples-ee6/remoting/chatroom/chatroom-web/pom.xml
Log:
chatroom example cleanup
Modified: branches/community/Seam_2_3/examples-ee6/remoting/chatroom/chatroom-ear/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/remoting/chatroom/chatroom-ear/pom.xml 2012-04-05 11:06:54 UTC (rev 14517)
+++ branches/community/Seam_2_3/examples-ee6/remoting/chatroom/chatroom-ear/pom.xml 2012-04-05 11:12:27 UTC (rev 14518)
@@ -29,16 +29,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>
@@ -68,6 +58,11 @@
<artifactId>chatroom-ejb</artifactId>
<bundleFileName>chatroom-ejb.jar</bundleFileName>
</ejbModule>
+ <ejbModule>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>jboss-seam</artifactId>
+ <bundleFileName>jboss-seam.jar</bundleFileName>
+ </ejbModule>
</modules>
</configuration>
</plugin>
Modified: branches/community/Seam_2_3/examples-ee6/remoting/chatroom/chatroom-ejb/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/remoting/chatroom/chatroom-ejb/pom.xml 2012-04-05 11:06:54 UTC (rev 14517)
+++ branches/community/Seam_2_3/examples-ee6/remoting/chatroom/chatroom-ejb/pom.xml 2012-04-05 11:12:27 UTC (rev 14518)
@@ -27,10 +27,12 @@
<dependency>
<groupId>org.jboss.spec.javax.ejb</groupId>
<artifactId>jboss-ejb-api_3.1_spec</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.spec.javax.faces</groupId>
<artifactId>jboss-jsf-api_2.0_spec</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.seam</groupId>
Modified: branches/community/Seam_2_3/examples-ee6/remoting/chatroom/chatroom-web/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/remoting/chatroom/chatroom-web/pom.xml 2012-04-05 11:06:54 UTC (rev 14517)
+++ branches/community/Seam_2_3/examples-ee6/remoting/chatroom/chatroom-web/pom.xml 2012-04-05 11:12:27 UTC (rev 14518)
@@ -29,6 +29,7 @@
<groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam</artifactId>
<type>ejb</type>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.seam</groupId>
12 years
Seam SVN: r14517 - branches/community/Seam_2_3/examples-ee6/openid/openid-web.
by seam-commits＠lists.jboss.org
Author: maschmid
Date: 2012-04-05 07:06:54 -0400 (Thu, 05 Apr 2012)
New Revision: 14517
Modified:
branches/community/Seam_2_3/examples-ee6/openid/openid-web/pom.xml
Log:
cleanup openid example
Modified: branches/community/Seam_2_3/examples-ee6/openid/openid-web/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/openid/openid-web/pom.xml 2012-04-05 07:54:43 UTC (rev 14516)
+++ branches/community/Seam_2_3/examples-ee6/openid/openid-web/pom.xml 2012-04-05 11:06:54 UTC (rev 14517)
@@ -29,6 +29,7 @@
<groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam</artifactId>
<type>ejb</type>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.seam</groupId>
12 years
Seam SVN: r14516 - in branches/community/Seam_2_3/examples-ee6/nestedbooking: nestedbooking-web and 1 other directory.
by seam-commits＠lists.jboss.org
Author: maschmid
Date: 2012-04-05 03:54:43 -0400 (Thu, 05 Apr 2012)
New Revision: 14516
Modified:
branches/community/Seam_2_3/examples-ee6/nestedbooking/nestedbooking-ear/pom.xml
branches/community/Seam_2_3/examples-ee6/nestedbooking/nestedbooking-web/pom.xml
Log:
cleanup nestedbooking
Modified: branches/community/Seam_2_3/examples-ee6/nestedbooking/nestedbooking-ear/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/nestedbooking/nestedbooking-ear/pom.xml 2012-04-05 07:27:31 UTC (rev 14515)
+++ branches/community/Seam_2_3/examples-ee6/nestedbooking/nestedbooking-ear/pom.xml 2012-04-05 07:54:43 UTC (rev 14516)
@@ -29,16 +29,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>
@@ -68,6 +58,11 @@
<artifactId>nestedbooking-ejb</artifactId>
<bundleFileName>nestedbooking-ejb.jar</bundleFileName>
</ejbModule>
+ <ejbModule>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>jboss-seam</artifactId>
+ <bundleFileName>jboss-seam.jar</bundleFileName>
+ </ejbModule>
</modules>
</configuration>
</plugin>
Modified: branches/community/Seam_2_3/examples-ee6/nestedbooking/nestedbooking-web/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/nestedbooking/nestedbooking-web/pom.xml 2012-04-05 07:27:31 UTC (rev 14515)
+++ branches/community/Seam_2_3/examples-ee6/nestedbooking/nestedbooking-web/pom.xml 2012-04-05 07:54:43 UTC (rev 14516)
@@ -29,6 +29,7 @@
<groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam</artifactId>
<type>ejb</type>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.seam</groupId>
12 years
Seam SVN: r14515 - in branches/community/Seam_2_3/examples-ee6/blog: blog-ear and 10 other directories.
by seam-commits＠lists.jboss.org
Author: dhinojosa
Date: 2012-04-05 03:27:31 -0400 (Thu, 05 Apr 2012)
New Revision: 14515
Added:
branches/community/Seam_2_3/examples-ee6/blog/blog-ear/src/main/application/META-INF/
branches/community/Seam_2_3/examples-ee6/blog/blog-ear/src/main/application/META-INF/jboss-deployment-structure.xml
branches/community/Seam_2_3/examples-ee6/blog/blog-tests/src/test/java/org/jboss/seam/example/blog/test/Deployments.java
branches/community/Seam_2_3/examples-ee6/blog/blog-tests/src/test/resources-integration/arquillian.xml
Modified:
branches/community/Seam_2_3/examples-ee6/blog/blog-ear/pom.xml
branches/community/Seam_2_3/examples-ee6/blog/blog-ejb/pom.xml
branches/community/Seam_2_3/examples-ee6/blog/blog-ejb/src/main/java/domain/Blog.java
branches/community/Seam_2_3/examples-ee6/blog/blog-ejb/src/main/java/domain/BlogEntry.java
branches/community/Seam_2_3/examples-ee6/blog/blog-ejb/src/main/resources/META-INF/persistence.xml
branches/community/Seam_2_3/examples-ee6/blog/blog-tests/pom.xml
branches/community/Seam_2_3/examples-ee6/blog/blog-tests/src/test/java/org/jboss/seam/example/blog/test/BlogTest.java
branches/community/Seam_2_3/examples-ee6/blog/blog-web/pom.xml
branches/community/Seam_2_3/examples-ee6/blog/blog-web/src/main/webapp/WEB-INF/components.xml
branches/community/Seam_2_3/examples-ee6/blog/blog-web/src/main/webapp/WEB-INF/web.xml
branches/community/Seam_2_3/examples-ee6/blog/pom.xml
Log:
upgraded libraries and files for blog
Modified: branches/community/Seam_2_3/examples-ee6/blog/blog-ear/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/blog/blog-ear/pom.xml 2012-04-05 00:16:05 UTC (rev 14514)
+++ branches/community/Seam_2_3/examples-ee6/blog/blog-ear/pom.xml 2012-04-05 07:27:31 UTC (rev 14515)
@@ -9,7 +9,7 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.jboss.seam.examples-ee6.blog</groupId>
+ <groupId>org.jboss.seam.examples-ee6</groupId>
<artifactId>blog-ear</artifactId>
<packaging>ear</packaging>
<name>Blog EAR Module (EE6)</name>
@@ -39,16 +39,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>
Copied: branches/community/Seam_2_3/examples-ee6/blog/blog-ear/src/main/application/META-INF/jboss-deployment-structure.xml (from rev 14514, branches/community/Seam_2_3/examples-ee6/booking/booking-ear/src/main/application/META-INF/jboss-deployment-structure.xml)
===================================================================
--- branches/community/Seam_2_3/examples-ee6/blog/blog-ear/src/main/application/META-INF/jboss-deployment-structure.xml (rev 0)
+++ branches/community/Seam_2_3/examples-ee6/blog/blog-ear/src/main/application/META-INF/jboss-deployment-structure.xml 2012-04-05 07:27:31 UTC (rev 14515)
@@ -0,0 +1,12 @@
+<jboss-deployment-structure xmlns="urn:jboss:deployment-structure:1.0">
+ <deployment>
+ <dependencies>
+ <module name="org.apache.log4j" export="true"/>
+ <module name="org.dom4j" export="true"/>
+ <module name="org.apache.commons.logging" export="true"/>
+ <module name="org.apache.commons.collections" export="true"/>
+ <module name="javax.faces.api" export="true"/>
+ <module name="com.sun.jsf-impl" export="true"/>
+ </dependencies>
+ </deployment>
+</jboss-deployment-structure>
Modified: branches/community/Seam_2_3/examples-ee6/blog/blog-ejb/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/blog/blog-ejb/pom.xml 2012-04-05 00:16:05 UTC (rev 14514)
+++ branches/community/Seam_2_3/examples-ee6/blog/blog-ejb/pom.xml 2012-04-05 07:27:31 UTC (rev 14515)
@@ -9,7 +9,7 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.jboss.seam.examples-ee6.blog</groupId>
+ <groupId>org.jboss.seam.examples-ee6</groupId>
<artifactId>blog-ejb</artifactId>
<packaging>ejb</packaging>
<name>Blog EJB Module (EE6)</name>
@@ -21,52 +21,67 @@
<type>ejb</type>
</dependency>
<dependency>
- <groupId>javax.persistence</groupId>
- <artifactId>persistence-api</artifactId>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.hibernate.javax.persistence</groupId>
+ <artifactId>hibernate-jpa-2.0-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.spec.javax.servlet</groupId>
+ <artifactId>jboss-servlet-api_3.0_spec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.spec.javax.ejb</groupId>
+ <artifactId>jboss-ejb-api_3.1_spec</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.hibernate</groupId>
+ <artifactId>hibernate-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
<artifactId>hibernate-validator</artifactId>
</dependency>
+ <!--<dependency>-->
+ <!--<groupId>org.hibernate</groupId>-->
+ <!--<artifactId>hibernate-annotations</artifactId>-->
+ <!--</dependency>-->
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-entitymanager</artifactId>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <scope>provided</scope>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-search</artifactId>
</dependency>
<dependency>
- <groupId>javax.ejb</groupId>
- <artifactId>ejb-api</artifactId>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-search-analyzers</artifactId>
</dependency>
<dependency>
- <groupId>com.sun.faces</groupId>
- <artifactId>jsf-api</artifactId>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-search-engine</artifactId>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
- <artifactId>hibernate-search</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.hibernate</groupId>
- <artifactId>ejb3-persistence</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.transaction</groupId>
- <artifactId>jta</artifactId>
- </exclusion>
- <exclusion>
- <groupId>hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- </exclusion>
- </exclusions>
+ <artifactId>hibernate-search-infinispan</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-search-orm</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.validation</groupId>
+ <artifactId>validation-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.spec.javax.faces</groupId>
+ <artifactId>jboss-jsf-api_2.0_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
<profiles>
<profile>
Modified: branches/community/Seam_2_3/examples-ee6/blog/blog-ejb/src/main/java/domain/Blog.java
===================================================================
--- branches/community/Seam_2_3/examples-ee6/blog/blog-ejb/src/main/java/domain/Blog.java 2012-04-05 00:16:05 UTC (rev 14514)
+++ branches/community/Seam_2_3/examples-ee6/blog/blog-ejb/src/main/java/domain/Blog.java 2012-04-05 07:27:31 UTC (rev 14515)
@@ -11,10 +11,10 @@
import javax.persistence.OneToOne;
import javax.persistence.OrderBy;
import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
import org.hibernate.annotations.Cache;
import org.hibernate.annotations.CacheConcurrencyStrategy;
-import org.hibernate.validator.constraints.Length;
/**
@@ -27,11 +27,11 @@
public class Blog {
/** the name of the blog */
- @Id @Length(max=70)
+ @Id @Size(max=70)
private String name;
/** the description of the blog */
- @Length(max=150) @NotNull
+ @Size(max=150) @NotNull
private String description;
/** the locale of the blog */
@@ -42,7 +42,7 @@
@NotNull
private TimeZone timeZone;
- @Length(min=5, max=10) @NotNull
+ @Size(min=5, max=10) @NotNull
private String password;
@OneToOne(optional=false, mappedBy="blog")
Modified: branches/community/Seam_2_3/examples-ee6/blog/blog-ejb/src/main/java/domain/BlogEntry.java
===================================================================
--- branches/community/Seam_2_3/examples-ee6/blog/blog-ejb/src/main/java/domain/BlogEntry.java 2012-04-05 00:16:05 UTC (rev 14514)
+++ branches/community/Seam_2_3/examples-ee6/blog/blog-ejb/src/main/java/domain/BlogEntry.java 2012-04-05 07:27:31 UTC (rev 14515)
@@ -8,12 +8,12 @@
import org.hibernate.annotations.Cache;
import org.hibernate.annotations.CacheConcurrencyStrategy;
import org.hibernate.search.annotations.*;
-import org.hibernate.validator.constraints.Length;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.ManyToOne;
import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
import java.util.Date;
/**
@@ -44,22 +44,22 @@
public class BlogEntry {
@Id
- @Length(min = 1, max = 20)
+ @Size(min = 1, max = 20)
@DocumentId
private String id;
@NotNull
- @Length(max = 70)
+ @Size(max = 70)
@Fields({
@Field(name = "title:en", analyzer = @Analyzer(definition = "en")),
@Field(name = "title:ngrams", analyzer = @Analyzer(definition = "ngrams"))})
private String title;
- @Length(max = 200)
+ @Size(max = 200)
private String excerpt;
@NotNull
- @Length(max = 1400)
+ @Size(max = 1400)
@Fields({
@Field(name = "body:en", analyzer = @Analyzer(definition = "en")),
@Field(name = "body:ngrams", analyzer = @Analyzer(definition = "ngrams"))})
Modified: branches/community/Seam_2_3/examples-ee6/blog/blog-ejb/src/main/resources/META-INF/persistence.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/blog/blog-ejb/src/main/resources/META-INF/persistence.xml 2012-04-05 00:16:05 UTC (rev 14514)
+++ branches/community/Seam_2_3/examples-ee6/blog/blog-ejb/src/main/resources/META-INF/persistence.xml 2012-04-05 07:27:31 UTC (rev 14515)
@@ -5,12 +5,12 @@
version="1.0">
<persistence-unit name="entityManager">
<provider>org.hibernate.ejb.HibernatePersistence</provider>
- <jta-data-source>java:/blogDatasource</jta-data-source>
+ <non-jta-data-source>java:jboss/datasources/ExampleDS</non-jta-data-source>
<properties>
<property name="hibernate.hbm2ddl.auto" value="create-drop"/>
<property name="hibernate.show_sql" value="true"/>
<property name="hibernate.cache.use_query_cache" value="true"/>
- <property name="jboss.entity.manager.factory.jndi.name" value="java:/blogEntityManagerFactory"/>
+ <!--<property name="jboss.entity.manager.factory.jndi.name" value="java:/blogEntityManagerFactory"/>-->
<property name="hibernate.jdbc.charSet" value="utf-8"/>
<!-- use a file system based index -->
Modified: branches/community/Seam_2_3/examples-ee6/blog/blog-tests/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/blog/blog-tests/pom.xml 2012-04-05 00:16:05 UTC (rev 14514)
+++ branches/community/Seam_2_3/examples-ee6/blog/blog-tests/pom.xml 2012-04-05 07:27:31 UTC (rev 14515)
@@ -9,20 +9,15 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.jboss.seam.examples-ee6.blog</groupId>
+ <groupId>org.jboss.seam.examples-ee6</groupId>
<artifactId>blog-tests</artifactId>
<name>Blog Integration Tests Module (EE6)</name>
<dependencies>
<dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <classifier>jdk15</classifier>
- </dependency>
- <dependency>
- <groupId>org.jboss.seam.examples-ee6.blog</groupId>
+ <groupId>org.jboss.seam.examples-ee6</groupId>
<artifactId>blog-ejb</artifactId>
+ <version>2.3.0.Beta2-SNAPSHOT</version>
<type>ejb</type>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.seam</groupId>
@@ -31,11 +26,23 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>com.sun.faces</groupId>
- <artifactId>jsf-api</artifactId>
- <scope>provided</scope>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.hibernate.javax.persistence</groupId>
+ <artifactId>hibernate-jpa-2.0-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.spec.javax.faces</groupId>
+ <artifactId>jboss-jsf-api_2.0_spec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.seleniumhq.selenium.server</groupId>
<artifactId>selenium-server</artifactId>
<classifier>standalone</classifier>
@@ -49,6 +56,7 @@
<artifactId>functional-tests</artifactId>
<scope>test</scope>
</dependency>
+
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
@@ -67,6 +75,35 @@
<scope>test</scope>
</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>
+ <dependency>
+ <groupId>dom4j</groupId>
+ <artifactId>dom4j</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javassist</groupId>
+ <artifactId>javassist</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-validator</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
<build>
@@ -137,17 +174,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}/../blog-ear/target/seam-blog.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/blog/blog-tests/src/test/java/org/jboss/seam/example/blog/test/BlogTest.java
===================================================================
--- branches/community/Seam_2_3/examples-ee6/blog/blog-tests/src/test/java/org/jboss/seam/example/blog/test/BlogTest.java 2012-04-05 00:16:05 UTC (rev 14514)
+++ branches/community/Seam_2_3/examples-ee6/blog/blog-tests/src/test/java/org/jboss/seam/example/blog/test/BlogTest.java 2012-04-05 07:27:31 UTC (rev 14515)
@@ -8,20 +8,41 @@
import javax.faces.model.SelectItem;
import javax.persistence.EntityManager;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.OverProtocol;
+import org.jboss.arquillian.junit.Arquillian;
import org.jboss.seam.contexts.Contexts;
+import org.jboss.seam.mock.JUnitSeamTest;
import org.jboss.seam.mock.SeamTest;
import org.jboss.seam.security.Identity;
import org.jboss.seam.theme.Theme;
import org.jboss.seam.theme.ThemeSelector;
-import org.testng.annotations.Test;
import actions.BlogService;
import actions.SearchService;
import domain.Blog;
import domain.BlogEntry;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.Test;
+import org.junit.runner.RunWith;
-public class BlogTest extends SeamTest
+(a)RunWith(Arquillian.class)
+public class BlogTest extends JUnitSeamTest
{
+
+ @Deployment(name="BookingTest")
+ @OverProtocol("Servlet 3.0")
+ public static Archive<?> createDeployment()
+ {
+ EnterpriseArchive er = Deployments.bookingDeployment();
+ WebArchive web = er.getAsType(WebArchive.class, "blog-web.war");
+
+ web.addClasses(BlogTest.class);
+
+ return er;
+ }
@Test
public void testPost() throws Exception
Copied: branches/community/Seam_2_3/examples-ee6/blog/blog-tests/src/test/java/org/jboss/seam/example/blog/test/Deployments.java (from rev 14514, branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/java/org/jboss/seam/example/booking/test/Deployments.java)
===================================================================
--- branches/community/Seam_2_3/examples-ee6/blog/blog-tests/src/test/java/org/jboss/seam/example/blog/test/Deployments.java (rev 0)
+++ branches/community/Seam_2_3/examples-ee6/blog/blog-tests/src/test/java/org/jboss/seam/example/blog/test/Deployments.java 2012-04-05 07:27:31 UTC (rev 14515)
@@ -0,0 +1,14 @@
+package org.jboss.seam.example.blog.test;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.importer.ZipImporter;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
+
+import java.io.File;
+
+public class Deployments {
+ public static EnterpriseArchive bookingDeployment() {
+ return ShrinkWrap.create(ZipImporter.class, "seam-blog.ear").importFrom(new File("../blog-ear/target/seam-blog.ear"))
+ .as(EnterpriseArchive.class);
+ }
+}
Copied: branches/community/Seam_2_3/examples-ee6/blog/blog-tests/src/test/resources-integration/arquillian.xml (from rev 14514, branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/resources-integration/arquillian.xml)
===================================================================
--- branches/community/Seam_2_3/examples-ee6/blog/blog-tests/src/test/resources-integration/arquillian.xml (rev 0)
+++ branches/community/Seam_2_3/examples-ee6/blog/blog-tests/src/test/resources-integration/arquillian.xml 2012-04-05 07:27:31 UTC (rev 14515)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<arquillian xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="http://jboss.org/schema/arquillian"
+ xsi:schemaLocation="http://jboss.org/schema/arquillian http://jboss.org/schema/arquillian/arquillian_1_0.xsd">
+
+ <engine>
+ <property name="deploymentExportPath">target/</property>
+ </engine>
+
+ <container qualifier="jboss" default="true">
+ <configuration>
+ <property name="javaVmArguments">-Xmx1024m -XX:MaxPermSize=512m</property>
+ <property name="jbossHome">target/jboss-as-${version.jbossas7}</property>
+ </configuration>
+ </container>
+
+</arquillian>
Modified: branches/community/Seam_2_3/examples-ee6/blog/blog-web/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/blog/blog-web/pom.xml 2012-04-05 00:16:05 UTC (rev 14514)
+++ branches/community/Seam_2_3/examples-ee6/blog/blog-web/pom.xml 2012-04-05 07:27:31 UTC (rev 14515)
@@ -10,7 +10,7 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.jboss.seam.examples-ee6.blog</groupId>
+ <groupId>org.jboss.seam.examples-ee6</groupId>
<artifactId>blog-web</artifactId>
<packaging>war</packaging>
<name>Blog Web Module (EE6)</name>
@@ -23,15 +23,15 @@
<dependencies>
<dependency>
- <groupId>org.jboss.seam.examples-ee6.blog</groupId>
+ <groupId>org.jboss.seam.examples-ee6</groupId>
<artifactId>blog-ejb</artifactId>
+ <version>${project.version}</version>
<type>ejb</type>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam</artifactId>
- <type>ejb</type>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.seam</groupId>
@@ -44,20 +44,19 @@
</exclusions>
</dependency>
<dependency>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils</artifactId>
- <exclusions>
- <exclusion>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</dependency>
<dependency>
+ <groupId>org.jboss.el</groupId>
+ <artifactId>jboss-el</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-validator</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.richfaces.ui</groupId>
<artifactId>richfaces-components-ui</artifactId>
</dependency>
@@ -65,6 +64,19 @@
<groupId>org.richfaces.core</groupId>
<artifactId>richfaces-core-impl</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.richfaces.core</groupId>
+ <artifactId>richfaces-core-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.spec.javax.faces</groupId>
+ <artifactId>jboss-jsf-api_2.0_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-search</artifactId>
+ </dependency>
</dependencies>
<build>
Modified: branches/community/Seam_2_3/examples-ee6/blog/blog-web/src/main/webapp/WEB-INF/components.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/blog/blog-web/src/main/webapp/WEB-INF/components.xml 2012-04-05 00:16:05 UTC (rev 14514)
+++ branches/community/Seam_2_3/examples-ee6/blog/blog-web/src/main/webapp/WEB-INF/components.xml 2012-04-05 07:27:31 UTC (rev 14515)
@@ -30,8 +30,8 @@
</theme:available-themes>
</theme:theme-selector>
- <persistence:managed-persistence-context auto-create="true" name="entityManager">
- <persistence:persistence-unit-jndi-name>java:/blogEntityManagerFactory</persistence:persistence-unit-jndi-name>
- </persistence:managed-persistence-context>
+ <!--<persistence:managed-persistence-context auto-create="true" name="entityManager">-->
+ <!--<persistence:persistence-unit-jndi-name>java:/blogEntityManagerFactory</persistence:persistence-unit-jndi-name>-->
+ <!--</persistence:managed-persistence-context>-->
</components>
Modified: branches/community/Seam_2_3/examples-ee6/blog/blog-web/src/main/webapp/WEB-INF/web.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/blog/blog-web/src/main/webapp/WEB-INF/web.xml 2012-04-05 00:16:05 UTC (rev 14514)
+++ branches/community/Seam_2_3/examples-ee6/blog/blog-web/src/main/webapp/WEB-INF/web.xml 2012-04-05 07:27:31 UTC (rev 14515)
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
-<web-app version="2.5"
+<web-app version="3.0"
xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
<display-name>Seam Blog Example</display-name>
Modified: branches/community/Seam_2_3/examples-ee6/blog/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/blog/pom.xml 2012-04-05 00:16:05 UTC (rev 14514)
+++ branches/community/Seam_2_3/examples-ee6/blog/pom.xml 2012-04-05 07:27:31 UTC (rev 14515)
@@ -27,19 +27,19 @@
<dependencyManagement>
<dependencies>
<dependency>
- <groupId>org.jboss.seam.examples-ee6.blog</groupId>
+ <groupId>org.jboss.seam.examples-ee6</groupId>
<artifactId>blog-ejb</artifactId>
<version>${project.version}</version>
<type>ejb</type>
</dependency>
<dependency>
- <groupId>org.jboss.seam.examples-ee6.blog</groupId>
+ <groupId>org.jboss.seam.examples-ee6</groupId>
<artifactId>blog-web</artifactId>
<version>${project.version}</version>
<type>war</type>
</dependency>
<dependency>
- <groupId>org.jboss.seam.examples-ee6.blog</groupId>
+ <groupId>org.jboss.seam.examples-ee6</groupId>
<artifactId>blog-ear</artifactId>
<version>${project.version}</version>
</dependency>
12 years
Seam SVN: r14514 - branches/community/Seam_2_3/examples-ee6.
by seam-commits＠lists.jboss.org
Author: dhinojosa
Date: 2012-04-04 20:16:05 -0400 (Wed, 04 Apr 2012)
New Revision: 14514
Modified:
branches/community/Seam_2_3/examples-ee6/pom.xml
Log:
added groovybooking and jpa modules to example-ee6/pom.xml
Modified: branches/community/Seam_2_3/examples-ee6/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/pom.xml 2012-04-05 00:14:01 UTC (rev 14513)
+++ branches/community/Seam_2_3/examples-ee6/pom.xml 2012-04-05 00:16:05 UTC (rev 14514)
@@ -21,6 +21,8 @@
<module>drools</module>
<!-- <module>dvdstore</module> -->
<module>excel</module>
+ <module>groovybooking</module>
+ <module>jpa</module>
<module>mail</module>
<module>messages</module>
<module>nestedbooking</module>
12 years
