[weld-commits] Weld SVN: r6923 - in core/trunk: bundles and 6 other directories.
weld-commits at lists.jboss.org
weld-commits at lists.jboss.org
Thu Aug 5 14:59:41 EDT 2010
Author: pete.muir at jboss.org
Date: 2010-08-05 14:59:41 -0400 (Thu, 05 Aug 2010)
New Revision: 6923
Added:
core/trunk/bundles/
core/trunk/bundles/osgi/
core/trunk/tests/src/test/java/org/jboss/weld/tests/resource/
core/trunk/tests/src/test/java/org/jboss/weld/tests/resource/producer/
core/trunk/tests/src/test/java/org/jboss/weld/tests/resource/producer/non/
core/trunk/tests/src/test/java/org/jboss/weld/tests/resource/producer/non/dependent/
core/trunk/tests/src/test/java/org/jboss/weld/tests/resource/producer/non/dependent/NonDependentResourceProducerFieldTest.java
core/trunk/tests/src/test/java/org/jboss/weld/tests/resource/producer/non/dependent/ResourceProducer.java
Removed:
core/trunk/osgi-bundle/
Modified:
core/trunk/pom.xml
core/trunk/tests-arquillian/pom.xml
Log:
add missing test, move osgi bundle to sub folder
Copied: core/trunk/bundles/osgi (from rev 6912, core/trunk/osgi-bundle)
Modified: core/trunk/pom.xml
===================================================================
--- core/trunk/pom.xml 2010-08-05 17:27:37 UTC (rev 6922)
+++ core/trunk/pom.xml 2010-08-05 18:59:41 UTC (rev 6923)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.weld</groupId>
<artifactId>weld-parent</artifactId>
- <version>12</version>
+ <version>15</version>
</parent>
<name>Weld Build Aggregator</name>
@@ -22,7 +22,10 @@
<!-- Minimal metadata -->
<description>The build aggregator for Weld, which takes care of calling the modules which make up Weld</description>
- <!-- Workaround bug in Maven 2.? where it can't download a unique version snapshot on import scope -->
+ <!--
+ Workaround bug in Maven 2.? where it can't download a unique
+ version snapshot on import scope
+ -->
<dependencies>
<dependency>
<groupId>org.jboss.weld</groupId>
@@ -43,42 +46,42 @@
<profile>
<id>default</id>
<activation>
- <activeByDefault>true</activeByDefault>
+ <property>
+ <name>weld.default.build</name>
+ <value>!false</value>
+ </property>
</activation>
<modules>
<module>bom</module>
<module>parent</module>
<module>impl</module>
- <module>tests</module>
- <module>tests-arquillian</module>
- <module>porting-package</module>
- <module>inject-tck-runner</module>
- <module>jboss-tck-runner</module>
- <module>osgi-bundle</module>
</modules>
</profile>
<profile>
<id>update-jboss-as</id>
<modules>
- <module>bom</module>
- <module>parent</module>
- <module>impl</module>
+ <module>jboss-as</module>
+ </modules>
+ </profile>
+ <profile>
+ <id>tests</id>
+ <activation>
+ <property>
+ <name>weld.default.build</name>
+ <value>!false</value>
+ </property>
+ </activation>
+ <modules>
<module>tests</module>
<module>tests-arquillian</module>
- <module>porting-package</module>
<module>inject-tck-runner</module>
<module>jboss-tck-runner</module>
- <module>osgi-bundle</module>
- <module>jboss-as</module>
</modules>
</profile>
<profile>
- <id>skip-tests</id>
+ <id>bundles</id>
<modules>
- <module>bom</module>
- <module>parent</module>
- <module>impl</module>
- <module>osgi-bundle</module>
+ <module>bundles/osgi</module>
</modules>
</profile>
</profiles>
Added: core/trunk/tests/src/test/java/org/jboss/weld/tests/resource/producer/non/dependent/NonDependentResourceProducerFieldTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/resource/producer/non/dependent/NonDependentResourceProducerFieldTest.java (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/resource/producer/non/dependent/NonDependentResourceProducerFieldTest.java 2010-08-05 18:59:41 UTC (rev 6923)
@@ -0,0 +1,21 @@
+package org.jboss.weld.tests.resource.producer.non.dependent;
+
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
+import org.jboss.weld.exceptions.DefinitionException;
+import org.jboss.weld.test.AbstractWeldTest;
+import org.testng.annotations.Test;
+
+ at Artifact
+ at ExpectedDeploymentException(DefinitionException.class)
+public class NonDependentResourceProducerFieldTest extends AbstractWeldTest
+{
+
+ @Test(groups="incontainer-broken")
+ // JBoss AS not reporting the right exception
+ public void test()
+ {
+ assert false;
+ }
+
+}
Property changes on: core/trunk/tests/src/test/java/org/jboss/weld/tests/resource/producer/non/dependent/NonDependentResourceProducerFieldTest.java
___________________________________________________________________
Name: svn:eol-style
+ native
Added: core/trunk/tests/src/test/java/org/jboss/weld/tests/resource/producer/non/dependent/ResourceProducer.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/resource/producer/non/dependent/ResourceProducer.java (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/resource/producer/non/dependent/ResourceProducer.java 2010-08-05 18:59:41 UTC (rev 6923)
@@ -0,0 +1,17 @@
+package org.jboss.weld.tests.resource.producer.non.dependent;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.inject.Produces;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+
+public class ResourceProducer
+{
+
+ @SuppressWarnings("unused")
+ @Produces
+ @ApplicationScoped
+ @PersistenceContext
+ private EntityManager entityManager;
+
+}
Property changes on: core/trunk/tests/src/test/java/org/jboss/weld/tests/resource/producer/non/dependent/ResourceProducer.java
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: core/trunk/tests-arquillian/pom.xml
===================================================================
--- core/trunk/tests-arquillian/pom.xml 2010-08-05 17:27:37 UTC (rev 6922)
+++ core/trunk/tests-arquillian/pom.xml 2010-08-05 18:59:41 UTC (rev 6923)
@@ -280,7 +280,6 @@
<dependency>
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-client</artifactId>
- <version>${version.jbossas_client}</version>
<type>pom</type>
<scope>test</scope>
</dependency>
More information about the weld-commits
mailing list