2:46 a.m.
Author: rsmeral
Date: 2012-04-25 03:46:15 -0400 (Wed, 25 Apr 2012)
New Revision: 14636
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/pom.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/java/org/jboss/seam/example/tasks/entity/User.java
branches/community/Seam_2_3/examples-ee6/tasks/tasks-tests/src/test/java/org/jboss/seam/example/tasks/test/TaskResourceTest.java
Log:
tasks: back to jettison
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-24 15:50:50
UTC (rev 14635)
+++ branches/community/Seam_2_3/examples-ee6/tasks/tasks-ear/pom.xml 2012-04-25 07:46:15
UTC (rev 14636)
@@ -64,16 +64,6 @@
<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>
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-24
15:50:50 UTC (rev 14635)
+++
branches/community/Seam_2_3/examples-ee6/tasks/tasks-ear/src/main/application/META-INF/jboss-deployment-structure.xml 2012-04-25
07:46:15 UTC (rev 14636)
@@ -5,5 +5,13 @@
<module name="org.apache.commons.collections"
export="true"/>
<module name="javax.faces.api" export="true"/>
</dependencies>
+ <exclusions>
+ <module name="org.jboss.resteasy.resteasy-jackson-provider"
slot="main"/>
+ </exclusions>
</deployment>
+ <sub-deployment name="tasks-web.war">
+ <exclusions>
+ <module name="org.jboss.resteasy.resteasy-jackson-provider"
slot="main"/>
+ </exclusions>
+ </sub-deployment>
</jboss-deployment-structure>
Modified: branches/community/Seam_2_3/examples-ee6/tasks/tasks-ejb/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/tasks/tasks-ejb/pom.xml 2012-04-24 15:50:50
UTC (rev 14635)
+++ branches/community/Seam_2_3/examples-ee6/tasks/tasks-ejb/pom.xml 2012-04-25 07:46:15
UTC (rev 14636)
@@ -53,45 +53,13 @@
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-jaxrs</artifactId>
<scope>provided</scope>
- <version>2.3.2.Final</version>
</dependency>
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-atom-provider</artifactId>
<scope>provided</scope>
- <version>2.3.2.Final</version>
</dependency>
<dependency>
- <groupId>org.jboss.resteasy</groupId>
- <artifactId>resteasy-jackson-provider</artifactId>
- <version>2.3.2.Final</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.resteasy</groupId>
- <artifactId>resteasy-jaxb-provider</artifactId>
- <version>2.3.2.Final</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-jaxrs</artifactId>
- <version>1.9.2</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-mapper-asl</artifactId>
- <version>1.9.2</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-core-asl</artifactId>
- <version>1.9.2</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-xc</artifactId>
- <version>1.9.2</version>
- </dependency>
- <dependency>
<groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam-resteasy</artifactId>
<exclusions>
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-24
15:50:50 UTC (rev 14635)
+++
branches/community/Seam_2_3/examples-ee6/tasks/tasks-ejb/src/main/java/org/jboss/seam/example/tasks/entity/Category.java 2012-04-25
07:46:15 UTC (rev 14636)
@@ -37,9 +37,6 @@
import javax.xml.bind.annotation.XmlTransient;
import javax.validation.constraints.NotNull;
-import org.codehaus.jackson.annotate.JsonBackReference;
-import org.codehaus.jackson.annotate.JsonManagedReference;
-import org.jboss.resteasy.annotations.providers.jaxb.IgnoreMediaTypes;
/**
*
@@ -95,7 +92,6 @@
@OneToMany(mappedBy = "category", cascade = CascadeType.REMOVE)
@XmlTransient
- @JsonManagedReference("category-task")
public List<Task> getTasks()
{
return tasks;
@@ -108,7 +104,6 @@
@ManyToOne
@XmlTransient
- @JsonBackReference("category-owner")
public User getOwner()
{
return owner;
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-24
15:50:50 UTC (rev 14635)
+++
branches/community/Seam_2_3/examples-ee6/tasks/tasks-ejb/src/main/java/org/jboss/seam/example/tasks/entity/Task.java 2012-04-25
07:46:15 UTC (rev 14636)
@@ -29,7 +29,6 @@
import javax.xml.bind.annotation.XmlTransient;
import javax.validation.constraints.NotNull;
-import org.codehaus.jackson.annotate.JsonBackReference;
/**
*
@@ -109,7 +108,6 @@
@ManyToOne
@XmlTransient
@NotNull
- @JsonBackReference("category-task")
public Category getCategory()
{
return category;
@@ -128,7 +126,6 @@
}
@Transient
- @JsonBackReference("task-owner")
public User getOwner() {
return category.getOwner();
}
Modified:
branches/community/Seam_2_3/examples-ee6/tasks/tasks-ejb/src/main/java/org/jboss/seam/example/tasks/entity/User.java
===================================================================
---
branches/community/Seam_2_3/examples-ee6/tasks/tasks-ejb/src/main/java/org/jboss/seam/example/tasks/entity/User.java 2012-04-24
15:50:50 UTC (rev 14635)
+++
branches/community/Seam_2_3/examples-ee6/tasks/tasks-ejb/src/main/java/org/jboss/seam/example/tasks/entity/User.java 2012-04-25
07:46:15 UTC (rev 14636)
@@ -30,7 +30,6 @@
import javax.xml.bind.annotation.XmlTransient;
import javax.validation.constraints.NotNull;
-import org.codehaus.jackson.annotate.JsonManagedReference;
/**
*
@@ -70,7 +69,6 @@
@OneToMany(mappedBy = "owner")
@XmlTransient
- @JsonManagedReference("category-owner")
public List<Category> getCategories()
{
return categories;
Modified:
branches/community/Seam_2_3/examples-ee6/tasks/tasks-tests/src/test/java/org/jboss/seam/example/tasks/test/TaskResourceTest.java
===================================================================
---
branches/community/Seam_2_3/examples-ee6/tasks/tasks-tests/src/test/java/org/jboss/seam/example/tasks/test/TaskResourceTest.java 2012-04-24
15:50:50 UTC (rev 14635)
+++
branches/community/Seam_2_3/examples-ee6/tasks/tasks-tests/src/test/java/org/jboss/seam/example/tasks/test/TaskResourceTest.java 2012-04-25
07:46:15 UTC (rev 14636)
@@ -61,7 +61,7 @@
public void createTaskTest() throws Exception
{
final String mimeType = "application/json";
- final String representation = "{\"name\":\"Test
task\"}";
+ final String representation =
"{\"task\":{\"name\":\"Test task\"}}";
new ResourceRequest(new ResourceRequestEnvironment(this), Method.POST,
"/v1/auth/category/School/unresolved")
{