You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwebbeans.apache.org by ge...@apache.org on 2010/03/15 22:19:19 UTC
svn commit: r923445 - in /openwebbeans/trunk/webbeans-tck:
jsr299-tck-impl-1.0.0-SNAPSHOT-suite.xml pom.xml
src/test/resources/META-INF/jboss-test-harness.properties
src/test/resources/META-INF/openwebbeans/openwebbeans.properties
src/test/resources/org/
Author: gerdogdu
Date: Mon Mar 15 21:19:18 2010
New Revision: 923445
URL: http://svn.apache.org/viewvc?rev=923445&view=rev
Log:
WebProfile testing support
Removed:
openwebbeans/trunk/webbeans-tck/src/test/resources/org/
Modified:
openwebbeans/trunk/webbeans-tck/jsr299-tck-impl-1.0.0-SNAPSHOT-suite.xml
openwebbeans/trunk/webbeans-tck/pom.xml
openwebbeans/trunk/webbeans-tck/src/test/resources/META-INF/jboss-test-harness.properties
openwebbeans/trunk/webbeans-tck/src/test/resources/META-INF/openwebbeans/openwebbeans.properties
Modified: openwebbeans/trunk/webbeans-tck/jsr299-tck-impl-1.0.0-SNAPSHOT-suite.xml
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-tck/jsr299-tck-impl-1.0.0-SNAPSHOT-suite.xml?rev=923445&r1=923444&r2=923445&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-tck/jsr299-tck-impl-1.0.0-SNAPSHOT-suite.xml (original)
+++ openwebbeans/trunk/webbeans-tck/jsr299-tck-impl-1.0.0-SNAPSHOT-suite.xml Mon Mar 15 21:19:18 2010
@@ -7,12 +7,12 @@
<method-selector>
<selector-class name="org.jboss.testharness.impl.testng.DisableIntegrationTestsMethodSelector" />
</method-selector>
- <!--
+
+ <!-- Used for Web Profiles -->
<method-selector>
<selector-class name="org.jboss.jsr299.tck.impl.WebProfileMethodSelector" />
</method-selector>
- -->
<method-selector>
<selector-class name="org.jboss.testharness.impl.testng.ExcludeIncontainerUnderInvestigationMethodSelector" />
Modified: openwebbeans/trunk/webbeans-tck/pom.xml
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-tck/pom.xml?rev=923445&r1=923444&r2=923445&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-tck/pom.xml (original)
+++ openwebbeans/trunk/webbeans-tck/pom.xml Mon Mar 15 21:19:18 2010
@@ -50,11 +50,13 @@
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-api</artifactId>
+ <version>1.2.8</version>
</dependency>
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-impl</artifactId>
+ <version>1.2.8</version>
</dependency>
<dependency>
@@ -63,12 +65,6 @@
</dependency>
<dependency>
- <groupId>org.jboss.test-harness</groupId>
- <artifactId>jboss-test-harness-tomcat</artifactId>
- <version>1.1.0-CR3</version>
- </dependency>
-
- <dependency>
<groupId>org.jboss.jsr299.tck</groupId>
<artifactId>jsr299-tck-impl</artifactId>
<version>${webbeans.tck.version}</version>
@@ -94,24 +90,45 @@
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>openwebbeans-ee-common</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>openwebbeans-web</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jcdi_1.0_spec</artifactId>
- <optional>true</optional>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-atinject_1.0_spec</artifactId>
- <optional>true</optional>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-atinject_1.0_spec</artifactId>
</dependency>
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-spi</artifactId>
- <optional>true</optional>
</dependency>
-
+
+ <!-- JSTL -->
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jstl</artifactId>
+ <version>1.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-ejb_3.0_spec</artifactId>
+ <version>1.0.1</version>
+ </dependency>
+
</dependencies>
@@ -163,6 +180,40 @@
<overWrite>true</overWrite>
<outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
</artifactItem>
+
+ <!-- OWB Web Plugin Package -->
+ <artifactItem>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>openwebbeans-web</artifactId>
+ <overWrite>true</overWrite>
+ <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
+ </artifactItem>
+
+ <!-- EJB API -->
+ <artifactItem>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-ejb_3.0_spec</artifactId>
+ <overWrite>true</overWrite>
+ <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
+ </artifactItem>
+
+
+ <!-- JSTL -->
+ <artifactItem>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jstl</artifactId>
+ <overWrite>true</overWrite>
+ <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
+ </artifactItem>
+
+ <!-- OWB EE Common Package -->
+ <artifactItem>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>openwebbeans-ee-common</artifactId>
+ <overWrite>true</overWrite>
+ <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
+ </artifactItem>
+
<!-- MyFaces API Package -->
<artifactItem>
@@ -180,13 +231,14 @@
<outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
</artifactItem>
- <!-- OWB EJB Plugin Package -->
+ <!-- OWB EJB Plugin Package
<artifactItem>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-ejb</artifactId>
<overWrite>true</overWrite>
<outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
</artifactItem>
+ -->
<!-- OWB Resource Plugin Package -->
<artifactItem>
@@ -237,6 +289,15 @@
<version>1.6</version>
<outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
</artifactItem>
+
+ <!-- commons-codec -->
+ <artifactItem>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <overWrite>true</overWrite>
+ <version>1.3</version>
+ <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
+ </artifactItem>
<!-- commons-validator -->
<artifactItem>
Modified: openwebbeans/trunk/webbeans-tck/src/test/resources/META-INF/jboss-test-harness.properties
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-tck/src/test/resources/META-INF/jboss-test-harness.properties?rev=923445&r1=923444&r2=923445&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-tck/src/test/resources/META-INF/jboss-test-harness.properties (original)
+++ openwebbeans/trunk/webbeans-tck/src/test/resources/META-INF/jboss-test-harness.properties Mon Mar 15 21:19:18 2010
@@ -19,13 +19,13 @@ org.jboss.jsr299.tck.spi.Managers=org.ap
org.jboss.jsr299.tck.spi.Beans=org.apache.webbeans.test.tck.BeansImpl
org.jboss.jsr299.tck.spi.Contexts=org.apache.webbeans.test.tck.ContextsImpl
org.jboss.testharness.spi.StandaloneContainers=org.apache.webbeans.test.tck.StandaloneContainersImpl
-org.jboss.testharness.spi.Containers=org.jboss.testharness.integration.tomcat.TomcatConnector
+org.jboss.testharness.spi.Containers=org.apache.webbeans.test.tck.ContainersImpl
org.jboss.jsr299.tck.spi.EL=org.apache.webbeans.test.tck.ELImpl
-org.jboss.testharness.standalone=true
+org.jboss.testharness.standalone=false
#jboss-as.dir=/tmp
#jboss.force.restart=false
org.jboss.testharness.libraryDirectory=target/dependency/lib
-org.jboss.testharness.runIntegrationTests=false
+org.jboss.testharness.runIntegrationTests=true
org.jboss.testharness.api.TestLauncher=org.jboss.testharness.impl.runner.servlet.ServletTestLauncher
Modified: openwebbeans/trunk/webbeans-tck/src/test/resources/META-INF/openwebbeans/openwebbeans.properties
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-tck/src/test/resources/META-INF/openwebbeans/openwebbeans.properties?rev=923445&r1=923444&r2=923445&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-tck/src/test/resources/META-INF/openwebbeans/openwebbeans.properties (original)
+++ openwebbeans/trunk/webbeans-tck/src/test/resources/META-INF/openwebbeans/openwebbeans.properties Mon Mar 15 21:19:18 2010
@@ -35,5 +35,8 @@ org.apache.webbeans.spi.JNDIService=org.
#use the web metadata as default
org.apache.webbeans.spi.ScannerService=org.apache.webbeans.test.tck.mock.TCKMetaDataDiscoveryImpl
-#use embedded openejb metadata discovery
-org.apache.webbeans.spi.deployer.useEjbMetaDataDiscoveryService=true
\ No newline at end of file
+#Used for Standalone
+#org.apache.webbeans.spi.deployer.useEjbMetaDataDiscoveryService=true
+
+#Used for WebProfile TCK
+org.apache.webbeans.spi.deployer.useEjbMetaDataDiscoveryService=false
\ No newline at end of file