svn commit: r1627372 - in /tomee/tomee/branches/tomee-1.7.x/arquillian: arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/ arquillian-tomee-tests/arquillian-tomee-jaxws-tests/src/test/java/org/apache/openejb/arquillian/tests/ja...

[rmannibucau]

Author: rmannibucau
Date: Wed Sep 24 17:42:35 2014
New Revision: 1627372

URL: http://svn.apache.org/r1627372
Log:
TOMEE-1362 WsRsTest was broken + avoid warning in tomee injection enricher when 
not relevant

Modified:
    
tomee/tomee/branches/tomee-1.7.x/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEInjectionEnricher.java
    
tomee/tomee/branches/tomee-1.7.x/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxws/wsrs/WsRsTest.java

Modified: 
tomee/tomee/branches/tomee-1.7.x/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEInjectionEnricher.java
URL: 
http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEInjectionEnricher.java?rev=1627372&r1=1627371&r2=1627372&view=diff
==============================================================================
--- 
tomee/tomee/branches/tomee-1.7.x/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEInjectionEnricher.java
 (original)
+++ 
tomee/tomee/branches/tomee-1.7.x/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEInjectionEnricher.java
 Wed Sep 24 17:42:35 2014
@@ -71,7 +71,9 @@ public class TomEEInjectionEnricher impl
             }
         }
 
-        
Logger.getLogger(TomEEInjectionEnricher.class.getName()).log(Level.WARNING, 
"Failed to find AppContext for: " + clazzName);
+        if (deployment != null && deployment.get() != null && 
deployment.get().getDescription().testable()) {
+            
Logger.getLogger(TomEEInjectionEnricher.class.getName()).log(Level.WARNING, 
"Failed to find AppContext for: " + clazzName);
+        }
 
         return null;
     }

Modified: 
tomee/tomee/branches/tomee-1.7.x/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxws/wsrs/WsRsTest.java
URL: 
http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxws/wsrs/WsRsTest.java?rev=1627372&r1=1627371&r2=1627372&view=diff
==============================================================================
--- 
tomee/tomee/branches/tomee-1.7.x/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxws/wsrs/WsRsTest.java
 (original)
+++ 
tomee/tomee/branches/tomee-1.7.x/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxws/wsrs/WsRsTest.java
 Wed Sep 24 17:42:35 2014
@@ -27,11 +27,16 @@ import org.jboss.arquillian.container.te
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.arquillian.test.api.ArquillianResource;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
 import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.jboss.shrinkwrap.descriptor.api.Descriptors;
+import org.jboss.shrinkwrap.descriptor.api.webapp30.WebAppDescriptor;
+import org.jboss.shrinkwrap.descriptor.api.webcommon30.WebAppVersionType;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+import javax.ws.rs.core.Application;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URI;
@@ -51,7 +56,24 @@ public class WsRsTest {
     @Deployment(testable = false)
     public static WebArchive createDeployment() {
         return ShrinkWrap.create(WebArchive.class, 
WsRsTest.class.getName().concat(".war"))
-                .addClasses(Bean.class);
+                .addClasses(Bean.class)
+                // jaxws and jaxrs are "servlets" so if one (jaxrs here) binds 
to /* then the other one is not accessible depending deployment order
+                .setWebXML(new StringAsset(
+                        Descriptors.create(WebAppDescriptor.class)
+                            .version(WebAppVersionType._3_0)
+                            .getOrCreateServlet()
+                                .servletName("jaxrs")
+                                .servletClass(Application.class.getName())
+                                .createInitParam()
+                                    .paramName(Application.class.getName())
+                                    .paramValue(Application.class.getName())
+                                .up()
+                            .up()
+                            .getOrCreateServletMapping()
+                                .servletName("jaxrs")
+                                .urlPattern("/api")
+                            .up()
+                            .exportAsString()));
     }
 
     @Test
@@ -84,7 +106,7 @@ public class WsRsTest {
 
     @Test
     public void invokeRest() throws Exception {
-        final URI uri = new URI(url.toExternalForm() + "rest/bean");
+        final URI uri = new URI(url.toExternalForm() + "api/rest/bean");
 
         final HttpGet get = new HttpGet(uri);
         final HttpResponse response = client.execute(get);