You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2015/03/14 19:34:50 UTC
[2/3] tomee git commit: setting up cdi-tomee + fixing tomee webapp -
was broken cause of a CDI (spec) regression + few unused imports
setting up cdi-tomee + fixing tomee webapp - was broken cause of a CDI (spec) regression + few unused imports
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/bdae43a0
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/bdae43a0
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/bdae43a0
Branch: refs/heads/master
Commit: bdae43a0ed0bb2ca66e9f5f92476013086703a48
Parents: f1cc8b9
Author: Romain Manni-Bucau <rm...@apache.org>
Authored: Sat Mar 14 19:33:52 2015 +0100
Committer: Romain Manni-Bucau <rm...@apache.org>
Committed: Sat Mar 14 19:33:52 2015 +0100
----------------------------------------------------------------------
.../openejb/cdi/CdiAppContextsService.java | 5 +-
pom.xml | 2 +-
.../openejb/tck/cdi/embedded/HTMLReporter.java | 60 ---
tck/cdi-embedded/src/test/resources/passing.xml | 19 +-
tck/cdi-tomee/pom.xml | 364 +++++--------------
.../apache/openejb/tck/cdi/tomee/BeansImpl.java | 104 ------
.../openejb/tck/cdi/tomee/ContextsImpl.java | 60 ---
.../apache/openejb/tck/cdi/tomee/ELImpl.java | 97 -----
.../openejb/tck/cdi/tomee/ManagersImpl.java | 33 --
.../apache/openejb/tck/cdi/tomee/Report.java | 260 -------------
.../META-INF/jboss-test-harness.properties | 31 --
tck/cdi-tomee/src/test/resources/passing.xml | 289 ++++++++++++++-
.../src/test/resources/webapps-failing.xml | 26 --
.../src/test/resources/webapps-passing.xml | 349 ------------------
tck/pom.xml | 2 +-
tck/tck-common/pom.xml | 5 +
.../org/apache/tomee/installer/Installer.java | 4 +-
.../src/main/webapp/WEB-INF/web.xml | 5 +
18 files changed, 385 insertions(+), 1330 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/bdae43a0/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiAppContextsService.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiAppContextsService.java b/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiAppContextsService.java
index 3e352a3..d319a95 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiAppContextsService.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiAppContextsService.java
@@ -36,7 +36,6 @@ import org.apache.webbeans.el.ELContextStore;
import org.apache.webbeans.event.EventMetadataImpl;
import org.apache.webbeans.spi.ContextsService;
import org.apache.webbeans.spi.ConversationService;
-import org.apache.webbeans.util.AnnotationUtil;
import org.apache.webbeans.web.context.ServletRequestContext;
import org.apache.webbeans.web.intercept.RequestScopedBeanInterceptorHandler;
@@ -174,7 +173,7 @@ public class CdiAppContextsService extends AbstractContextsService implements Co
startContext(Singleton.class, initializeObject);
}
- public void beforeStop(final Object destroyObject) {
+ public void beforeStop(final Object ignored) {
{ // trigger @PreDestroy mainly but keep it active until destroy(xxx)
applicationContext.destroy();
webBeansContext.getBeanManagerImpl().fireEvent(
@@ -204,6 +203,8 @@ public class CdiAppContextsService extends AbstractContextsService implements Co
initSessionContext(httpSession);
try {
httpSession.invalidate();
+ } catch (final IllegalStateException ise) {
+ // no-op
} finally {
destroySessionContext(httpSession);
}
http://git-wip-us.apache.org/repos/asf/tomee/blob/bdae43a0/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 513bbb4..d577de6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -96,7 +96,7 @@
<openjpa.version>2.4.0-nonfinal-1598334</openjpa.version>
<org.apache.openwebbeans.version>1.5.0-SNAPSHOT</org.apache.openwebbeans.version>
- <jcs.version>2.0-beta-1</jcs.version>
+ <jcs.version>2.0-SNAPSHOT</jcs.version>
<!-- Maven module versions -->
<maven-bundle-plugin.version>2.3.7</maven-bundle-plugin.version>
http://git-wip-us.apache.org/repos/asf/tomee/blob/bdae43a0/tck/cdi-embedded/src/test/java/org/apache/openejb/tck/cdi/embedded/HTMLReporter.java
----------------------------------------------------------------------
diff --git a/tck/cdi-embedded/src/test/java/org/apache/openejb/tck/cdi/embedded/HTMLReporter.java b/tck/cdi-embedded/src/test/java/org/apache/openejb/tck/cdi/embedded/HTMLReporter.java
deleted file mode 100644
index 82d8215..0000000
--- a/tck/cdi-embedded/src/test/java/org/apache/openejb/tck/cdi/embedded/HTMLReporter.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.openejb.tck.cdi.embedded;
-
-import org.testng.ITestResult;
-import org.testng.reporters.TestHTMLReporter;
-
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.Method;
-import java.lang.reflect.Proxy;
-import java.util.ArrayList;
-import java.util.List;
-
-public class HTMLReporter extends TestHTMLReporter {
- private static final Class<?>[] API = new Class<?>[]{ITestResult.class};
-
- @Override
- public List<ITestResult> getFailedTests() {
- return doWrap(super.getFailedTests());
- }
-
- @Override
- public List<ITestResult> getPassedTests() {
- return doWrap(super.getPassedTests());
- }
-
- private List<ITestResult> doWrap(final List<ITestResult> raw) {
- final List<ITestResult> wrapped = new ArrayList<>(raw.size());
- final ClassLoader loader = Thread.currentThread().getContextClassLoader();
- for (final ITestResult result : raw) {
- wrapped.add(ITestResult.class.cast(
- Proxy.newProxyInstance(loader, API,
- new InvocationHandler() {
- @Override
- public Object invoke(final Object proxy, final Method method, final Object[] args) throws Throwable {
- if (method.getName().equals("getParameters")) {
- return new Object[method.getParameterTypes().length];
- }
- return method.invoke(result, args);
- }
- })
- ));
- }
- return wrapped;
- }
-}
http://git-wip-us.apache.org/repos/asf/tomee/blob/bdae43a0/tck/cdi-embedded/src/test/resources/passing.xml
----------------------------------------------------------------------
diff --git a/tck/cdi-embedded/src/test/resources/passing.xml b/tck/cdi-embedded/src/test/resources/passing.xml
index 64aaf49..ad14e73 100644
--- a/tck/cdi-embedded/src/test/resources/passing.xml
+++ b/tck/cdi-embedded/src/test/resources/passing.xml
@@ -16,23 +16,6 @@
limitations under the License.
-->
<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd" >
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version
- 2.0 (the "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0 Unless required by
- applicable law or agreed to in writing, software distributed under the
- License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
- CONDITIONS OF ANY KIND, either express or implied. See the License for
- the specific language governing permissions and limitations under the
- License.
--->
-<!-- OWB one ATM, remove exclude groups to be openejb ;) -->
<suite name="JSR-346-TCK" verbose="2" configfailurepolicy="continue" >
<listeners>
<!-- debug -->
@@ -47,7 +30,7 @@
<listener class-name="org.testng.reporters.FailedReporter"/>
<listener class-name="org.testng.reporters.XMLReporter"/>
<listener class-name="org.testng.reporters.EmailableReporter"/>
- <listener class-name="org.apache.openejb.tck.cdi.embedded.HTMLReporter"/>
+ <listener class-name="org.apache.openejb.tck.testng.HTMLReporter"/>
</listeners>
<test name="JSR-346 TCK">
http://git-wip-us.apache.org/repos/asf/tomee/blob/bdae43a0/tck/cdi-tomee/pom.xml
----------------------------------------------------------------------
diff --git a/tck/cdi-tomee/pom.xml b/tck/cdi-tomee/pom.xml
index 8895cf1..e231488 100644
--- a/tck/cdi-tomee/pom.xml
+++ b/tck/cdi-tomee/pom.xml
@@ -22,331 +22,159 @@
<groupId>org.apache.openejb</groupId>
<version>5.0.0-SNAPSHOT</version>
</parent>
+
<modelVersion>4.0.0</modelVersion>
<artifactId>cdi-tomee</artifactId>
- <packaging>jar</packaging>
<name>OpenEJB :: TCK :: CDI TomEE</name>
- <properties>
- <openejb.home>${project.build.directory}${file.separator}apache-tomee-${tomee.classifier}-${tomee.version}
- </openejb.home>
- <openejb.deployer.jndiname>openejb/DeployerBusinessRemote</openejb.deployer.jndiname>
- <org.jboss.testharness.spi.Containers>org.apache.openejb.tck.impl.ContainersImplTomEE</org.jboss.testharness.spi.Containers>
- <suiteXmlFile>src/test/resources/passing.xml</suiteXmlFile>
- </properties>
-
<dependencies>
<dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-api</artifactId>
+ <version>${myfaces.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.openejb</groupId>
- <artifactId>openejb-core</artifactId>
- <version>${openejb.version}</version>
+ <artifactId>javaee-api</artifactId>
+ <version>${javaee-api.version}</version>
+ <scope>provided</scope>
</dependency>
- <dependency> <!-- for TomEERuntimeException -->
+ <dependency>
<groupId>org.apache.openejb</groupId>
- <artifactId>tomee-catalina</artifactId>
+ <artifactId>apache-tomee</artifactId>
<version>${tomee.version}</version>
+ <type>zip</type>
+ <classifier>plus</classifier>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.shrinkwrap.descriptors</groupId>
+ <artifactId>shrinkwrap-descriptors-impl-javaee</artifactId>
+ <version>2.0.0-alpha-3</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.arquillian.testng</groupId>
+ <artifactId>arquillian-testng-container</artifactId>
+ <version>${version.arquillian}</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
- <artifactId>webdeployer</artifactId>
- <version>${openejb.version}</version>
+ <artifactId>arquillian-tomee-remote</artifactId>
+ <version>${tomee.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
<scope>test</scope>
</dependency>
- <!--<dependency>-->
- <!--<groupId>org.apache.openejb</groupId>-->
- <!--<artifactId>apache-tomee</artifactId>-->
- <!--<type>zip</type>-->
- <!--<version>${tomee.version}</version>-->
- <!--<classifier>webprofile</classifier>-->
- <!--</dependency>-->
- <!--<dependency>-->
- <!--<groupId>org.apache.openejb</groupId>-->
- <!--<artifactId>apache-tomee</artifactId>-->
- <!--<type>zip</type>-->
- <!--<version>${tomee.version}</version>-->
- <!--<classifier>plus</classifier>-->
- <!--</dependency>-->
- <!--<dependency>-->
- <!--<groupId>org.apache.openejb</groupId>-->
- <!--<artifactId>apache-tomee</artifactId>-->
- <!--<type>zip</type>-->
- <!--<version>${tomee.version}</version>-->
- <!--<classifier>plume</classifier>-->
- <!--</dependency>-->
<dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-jasper-el</artifactId>
- <version>${tomcat.version}</version>
- <scope>provided</scope>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>openwebbeans-porting</artifactId>
+ <version>${org.apache.openwebbeans.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>openejb-core</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>tck-common</artifactId>
<version>${openejb.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
- <groupId>org.jboss.jsr299.tck</groupId>
- <artifactId>jsr299-tck-impl</artifactId>
- <version>1.0.4.SP1</version>
+ <groupId>org.jboss.cdi.tck</groupId>
+ <artifactId>cdi-tck-impl</artifactId>
+ <version>1.2.4.Final</version>
<exclusions>
<exclusion>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
+ <groupId>javax.enterprise</groupId>
+ <artifactId>cdi-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
</exclusion>
<exclusion>
- <groupId>org.jboss.ejb3</groupId>
- <artifactId>jboss-ejb3-api</artifactId>
+ <groupId>javax.servlet.jsp</groupId>
+ <artifactId>jsp-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.transaction</groupId>
+ <artifactId>jta</artifactId>
</exclusion>
</exclusions>
</dependency>
+
+ <!-- debugging -->
<dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency> <!-- useless but so cool for debug purposes -->
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-catalina</artifactId>
- <version>${tomcat.version}</version>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-jcs-jcache</artifactId>
+ <version>${jcs.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
+
<build>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
+ <testResources>
+ <testResource>
+ <directory>src/test/resources</directory>
<filtering>true</filtering>
- </resource>
- </resources>
+ </testResource>
+ </testResources>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>reserve-network-port</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>reserve-network-port</goal>
- </goals>
- <configuration>
- <portNames>
- <portName>tomee.ssl.port</portName>
- <portName>tomee.ajp.port</portName>
- <portName>tomee.http.port</portName>
- <portName>tomee.shutdown.port</portName>
- </portNames>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <useFile>false</useFile>
- <disableXmlReport>true</disableXmlReport>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <version>1.3.2</version>
<executions>
<execution>
- <id>unpack</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>unpack</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.apache.openejb</groupId>
- <artifactId>apache-tomee</artifactId>
- <version>${tomee.version}</version>
- <type>zip</type>
- <classifier>${tomee.classifier}</classifier>
- <outputDirectory>${project.build.directory}</outputDirectory>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- <execution>
- <id>copy</id>
- <phase>pre-integration-test</phase>
+ <id>dump-porting</id>
+ <phase>test-compile</phase>
<goals>
- <goal>copy</goal>
+ <goal>java</goal>
</goals>
<configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.apache.openejb</groupId>
- <artifactId>webdeployer</artifactId>
- <version>${project.version}</version>
- <outputDirectory>${openejb.home}/lib</outputDirectory>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.openejb</groupId>
- <artifactId>tck-common</artifactId>
- <version>${project.version}</version>
- <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.openejb</groupId>
- <artifactId>cdi-tomee</artifactId>
- <version>${project.version}</version>
- <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
- </artifactItem>
- </artifactItems>
+ <mainClass>org.apache.openejb.tck.cdi.tomee.EnrichmentDumper</mainClass>
+ <classpathScope>test</classpathScope>
+ <arguments>
+ <argument>${project.build.directory}/dependency/lib/</argument>
+ </arguments>
</configuration>
</execution>
</executions>
</plugin>
- <!-- TomEE embedds a lot of applications in. We should remove all not necessary web
- application for TCK (ie. all but openejb and ROOT -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>remove-apps</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <target>
- <delete dir="${openejb.home}/webapps/ROOT" />
- <delete dir="${openejb.home}/webapps/docs" />
- <delete dir="${openejb.home}/webapps/manager" />
- <delete dir="${openejb.home}/webapps/host-manager" />
- <replace file="${openejb.home}/conf/server.xml" token="8080" value="${tomee.http.port}" />
- <replace file="${openejb.home}/conf/server.xml" token="8443" value="${tomee.ssl.port}" />
- <replace file="${openejb.home}/conf/server.xml" token="8005" value="${tomee.shutdown.port}" />
- <replace file="${openejb.home}/conf/server.xml" token="8009" value="${tomee.ajp.port}" />
- </target>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-failsafe-plugin</artifactId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.18</version>
<configuration>
+ <reuseForks>true</reuseForks>
+ <forkCount>1</forkCount>
+ <useFile>false</useFile>
+ <disableXmlReport>true</disableXmlReport>
<suiteXmlFiles>
- <suiteXmlFile>${suiteXmlFile}</suiteXmlFile>
- <!--<suiteXmlFile>src/test/resources/failing.xml</suiteXmlFile>-->
+ <suiteXmlFile>src/test/resources/passing.xml</suiteXmlFile>
</suiteXmlFiles>
- <argLine>-Xmx768m -XX:PermSize=64m -XX:MaxPermSize=512m -XX:ReservedCodeCacheSize=64m -Xss2048k</argLine>
- <systemPropertyVariables>
- <org.jboss.testharness.standalone>false</org.jboss.testharness.standalone>
- <org.jboss.testharness.runIntegrationTests>true</org.jboss.testharness.runIntegrationTests>
- <org.jboss.testharness.container.forceRestart>true</org.jboss.testharness.container.forceRestart>
- <org.jboss.testharness.libraryDirectory>${project.build.directory}/dependency/lib</org.jboss.testharness.libraryDirectory>
- <org.jboss.testharness.host>127.0.0.1:${tomee.http.port}</org.jboss.testharness.host>
- <!--<org.jboss.testharness.outputDirectory>target</org.jboss.testharness.outputDirectory>-->
- <deleteArtifacts>true</deleteArtifacts>
-
- <!--<maven.failsafe.debug>true</maven.failsafe.debug>-->
- <!--<openejb.server.debug>true</openejb.server.debug>-->
- <java.naming.provider.url>http://127.0.0.1:${tomee.http.port}/tomee/ejb</java.naming.provider.url>
- <connect.tries>90</connect.tries>
- <server.http.port>${tomee.http.port}</server.http.port>
- <server.shutdown.port>${tomee.shutdown.port}</server.shutdown.port>
- <java.opts>-Xmx768m -XX:PermSize=64m -XX:MaxPermSize=512m -XX:ReservedCodeCacheSize=64m -Xss2048k</java.opts>
- <openejb.home>${openejb.home}</openejb.home>
- <openejb.deployer.jndiname>${openejb.deployer.jndiname}</openejb.deployer.jndiname>
- <org.jboss.testharness.spi.Containers>${org.jboss.testharness.spi.Containers}
- </org.jboss.testharness.spi.Containers>
- </systemPropertyVariables>
+ <properties>
+ <property>
+ <name>usedefaultlisteners</name>
+ <value>false</value>
+ </property>
+ </properties>
</configuration>
- <executions>
- <execution>
- <id>integration-test</id>
- <phase>integration-test</phase>
- <goals>
- <goal>integration-test</goal>
- </goals>
- </execution>
- <execution>
- <id>verify</id>
- <phase>verify</phase>
- <goals>
- <goal>verify</goal>
- </goals>
- </execution>
- </executions>
</plugin>
</plugins>
</build>
-
-
- <profiles>
- <profile>
- <id>webapp-deployer</id>
- <properties>
- <org.jboss.testharness.spi.Containers>org.apache.openejb.tck.impl.FullRestartContainer</org.jboss.testharness.spi.Containers>
- <!--suiteXmlFile>src/test/resources/webapps-passing.xml</suiteXmlFile-->
- </properties>
- </profile>
-
- <profile>
- <id>webprofile</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <properties>
- <tomee.classifier>webprofile</tomee.classifier>
- </properties>
- <dependencies>
- <dependency>
- <groupId>org.apache.openejb</groupId>
- <artifactId>apache-tomee</artifactId>
- <type>zip</type>
- <version>${tomee.version}</version>
- <classifier>${tomee.classifier}</classifier>
- </dependency>
- </dependencies>
- </profile>
-
- <profile>
- <id>plus</id>
- <properties>
- <tomee.classifier>plus</tomee.classifier>
- </properties>
- <dependencies>
- <dependency>
- <groupId>org.apache.openejb</groupId>
- <artifactId>apache-tomee</artifactId>
- <type>zip</type>
- <version>${tomee.version}</version>
- <classifier>${tomee.classifier}</classifier>
- </dependency>
- </dependencies>
- </profile>
-
- <profile>
- <id>plume</id>
- <properties>
- <tomee.classifier>plume</tomee.classifier>
- </properties>
- <dependencies>
- <dependency>
- <groupId>org.apache.openejb</groupId>
- <artifactId>apache-tomee</artifactId>
- <type>zip</type>
- <version>${tomee.version}</version>
- <classifier>${tomee.classifier}</classifier>
- </dependency>
- </dependencies>
- </profile>
-
- </profiles>
-
</project>
http://git-wip-us.apache.org/repos/asf/tomee/blob/bdae43a0/tck/cdi-tomee/src/main/java/org/apache/openejb/tck/cdi/tomee/BeansImpl.java
----------------------------------------------------------------------
diff --git a/tck/cdi-tomee/src/main/java/org/apache/openejb/tck/cdi/tomee/BeansImpl.java b/tck/cdi-tomee/src/main/java/org/apache/openejb/tck/cdi/tomee/BeansImpl.java
deleted file mode 100644
index 3f1fa42..0000000
--- a/tck/cdi-tomee/src/main/java/org/apache/openejb/tck/cdi/tomee/BeansImpl.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.openejb.tck.cdi.tomee;
-
-import org.apache.openejb.core.ivm.IntraVmCopyMonitor;
-import org.apache.openejb.core.ivm.IntraVmProxy;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.io.ObjectStreamClass;
-import java.lang.reflect.Proxy;
-
-/**
- * @version $Rev$ $Date$
- */
-public class BeansImpl implements org.jboss.jsr299.tck.spi.Beans {
-
- public boolean isProxy(Object instance) {
- System.out.println("isProxy: " + instance);
- return instance instanceof IntraVmProxy || instance.getClass().getName().contains("$Owb");
- }
-
- @Override
- public byte[] serialize(Object instance) throws IOException {
- IntraVmCopyMonitor.prePassivationOperation();
- try {
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- ObjectOutputStream os = new ObjectOutputStream(baos);
- os.writeObject(instance);
- os.flush();
- return baos.toByteArray();
- } finally {
- IntraVmCopyMonitor.postPassivationOperation();
- }
- }
-
- @Override
- public Object deserialize(byte[] bytes) throws IOException, ClassNotFoundException {
- ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
- ObjectInputStream is = new BeanObjectInputStream(bais);
- return is.readObject();
- }
-
-
- public static class BeanObjectInputStream extends ObjectInputStream {
-
- public BeanObjectInputStream(InputStream in) throws IOException {
- super(in);
- }
-
- protected Class resolveClass(ObjectStreamClass classDesc) throws IOException, ClassNotFoundException {
- try {
- return Class.forName(classDesc.getName(), false, getClassloader());
- } catch (ClassNotFoundException e) {
- String n = classDesc.getName();
- if (n.equals("boolean")) return boolean.class;
- if (n.equals("byte")) return byte.class;
- if (n.equals("char")) return char.class;
- if (n.equals("short")) return short.class;
- if (n.equals("int")) return int.class;
- if (n.equals("long")) return long.class;
- if (n.equals("float")) return float.class;
- if (n.equals("double")) return double.class;
-
- throw e;
- }
- }
-
- protected Class resolveProxyClass(String[] interfaces) throws IOException, ClassNotFoundException {
- Class[] cinterfaces = new Class[interfaces.length];
- for (int i = 0; i < interfaces.length; i++)
- cinterfaces[i] = getClassloader().loadClass(interfaces[i]);
-
- try {
- return Proxy.getProxyClass(getClassloader(), cinterfaces);
- } catch (IllegalArgumentException e) {
- throw new ClassNotFoundException(null, e);
- }
- }
-
- ClassLoader getClassloader() {
- return Thread.currentThread().getContextClassLoader();
- }
- }
-
-}
http://git-wip-us.apache.org/repos/asf/tomee/blob/bdae43a0/tck/cdi-tomee/src/main/java/org/apache/openejb/tck/cdi/tomee/ContextsImpl.java
----------------------------------------------------------------------
diff --git a/tck/cdi-tomee/src/main/java/org/apache/openejb/tck/cdi/tomee/ContextsImpl.java b/tck/cdi-tomee/src/main/java/org/apache/openejb/tck/cdi/tomee/ContextsImpl.java
deleted file mode 100644
index 4175d6d..0000000
--- a/tck/cdi-tomee/src/main/java/org/apache/openejb/tck/cdi/tomee/ContextsImpl.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.openejb.tck.cdi.tomee;
-
-import org.apache.webbeans.config.WebBeansContext;
-import org.apache.webbeans.context.AbstractContext;
-import org.apache.webbeans.context.ContextFactory;
-import org.apache.webbeans.context.RequestContext;
-
-import javax.enterprise.context.Dependent;
-import javax.enterprise.context.RequestScoped;
-
-/**
- * @version $Rev$ $Date$
- */
-public class ContextsImpl implements org.jboss.jsr299.tck.spi.Contexts<AbstractContext> {
-
- public AbstractContext getRequestContext() {
- ContextFactory contextFactory = WebBeansContext.currentInstance().getContextFactory();
- RequestContext ctx = (RequestContext) contextFactory.getStandardContext(RequestScoped.class);
-
- if (ctx == null) {
- contextFactory.initRequestContext(null);
- }
-
- return (AbstractContext) contextFactory.getStandardContext(RequestScoped.class);
- }
-
- public void setActive(AbstractContext context) {
- context.setActive(true);
-
- }
-
- public void setInactive(AbstractContext context) {
- context.setActive(false);
- }
-
- public AbstractContext getDependentContext() {
- ContextFactory contextFactory = WebBeansContext.currentInstance().getContextFactory();
- return (AbstractContext) contextFactory.getStandardContext(Dependent.class);
- }
-
- public void destroyContext(AbstractContext context) {
- context.destroy();
- }
-}
http://git-wip-us.apache.org/repos/asf/tomee/blob/bdae43a0/tck/cdi-tomee/src/main/java/org/apache/openejb/tck/cdi/tomee/ELImpl.java
----------------------------------------------------------------------
diff --git a/tck/cdi-tomee/src/main/java/org/apache/openejb/tck/cdi/tomee/ELImpl.java b/tck/cdi-tomee/src/main/java/org/apache/openejb/tck/cdi/tomee/ELImpl.java
deleted file mode 100644
index 9710e3e..0000000
--- a/tck/cdi-tomee/src/main/java/org/apache/openejb/tck/cdi/tomee/ELImpl.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.openejb.tck.cdi.tomee;
-
-import org.apache.el.ExpressionFactoryImpl;
-import org.apache.el.lang.FunctionMapperImpl;
-import org.apache.el.lang.VariableMapperImpl;
-import org.apache.webbeans.el22.WrappedExpressionFactory;
-import org.apache.webbeans.el22.WebBeansELResolver;
-
-import javax.el.ArrayELResolver;
-import javax.el.BeanELResolver;
-import javax.el.CompositeELResolver;
-import javax.el.ELContext;
-import javax.el.ELResolver;
-import javax.el.ExpressionFactory;
-import javax.el.FunctionMapper;
-import javax.el.ListELResolver;
-import javax.el.MapELResolver;
-import javax.el.ResourceBundleELResolver;
-import javax.el.VariableMapper;
-
-/**
- * @version $Rev$ $Date$
- */
-public class ELImpl implements org.jboss.jsr299.tck.spi.EL {
-
- private static final ExpressionFactory EXPRESSION_FACTORY = new WrappedExpressionFactory(new ExpressionFactoryImpl());
-
- public ELImpl() {
- }
-
- public static ELResolver getELResolver() {
- CompositeELResolver composite = new CompositeELResolver();
- composite.add(new BeanELResolver());
- composite.add(new ArrayELResolver());
- composite.add(new MapELResolver());
- composite.add(new ListELResolver());
- composite.add(new ResourceBundleELResolver());
- composite.add(new WebBeansELResolver());
-
- return composite;
- }
-
- public static class ELContextImpl extends ELContext {
- @Override
- public ELResolver getELResolver() {
- return ELImpl.getELResolver();
- }
-
- @Override
- public FunctionMapper getFunctionMapper() {
- return new FunctionMapperImpl();
- }
-
- @Override
- public VariableMapper getVariableMapper() {
- return new VariableMapperImpl();
- }
-
- }
-
- @SuppressWarnings("unchecked")
- public <T> T evaluateMethodExpression(String expression, Class<T> expectedType, Class<?>[] expectedParamTypes, Object[] expectedParams) {
- ELContext context = createELContext();
- Object object = EXPRESSION_FACTORY.createMethodExpression(context, expression, expectedType, expectedParamTypes).invoke(context, expectedParams);
-
- return (T) object;
- }
-
- @SuppressWarnings("unchecked")
- public <T> T evaluateValueExpression(String expression, Class<T> expectedType) {
- ELContext context = createELContext();
- Object object = EXPRESSION_FACTORY.createValueExpression(context, expression, expectedType).getValue(context);
-
- return (T) object;
- }
-
- @Override
- public ELContext createELContext() {
- return new ELContextImpl();
- }
-}
http://git-wip-us.apache.org/repos/asf/tomee/blob/bdae43a0/tck/cdi-tomee/src/main/java/org/apache/openejb/tck/cdi/tomee/ManagersImpl.java
----------------------------------------------------------------------
diff --git a/tck/cdi-tomee/src/main/java/org/apache/openejb/tck/cdi/tomee/ManagersImpl.java b/tck/cdi-tomee/src/main/java/org/apache/openejb/tck/cdi/tomee/ManagersImpl.java
deleted file mode 100644
index 0011521..0000000
--- a/tck/cdi-tomee/src/main/java/org/apache/openejb/tck/cdi/tomee/ManagersImpl.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.openejb.tck.cdi.tomee;
-
-import org.apache.webbeans.config.WebBeansContext;
-import org.apache.webbeans.container.InjectableBeanManager;
-
-import javax.enterprise.inject.spi.BeanManager;
-
-/**
- * @version $Rev$ $Date$
- */
-public class ManagersImpl implements org.jboss.jsr299.tck.spi.Managers {
-
- public BeanManager getManager() {
- return new InjectableBeanManager(WebBeansContext.currentInstance().getBeanManagerImpl());
- }
-
-}
http://git-wip-us.apache.org/repos/asf/tomee/blob/bdae43a0/tck/cdi-tomee/src/main/java/org/apache/openejb/tck/cdi/tomee/Report.java
----------------------------------------------------------------------
diff --git a/tck/cdi-tomee/src/main/java/org/apache/openejb/tck/cdi/tomee/Report.java b/tck/cdi-tomee/src/main/java/org/apache/openejb/tck/cdi/tomee/Report.java
deleted file mode 100644
index e8a2bd6..0000000
--- a/tck/cdi-tomee/src/main/java/org/apache/openejb/tck/cdi/tomee/Report.java
+++ /dev/null
@@ -1,260 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.openejb.tck.cdi.tomee;
-
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXException;
-import org.xml.sax.helpers.DefaultHandler;
-
-import javax.xml.parsers.SAXParser;
-import javax.xml.parsers.SAXParserFactory;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.PrintStream;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.atomic.AtomicInteger;
-
-/**
- * @version $Rev$ $Date$
- */
-public class Report {
-
- public static void main(String[] args) throws Exception {
- new Report().main();
- }
-
- private final LinkedList<TestClass> classes = new LinkedList<TestClass>();
-
- private void main() throws Exception {
-// final File file = new File("/Users/dblevins/work/uber/geronimo-tck-public-trunk/jcdi-tck-runner/target/surefire-reports/testng-results.xml");
- final File file = new File("/Users/dblevins/work/all/trunk/openejb/tck/cdi-tomee/target/failsafe-reports/testng-results.xml");
-// final File file = new File("/Users/dblevins/work/uber/testng-results.xml");
-
- final SAXParser parser = SAXParserFactory.newInstance().newSAXParser();
-
- parser.parse(file, new DefaultHandler() {
- @Override
- public void startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException {
- final String name = qName;
- if ("class".equals(name)) {
- classes.add(new TestClass(attributes.getValue("name")));
- }
-
- if ("test-method".equals(name)) {
- classes.getLast().addStatus(attributes.getValue("status"), attributes.getValue("name"));
- }
- }
- });
-
- Collections.sort(classes);
-
- textReport(file);
- passingXml(file);
- failingXml(file);
-
- }
-
- private void textReport(File file) throws FileNotFoundException {
- final File report = new File(file.getParentFile(), file.getName().replaceAll(".xml$", ".txt"));
- final PrintStream out = new PrintStream(new FileOutputStream(report));
- printResults(out);
- out.close();
- }
-
- private void passingXml(File file) throws FileNotFoundException {
- final File report = new File(file.getParentFile(), file.getName().replaceAll(".xml$", "-passing.xml"));
- final PrintStream out = new PrintStream(new FileOutputStream(report));
-
- out.println(header +
- "<suite name=\"CDI TCK\" verbose=\"0\">\n" +
- " <test name=\"CDI TCK\">\n" +
- " <packages>\n" +
- " <package name=\"org.jboss.jsr299.tck.tests.*\"/>\n" +
- " <package name=\"org.jboss.jsr299.tck.interceptors.tests.*\"/>\n" +
- " </packages>\n" +
- " <classes>");
-
- for (TestClass testClass : classes) {
-
- if (contains(testClass, Status.FAIL)) {
- out.printf(" <class name=\"%s\">\n", testClass.name);
- out.printf(" <methods>\n");
-
- for (TestResult result : testClass.getResults()) {
- if (result.status == Status.FAIL) {
- out.printf(" <exclude name=\"%s\"/>\n", result.name);
- }
- }
-
- out.printf(" </methods>\n");
- out.printf(" </class>\n");
- }
- }
- out.println(" </classes>");
- out.println(" </test>");
- out.println("</suite>");
-
- out.close();
- }
-
- private void failingXml(File file) throws FileNotFoundException {
- final File report = new File(file.getParentFile(), file.getName().replaceAll(".xml$", "-failing.xml"));
- final PrintStream out = new PrintStream(new FileOutputStream(report));
-
- out.println(header);
- out.println("<suite name=\"CDI TCK\" verbose=\"0\">");
- out.println(" <test name=\"CDI TCK\">");
- out.println(" <!--<packages>-->\n" +
- " <!--<package name=\"org.jboss.jsr299.tck.tests.*\"/>-->\n" +
- " <!--<package name=\"org.jboss.jsr299.tck.interceptors.tests.*\"/>-->\n" +
- " <!--</packages>-->");
- out.println(" <classes>");
-
- for (TestClass testClass : classes) {
-
- if (contains(testClass, Status.FAIL)) {
- out.printf(" <class name=\"%s\"/>\n", testClass.name);
- }
- }
- out.println(" </classes>");
- out.println(" </test>");
- out.println("</suite>");
-
- out.close();
- }
-
- private boolean contains(TestClass testClass, Status status) {
-
- for (TestResult result : testClass.getResults()) {
- if (result.name.equals("beforeClass")) continue;
- if (result.name.equals("afterClass")) continue;
- if (result.name.equals("afterSuite")) continue;
- if (result.name.equals("beforeSuite")) continue;
-
- if (result.status == status) {
- return true;
- }
- }
- return false;
- }
-
- private void printResults(PrintStream out) {
-
- Map<Status, AtomicInteger> totals = new HashMap<Status, AtomicInteger>();
- for (Status status : Status.values()) {
- totals.put(status, new AtomicInteger());
- }
-
- for (TestClass testClass : classes) {
-
- for (TestResult result : testClass.getResults()) {
- if (result.name.equals("beforeClass")) continue;
- if (result.name.equals("afterClass")) continue;
- if (result.name.equals("afterSuite")) continue;
- if (result.name.equals("beforeSuite")) continue;
-// if (result.status == Status.PASS) continue;
- totals.get(result.status).getAndIncrement();
-
- out.printf("%s - %s(%s)\n", result.status, result.name, testClass.name);
- }
- }
-
- out.println("\n\n");
-
- int total = 0;
-
- for (Map.Entry<Status, AtomicInteger> entry : totals.entrySet()) {
- final int i = entry.getValue().get();
- total += i;
- out.printf("%5s %s\n", i, entry.getKey());
- }
-
- out.printf("%5s %s\n", total, "Total");
-
- }
-
- public static enum Status {
- PASS, FAIL, ERROR;
- }
- public static class TestResult {
- private final String name;
- private final Status status;
-
- public TestResult(String name, Status status) {
- this.name = name;
- this.status = status;
- }
- }
-
- public static class TestClass implements Comparable<TestClass>{
-
- private final String name;
- private int failed;
- private int passed;
- private int error;
- private final List<TestResult> results = new ArrayList<TestResult>();
-
- public TestClass(String name) {
- this.name = name;
- }
-
- public void addStatus(String status, String testName) {
- results.add(new TestResult(testName, Status.valueOf(status)));
- if ("PASS".equals(status)) passed++;
- if ("FAIL".equals(status)) failed++;
- if ("ERROR".equals(status)) error++;
- }
-
- public List<TestResult> getResults() {
- return results;
- }
-
- public boolean hasFailures() {
- return failed > 0 || error > 0;
- }
-
- @Override
- public int compareTo(TestClass o) {
- return this.name.compareTo(o.name);
- }
- }
-
- private static final String header = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
- "<!--\n" +
- "\n" +
- " Licensed to the Apache Software Foundation (ASF) under one or more\n" +
- " contributor license agreements. See the NOTICE file distributed with\n" +
- " this work for additional information regarding copyright ownership.\n" +
- " The ASF licenses this file to You under the Apache License, Version 2.0\n" +
- " (the \"License\"); you may not use this file except in compliance with\n" +
- " the License. You may obtain a copy of the License at\n" +
- "\n" +
- " http://www.apache.org/licenses/LICENSE-2.0\n" +
- "\n" +
- " Unless required by applicable law or agreed to in writing, software\n" +
- " distributed under the License is distributed on an \"AS IS\" BASIS,\n" +
- " WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n" +
- " See the License for the specific language governing permissions and\n" +
- " limitations under the License.\n" +
- "-->\n";
-}
http://git-wip-us.apache.org/repos/asf/tomee/blob/bdae43a0/tck/cdi-tomee/src/main/resources/META-INF/jboss-test-harness.properties
----------------------------------------------------------------------
diff --git a/tck/cdi-tomee/src/main/resources/META-INF/jboss-test-harness.properties b/tck/cdi-tomee/src/main/resources/META-INF/jboss-test-harness.properties
deleted file mode 100644
index e08c324..0000000
--- a/tck/cdi-tomee/src/main/resources/META-INF/jboss-test-harness.properties
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-org.jboss.jsr299.tck.spi.Managers=org.apache.openejb.tck.cdi.tomee.ManagersImpl
-org.jboss.jsr299.tck.spi.Beans=org.apache.openejb.tck.cdi.tomee.BeansImpl
-org.jboss.jsr299.tck.spi.Contexts=org.apache.openejb.tck.cdi.tomee.ContextsImpl
-org.jboss.jsr299.tck.spi.EL=org.apache.openejb.tck.cdi.tomee.ELImpl
-org.jboss.testharness.spi.StandaloneContainers=org.apache.openejb.tck.impl.StandaloneContainersImpl
-#org.jboss.testharness.spi.Containers=org.apache.openejb.tck.impl.ContainersImplTomEE
-##org.jboss.testharness.spi.Containers=org.apache.openejb.tck.impl.FullRestartContainer
-
-org.jboss.testharness.standalone=false
-org.jboss.testharness.api.TestLauncher=org.jboss.testharness.impl.runner.servlet.ServletTestLauncher
-org.jboss.testharness.runIntegrationTests=true
-org.jboss.testharness.outputDirectory=dumpedArtifacts
-org.jboss.testharness.container.forceRestart=false
-# org.jboss.testharness.host=localhost:${tomee.http.port}
http://git-wip-us.apache.org/repos/asf/tomee/blob/bdae43a0/tck/cdi-tomee/src/test/resources/passing.xml
----------------------------------------------------------------------
diff --git a/tck/cdi-tomee/src/test/resources/passing.xml b/tck/cdi-tomee/src/test/resources/passing.xml
index a8ae68a..ad14e73 100644
--- a/tck/cdi-tomee/src/test/resources/passing.xml
+++ b/tck/cdi-tomee/src/test/resources/passing.xml
@@ -15,45 +15,298 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<suite name="CDI TCK" verbose="0">
- <test name="CDI TCK">
+<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd" >
+<suite name="JSR-346-TCK" verbose="2" configfailurepolicy="continue" >
+ <listeners>
+ <!-- debug -->
+ <!--listener class-name="org.apache.openejb.tck.cdi.embedded.GCListener"/-->
+ <!-- Required - avoid randomly mixed test method execution -->
+ <listener class-name="org.jboss.cdi.tck.impl.testng.SingleTestClassMethodInterceptor"/>
+ <!-- Optional - intended for debug purpose only -->
+ <listener class-name="org.jboss.cdi.tck.impl.testng.ConfigurationLoggingListener"/>
+ <listener class-name="org.jboss.cdi.tck.impl.testng.ProgressLoggingTestListener"/>
+ <!-- Optional - it's recommended to disable the default JUnit XML reporter -->
+ <listener class-name="org.testng.reporters.SuiteHTMLReporter"/>
+ <listener class-name="org.testng.reporters.FailedReporter"/>
+ <listener class-name="org.testng.reporters.XMLReporter"/>
+ <listener class-name="org.testng.reporters.EmailableReporter"/>
+ <listener class-name="org.apache.openejb.tck.testng.HTMLReporter"/>
+ </listeners>
+
+ <test name="JSR-346 TCK">
<packages>
- <package name="org.jboss.jsr299.tck.tests.*"/>
- <package name="org.jboss.jsr299.tck.interceptors.tests.*"/>
+ <package name="org.jboss.cdi.tck.tests.*">
+ <!-- CHALLENGED TCK TESTS: clarifying this in the EG -->
+ <exclude name="org.jboss.cdi.tck.tests.inheritance.specialization.simple"/>
+ <!-- CDITCK-432 -->
+ <exclude name="org.jboss.cdi.tck.tests.decorators.builtin.event.complex"/>
+ </package>
+ <package name="org.jboss.cdi.tck.interceptors.tests.*"/>
</packages>
+
<classes>
- <class name="org.jboss.jsr299.tck.tests.context.passivating.broken.dependentScopedProducerFieldReturnsNonSerializableObjectForInjectionIntoStatefulSessionBean.EnterpriseBeanWithIllegalDependencyTest">
+ <!-- in discussion -->
+ <!-- seems when InjectionPoint injection in for an EJB injection point then it should be null, any real reason? -->
+ <class name="org.jboss.cdi.tck.tests.lookup.injectionpoint.non.contextual.NonContextualInjectionPointTest">
+ <methods>
+ <exclude name="testNonContextualEjbInjectionPointGetBean" />
+ </methods>
+ </class>
+
+ <!-- Issues in the spec -->
+ <!-- CDI-437 -->
+ <class name="org.jboss.cdi.tck.tests.lookup.byname.ambiguous.broken.AmbiguousELNamesTest">
+ <methods>
+ <exclude name=".*"/>
+ </methods>
+ </class>
+
+ <!-- Issues in the TCK -->
+ <!-- CDITCK-444 -->
+ <class name="org.jboss.cdi.tck.tests.extensions.lifecycle.processBeanAttributes.broken.invalid.InvalidStereotypeTest">
+ <methods>
+ <exclude name=".*"/>
+ </methods>
+ </class>
+
+ <!-- CDITCK-418 -->
+ <class name="org.jboss.cdi.tck.interceptors.tests.contract.interceptorLifeCycle.environment.jndi.ejb.InterceptorEnvironmentJNDISessionBeanTest">
+ <methods>
+ <exclude name=".*"/>
+ </methods>
+ </class>
+
+ <!-- CDITCK-417 -->
+ <class name="org.jboss.cdi.tck.tests.extensions.registration.BeanRegistrationByExtensionInEarLibraryTest">
+ <methods>
+ <exclude name=".*"/>
+ </methods>
+ </class>
+
+ <!-- CDITCK-421 -->
+ <class name="org.jboss.cdi.tck.interceptors.tests.contract.aroundInvoke.AroundInvokeAccessInterceptorTest">
+ <methods>
+ <exclude name=".*"/>
+ </methods>
+ </class>
+
+ <!-- CDITCK-427 -->
+ <class name="org.jboss.cdi.tck.tests.lookup.circular.CircularDependencyTest">
+ <methods>
+ <exclude name="testDependentProducerMethodDeclaredOnNormalBeanWhichInjectsProducedBean"/>
+ </methods>
+ </class>
+
+ <!-- CDITCK-428 -->
+ <class name="org.jboss.cdi.tck.interceptors.tests.contract.interceptorLifeCycle.InterceptorLifeCycleTest">
<methods>
- <exclude name="test"/>
+ <exclude name="testInterceptorInstanceCreatedWhenTargetInstanceCreated"/>
</methods>
</class>
- <class name="org.jboss.jsr299.tck.tests.context.passivating.broken.dependentScopedProducerMethodReturnsNonSerializableObjectForInjectionIntoStatefulSessionBean.EnterpriseBeanWithIllegalDependencyTest">
+
+ <class name="org.jboss.cdi.tck.interceptors.tests.contract.aroundTimeout.AroundTimeoutInterceptorTest">
<methods>
- <exclude name="test"/>
+ <exclude name=".*"/>
</methods>
</class>
- <class name="org.jboss.jsr299.tck.tests.context.passivating.broken.enterpriseBeanWithNonPassivatingDecorator.EnterpriseBeanWithNonPassivatingDecoratorTest">
+
+ <!-- CDITCK-423 -->
+ <class name="org.jboss.cdi.tck.tests.implementation.enterprise.definition.remote.RemoteInterfaceNotInAPITypesTest">
<methods>
- <exclude name="testEnterpriseBeanWithNonPassivatingDecoratorFails"/>
+ <exclude name=".*"/>
</methods>
</class>
- <class name="org.jboss.jsr299.tck.tests.implementation.enterprise.lifecycle.EnterpriseBeanLifecycleTest">
+
+ <!-- CDITCK-437 -->
+ <class name="org.jboss.cdi.tck.tests.decorators.interceptor.DecoratorAndInterceptorTest">
<methods>
- <exclude name="testCreateSFSB"/>
+ <exclude name="testLifecycleCallbacks"/>
</methods>
</class>
- <class name="org.jboss.jsr299.tck.tests.lookup.injection.non.contextual.ws.InjectionIntoWebServiceEndPointTest">
+
+ <!-- CDITCK-449 -->
+ <class name="org.jboss.cdi.tck.tests.extensions.beanManager.beanAttributes.CreateBeanAttributesTest">
<methods>
- <exclude name="testInjectionIntoWebServiceEndpoint"/>
+ <exclude name="testBeanAttributesForManagedBeanWithModifiedAnnotatedType"/>
</methods>
</class>
- <!-- see CDI-140 -->
- <class
- name="org.jboss.jsr299.tck.tests.context.passivating.broken.passivatingProducerMethodWithNonPassivatingParameter.PassivatingProducerMethodWithNonPassivatingParameterTest">
+ <!-- CDITCK-459 -->
+ <class name="org.jboss.cdi.tck.tests.implementation.enterprise.newBean.NewEnterpriseBeanTest">
+ <methods>
+ <exclude name="testNewBeanCreatedForFieldInjectionPoint"/>
+ <exclude name="testNewBeanCreatedForInitializerInjectionPoint"/>
+ <exclude name="testNewBeanCreatedForConstructorInjectionPoint"/>
+ <exclude name="testNewBeanCreatedForProducerMethod"/>
+ <exclude name="testNewBeanCreatedForObserverMethod"/>
+ <exclude name="testNewBeanCreatedForDisposerMethod"/>
+ </methods>
+ </class>
+
+ <!-- CDITCK-461
+ <class name="org.jboss.cdi.tck.tests.interceptors.definition.broken.finalClassInterceptor.FinalMethodClassLevelInterceptorTest">
+ <methods>
+ <exclude name="testFinalMethodWithClassLevelInterceptor" />
+ </methods>
+ </class>
+ -->
+
+ <!-- CDITCK-462 javax.enterprise.context.conversation.id is not el compliant -->
+ <class name="org.jboss.cdi.tck.tests.context.conversation.LongRunningConversationPropagatedByFacesContextTest">
+ <methods>
+ <exclude name="testConversationPropagatedAjax" />
+ </methods>
+ </class>
+
+ <!-- CDITCK-463 -->
+ <class name="org.jboss.cdi.tck.tests.lookup.manager.provider.custom.CustomCDIProviderTest">
<methods>
- <exclude name="testSimpleDependentWebBeanWithNonSerializableImplementationInjectedIntoProducerMethodParameterWithPassivatingScopeFails"></exclude>
+ <exclude name=".*" />
+ </methods>
+ </class>
+
+ <!-- CDITCK-466 -->
+ <class name="org.jboss.cdi.tck.tests.extensions.lifecycle.bbd.broken.passivatingScope.AddingPassivatingScopeTest">
+ <methods>
+ <exclude name=".*"/>
+ </methods>
+ </class>
+
+ <!-- CDITCK-467 -->
+ <class name="org.jboss.cdi.tck.tests.extensions.lifecycle.processBeanAttributes.specialization.SpecializationTest">
+ <methods>
+ <exclude name=".*"/>
+ </methods>
+ </class>
+ <class name="org.jboss.cdi.tck.tests.extensions.lifecycle.processBeanAttributes.VerifyValuesTest">
+ <methods>
+ <exclude name="testManagedBeanAttributes"/>
+ </methods>
+ </class>
+
+ <!-- CDI-514 (issue got moved from original CDITCK-467) -->
+ <class name="org.jboss.cdi.tck.tests.event.fires.FireEventTest">
+ <methods>
+ <exclude name="testDuplicateBindingsToFireEventFails"/>
+ </methods>
+ </class>
+ <class name="org.jboss.cdi.tck.tests.event.select.SelectEventTest">
+ <methods>
+ <exclude name=".*DuplicateBindingType"/>
+ </methods>
+ </class>
+ <class name="org.jboss.cdi.tck.tests.event.resolve.binding.DuplicateBindingTypesWhenResolvingTest">
+ <methods>
+ <exclude name=".*"/>
+ </methods>
+ </class>
+ <class name="org.jboss.cdi.tck.tests.lookup.dynamic.DynamicLookupTest">
+ <methods>
+ <exclude name="testDuplicateBindingsThrowsException"/>
+ </methods>
+ </class>
+ <class name="org.jboss.cdi.tck.tests.extensions.bean.bytype.BeanByTypeTest">
+ <methods>
+ <exclude name="testSameBindingTwice"/>
+ </methods>
+ </class>
+ <class name="org.jboss.cdi.tck.tests.interceptors.definition.InterceptorDefinitionTest">
+ <methods>
+ <exclude name="testSameBindingTypesToResolveInterceptorsFails"/>
+ </methods>
+ </class>
+
+
+ <!-- CDI-312 ambiguous BDA definition (EE-module vs JAR) -->
+ <class name="org.jboss.cdi.tck.tests.interceptors.ordering.global.GlobalInterceptorOrderingTest">
+ <methods>
+ <exclude name=".*"/>
+ </methods>
+ </class>
+ <class name="org.jboss.cdi.tck.tests.extensions.interceptors.InterceptorExtensionTest">
+ <methods>
+ <exclude name=".*"/>
+ </methods>
+ </class>
+ <class name="org.jboss.cdi.tck.tests.lookup.modules.specialization.alternative.Specialization02Test">
+ <methods>
+ <exclude name=".*"/>
+ </methods>
+ </class>
+ <class name="org.jboss.cdi.tck.tests.lookup.modules.specialization.alternative.Specialization03Test">
+ <methods>
+ <exclude name=".*"/>
+ </methods>
+ </class>
+ <class name="org.jboss.cdi.tck.tests.lookup.modules.specialization.alternative.Specialization05Test">
+ <methods>
+ <exclude name=".*"/>
+ </methods>
+ </class>
+ <class name="org.jboss.cdi.tck.tests.lookup.manager.provider.runtime.CDIProviderRuntimeTest">
+ <methods>
+ <exclude name=".*"/>
+ </methods>
+ </class>
+ <class name="org.jboss.cdi.tck.tests.deployment.packaging.war.modules.WebArchiveModulesTest">
+ <methods>
+ <exclude name="testAlternatives"/>
+ <exclude name="testInjectionChainVisibilityAndInterceptorEnablement"/>
+ <exclude name="testDecoratorAndCrossModuleEventObserver"/>
+ </methods>
+ </class>
+ <class name="org.jboss.cdi.tck.tests.lookup.manager.provider.init.CDIProviderInitTest">
+ <methods>
+ <exclude name=".*"/>
+ </methods>
+ </class>
+
+ <!-- CDI-517 -->
+ <class name="org.jboss.cdi.tck.tests.lookup.typesafe.resolution.parameterized.raw.RawBeanTypeParameterizedRequiredTypeTest">
+ <methods>
+ <exclude name="testNotAssignableTypeParams"/>
+ </methods>
+ </class>
+
+
+ <!-- not in web profile and not supported by embedded adapter anyway -->
+ <class name="org.jboss.cdi.tck.tests.deployment.packaging.rar.ResourceAdapterArchiveTest">
+ <methods>
+ <exclude name=".*" />
+ </methods>
+ </class>
+
+ <!-- ears so not in web profile, Note: can be switch on if passing but dont let them block the build -->
+ <class name="org.jboss.cdi.tck.tests.lookup.dependency.resolution.broken.ambiguous.ear.MultiModuleSessionBeanAmbiguousDependencyTest"><methods><exclude name=".*" /></methods></class>
+ <class name="org.jboss.cdi.tck.tests.lookup.modules.interceptors.InterceptorModularityTest"><methods><exclude name=".*" /></methods></class>
+ <class name="org.jboss.cdi.tck.tests.lookup.modules.specialization.SpecializationModularity03Test"><methods><exclude name=".*" /></methods></class>
+ <class name="org.jboss.cdi.tck.tests.lookup.modules.specialization.SpecializationModularity05Test"><methods><exclude name=".*" /></methods></class>
+ <class name="org.jboss.cdi.tck.tests.lookup.modules.specialization.SpecializationModularity06Test"><methods><exclude name=".*" /></methods></class>
+ <class name="org.jboss.cdi.tck.tests.lookup.modules.specialization.SpecializationModularity07Test"><methods><exclude name=".*" /></methods></class>
+ <class name="org.jboss.cdi.tck.tests.lookup.modules.SpecializedBeanInjectionNotAvailableTest"><methods><exclude name=".*" /></methods></class>
+ <class name="org.jboss.cdi.tck.tests.deployment.packaging.installedLibrary.InstalledLibraryEarTest"><methods><exclude name=".*" /></methods></class>
+ <class name="org.jboss.cdi.tck.tests.decorators.ordering.global.EnterpriseDecoratorOrderingTest"><methods><exclude name=".*" /></methods></class>
+ <class name="org.jboss.cdi.tck.tests.interceptors.ordering.global.EnterpriseInterceptorOrderingTest"><methods><exclude name=".*" /></methods></class>
+ <class name="org.jboss.cdi.tck.tests.context.application.event.ApplicationScopeEventMultiWarTest"><methods><exclude name=".*" /></methods></class>
+ <class name="org.jboss.cdi.tck.tests.deployment.packaging.ear.modules.EnterpriseArchiveModulesTest"><methods><exclude name=".*" /></methods></class>
+ <class name="org.jboss.cdi.tck.tests.context.passivating.dependency.resource.remote.ResourcePassivationDependencyTest"><methods><exclude name=".*" /></methods></class>
+
+ <!-- not supported by embedded adapter -->
+ <class name="org.jboss.cdi.tck.tests.lookup.injection.non.contextual.InjectionIntoNonContextualComponentTest">
+ <methods>
+ <exclude name="testInjectionIntoTagHandler" />
+ </methods>
+ </class>
+ <class name="org.jboss.cdi.tck.tests.context.conversation.filter.ConversationFilterTest">
+ <methods>
+ <exclude name="testConversationActivation" />
+ </methods>
+ </class>
+ <class name="org.jboss.cdi.tck.tests.lookup.el.integration.IntegrationWithUnifiedELTest">
+ <methods>
+ <exclude name=".*" />
</methods>
</class>
</classes>
</test>
</suite>
+
http://git-wip-us.apache.org/repos/asf/tomee/blob/bdae43a0/tck/cdi-tomee/src/test/resources/webapps-failing.xml
----------------------------------------------------------------------
diff --git a/tck/cdi-tomee/src/test/resources/webapps-failing.xml b/tck/cdi-tomee/src/test/resources/webapps-failing.xml
deleted file mode 100644
index a5461fa..0000000
--- a/tck/cdi-tomee/src/test/resources/webapps-failing.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<suite name="CDI TCK" verbose="0">
- <test name="CDI TCK">
- <classes>
- <class name="org.jboss.jsr299.tck.tests.context.conversation.ManualCidPropagationTest"/>
- </classes>
- </test>
-</suite>
http://git-wip-us.apache.org/repos/asf/tomee/blob/bdae43a0/tck/cdi-tomee/src/test/resources/webapps-passing.xml
----------------------------------------------------------------------
diff --git a/tck/cdi-tomee/src/test/resources/webapps-passing.xml b/tck/cdi-tomee/src/test/resources/webapps-passing.xml
deleted file mode 100644
index e25db2d..0000000
--- a/tck/cdi-tomee/src/test/resources/webapps-passing.xml
+++ /dev/null
@@ -1,349 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<suite name="CDI TCK" verbose="0">
- <test name="CDI TCK">
- <packages>
- <package name="org.jboss.jsr299.tck.tests.*"/>
- <package name="org.jboss.jsr299.tck.interceptors.tests.*"/>
- </packages>
- <classes>
- <class name="org.jboss.jsr299.tck.tests.context.application.ejb.ApplicationContextSharedTest">
- <methods>
- <exclude name="testApplicationContextShared"/>
- <exclude name="testApplicationScopeActiveDuringCallToEjbTimeoutMethod"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.context.dependent.ejb.DependentContextEjbTest">
- <methods>
- <exclude name="testDestroyingEjbDestroysDependentSimples"/>
- <exclude name="testDestroyingEjbDestroysDependents"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.context.passivating.PassivatingContextTest">
- <methods>
- <exclude name="testBeanWithNonSerializableImplementationInjectedIntoTransientFieldOK"/>
- <exclude name="testInjectionOfDependentPrimitiveProductIntoNormalBean"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.context.passivating.broken.enterpriseBeanWithNonPassivatingBeanConstructorParameterInInterceptor.EnterpriseBeanWithNonPassivatingBeanConstructorParameterInInterceptorTest">
- <methods>
- <exclude name="testSessionBeanWithNonPassivatingBeanConstructorParamInInterceptorFails"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.context.passivating.broken.enterpriseBeanWithNonPassivatingConstructorFieldInDecorator.EnterpriseBeanWithNonPassivatingFieldInDecoratorTest">
- <methods>
- <exclude name="testSessionBeanWithNonPassivatingConstructorFieldInDecoratorFails"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.context.passivating.broken.enterpriseBeanWithNonPassivatingInitializerInDecorator.EnterpriseBeanWithNonPassivatingInitializerInDecoratorTest">
- <methods>
- <exclude name="testSessionBeanWithNonPassivatingInitializerFieldInDecoratorFails"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.context.passivating.broken.enterpriseBeanWithNonPassivatingInitializerParameterInInterceptor.EnterpriseBeanWithNonPassivatingInitializerParameterInInterceptorTest">
- <methods>
- <exclude name="testSessionBeanWithNonPassivatingInitializerParamInInterceptorFails"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.context.passivating.broken.enterpriseBeanWithNonPassivatingInjectedFieldInDecorator.EnterpriseBeanWithNonPassivatingInjectedFieldInDecoratorTest">
- <methods>
- <exclude name="testSessionBeanWithNonPassivatingInjectedFieldInDecoratorFails"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.context.passivating.broken.enterpriseBeanWithNonPassivatingInjectedFieldInInterceptor.EnterpriseBeanWithNonPassivatingInjectedFieldInInterceptorTest">
- <methods>
- <exclude name="testSessionBeanWithNonPassivatingInjectedFieldInInterceptorFails"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.context.passivating.broken.enterpriseBeanWithNonSerializableIntializerMethod.EnterpriseBeanWithNonSerializableIntializerMethodTest">
- <methods>
- <exclude name="testDependentBeanWithNonSerializableImplementationInStatefulSessionBeanInitializerFails"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.context.passivating.broken.finalProducerFieldNotPassivationCapable.NonPassivationCapableProducerFieldTest">
- <methods>
- <exclude name="testNonPassivationCapableProducerFieldNotOk"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.context.passivating.broken.managedBeanWithNonPassivatingDecorator.ManagedBeanWithNonPassivatingDecoratorTest">
- <methods>
- <exclude name="testManagedBeanWithNonPassivatingDecoratorFails"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.context.passivating.broken.nonPassivationCapableProducerField.NonPassivationCapableProducerFieldTest">
- <methods>
- <exclude name="testNonPassivationCapableProducerFieldNotOk"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.context.passivating.broken.nonPassivationCapableProducerMethod.NonPassivationCapableProducerMethodTest">
- <methods>
- <exclude name="testNonPassivationCapableProducerMethodNotOk"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.context.passivating.broken.unserializableSimpleInjectedIntoPassivatingEnterpriseBean.UnserializableSimpleInjectedIntoPassivatingEnterpriseBeanTest">
- <methods>
- <exclude name="testSimpleDependentWebBeanWithNonSerializableImplementationInjectedIntoStatefulSessionBeanFails"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.context.request.ejb.EJBRequestContextTest">
- <methods>
- <exclude name="testRequestScopeActiveDuringCallToEjbTimeoutMethod"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.context.session.SessionContextTest">
- <methods>
- <exclude name="testSessionScopeActiveDuringDoFilterMethod"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.decorators.invocation.EJBDecoratorInvocationTest">
- <methods>
- <exclude name="testEJBDecoratorInvocation"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.definition.qualifier.enterprise.EnterpriseQualifierDefinitionTest">
- <methods>
- <exclude name="testQualifierDeclaredInheritedIsIndirectlyInherited"/>
- <exclude name="testQualifierDeclaredInheritedIsInherited"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.definition.scope.enterprise.EnterpriseScopeDefinitionTest">
- <methods>
- <exclude name="testScopeTypeDeclaredInheritedIsIndirectlyInherited"/>
- <exclude name="testScopeTypeDeclaredInheritedIsInherited"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.definition.stereotype.enterprise.EnterpriseStereotypeDefinitionTest">
- <methods>
- <exclude name="testStereotypeDeclaredInheritedIsIndirectlyInherited"/>
- <exclude name="testStereotypeDeclaredInheritedIsInherited"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.deployment.lifecycle.broken.failsDuringBeanDiscovery.DeploymentFailureTest">
- <methods>
- <exclude name="testDeploymentFailsBeforeNotifyingObserversAfterBeanDiscovery"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.deployment.packaging.bundledLibrary.LibraryInEarTest">
- <methods>
- <exclude name="test"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.event.broken.observer.notBusinessMethod.EJBObserverMethodNotBusinessMethodTest">
- <methods>
- <exclude name="testObserverMethodOnEnterpriseBeanNotBusinessMethodOrStaticFails"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.event.observer.enterprise.EnterpriseEventInheritenceTest">
- <methods>
- <exclude name="testNonStaticObserverMethodIndirectlyInherited"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.extensions.container.event.ContainerEventTest">
- <methods>
- <exclude name="testGetEJBName"/>
- <exclude name="testGetSessionBeanType"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.extensions.processBean.ProcessSessionBeanTest">
- <methods>
- <exclude name="testProcessSessionBeanEvent"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.implementation.builtin.BuiltInBeansTest">
- <methods>
- <exclude name="testDefaultValidatorBean"/>
- <exclude name="testDefaultValidatorFactoryBean"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken.methodOnSessionBean.DisposalMethodOnSessionBean">
- <methods>
- <exclude name="testDisposalMethodNotBusinessOrStatic"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.implementation.enterprise.broken.singletonWithConversationScope.SingletonWithConversationScopeTest">
- <methods>
- <exclude name="testSingletonWithConversationScopeFails"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.implementation.enterprise.broken.singletonWithRequestScope.SingletonWithRequestScopeTest">
- <methods>
- <exclude name="testSingletonWithRequestScopeFails"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.implementation.enterprise.broken.singletonWithSessionScope.SingletonWithSessionScopeTest">
- <methods>
- <exclude name="testSingletonWithSessionScopeFails"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.implementation.enterprise.broken.statelessWithApplicationScope.StatelessWithApplicationScopeTest">
- <methods>
- <exclude name="testStatelessWithSessionScopeFails"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.implementation.enterprise.broken.statelessWithConversationScope.StatelessWithConversationScopeTest">
- <methods>
- <exclude name="testStatelessWithConversationScopeFails"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.implementation.enterprise.broken.statelessWithRequestScope.StatelessWithRequestScopeTest">
- <methods>
- <exclude name="testStatelessWithRequestScopeFails"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.implementation.enterprise.broken.statelessWithSessionScope.StatelessWithSessionScopeTest">
- <methods>
- <exclude name="testStatelessWithSessionScopeFails"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.implementation.enterprise.definition.EnterpriseBeanDefinitionTest">
- <methods>
- <exclude name="testBeanTypesAreLocalInterfacesWithoutWildcardTypesOrTypeVariablesWithSuperInterfaces"/>
- <exclude name="testBeanWithNamedAnnotation"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.implementation.enterprise.definition.EnterpriseBeanViaXmlTest">
- <methods>
- <exclude name="testEjbDeclaredInXmlNotSimpleBean"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.implementation.enterprise.lifecycle.EnterpriseBeanLifecycleTest">
- <methods>
- <exclude name="testCreateSLSB"/>
- <exclude name="testDependentObjectsDestroyed"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.implementation.enterprise.newBean.NewEnterpriseBeanICTest">
- <methods>
- <exclude name="testNewBeanHasNoDisposalMethods"/>
- <exclude name="testNewBeanHasNoProducerMethods"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.implementation.enterprise.newBean.NewEnterpriseBeanTest">
- <methods>
- <exclude name="testForEachEnterpriseBeanANewBeanExists"/>
- <exclude name="testNewBeanHasNoBeanELName"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.implementation.enterprise.remove.EnterpriseBeanRemoveMethodTest">
- <methods>
- <exclude name="testApplicationCannotCallRemoveMethodOnNonDependentScopedSessionEnterpriseBean"/>
- <exclude name="testApplicationMayCallAnyRemoveMethodOnDependentScopedSessionEnterpriseBeans"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.implementation.initializer.EjbInitializerMethodTest">
- <methods>
- <exclude name="testInitializerMethodNotABusinessMethod"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.implementation.initializer.InitializerMethodTest">
- <methods>
- <exclude name="testBindingTypeOnInitializerParameter"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.implementation.producer.field.definition.enterprise.EnterpriseProducerFieldDefinitionTest">
- <methods>
- <exclude name="testStaticProducerField"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.implementation.producer.method.broken.enterprise.nonbusiness.ProducerMethodNotBusinessMethodTest">
- <methods>
- <exclude name="testProducerMethodOnSessionBeanMustBeBusinessMethod"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.implementation.producer.method.definition.enterprise.EnterpriseProducerMethodDefinitionTest">
- <methods>
- <exclude name="testNonStaticProducerMethodInheritedBySpecializingSubclass"/>
- <exclude name="testNonStaticProducerMethodNotIndirectlyInherited"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.implementation.simple.resource.ejb.EjbInjectionTest">
- <methods>
- <exclude name="testInjectionOfEjbs"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.EnterpriseBeanSpecializationIntegrationTest">
- <methods>
- <exclude name="testSpecializedBeanNotInstantiated"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.EnterpriseBeanSpecializationTest">
- <methods>
- <exclude name="testSpecializingBeanHasBindingsOfSpecializedAndSpecializingBean"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.broken.directlyExtendsNothing.DirectlyExtendsNothingTest">
- <methods>
- <exclude name="testSpecializingClassDirectlyExtendsNothing"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.broken.directlyExtendsSimpleBean.DirectlyExtendsSimpleBeanTest">
- <methods>
- <exclude name="testSpecializingClassDirectlyExtendsSimpleBean"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.broken.implementInterfaceAndExtendsNothing.ImplementsInterfaceAndExtendsNothingTest">
- <methods>
- <exclude name="testSpecializingClassImplementsInterfaceAndExtendsNothing"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.broken.sameName.SameNameTest">
- <methods>
- <exclude name="testSpecializingAndSpecializedBeanHasName"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.inheritance.specialization.simple.broken.extendejb.SpecializingBeanExtendsEnterpriseBeanTest">
- <methods>
- <exclude name="testSpecializingClassDirectlyExtendsEnterpriseBean"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.interceptors.definition.enterprise.interceptorOrder.SessionBeanInterceptorOrderTest">
- <methods>
- <exclude name="testInterceptorsDeclaredUsingInterceptorsCalledBeforeInterceptorBinding"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.interceptors.definition.enterprise.nonContextualReference.SessionBeanInterceptorOnNonContextualEjbReferenceTest">
- <methods>
- <exclude name="testNonContextualSessionBeanReferenceIsIntercepted"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.interceptors.definition.enterprise.simpleInterception.SessionBeanInterceptorDefinitionTest">
- <methods>
- <exclude name="testSessionBeanIsIntercepted"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.lookup.injection.enterprise.SessionBeanInjectionOrderingTest">
- <methods>
- <exclude name="testInitializerCalledAfterFieldInjectionOfSuperclass"/>
- <exclude name="testInitializerCalledAfterResourceInjection"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.lookup.injection.enterprise.SessionBeanInjectionTest">
- <methods>
- <exclude name="testFieldDeclaredInSuperclassIndirectlyInjected"/>
- <exclude name="testFieldDeclaredInSuperclassInjected"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.lookup.typesafe.resolution.EnterpriseResolutionByTypeTest">
- <methods>
- <exclude name="testBeanTypesOnSessionBean"/>
- </methods>
- </class>
- </classes>
- </test>
-</suite>
http://git-wip-us.apache.org/repos/asf/tomee/blob/bdae43a0/tck/pom.xml
----------------------------------------------------------------------
diff --git a/tck/pom.xml b/tck/pom.xml
index 3c627fc..d697f08 100644
--- a/tck/pom.xml
+++ b/tck/pom.xml
@@ -29,7 +29,7 @@
<modules>
<module>cdi-embedded</module>
<module>cdi-tomee</module>
- <module>cdi-tomee-embedded</module>
+ <module>cdi-tomee-embedded</module> <!-- TODO: either really use this module or delete it -->
<module>bval-embedded</module>
<module>tck-common</module>
<module>bval-tomee</module>
http://git-wip-us.apache.org/repos/asf/tomee/blob/bdae43a0/tck/tck-common/pom.xml
----------------------------------------------------------------------
diff --git a/tck/tck-common/pom.xml b/tck/tck-common/pom.xml
index 6c50689..a4fcaf0 100644
--- a/tck/tck-common/pom.xml
+++ b/tck/tck-common/pom.xml
@@ -66,6 +66,11 @@
<artifactId>tomee-util</artifactId>
<version>${tomee.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
<build>
<plugins>