Bump seam-parent version plus minor fixes to get integration tests wo…

…rking again.
seam · Aug 25, 2011 · 88ba0e5 · 88ba0e5
1 parent 37b8610
commit 88ba0e5
Show file tree

Hide file tree

Showing 21 changed files with 83 additions and 62 deletions.
diff --git a/impl/pom.xml b/impl/pom.xml
@@ -17,11 +17,10 @@
     <url>http://seamframework.org/Seam3/RESTModule</url>
 
     <properties>
-        <arquillian.version>1.0.0.CR1</arquillian.version>
+        <jbossas7.version>7.0.1.Final</jbossas7.version>
         <jbossas6.version>6.1.0.Final</jbossas6.version>
-        <jbossas7.version>7.0.0.CR1</jbossas7.version>
         <jboss.osgi.version>1.0.27</jboss.osgi.version>
-        <arquillian.launch>jbossas7</arquillian.launch>
+        <arquillian.version>1.0.0.CR3</arquillian.version>
     </properties>
 
     <dependencies>
@@ -80,9 +79,15 @@
         <dependency>
             <groupId>org.jboss.arquillian.junit</groupId>
             <artifactId>arquillian-junit-container</artifactId>
-            <version>${arquillian.version}</version>
             <scope>test</scope>
+            <version>${arquillian.version}</version>
         </dependency>
+
+        <dependency>
+            <groupId>org.jboss.shrinkwrap.resolver</groupId>
+            <artifactId>shrinkwrap-resolver-impl-maven</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>commons-httpclient</groupId>
             <artifactId>commons-httpclient</artifactId>
@@ -128,12 +133,6 @@
                             <additionalClasspathElements>
                                 <additionalClasspathElement>${basedir}/target/lib</additionalClasspathElement>
                             </additionalClasspathElements>
-                            <systemProperties>
-                                <property>
-                                    <name>arquillian.launch</name>
-                                    <value>${arquillian.launch}</value>
-                                </property>
-                            </systemProperties>
                         </configuration>
                     </execution>
                 </executions>
@@ -246,20 +245,18 @@
             <properties>
                 <bindAddress>localhost</bindAddress>
                 <httpPort>8080</httpPort>
-                <arquillian.launch>jbossas6</arquillian.launch>
             </properties>
             <dependencies>
                 <dependency>
                     <groupId>org.jboss.jbossas</groupId>
                     <artifactId>jboss-as-client</artifactId>
                     <type>pom</type>
-			<version>${jbossas6.version}</version>
+                    <version>${jbossas6.version}</version>
                     <scope>test</scope>
                 </dependency>
                 <dependency>
                     <groupId>org.jboss.arquillian.container</groupId>
                     <artifactId>arquillian-jbossas-managed-6</artifactId>
-                    <version>${arquillian.version}</version>
                     <scope>test</scope>
                 </dependency>
                 <dependency>
@@ -272,9 +269,6 @@
 
         <profile>
             <id>jbossas-remote-6</id>
-            <properties>
-                <arquillian.launch>jbossas6</arquillian.launch>
-            </properties>
             <dependencies>
                 <dependency>
                     <groupId>org.jboss.jbossas</groupId>
@@ -286,7 +280,6 @@
                 <dependency>
                     <groupId>org.jboss.arquillian.container</groupId>
                     <artifactId>arquillian-jbossas-remote-6</artifactId>
-                    <version>${arquillian.version}</version>
                     <scope>test</scope>
                 </dependency>
             </dependencies>
@@ -317,9 +310,14 @@
                 <dependency>
                     <groupId>org.jboss.arquillian.container</groupId>
                     <artifactId>arquillian-glassfish-remote-3.1</artifactId>
-                    <version>${arquillian.version}</version>
                     <scope>test</scope>
                 </dependency>
+                <!-- Workaround for ARQ-543 -->
+                <dependency>
+                    <groupId>org.jboss.arquillian.testenricher</groupId>
+                    <artifactId>arquillian-testenricher-initialcontext</artifactId>
+                    <version>1.0.0.CR4</version>
+                </dependency>
                 <dependency>
                     <groupId>com.sun.jersey</groupId>
                     <artifactId>jersey-bundle</artifactId>

diff --git a/impl/src/main/java/org/jboss/seam/rest/SeamRestStartup.java b/impl/src/main/java/org/jboss/seam/rest/SeamRestStartup.java
@@ -5,7 +5,7 @@
 import javax.inject.Inject;
 import javax.servlet.ServletContext;
 
-import org.jboss.logging.Logger;
+import org.jboss.seam.logging.Logger;
 import org.jboss.seam.rest.client.RestClientExtension;
 import org.jboss.seam.rest.exceptions.ExceptionMappingExtension;
 import org.jboss.seam.rest.exceptions.RestResource;

diff --git a/impl/src/main/java/org/jboss/seam/rest/SeamRestStartupListener.java b/impl/src/main/java/org/jboss/seam/rest/SeamRestStartupListener.java
@@ -8,7 +8,7 @@
 import javax.servlet.annotation.WebListener;
 import javax.servlet.http.HttpServlet;
 
-import org.jboss.logging.Logger;
+import org.jboss.seam.logging.Logger;
 
 /**
  * We also extend HttpServlet so that Seam REST can be bootstrapped by eagerly-loaded Servlet on Tomcat 7, where 

diff --git a/impl/src/main/java/org/jboss/seam/rest/client/RestClientExtension.java b/impl/src/main/java/org/jboss/seam/rest/client/RestClientExtension.java
@@ -14,7 +14,7 @@
 import javax.enterprise.inject.spi.ProcessBean;
 import javax.enterprise.inject.spi.ProcessManagedBean;
 
-import org.jboss.logging.Logger;
+import org.jboss.seam.logging.Logger;
 import org.jboss.seam.rest.util.Utils;
 import org.jboss.seam.solder.reflection.AnnotationInspector;
 

diff --git a/impl/src/main/java/org/jboss/seam/rest/client/RestClientProducer.java b/impl/src/main/java/org/jboss/seam/rest/client/RestClientProducer.java
@@ -9,7 +9,7 @@
 import javax.enterprise.inject.spi.InjectionPoint;
 import javax.inject.Inject;
 
-import org.jboss.logging.Logger;
+import org.jboss.seam.logging.Logger;
 import org.jboss.resteasy.client.ClientExecutor;
 import org.jboss.resteasy.client.ClientRequest;
 import org.jboss.resteasy.client.ProxyFactory;

diff --git a/impl/src/main/java/org/jboss/seam/rest/exceptions/ExceptionMappingExtension.java b/impl/src/main/java/org/jboss/seam/rest/exceptions/ExceptionMappingExtension.java
@@ -11,7 +11,7 @@
 import javax.enterprise.inject.spi.Extension;
 import javax.enterprise.inject.spi.ProcessAnnotatedType;
 
-import org.jboss.logging.Logger;
+import org.jboss.seam.logging.Logger;
 import org.jboss.seam.rest.util.Utils;
 
 public class ExceptionMappingExtension implements Extension {

diff --git a/impl/src/main/java/org/jboss/seam/rest/exceptions/SeamExceptionMapper.java b/impl/src/main/java/org/jboss/seam/rest/exceptions/SeamExceptionMapper.java
@@ -14,7 +14,7 @@
 import javax.ws.rs.ext.ExceptionMapper;
 import javax.ws.rs.ext.Provider;
 
-import org.jboss.logging.Logger;
+import org.jboss.seam.logging.Logger;
 import org.jboss.seam.rest.SeamRestConfiguration;
 import org.jboss.seam.rest.validation.ValidationException;
 import org.jboss.seam.rest.validation.ValidationExceptionHandler;

diff --git a/impl/src/main/java/org/jboss/seam/rest/exceptions/integration/CatchExceptionMapper.java b/impl/src/main/java/org/jboss/seam/rest/exceptions/integration/CatchExceptionMapper.java
@@ -9,7 +9,7 @@
 import javax.ws.rs.core.Response.ResponseBuilder;
 import javax.ws.rs.ext.ExceptionMapper;
 
-import org.jboss.logging.Logger;
+import org.jboss.seam.logging.Logger;
 import org.jboss.seam.exception.control.CaughtException;
 import org.jboss.seam.exception.control.ExceptionToCatch;
 import org.jboss.seam.exception.control.Handles;

diff --git a/impl/src/main/java/org/jboss/seam/rest/templating/TemplatingMessageBodyWriter.java b/impl/src/main/java/org/jboss/seam/rest/templating/TemplatingMessageBodyWriter.java
@@ -18,7 +18,7 @@
 import javax.ws.rs.ext.MessageBodyWriter;
 import javax.ws.rs.ext.Provider;
 
-import org.jboss.logging.Logger;
+import org.jboss.seam.logging.Logger;
 import org.jboss.seam.rest.SeamRestConfiguration;
 import org.jboss.seam.rest.exceptions.RestResource;
 

diff --git a/impl/src/main/java/org/jboss/seam/rest/validation/ValidationInterceptor.java b/impl/src/main/java/org/jboss/seam/rest/validation/ValidationInterceptor.java
@@ -15,7 +15,7 @@
 import javax.validation.Valid;
 import javax.validation.Validator;
 
-import org.jboss.logging.Logger;
+import org.jboss.seam.logging.Logger;
 import org.jboss.seam.rest.util.Annotations;
 import org.jboss.seam.solder.reflection.AnnotationInspector;
 import org.jboss.seam.solder.reflection.PrimitiveTypes;

diff --git a/impl/src/test/java/org/jboss/seam/rest/test/Dependencies.java b/impl/src/test/java/org/jboss/seam/rest/test/Dependencies.java
@@ -1,18 +1,23 @@
 package org.jboss.seam.rest.test;
 
+import java.io.InputStream;
+
+import org.jboss.osgi.testing.ManifestBuilder;
 import org.jboss.shrinkwrap.api.Archive;
 import org.jboss.shrinkwrap.api.GenericArchive;
+import org.jboss.shrinkwrap.api.asset.Asset;
+import org.jboss.shrinkwrap.api.container.ManifestContainer;
 import org.jboss.shrinkwrap.resolver.api.DependencyResolvers;
 import org.jboss.shrinkwrap.resolver.api.maven.MavenDependencyResolver;
 
-public interface Dependencies {
+public class Dependencies {
     public static final Archive<?>[] SEAM_SOLDER = DependencyResolvers.use(MavenDependencyResolver.class)
-            .loadReposFromPom("pom.xml").artifact("org.jboss.seam.solder:seam-solder").exclusion("*")
-            .resolveAs(GenericArchive.class).toArray(new Archive<?>[0]);
+            .loadReposFromPom("pom.xml").artifact("org.jboss.seam.solder:seam-solder").resolveAs(GenericArchive.class)
+            .toArray(new Archive<?>[0]);
 
     public static final Archive<?>[] SEAM_CATCH = DependencyResolvers.use(MavenDependencyResolver.class)
-            .loadReposFromPom("pom.xml").artifact("org.jboss.seam.catch:seam-catch").exclusion("*")
-            .resolveAs(GenericArchive.class).toArray(new Archive<?>[0]);
+            .loadReposFromPom("pom.xml").artifact("org.jboss.seam.catch:seam-catch").resolveAs(GenericArchive.class)
+            .toArray(new Archive<?>[0]);
 
     public static final Archive<?>[] FREEMARKER = DependencyResolvers.use(MavenDependencyResolver.class)
             .loadReposFromPom("pom.xml").artifact("org.freemarker:freemarker").exclusion("*").resolveAs(GenericArchive.class)
@@ -23,6 +28,24 @@ public interface Dependencies {
             .toArray(new Archive<?>[0]);
 
     public static final Archive<?>[] VELOCITY_TOOLS = DependencyResolvers.use(MavenDependencyResolver.class)
-            .loadReposFromPom("pom.xml").artifact("org.apache.velocity:velocity-tools").exclusion("*").resolveAs(GenericArchive.class)
-            .toArray(new Archive<?>[0]);
+            .loadReposFromPom("pom.xml").artifact("org.apache.velocity:velocity-tools").exclusion("*")
+            .resolveAs(GenericArchive.class).toArray(new Archive<?>[0]);
+
+    public static <T extends ManifestContainer<?>> T addDependencyToManifest(T archive, final String dependencies)
+    {
+        archive.setManifest(new Asset() {
+
+            @Override
+            public InputStream openStream() {
+                return ManifestBuilder.newInstance().addManifestHeader("Dependencies", dependencies)
+                        .openStream();
+            }
+        });
+        return archive;
+    }
+
+    public static <T extends ManifestContainer<?>> T addJBossLoggingDependencyToManifest(T archive)
+    {
+        return addDependencyToManifest(archive, "org.jboss.logging,org.jboss.logmanager");
+    }
 }
diff --git a/impl/src/test/java/org/jboss/seam/rest/test/client/RestClientTest.java b/impl/src/test/java/org/jboss/seam/rest/test/client/RestClientTest.java
@@ -1,15 +1,14 @@
 package org.jboss.seam.rest.test.client;
 
-import java.io.File;
-import java.io.InputStream;
+import static org.jboss.seam.rest.test.Dependencies.addDependencyToManifest;
+import static org.junit.Assert.assertEquals;
 
 import javax.enterprise.inject.spi.Extension;
 import javax.inject.Inject;
 import javax.ws.rs.core.MediaType;
 
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
-import org.jboss.osgi.testing.ManifestBuilder;
 import org.jboss.resteasy.client.ClientRequest;
 import org.jboss.resteasy.client.ClientResponse;
 import org.jboss.seam.rest.client.RestClientExtension;
@@ -18,16 +17,12 @@
 import org.jboss.seam.solder.bean.Beans;
 import org.jboss.seam.solder.literal.DefaultLiteral;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.asset.Asset;
 import org.jboss.shrinkwrap.api.asset.EmptyAsset;
-import org.jboss.shrinkwrap.api.exporter.ZipExporter;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
 import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import static org.junit.Assert.assertEquals;
-
 @RunWith(Arquillian.class)
 public class RestClientTest {
     @Inject
@@ -44,17 +39,7 @@ public static WebArchive getDeployment() {
         war.setWebXML("WEB-INF/web.xml");
         war.addAsLibrary(getSeamRest());
         war.addAsLibraries(Dependencies.SEAM_SOLDER);
-
-        // JBoss AS 7
-        war.setManifest(new Asset() {
-
-            @Override
-            public InputStream openStream() {
-                return ManifestBuilder.newInstance().addManifestHeader("Dependencies", "org.apache.httpcomponents")
-                        .openStream();
-            }
-        });
-        war.as(ZipExporter.class).exportTo(new File("target/test.war"));
+        addDependencyToManifest(war, "org.jboss.logging,org.jboss.logmanager,org.apache.httpcomponents"); // JBoss AS 7, SOLDER-119
         return war;
     }
 

diff --git a/impl/src/test/java/org/jboss/seam/rest/test/exceptions/BuiltinExceptionMappingTest.java b/impl/src/test/java/org/jboss/seam/rest/test/exceptions/BuiltinExceptionMappingTest.java
@@ -1,5 +1,7 @@
 package org.jboss.seam.rest.test.exceptions;
 
+import static org.jboss.seam.rest.test.Dependencies.addJBossLoggingDependencyToManifest;
+
 import javax.enterprise.inject.spi.Extension;
 
 import org.jboss.arquillian.container.test.api.Deployment;
@@ -26,6 +28,7 @@ public static WebArchive createDeployment() {
         war.addClasses(Exception1.class, Exception2.class);
         war.addAsLibraries(Dependencies.SEAM_SOLDER);
         war.addAsLibraries(getSeamRest());
+        addJBossLoggingDependencyToManifest(war); // SOLDER-119
         return war;
     }
 

diff --git a/impl/src/test/java/org/jboss/seam/rest/test/exceptions/CatchIntegrationTest.java b/impl/src/test/java/org/jboss/seam/rest/test/exceptions/CatchIntegrationTest.java
@@ -1,5 +1,7 @@
 package org.jboss.seam.rest.test.exceptions;
 
+import static org.jboss.seam.rest.test.Dependencies.addJBossLoggingDependencyToManifest;
+
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.seam.rest.test.Dependencies;
@@ -13,6 +15,7 @@ public class CatchIntegrationTest extends BuiltinExceptionMappingTest {
     public static WebArchive createDeployment() {
         WebArchive war = BuiltinExceptionMappingTest.createDeployment();
         war.addAsLibraries(Dependencies.SEAM_CATCH);
+        addJBossLoggingDependencyToManifest(war); // SOLDER-119
         return war;
     }
 

diff --git a/impl/src/test/java/org/jboss/seam/rest/test/templating/DisabledTemplatingTest.java b/impl/src/test/java/org/jboss/seam/rest/test/templating/DisabledTemplatingTest.java
@@ -1,5 +1,7 @@
 package org.jboss.seam.rest.test.templating;
 
+import static org.jboss.seam.rest.test.Dependencies.addJBossLoggingDependencyToManifest;
+
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.Test;
@@ -12,7 +14,9 @@
 public class DisabledTemplatingTest extends AbstractTemplatingTest {
     @Deployment(testable = false)
     public static WebArchive createDeployment() {
-        return createTestApplication().addAsLibrary(getSeamRest());
+        WebArchive war = createTestApplication().addAsLibrary(getSeamRest());
+        addJBossLoggingDependencyToManifest(war); // SOLDER-119
+        return war;
     }
 
     @Test

diff --git a/impl/src/test/java/org/jboss/seam/rest/test/templating/FreeMarkerTest.java b/impl/src/test/java/org/jboss/seam/rest/test/templating/FreeMarkerTest.java
@@ -1,5 +1,7 @@
 package org.jboss.seam.rest.test.templating;
 
+import static org.jboss.seam.rest.test.Dependencies.addJBossLoggingDependencyToManifest;
+
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.seam.rest.test.Dependencies;
 import org.jboss.shrinkwrap.api.spec.WebArchive;
@@ -12,6 +14,7 @@ public static WebArchive createDeployment() {
         WebArchive war = createTestApplication();
         war.addAsLibraries(Dependencies.FREEMARKER);
         war.addAsLibrary(getSeamRest());
+        addJBossLoggingDependencyToManifest(war); // SOLDER-119
         return war;
     }
     @Test

diff --git a/impl/src/test/java/org/jboss/seam/rest/test/templating/VelocityTest.java b/impl/src/test/java/org/jboss/seam/rest/test/templating/VelocityTest.java
@@ -1,5 +1,7 @@
 package org.jboss.seam.rest.test.templating;
 
+import static org.jboss.seam.rest.test.Dependencies.addJBossLoggingDependencyToManifest;
+
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.seam.rest.test.Dependencies;
 import org.jboss.shrinkwrap.api.spec.WebArchive;
@@ -13,6 +15,7 @@ public static WebArchive createDeployment() {
         war.addAsLibraries(Dependencies.VELOCITY);
         war.addAsLibraries(Dependencies.VELOCITY_TOOLS);
         war.addAsLibrary(getSeamRest());
+        addJBossLoggingDependencyToManifest(war); // SOLDER-119
         return war;
     }
 

diff --git a/...est/java/org/jboss/seam/rest/test/templating/multiple/PreferedTemplatingProviderTest.java b/...est/java/org/jboss/seam/rest/test/templating/multiple/PreferedTemplatingProviderTest.java
@@ -1,5 +1,7 @@
 package org.jboss.seam.rest.test.templating.multiple;
 
+import static org.jboss.seam.rest.test.Dependencies.addJBossLoggingDependencyToManifest;
+
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.seam.rest.test.Dependencies;
 import org.jboss.seam.rest.test.templating.AbstractTemplatingTest;
@@ -19,6 +21,7 @@ public static WebArchive createDeployment() {
         war.addAsLibraries(Dependencies.VELOCITY);
         war.addAsLibraries(Dependencies.VELOCITY_TOOLS);
         war.addAsLibrary(getSeamRest());
+        addJBossLoggingDependencyToManifest(war); // SOLDER-119
         return war;
     }