From 88ba0e5624940d8e45d98b39c544d257a6d773db Mon Sep 17 00:00:00 2001 From: Jozef Hartinger Date: Thu, 25 Aug 2011 08:52:03 +0200 Subject: [PATCH] Bump seam-parent version plus minor fixes to get integration tests working again. --- impl/pom.xml | 34 ++++++++--------- .../org/jboss/seam/rest/SeamRestStartup.java | 2 +- .../seam/rest/SeamRestStartupListener.java | 2 +- .../seam/rest/client/RestClientExtension.java | 2 +- .../seam/rest/client/RestClientProducer.java | 2 +- .../exceptions/ExceptionMappingExtension.java | 2 +- .../rest/exceptions/SeamExceptionMapper.java | 2 +- .../integration/CatchExceptionMapper.java | 2 +- .../TemplatingMessageBodyWriter.java | 2 +- .../validation/ValidationInterceptor.java | 2 +- .../jboss/seam/rest/test/Dependencies.java | 37 +++++++++++++++---- .../seam/rest/test/client/RestClientTest.java | 21 ++--------- .../BuiltinExceptionMappingTest.java | 3 ++ .../test/exceptions/CatchIntegrationTest.java | 3 ++ .../templating/DisabledTemplatingTest.java | 6 ++- .../rest/test/templating/FreeMarkerTest.java | 3 ++ .../rest/test/templating/VelocityTest.java | 3 ++ .../PreferedTemplatingProviderTest.java | 3 ++ .../rest/test/validation/ValidationTest.java | 2 + impl/src/test/resources/arquillian.xml | 8 +--- pom.xml | 4 +- 21 files changed, 83 insertions(+), 62 deletions(-) diff --git a/impl/pom.xml b/impl/pom.xml index 7d65183..3a503e4 100644 --- a/impl/pom.xml +++ b/impl/pom.xml @@ -17,11 +17,10 @@ http://seamframework.org/Seam3/RESTModule - 1.0.0.CR1 + 7.0.1.Final 6.1.0.Final - 7.0.0.CR1 1.0.27 - jbossas7 + 1.0.0.CR3 @@ -80,9 +79,15 @@ org.jboss.arquillian.junit arquillian-junit-container - ${arquillian.version} test + ${arquillian.version} + + + org.jboss.shrinkwrap.resolver + shrinkwrap-resolver-impl-maven + + commons-httpclient commons-httpclient @@ -128,12 +133,6 @@ ${basedir}/target/lib - - - arquillian.launch - ${arquillian.launch} - - @@ -246,20 +245,18 @@ localhost 8080 - jbossas6 org.jboss.jbossas jboss-as-client pom - ${jbossas6.version} + ${jbossas6.version} test org.jboss.arquillian.container arquillian-jbossas-managed-6 - ${arquillian.version} test @@ -272,9 +269,6 @@ jbossas-remote-6 - - jbossas6 - org.jboss.jbossas @@ -286,7 +280,6 @@ org.jboss.arquillian.container arquillian-jbossas-remote-6 - ${arquillian.version} test @@ -317,9 +310,14 @@ org.jboss.arquillian.container arquillian-glassfish-remote-3.1 - ${arquillian.version} test + + + org.jboss.arquillian.testenricher + arquillian-testenricher-initialcontext + 1.0.0.CR4 + com.sun.jersey jersey-bundle diff --git a/impl/src/main/java/org/jboss/seam/rest/SeamRestStartup.java b/impl/src/main/java/org/jboss/seam/rest/SeamRestStartup.java index b17b209..2258d00 100644 --- 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 index 4815e5f..7efccb8 100644 --- 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 index b9f1974..4c74c47 100644 --- 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 index 1263ffb..3925b93 100644 --- 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 index 3093ef0..06bb1b9 100644 --- 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 index 9113096..e2353c6 100644 --- 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 index f3e0f5d..102ad21 100644 --- 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 index c9581e3..dac11d4 100644 --- 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 index 8044da5..d0734ec 100644 --- 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 index 07d1f2d..fa71772 100644 --- 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 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 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 index 5fbc909..4743320 100644 --- 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,7 +1,7 @@ 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; @@ -9,7 +9,6 @@ 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 index 834e179..dff5ad3 100644 --- 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 index f88d9b5..feedf64 100644 --- 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 index 85fc72b..807348e 100644 --- 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 index a10b9af..3396b3b 100644 --- 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 index 26a8352..181cf33 100644 --- 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/impl/src/test/java/org/jboss/seam/rest/test/templating/multiple/PreferedTemplatingProviderTest.java b/impl/src/test/java/org/jboss/seam/rest/test/templating/multiple/PreferedTemplatingProviderTest.java index b459c68..8ed72d5 100644 --- a/impl/src/test/java/org/jboss/seam/rest/test/templating/multiple/PreferedTemplatingProviderTest.java +++ b/impl/src/test/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; } diff --git a/impl/src/test/java/org/jboss/seam/rest/test/validation/ValidationTest.java b/impl/src/test/java/org/jboss/seam/rest/test/validation/ValidationTest.java index d09b7d9..b28b7ff 100644 --- a/impl/src/test/java/org/jboss/seam/rest/test/validation/ValidationTest.java +++ b/impl/src/test/java/org/jboss/seam/rest/test/validation/ValidationTest.java @@ -1,5 +1,6 @@ package org.jboss.seam.rest.test.validation; +import static org.jboss.seam.rest.test.Dependencies.addJBossLoggingDependencyToManifest; import static org.junit.Assert.assertEquals; import javax.enterprise.inject.Instance; @@ -56,6 +57,7 @@ public static WebArchive createDeployment() { war.addClass(Dependencies.class); war.addAsLibraries(Dependencies.SEAM_SOLDER); war.addAsLibraries(Dependencies.SEAM_CATCH); + addJBossLoggingDependencyToManifest(war); return war; } diff --git a/impl/src/test/resources/arquillian.xml b/impl/src/test/resources/arquillian.xml index 45c22cd..f4a12b6 100644 --- a/impl/src/test/resources/arquillian.xml +++ b/impl/src/test/resources/arquillian.xml @@ -2,15 +2,9 @@ - + -Xmx1024m -XX:MaxPermSize=512m - - - - REMOTE - - diff --git a/pom.xml b/pom.xml index 7fffa9a..90432f2 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.jboss.seam seam-parent - 10 + 14 org.jboss.seam.rest @@ -15,7 +15,7 @@ pom - 3.0.0.Final + 3.1.0.Beta2 3.1 5.14.2 1.6.1