[jboss-cvs] JBossAS SVN: r96049 - in projects/kernel/trunk/weld-int: src/test/java/org/jboss/test/kernel/weld and 4 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Nov 5 08:59:17 EST 2009
Author: kabir.khan at jboss.com
Date: 2009-11-05 08:59:17 -0500 (Thu, 05 Nov 2009)
New Revision: 96049
Modified:
projects/kernel/trunk/weld-int/.classpath
projects/kernel/trunk/weld-int/pom.xml
projects/kernel/trunk/weld-int/src/test/java/org/jboss/test/kernel/weld/WeldMcTestDelegate.java
projects/kernel/trunk/weld-int/src/test/java/org/jboss/test/kernel/weld/bidirectional/test/BidirectionalWeldAndMcTestCase.java
projects/kernel/trunk/weld-int/src/test/java/org/jboss/test/kernel/weld/mctowb/support/validateobserver/TestObserver.java
projects/kernel/trunk/weld-int/src/test/java/org/jboss/test/kernel/weld/mctowb/test/InjectMcBeansInWeldTestCase.java
projects/kernel/trunk/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/test/InjectWeldInMcBeansTestCase.java
Log:
[JBKERNEL-51] Adjustments to avoid issues with freshly build weld
Modified: projects/kernel/trunk/weld-int/.classpath
===================================================================
--- projects/kernel/trunk/weld-int/.classpath 2009-11-05 11:58:35 UTC (rev 96048)
+++ projects/kernel/trunk/weld-int/.classpath 2009-11-05 13:59:17 UTC (rev 96049)
@@ -9,6 +9,7 @@
<classpathentry kind="var" path="M2_REPO/javax/el/el-api/2.1.2-b04/el-api-2.1.2-b04.jar"/>
<classpathentry kind="var" path="M2_REPO/javax/inject/javax.inject/1/javax.inject-1.jar" sourcepath="M2_REPO/javax/inject/javax.inject/1/javax.inject-1-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/javax/faces/jsf-api/1.2_12/jsf-api-1.2_12.jar" sourcepath="M2_REPO/javax/faces/jsf-api/1.2_12/jsf-api-1.2_12-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javax/annotation/jsr250-api/1.0/jsr250-api-1.0.jar" sourcepath="M2_REPO/javax/annotation/jsr250-api/1.0/jsr250-api-1.0-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/javax/transaction/jta/1.0.1B/jta-1.0.1B.jar"/>
<classpathentry kind="var" path="M2_REPO/javax/persistence/persistence-api/1.0/persistence-api-1.0.jar" sourcepath="M2_REPO/javax/persistence/persistence-api/1.0/persistence-api-1.0-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.5/servlet-api-2.5.jar" sourcepath="M2_REPO/javax/servlet/servlet-api/2.5/servlet-api-2.5-sources.jar"/>
@@ -16,6 +17,7 @@
<classpathentry kind="var" path="M2_REPO/org/apache/ant/ant/1.7.0/ant-1.7.0.jar"/>
<classpathentry kind="var" path="M2_REPO/org/apache/ant/ant-junit/1.7.0/ant-junit-1.7.0.jar"/>
<classpathentry kind="var" path="M2_REPO/org/apache/ant/ant-launcher/1.7.0/ant-launcher-1.7.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/ch/qos/cal10n/cal10n-api/0.7.2/cal10n-api-0.7.2.jar" sourcepath="M2_REPO/ch/qos/cal10n/cal10n-api/0.7.2/cal10n-api-0.7.2-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/commons-codec/commons-codec/1.3/commons-codec-1.3.jar" sourcepath="M2_REPO/commons-codec/commons-codec/1.3/commons-codec-1.3-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.jar" sourcepath="M2_REPO/commons-collections/commons-collections/3.2.1/commons-collections-3.2.1-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.jar"/>
@@ -25,6 +27,7 @@
<classpathentry kind="var" path="M2_REPO/net/sourceforge/cssparser/cssparser/0.9.5/cssparser-0.9.5.jar" sourcepath="M2_REPO/net/sourceforge/cssparser/cssparser/0.9.5/cssparser-0.9.5-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/wutka-dtdparser/dtdparser121/1.2.1/dtdparser121-1.2.1.jar"/>
<classpathentry kind="var" path="M2_REPO/org/glassfish/web/el-impl/2.1.2-b04/el-impl-2.1.2-b04.jar"/>
+ <classpathentry kind="var" path="M2_REPO/com/google/collections/google-collections/1.0-rc3/google-collections-1.0-rc3.jar" sourcepath="M2_REPO/com/google/collections/google-collections/1.0-rc3/google-collections-1.0-rc3-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/net/sourceforge/htmlunit/htmlunit/2.4/htmlunit-2.4.jar" sourcepath="M2_REPO/net/sourceforge/htmlunit/htmlunit/2.4/htmlunit-2.4-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/net/sourceforge/htmlunit/htmlunit-core-js/2.4/htmlunit-core-js-2.4.jar" sourcepath="M2_REPO/net/sourceforge/htmlunit/htmlunit-core-js/2.4/htmlunit-core-js-2.4-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/javassist/javassist/3.11.0.GA/javassist-3.11.0.GA.jar" sourcepath="M2_REPO/javassist/javassist/3.11.0.GA/javassist-3.11.0.GA-sources.jar"/>
@@ -33,11 +36,11 @@
<classpathentry kind="src" path="/jboss-dependency"/>
<classpathentry kind="var" path="M2_REPO/org/jboss/ejb3/jboss-ejb3-api/3.1.0-Alpha1/jboss-ejb3-api-3.1.0-Alpha1.jar" sourcepath="M2_REPO/org/jboss/ejb3/jboss-ejb3-api/3.1.0-Alpha1/jboss-ejb3-api-3.1.0-Alpha1-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/org/jboss/interceptor/jboss-interceptor/1.0.0-CR3/jboss-interceptor-1.0.0-CR3.jar" sourcepath="M2_REPO/org/jboss/interceptor/jboss-interceptor/1.0.0-CR3/jboss-interceptor-1.0.0-CR3-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/interceptor/jboss-interceptor-api/3.1.0-CR1/jboss-interceptor-api-3.1.0-CR1.jar" sourcepath="M2_REPO/org/jboss/interceptor/jboss-interceptor-api/3.1.0-CR1/jboss-interceptor-api-3.1.0-CR1-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/interceptor/jboss-interceptor-api/1.1-CR1/jboss-interceptor-api-1.1-CR1.jar" sourcepath="M2_REPO/org/jboss/interceptor/jboss-interceptor-api/1.1-CR1/jboss-interceptor-api-1.1-CR1-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/jboss/jbossws/jboss-jaxrpc/1.0.4.GA/jboss-jaxrpc-1.0.4.GA.jar"/>
<classpathentry kind="src" path="/jboss-kernel"/>
<classpathentry kind="var" path="M2_REPO/org/jboss/logging/jboss-logging-log4j/2.0.5.GA/jboss-logging-log4j-2.0.5.GA.jar" sourcepath="M2_REPO/org/jboss/logging/jboss-logging-log4j/2.0.5.GA/jboss-logging-log4j-2.0.5.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/logging/jboss-logging-spi/2.0.5.GA/jboss-logging-spi-2.0.5.GA.jar" sourcepath="M2_REPO/org/jboss/logging/jboss-logging-spi/2.0.5.GA/jboss-logging-spi-2.0.5.GA-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/logging/jboss-logging-spi/2.1.0.GA/jboss-logging-spi-2.1.0.GA.jar" sourcepath="M2_REPO/org/jboss/logging/jboss-logging-spi/2.1.0.GA/jboss-logging-spi-2.1.0.GA-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/org/jboss/man/jboss-managed/2.1.1.GA/jboss-managed-2.1.1.GA.jar" sourcepath="M2_REPO/org/jboss/man/jboss-managed/2.1.1.GA/jboss-managed-2.1.1.GA-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/org/jboss/jboss-mdr/2.0.2.GA/jboss-mdr-2.0.2.GA.jar" sourcepath="M2_REPO/org/jboss/jboss-mdr/2.0.2.GA/jboss-mdr-2.0.2.GA-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/org/jboss/man/jboss-metatype/2.1.1.GA/jboss-metatype-2.1.1.GA.jar" sourcepath="M2_REPO/org/jboss/man/jboss-metatype/2.1.1.GA/jboss-metatype-2.1.1.GA-sources.jar"/>
@@ -45,8 +48,8 @@
<classpathentry kind="var" path="M2_REPO/org/jboss/jboss-reflect/2.0.2.GA/jboss-reflect-2.0.2.GA.jar" sourcepath="M2_REPO/org/jboss/jboss-reflect/2.0.2.GA/jboss-reflect-2.0.2.GA-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-server-manager/0.1.1.GA/jboss-server-manager-0.1.1.GA.jar" sourcepath="M2_REPO/org/jboss/jbossas/jboss-server-manager/0.1.1.GA/jboss-server-manager-0.1.1.GA-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/org/jboss/test/jboss-test/1.1.1.GA/jboss-test-1.1.1.GA.jar" sourcepath="M2_REPO/org/jboss/test/jboss-test/1.1.1.GA/jboss-test-1.1.1.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/test-harness/jboss-test-harness/1.1.0-SNAPSHOT/jboss-test-harness-1.1.0-SNAPSHOT.jar" sourcepath="M2_REPO/org/jboss/test-harness/jboss-test-harness/1.1.0-SNAPSHOT/jboss-test-harness-1.1.0-SNAPSHOT-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/test-harness/jboss-test-harness-api/1.1.0-SNAPSHOT/jboss-test-harness-api-1.1.0-SNAPSHOT.jar" sourcepath="M2_REPO/org/jboss/test-harness/jboss-test-harness-api/1.1.0-SNAPSHOT/jboss-test-harness-api-1.1.0-SNAPSHOT-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/test-harness/jboss-test-harness/1.1.0-CR3/jboss-test-harness-1.1.0-CR3.jar" sourcepath="M2_REPO/org/jboss/test-harness/jboss-test-harness/1.1.0-CR3/jboss-test-harness-1.1.0-CR3-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/test-harness/jboss-test-harness-api/1.1.0-CR3/jboss-test-harness-api-1.1.0-CR3.jar" sourcepath="M2_REPO/org/jboss/test-harness/jboss-test-harness-api/1.1.0-CR3/jboss-test-harness-api-1.1.0-CR3-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/org/jboss/javaee/jboss-transaction-api/1.0.1.CR2/jboss-transaction-api-1.0.1.CR2.jar" sourcepath="M2_REPO/org/jboss/javaee/jboss-transaction-api/1.0.1.CR2/jboss-transaction-api-1.0.1.CR2-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/org/jboss/jbossxb/2.0.2-SNAPSHOT/jbossxb-2.0.2-SNAPSHOT.jar" sourcepath="M2_REPO/org/jboss/jbossxb/2.0.2-SNAPSHOT/jbossxb-2.0.2-SNAPSHOT-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/junit/junit/4.4/junit-4.4.jar" sourcepath="M2_REPO/junit/junit/4.4/junit-4.4-sources.jar"/>
@@ -54,11 +57,13 @@
<classpathentry kind="var" path="M2_REPO/net/sourceforge/nekohtml/nekohtml/1.9.11/nekohtml-1.9.11.jar" sourcepath="M2_REPO/net/sourceforge/nekohtml/nekohtml/1.9.11/nekohtml-1.9.11-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/org/w3c/css/sac/1.3/sac-1.3.jar" sourcepath="M2_REPO/org/w3c/css/sac/1.3/sac-1.3-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/xalan/serializer/2.7.1/serializer-2.7.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.5.6/slf4j-api-1.5.6.jar" sourcepath="M2_REPO/org/slf4j/slf4j-api/1.5.6/slf4j-api-1.5.6-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.5.9.RC1/slf4j-api-1.5.9.RC1.jar" sourcepath="M2_REPO/org/slf4j/slf4j-api/1.5.9.RC1/slf4j-api-1.5.9.RC1-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-ext/1.5.9.RC1/slf4j-ext-1.5.9.RC1.jar" sourcepath="M2_REPO/org/slf4j/slf4j-ext/1.5.9.RC1/slf4j-ext-1.5.9.RC1-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/org/jboss/slf4j/slf4j-jboss-logging/1.0.2.GA/slf4j-jboss-logging-1.0.2.GA.jar" sourcepath="M2_REPO/org/jboss/slf4j/slf4j-jboss-logging/1.0.2.GA/slf4j-jboss-logging-1.0.2.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/weld/weld-core/1.0.0-SNAPSHOT/weld-core-1.0.0-SNAPSHOT.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/weld/weld-api/1.0-CR4/weld-api-1.0-CR4.jar" sourcepath="M2_REPO/org/jboss/weld/weld-api/1.0-CR4/weld-api-1.0-CR4-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/weld/weld-core/1.0.0-SNAPSHOT/weld-core-1.0.0-SNAPSHOT.jar" sourcepath="M2_REPO/org/jboss/weld/weld-core/1.0.0-SNAPSHOT/weld-core-1.0.0-SNAPSHOT-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/org/jboss/weld/weld-core-test/1.0.0-SNAPSHOT/weld-core-test-1.0.0-SNAPSHOT.jar" sourcepath="M2_REPO/org/jboss/weld/weld-core-test/1.0.0-SNAPSHOT/weld-core-test-1.0.0-SNAPSHOT-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/weld/weld-spi/1.0-SNAPSHOT/weld-spi-1.0-SNAPSHOT.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/weld/weld-spi/1.0-CR4/weld-spi-1.0-CR4.jar" sourcepath="M2_REPO/org/jboss/weld/weld-spi/1.0-CR4/weld-spi-1.0-CR4-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/xalan/xalan/2.7.1/xalan-2.7.1.jar" sourcepath="M2_REPO/xalan/xalan/2.7.1/xalan-2.7.1-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/apache-xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.jar"/>
<classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.8.1/xercesImpl-2.8.1.jar" sourcepath="M2_REPO/xerces/xercesImpl/2.8.1/xercesImpl-2.8.1-sources.jar"/>
Modified: projects/kernel/trunk/weld-int/pom.xml
===================================================================
--- projects/kernel/trunk/weld-int/pom.xml 2009-11-05 11:58:35 UTC (rev 96048)
+++ projects/kernel/trunk/weld-int/pom.xml 2009-11-05 13:59:17 UTC (rev 96049)
@@ -52,6 +52,10 @@
</exclusions>
</dependency>
<dependency>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-core</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3-api</artifactId>
<scope>test</scope>
Modified: projects/kernel/trunk/weld-int/src/test/java/org/jboss/test/kernel/weld/WeldMcTestDelegate.java
===================================================================
--- projects/kernel/trunk/weld-int/src/test/java/org/jboss/test/kernel/weld/WeldMcTestDelegate.java 2009-11-05 11:58:35 UTC (rev 96048)
+++ projects/kernel/trunk/weld-int/src/test/java/org/jboss/test/kernel/weld/WeldMcTestDelegate.java 2009-11-05 13:59:17 UTC (rev 96049)
@@ -158,7 +158,7 @@
copyExtensions(extension);
testContainer = new TestContainer(new MockEELifecycle(), Arrays.asList(classes), null);
- testContainer.startContainer(false);
+ testContainer.getLifecycle().initialize();
if (deploy)
{
@@ -175,7 +175,7 @@
if (testContainer == null)
throw new IllegalStateException("You must call initalizeWeld() before calling deployInitializedWeld()");
- testContainer.beginApplication();
+ testContainer.getLifecycle().beginApplication();
testContainer.ensureRequestActive();
}
Modified: projects/kernel/trunk/weld-int/src/test/java/org/jboss/test/kernel/weld/bidirectional/test/BidirectionalWeldAndMcTestCase.java
===================================================================
--- projects/kernel/trunk/weld-int/src/test/java/org/jboss/test/kernel/weld/bidirectional/test/BidirectionalWeldAndMcTestCase.java 2009-11-05 11:58:35 UTC (rev 96048)
+++ projects/kernel/trunk/weld-int/src/test/java/org/jboss/test/kernel/weld/bidirectional/test/BidirectionalWeldAndMcTestCase.java 2009-11-05 13:59:17 UTC (rev 96049)
@@ -30,14 +30,12 @@
import org.jboss.test.kernel.weld.bidirectional.support.First;
import org.jboss.test.kernel.weld.bidirectional.support.Last;
import org.jboss.test.kernel.weld.bidirectional.support.Middle;
-import org.jboss.testharness.impl.packaging.Artifact;
/**
*
* @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
* @version $Revision: 1.1 $
*/
- at Artifact
public class BidirectionalWeldAndMcTestCase extends AbstractWeldMcTest
{
public BidirectionalWeldAndMcTestCase(String name)
Modified: projects/kernel/trunk/weld-int/src/test/java/org/jboss/test/kernel/weld/mctowb/support/validateobserver/TestObserver.java
===================================================================
--- projects/kernel/trunk/weld-int/src/test/java/org/jboss/test/kernel/weld/mctowb/support/validateobserver/TestObserver.java 2009-11-05 11:58:35 UTC (rev 96048)
+++ projects/kernel/trunk/weld-int/src/test/java/org/jboss/test/kernel/weld/mctowb/support/validateobserver/TestObserver.java 2009-11-05 13:59:17 UTC (rev 96049)
@@ -27,14 +27,12 @@
import javax.enterprise.inject.spi.ProcessInjectionTarget;
import org.jboss.kernel.weld.plugins.weld.McBeanRegistryObserver;
-import org.jboss.testharness.impl.packaging.Artifact;
/**
*
* @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
* @version $Revision: 1.1 $
*/
- at Artifact
public class TestObserver extends McBeanRegistryObserver implements Extension
{
public static boolean invoked;
Modified: projects/kernel/trunk/weld-int/src/test/java/org/jboss/test/kernel/weld/mctowb/test/InjectMcBeansInWeldTestCase.java
===================================================================
--- projects/kernel/trunk/weld-int/src/test/java/org/jboss/test/kernel/weld/mctowb/test/InjectMcBeansInWeldTestCase.java 2009-11-05 11:58:35 UTC (rev 96048)
+++ projects/kernel/trunk/weld-int/src/test/java/org/jboss/test/kernel/weld/mctowb/test/InjectMcBeansInWeldTestCase.java 2009-11-05 13:59:17 UTC (rev 96049)
@@ -46,14 +46,12 @@
import org.jboss.test.kernel.weld.mctowb.support.wb.Simple;
import org.jboss.test.kernel.weld.mctowb.support.wb.ThingConstructor;
import org.jboss.test.kernel.weld.mctowb.support.wb.ThingField;
-import org.jboss.testharness.impl.packaging.Artifact;
/**
*
* @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
* @version $Revision: 1.1 $
*/
- at Artifact
public class InjectMcBeansInWeldTestCase extends AbstractWeldMcTest
{
public InjectMcBeansInWeldTestCase(String name)
Modified: projects/kernel/trunk/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/test/InjectWeldInMcBeansTestCase.java
===================================================================
--- projects/kernel/trunk/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/test/InjectWeldInMcBeansTestCase.java 2009-11-05 11:58:35 UTC (rev 96048)
+++ projects/kernel/trunk/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/test/InjectWeldInMcBeansTestCase.java 2009-11-05 13:59:17 UTC (rev 96049)
@@ -62,14 +62,12 @@
import org.jboss.test.kernel.weld.wbtomc.support.MissingDependenciesFieldBean;
import org.jboss.test.kernel.weld.wbtomc.support.Simple;
import org.jboss.test.kernel.weld.wbtomc.support.WebBean;
-import org.jboss.testharness.impl.packaging.Artifact;
/**
*
* @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
* @version $Revision: 1.1 $
*/
- at Artifact
public class InjectWeldInMcBeansTestCase extends AbstractWeldMcTest
{
public InjectWeldInMcBeansTestCase(String name)
More information about the jboss-cvs-commits
mailing list