[jboss-cvs] JBossAS SVN: r111833 - in trunk/resteasy-int/test/cdi-test-2: src/main/java/org/jboss/resteasy/cdi/test/basic and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Jul 26 04:52:11 EDT 2011
Author: jharting
Date: 2011-07-26 04:52:10 -0400 (Tue, 26 Jul 2011)
New Revision: 111833
Modified:
trunk/resteasy-int/test/cdi-test-2/pom.xml
trunk/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/basic/TestProvider.java
trunk/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/basic/TestResource.java
trunk/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/ejb/BeanClassLocalViewEjbProvider.java
trunk/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/ejb/SingletonProvider.java
trunk/resteasy-int/test/cdi-test-2/src/test/java/org/jboss/resteasy/cdi/test/AbstractTest.java
Log:
minor fixes to make the tests pass on JBoss AS 7.
Modified: trunk/resteasy-int/test/cdi-test-2/pom.xml
===================================================================
--- trunk/resteasy-int/test/cdi-test-2/pom.xml 2011-07-26 07:13:15 UTC (rev 111832)
+++ trunk/resteasy-int/test/cdi-test-2/pom.xml 2011-07-26 08:52:10 UTC (rev 111833)
@@ -94,6 +94,7 @@
</repositories>
<build>
+ <finalName>resteasy-cdi</finalName>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -129,7 +130,6 @@
<profile>
<id>jbossas7</id>
<build>
- <finalName>resteasy-cdi</finalName>
<plugins>
<plugin>
<groupId>org.jboss.as.plugins</groupId>
@@ -175,7 +175,6 @@
<activeByDefault>true</activeByDefault>
</activation>
<build>
- <finalName>resteasy-cdi</finalName>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
Modified: trunk/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/basic/TestProvider.java
===================================================================
--- trunk/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/basic/TestProvider.java 2011-07-26 07:13:15 UTC (rev 111832)
+++ trunk/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/basic/TestProvider.java 2011-07-26 08:52:10 UTC (rev 111833)
@@ -22,7 +22,7 @@
import org.jboss.resteasy.cdi.test.Dog;
@Provider
- at Produces("text/plain")
+ at Produces("text/foo")
public class TestProvider implements MessageBodyWriter<Dog>
{
Modified: trunk/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/basic/TestResource.java
===================================================================
--- trunk/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/basic/TestResource.java 2011-07-26 07:13:15 UTC (rev 111832)
+++ trunk/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/basic/TestResource.java 2011-07-26 08:52:10 UTC (rev 111833)
@@ -113,6 +113,7 @@
@GET
@Path("/providers")
+ @Produces("text/foo")
public Dog testProviders()
{
return new Dog();
@@ -120,6 +121,7 @@
@GET
@Path("/resteasyInterceptor")
+ @Produces("text/foo")
public Dog testResteasyInterceptor()
{
return new Dog();
Modified: trunk/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/ejb/BeanClassLocalViewEjbProvider.java
===================================================================
--- trunk/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/ejb/BeanClassLocalViewEjbProvider.java 2011-07-26 07:13:15 UTC (rev 111832)
+++ trunk/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/ejb/BeanClassLocalViewEjbProvider.java 2011-07-26 08:52:10 UTC (rev 111833)
@@ -1,7 +1,7 @@
package org.jboss.resteasy.cdi.test.ejb;
import javax.ejb.EJB;
-import javax.ejb.LocalBean;
+import javax.ejb.Local;
import javax.ejb.Stateless;
import javax.inject.Inject;
import javax.ws.rs.Produces;
@@ -17,51 +17,46 @@
@Provider
@Produces("text/plain")
@Stateless
- at LocalBean
-public class BeanClassLocalViewEjbProvider implements ExceptionMapper<NullPointerException>
-{
+ at Local({ BeanClassLocalViewEjbProvider.class, ExceptionMapper.class })
+public class BeanClassLocalViewEjbProvider implements ExceptionMapper<NullPointerException> {
- @Inject
- private Cat cat;
- @EJB
- private InjectedStatelessEjbLocal statelessEjb;
- private Cat constructorCat;
- private Cat initializerCat;
- @Context
- private Providers providers;
-
- public BeanClassLocalViewEjbProvider()
- {
- }
+ @Inject
+ private Cat cat;
+ @EJB
+ private InjectedStatelessEjbLocal statelessEjb;
+ private Cat constructorCat;
+ private Cat initializerCat;
+ @Context
+ private Providers providers;
- @Inject
- public BeanClassLocalViewEjbProvider(Cat cat)
- {
- constructorCat = cat;
- }
-
- @Inject
- public void init(Cat cat)
- {
- initializerCat = cat;
- }
-
- public Response toResponse(NullPointerException exception)
- {
- StringBuilder builder = new StringBuilder();
- builder.append("CDI field injection: ");
- builder.append(cat != null);
- builder.append("\nCDI constructor injection: ");
- builder.append(constructorCat != null);
- builder.append("\nCDI initializer injection: ");
- builder.append(initializerCat != null);
- builder.append("\nEJB injection: ");
- builder.append(statelessEjb != null);
- builder.append("\nJAX-RS field injection: ");
- builder.append(providers != null);
- builder.append("\nProvider toString(): ");
- builder.append(toString());
-
- return Response.status(Status.OK).entity(builder.toString()).build();
- }
+ public BeanClassLocalViewEjbProvider() {
+ }
+
+ @Inject
+ public BeanClassLocalViewEjbProvider(Cat cat) {
+ constructorCat = cat;
+ }
+
+ @Inject
+ public void init(Cat cat) {
+ initializerCat = cat;
+ }
+
+ public Response toResponse(NullPointerException exception) {
+ StringBuilder builder = new StringBuilder();
+ builder.append("CDI field injection: ");
+ builder.append(cat != null);
+ builder.append("\nCDI constructor injection: ");
+ builder.append(constructorCat != null);
+ builder.append("\nCDI initializer injection: ");
+ builder.append(initializerCat != null);
+ builder.append("\nEJB injection: ");
+ builder.append(statelessEjb != null);
+ builder.append("\nJAX-RS field injection: ");
+ builder.append(providers != null);
+ builder.append("\nProvider toString(): ");
+ builder.append(toString());
+
+ return Response.status(Status.OK).entity(builder.toString()).build();
+ }
}
Modified: trunk/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/ejb/SingletonProvider.java
===================================================================
--- trunk/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/ejb/SingletonProvider.java 2011-07-26 07:13:15 UTC (rev 111832)
+++ trunk/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/ejb/SingletonProvider.java 2011-07-26 08:52:10 UTC (rev 111833)
@@ -1,7 +1,7 @@
package org.jboss.resteasy.cdi.test.ejb;
import javax.ejb.EJB;
-import javax.ejb.LocalBean;
+import javax.ejb.Local;
import javax.ejb.Singleton;
import javax.inject.Inject;
import javax.ws.rs.Produces;
@@ -15,7 +15,7 @@
import org.jboss.resteasy.cdi.test.Cat;
@Singleton
- at LocalBean
+ at Local({SingletonProvider.class, ExceptionMapper.class})
@Produces("text/plain")
@Provider
public class SingletonProvider implements ExceptionMapper<InstantiationException>
Modified: trunk/resteasy-int/test/cdi-test-2/src/test/java/org/jboss/resteasy/cdi/test/AbstractTest.java
===================================================================
--- trunk/resteasy-int/test/cdi-test-2/src/test/java/org/jboss/resteasy/cdi/test/AbstractTest.java 2011-07-26 07:13:15 UTC (rev 111832)
+++ trunk/resteasy-int/test/cdi-test-2/src/test/java/org/jboss/resteasy/cdi/test/AbstractTest.java 2011-07-26 08:52:10 UTC (rev 111833)
@@ -18,7 +18,7 @@
public void testPlainTextReadonlyResource(String uri, String body)
{
GetMethod get = new GetMethod(uri);
- get.addRequestHeader("Accept", "text/plain");
+ get.addRequestHeader("Accept", "text/*");
try
{
int status = client.executeMethod(get);
More information about the jboss-cvs-commits
mailing list