Author: maschmid Date: 2012-03-01 11:30:19 -0500 (Thu, 01 Mar 2012) New Revision: 14344 Added: branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/resources/WEB-INF/ejb-jar.xml Removed: branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/resources/META-INF/ejb-jar.xml Modified: branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/java/org/jboss/seam/test/integration/Deployments.java branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/java/org/jboss/seam/test/integration/MessagingTest.java branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/resources-jbossas-7/arquillian.xml branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/resources/WEB-INF/components.xml Log: ee6 integration tests, fixing MessagingTest Modified: branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/java/org/jboss/seam/test/integration/Deployments.java =================================================================== --- branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/java/org/jboss/seam/test/integration/Deployments.java 2012-02-29 09:12:53 UTC (rev 14343) +++ branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/java/org/jboss/seam/test/integration/Deployments.java 2012-03-01 16:30:19 UTC (rev 14344) @@ -25,15 +25,12 @@ .addAsResource("components.properties") .addAsResource("messages_en.properties") .addAsResource("META-INF/persistence.xml") - - //.addAsWebInfResource(new StringAsset("org.jboss.seam.mock.MockFacesContextFactory"), "classes/META-INF/services/javax.faces.context.FacesContextFactory") - //.addAsWebInfResource(new StringAsset("org.jboss.seam.mock.MockApplicationFactory"), "classes/META-INF/services/javax.faces.application.ApplicationFactory") .addAsResource("hibernate.cfg.xml") .addAsWebInfResource("WEB-INF/components.xml", "components.xml") .addAsWebInfResource("WEB-INF/pages.xml", "pages.xml") - .addAsWebInfResource("WEB-INF/web.xml", "web.xml") + .addAsWebInfResource("WEB-INF/ejb-jar.xml", "ejb-jar.xml") .addAsLibraries(DependencyResolvers.use(MavenDependencyResolver.class) .configureFrom("pom.xml") @@ -58,6 +55,7 @@ .addAsResource("components.properties") .addAsResource("messages_en.properties") .addAsResource("META-INF/persistence.xml") + .addAsResource("testProcess1.jpdl.xml") .addAsResource("testProcess2.jpdl.xml") .addAsResource("testProcess3.jpdl.xml") @@ -67,9 +65,9 @@ .addAsResource("hibernate.cfg.xml") .addAsWebInfResource("WEB-INF/components-jbpm.xml", "components.xml") - .addAsWebInfResource("WEB-INF/pages.xml", "pages.xml") - + .addAsWebInfResource("WEB-INF/pages.xml", "pages.xml") .addAsWebInfResource("WEB-INF/web.xml", "web.xml") + .addAsWebInfResource("WEB-INF/ejb-jar.xml", "ejb-jar.xml") .addAsLibraries(DependencyResolvers.use(MavenDependencyResolver.class) .configureFrom("pom.xml") Modified: branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/java/org/jboss/seam/test/integration/MessagingTest.java =================================================================== --- branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/java/org/jboss/seam/test/integration/MessagingTest.java 2012-02-29 09:12:53 UTC (rev 14343) +++ branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/java/org/jboss/seam/test/integration/MessagingTest.java 2012-03-01 16:30:19 UTC (rev 14344) @@ -24,7 +24,7 @@ import org.junit.runner.RunWith; @RunWith(Arquillian.class) -@Ignore +// @Ignore public class MessagingTest extends JUnitSeamTest { @@ -112,7 +112,7 @@ @MessageDriven(activationConfig={ @ActivationConfigProperty(propertyName="destinationType", propertyValue="javax.jms.Topic"), - @ActivationConfigProperty(propertyName="destination", propertyValue="topic/testTopic") + @ActivationConfigProperty(propertyName="destination", propertyValue="topic/test") }) @Name("testTopicListener") static public class TestTopicListener @@ -133,7 +133,7 @@ @MessageDriven(activationConfig={ @ActivationConfigProperty(propertyName="destinationType", propertyValue="javax.jms.Queue"), - @ActivationConfigProperty(propertyName="destination", propertyValue="queue/testQueue") + @ActivationConfigProperty(propertyName="destination", propertyValue="queue/test") }) @Name("testQueueListener") static public class TestQueueListener Deleted: branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/resources/META-INF/ejb-jar.xml =================================================================== --- branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/resources/META-INF/ejb-jar.xml 2012-02-29 09:12:53 UTC (rev 14343) +++ branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/resources/META-INF/ejb-jar.xml 2012-03-01 16:30:19 UTC (rev 14344) @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<ejb-jar xmlns="http://java.sun.com/xml/ns/javaee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/ejb-jar_3_0.xsd" - version="3.0"> - - <interceptors> - <interceptor> - <interceptor-class>org.jboss.seam.ejb.SeamInterceptor</interceptor-class> - </interceptor> - </interceptors> - - <assembly-descriptor> - <interceptor-binding> - <ejb-name>*</ejb-name> - <interceptor-class>org.jboss.seam.ejb.SeamInterceptor</interceptor-class> - </interceptor-binding> - </assembly-descriptor> - -</ejb-jar> \ No newline at end of file Modified: branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/resources/WEB-INF/components.xml =================================================================== --- branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/resources/WEB-INF/components.xml 2012-02-29 09:12:53 UTC (rev 14343) +++ branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/resources/WEB-INF/components.xml 2012-03-01 16:30:19 UTC (rev 14344) @@ -32,16 +32,16 @@ auto-create="true" persistence-unit-jndi-name="java:/integrationEntityManagerFactory" /> - <jms:topic-connection topic-connection-factory-jndi-name="/ConnectionFactory" /> - <jms:queue-connection queue-connection-factory-jndi-name="/ConnectionFactory" /> + <jms:topic-connection topic-connection-factory-jndi-name="java:/ConnectionFactory" /> + <jms:queue-connection queue-connection-factory-jndi-name="java:/ConnectionFactory" /> <jms:managed-topic-publisher name="testPublisher" auto-create="true" - topic-jndi-name="/topic/testTopic" /> + topic-jndi-name="topic/test" /> <jms:managed-queue-sender name="testSender" auto-create="true" - queue-jndi-name="/queue/testQueue" /> + queue-jndi-name="queue/test" /> </components> Added: branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/resources/WEB-INF/ejb-jar.xml =================================================================== --- branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/resources/WEB-INF/ejb-jar.xml (rev 0) +++ branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/resources/WEB-INF/ejb-jar.xml 2012-03-01 16:30:19 UTC (rev 14344) @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ejb-jar xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/ejb-jar_3_0.xsd" + version="3.0"> + + <interceptors> + <interceptor> + <interceptor-class>org.jboss.seam.ejb.SeamInterceptor</interceptor-class> + </interceptor> + </interceptors> + + <assembly-descriptor> + <interceptor-binding> + <ejb-name>*</ejb-name> + <interceptor-class>org.jboss.seam.ejb.SeamInterceptor</interceptor-class> + </interceptor-binding> + </assembly-descriptor> + +</ejb-jar> \ No newline at end of file Modified: branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/resources-jbossas-7/arquillian.xml =================================================================== --- branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/resources-jbossas-7/arquillian.xml 2012-02-29 09:12:53 UTC (rev 14343) +++ branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/resources-jbossas-7/arquillian.xml 2012-03-01 16:30:19 UTC (rev 14344) @@ -11,6 +11,7 @@ <configuration> <property name="javaVmArguments">-Xmx1024m -XX:MaxPermSize=512m</property> <property name="jbossHome">target/jboss-as-${version.jbossas7}</property> + <property name="serverConfig">standalone-full.xml</property> </configuration> </container>