Author: dan.j.allen Date: 2011-03-29 21:10:45 -0400 (Tue, 29 Mar 2011) New Revision: 7206 Removed: archetypes/javaee6-webapp/trunk/src/test/resources-jbossas/jndi.properties Modified: archetypes/javaee6-webapp/trunk/pom.xml archetypes/javaee6-webapp/trunk/src/test/java/com/mycompany/test/MemberRegistrationTest.java Log: upgrade to Arquillian 1.0.0.Alpha5; add Weld Embedded EE test profile (unused) Modified: archetypes/javaee6-webapp/trunk/pom.xml =================================================================== --- archetypes/javaee6-webapp/trunk/pom.xml 2011-03-30 00:20:12 UTC (rev 7205) +++ archetypes/javaee6-webapp/trunk/pom.xml 2011-03-30 01:10:45 UTC (rev 7206) @@ -23,7 +23,7 @@ <!-- By default, we assign it to the value of the JBOSS_HOME envrionment variable --> <jboss.home>${env.JBOSS_HOME}</jboss.home> <jboss.domain>default</jboss.domain> - <arquillian.version>1.0.0.Alpha4</arquillian.version> + <arquillian.version>1.0.0.Alpha5</arquillian.version> <jboss-javaee6-spec.version>1.0.0.Final</jboss-javaee6-spec.version> </properties> @@ -91,7 +91,7 @@ <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-validator</artifactId> - <version>4.0.0.GA</version> + <version>4.1.0.Final</version> <scope>provided</scope> </dependency> @@ -182,6 +182,7 @@ <profile> <!-- An optional Arquillian testing profile that executes tests in GlassFish Embedded --> + <!-- Tests are broken under Arquillian 1.0.0.Alpha5 since sun-resources.xml is not supported --> <!-- Run with 'mvn clean test -Parq-glassfish-embedded' --> <id>arq-glassfish-embedded</id> <dependencies> @@ -275,5 +276,50 @@ </testResources> </build> </profile> + + <profile> + <id>arq-weld-ee-embedded</id> + <dependencies> + <dependency> + <groupId>org.jboss.arquillian.container</groupId> + <artifactId>arquillian-weld-ee-embedded-1.1</artifactId> + <version>${arquillian.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss.spec</groupId> + <artifactId>jboss-javaee-6.0</artifactId> + <version>${jboss-javaee6-spec.version}</version> + <type>pom</type> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-core</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-api</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-simple</artifactId> + <scope>test</scope> + </dependency> + </dependencies> + <dependencyManagement> + <dependencies> + <dependency> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-core-bom</artifactId> + <version>1.1.0.Final</version> + <type>pom</type> + <scope>import</scope> + </dependency> + </dependencies> + </dependencyManagement> + </profile> </profiles> </project> Modified: archetypes/javaee6-webapp/trunk/src/test/java/com/mycompany/test/MemberRegistrationTest.java =================================================================== --- archetypes/javaee6-webapp/trunk/src/test/java/com/mycompany/test/MemberRegistrationTest.java 2011-03-30 00:20:12 UTC (rev 7205) +++ archetypes/javaee6-webapp/trunk/src/test/java/com/mycompany/test/MemberRegistrationTest.java 2011-03-30 01:10:45 UTC (rev 7206) @@ -28,8 +28,9 @@ public static Archive<?> createTestArchive() { return ShrinkWrap.create(WebArchive.class, "test.war") .addClasses(Member.class, MemberRegistration.class, MemberRepository.class, MemberRepositoryProducer.class) - .addManifestResource("test-persistence.xml", "persistence.xml") - .addWebResource(EmptyAsset.INSTANCE, "beans.xml"); + // addAsManifestResource is incorrectly targeting /META-INF + .addAsResource("test-persistence.xml", "META-INF/persistence.xml") + .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml"); } @Inject MemberRegistration memberRegistration; Deleted: archetypes/javaee6-webapp/trunk/src/test/resources-jbossas/jndi.properties =================================================================== --- archetypes/javaee6-webapp/trunk/src/test/resources-jbossas/jndi.properties 2011-03-30 00:20:12 UTC (rev 7205) +++ archetypes/javaee6-webapp/trunk/src/test/resources-jbossas/jndi.properties 2011-03-30 01:10:45 UTC (rev 7206) @@ -1,3 +0,0 @@ -java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory -java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces -java.naming.provider.url=jnp://localhost:1099