[seam-commits] Seam SVN: r14609 - in branches/community/Seam_2_3/examples-ee6/tasks: tasks-ear/src/main/application/META-INF and 2 other directories.

Author: rsmeral Date: 2012-04-19 11:35:53 -0400 (Thu, 19 Apr 2012) New Revision: 14609 Modified: branches/community/Seam_2_3/examples-ee6/tasks/tasks-ear/pom.xml branches/community/Seam_2_3/examples-ee6/tasks/tasks-ear/src/main/application/META-INF/jboss-deployment-structure.xml branches/community/Seam_2_3/examples-ee6/tasks/tasks-ejb/src/main/java/org/jboss/seam/example/tasks/entity/Category.java branches/community/Seam_2_3/examples-ee6/tasks/tasks-ejb/src/main/java/org/jboss/seam/example/tasks/entity/Task.java branches/community/Seam_2_3/examples-ee6/tasks/tasks-ejb/src/main/resources/import.sql Log: tasks-tests modified Modified: branches/community/Seam_2_3/examples-ee6/tasks/tasks-ear/pom.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/tasks/tasks-ear/pom.xml 2012-04-19 15:30:05 UTC (rev 14608) +++ branches/community/Seam_2_3/examples-ee6/tasks/tasks-ear/pom.xml 2012-04-19 15:35:53 UTC (rev 14609) @@ -30,6 +30,14 @@ <type>ejb</type> <scope>compile</scope> </dependency> + <dependency> + <groupId>org.jboss.resteasy</groupId> + <artifactId>resteasy-jaxrs</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.resteasy</groupId> + <artifactId>resteasy-atom-provider</artifactId> + </dependency> </dependencies> @@ -64,6 +72,17 @@ <artifactId>jboss-seam</artifactId> <bundleFileName>jboss-seam.jar</bundleFileName> </ejbModule> + <jarModule> + <groupId>org.jboss.resteasy</groupId> + <artifactId>resteasy-jaxrs</artifactId> + <bundleDir>lib</bundleDir> + </jarModule> + <jarModule> + <groupId>org.jboss.resteasy</groupId> + <artifactId>resteasy-atom-provider</artifactId> + <bundleDir>lib</bundleDir> + </jarModule> + </modules> </configuration> </plugin> Modified: branches/community/Seam_2_3/examples-ee6/tasks/tasks-ear/src/main/application/META-INF/jboss-deployment-structure.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/tasks/tasks-ear/src/main/application/META-INF/jboss-deployment-structure.xml 2012-04-19 15:30:05 UTC (rev 14608) +++ branches/community/Seam_2_3/examples-ee6/tasks/tasks-ear/src/main/application/META-INF/jboss-deployment-structure.xml 2012-04-19 15:35:53 UTC (rev 14609) @@ -1,9 +1,22 @@ <jboss-deployment-structure xmlns="urn:jboss:deployment-structure:1.0"> - <deployment> - <dependencies> - <module name="org.dom4j" export="true"/> - <module name="org.apache.commons.collections" export="true"/> - <module name="javax.faces.api" export="true"/> - </dependencies> - </deployment> + <deployment> + <dependencies> + <module name="org.dom4j" export="true"/> + <module name="org.apache.commons.collections" export="true"/> + <module name="javax.faces.api" export="true"/> + </dependencies> + <exclusions> + <module name="org.jboss.resteasy.resteasy-jaxrs" slot="main"/> + <module name="org.jboss.resteasy.resteasy-jettison-provider" slot="main"/> + <module name="org.jboss.resteasy.resteasy-jaxb-provider" slot="main"/> + </exclusions> + </deployment> + <sub-deployment name="tasks-web.war"> + <exclusions> + <module name="org.jboss.resteasy.resteasy-jaxrs" slot="main"/> + <module name="org.jboss.resteasy.resteasy-jettison-provider" slot="main"/> + <module name="org.jboss.resteasy.resteasy-jaxb-provider" slot="main"/> + <module name="org.jboss.resteasy.resteasy-yaml-provider" slot="main"/> + </exclusions> + </sub-deployment> </jboss-deployment-structure> Modified: branches/community/Seam_2_3/examples-ee6/tasks/tasks-ejb/src/main/java/org/jboss/seam/example/tasks/entity/Category.java =================================================================== --- branches/community/Seam_2_3/examples-ee6/tasks/tasks-ejb/src/main/java/org/jboss/seam/example/tasks/entity/Category.java 2012-04-19 15:30:05 UTC (rev 14608) +++ branches/community/Seam_2_3/examples-ee6/tasks/tasks-ejb/src/main/java/org/jboss/seam/example/tasks/entity/Category.java 2012-04-19 15:35:53 UTC (rev 14609) @@ -26,6 +26,7 @@ import javax.persistence.CascadeType; import javax.persistence.Entity; import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.ManyToOne; import javax.persistence.NamedQuery; @@ -66,7 +67,7 @@ } @Id - @GeneratedValue + @GeneratedValue(strategy= GenerationType.IDENTITY) @XmlTransient public Long getId() { Modified: branches/community/Seam_2_3/examples-ee6/tasks/tasks-ejb/src/main/java/org/jboss/seam/example/tasks/entity/Task.java =================================================================== --- branches/community/Seam_2_3/examples-ee6/tasks/tasks-ejb/src/main/java/org/jboss/seam/example/tasks/entity/Task.java 2012-04-19 15:30:05 UTC (rev 14608) +++ branches/community/Seam_2_3/examples-ee6/tasks/tasks-ejb/src/main/java/org/jboss/seam/example/tasks/entity/Task.java 2012-04-19 15:35:53 UTC (rev 14609) @@ -23,14 +23,7 @@ import java.util.Date; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.NamedQuery; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.persistence.Transient; +import javax.persistence.*; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlTransient; @@ -55,7 +48,7 @@ private Category category; @Id - @GeneratedValue + @GeneratedValue(strategy= GenerationType.IDENTITY) public Long getId() { return id; Modified: branches/community/Seam_2_3/examples-ee6/tasks/tasks-ejb/src/main/resources/import.sql =================================================================== --- branches/community/Seam_2_3/examples-ee6/tasks/tasks-ejb/src/main/resources/import.sql 2012-04-19 15:30:05 UTC (rev 14608) +++ branches/community/Seam_2_3/examples-ee6/tasks/tasks-ejb/src/main/resources/import.sql 2012-04-19 15:35:53 UTC (rev 14609) @@ -1,24 +1,24 @@ insert into User (username, password, admin) values ('demo', 'demo', false) insert into User (username, password, admin) values ('admin', 'password', true) -insert into Category (id, name, owner_username) values (-1, 'School', 'demo') - insert into Task (id, name, resolved, created, updated, category_id) values (-2, 'Build the Turing machine', false, '2009-04-19 16:11:05', null, -1) - insert into Task (id, name, resolved, created, updated, category_id) values (-3, 'Finish the RESTEasy-Seam integration example', false, '2009-04-19 16:11:05', null, -1) - insert into Task (id, name, resolved, created, updated, category_id) values (-4, 'Learn new vocab for English conversations', false, '2009-04-19 16:11:05', null, -1) - insert into Task (id, name, resolved, created, updated, category_id) values (-5, 'Prepare a presentation for webdesign seminar', false, '2009-04-19 16:11:05', null, -1) +insert into Category (id, name, owner_username) values (1, 'School', 'demo') + insert into Task (id, name, resolved, created, updated, category_id) values (2, 'Build the Turing machine', false, '2009-04-19 16:11:05', null, 1) + insert into Task (id, name, resolved, created, updated, category_id) values (3, 'Finish the RESTEasy-Seam integration example', false, '2009-04-19 16:11:05', null, 1) + insert into Task (id, name, resolved, created, updated, category_id) values (4, 'Learn new vocab for English conversations', false, '2009-04-19 16:11:05', null, 1) + insert into Task (id, name, resolved, created, updated, category_id) values (5, 'Prepare a presentation for webdesign seminar', false, '2009-04-19 16:11:05', null, 1) -insert into Category (id, name, owner_username) values (-2, 'Work', 'demo') - insert into Task (id, name, resolved, created, updated, category_id) values (-6, 'Pick up meal tickets', false, '2009-04-19 16:11:05', null, -2) -insert into Category (id, name, owner_username) values (-3, 'Buy', 'demo') - insert into Task (id, name, resolved, created, updated, category_id) values (-7, 'Buy milk', false, '2009-04-19 16:11:05', null, -3) - insert into Task (id, name, resolved, created, updated, category_id) values (-8, 'Buy an infinite tape', false, '2009-04-19 16:11:05', null, -3) - insert into Task (id, name, resolved, created, updated, category_id) values (-9, 'Order books', false, '2009-04-19 16:11:05', null, -3) - insert into Task (id, name, resolved, created, updated, category_id) values (-10, 'Buy a turtle', true, '2009-04-19 16:11:05', '2009-04-22 13:15:33', -3) -insert into Category (id, name, owner_username) values (-4, 'Other stuff', 'demo') - insert into Task (id, name, resolved, created, updated, category_id) values (-11, 'Learn to fly', false, '2009-04-19 16:11:05', null, -4) - insert into Task (id, name, resolved, created, updated, category_id) values (-12, 'Visit grandma', false, '2009-04-19 16:11:05', null, -4) - insert into Task (id, name, resolved, created, updated, category_id) values (-13, 'Extend passport', false, '2009-04-19 16:11:05', null, -4) - insert into Task (id, name, resolved, created, updated, category_id) values (-14, 'Get a haircut', false, '2009-04-19 16:11:05', null, -4) +insert into Category (id, name, owner_username) values (2, 'Work', 'demo') + insert into Task (id, name, resolved, created, updated, category_id) values (6, 'Pick up meal tickets', false, '2009-04-19 16:11:05', null, 2) +insert into Category (id, name, owner_username) values (3, 'Buy', 'demo') + insert into Task (id, name, resolved, created, updated, category_id) values (7, 'Buy milk', false, '2009-04-19 16:11:05', null, 3) + insert into Task (id, name, resolved, created, updated, category_id) values (8, 'Buy an infinite tape', false, '2009-04-19 16:11:05', null, 3) + insert into Task (id, name, resolved, created, updated, category_id) values (9, 'Order books', false, '2009-04-19 16:11:05', null, 3) + insert into Task (id, name, resolved, created, updated, category_id) values (10, 'Buy a turtle', true, '2009-04-19 16:11:05', '2009-04-22 13:15:33', 3) +insert into Category (id, name, owner_username) values (4, 'Other stuff', 'demo') + insert into Task (id, name, resolved, created, updated, category_id) values (11, 'Learn to fly', false, '2009-04-19 16:11:05', null, 4) + insert into Task (id, name, resolved, created, updated, category_id) values (12, 'Visit grandma', false, '2009-04-19 16:11:05', null, 4) + insert into Task (id, name, resolved, created, updated, category_id) values (13, 'Extend passport', false, '2009-04-19 16:11:05', null, 4) + insert into Task (id, name, resolved, created, updated, category_id) values (14, 'Get a haircut', false, '2009-04-19 16:11:05', null, 4) -insert into Category (id, name, owner_username) values (-5, 'Administration', 'admin') -insert into Task (id, name, resolved, created, updated, category_id) values (-15, 'Ban demo user :-)', false, '2009-05-04 12:35:13', null, -5) +insert into Category (id, name, owner_username) values (5, 'Administration', 'admin') +insert into Task (id, name, resolved, created, updated, category_id) values (15, 'Ban demo user :-)', false, '2009-05-04 12:35:13', null, 5)