Author: dblevins
Date: Mon Sep 12 07:27:11 2011
New Revision: 1169630
URL: http://svn.apache.org/viewvc?rev=1169630&view=rev
Log:
Embedded setup for TomEE CDI TCK
Added:
openejb/trunk/openejb3/tck/cdi-tomee-embedded/
openejb/trunk/openejb3/tck/cdi-tomee-embedded/pom.xml
- copied, changed from r1167603,
openejb/trunk/openejb3/tck/cdi-tomee/pom.xml
openejb/trunk/openejb3/tck/cdi-tomee-embedded/src/
openejb/trunk/openejb3/tck/cdi-tomee-embedded/src/main/
openejb/trunk/openejb3/tck/cdi-tomee-embedded/src/main/java/
openejb/trunk/openejb3/tck/cdi-tomee-embedded/src/main/java/org/
openejb/trunk/openejb3/tck/cdi-tomee-embedded/src/main/java/org/apache/
openejb/trunk/openejb3/tck/cdi-tomee-embedded/src/main/java/org/apache/openejb/
openejb/trunk/openejb3/tck/cdi-tomee-embedded/src/main/java/org/apache/openejb/tck/
openejb/trunk/openejb3/tck/cdi-tomee-embedded/src/main/java/org/apache/openejb/tck/cdi/
openejb/trunk/openejb3/tck/cdi-tomee-embedded/src/main/java/org/apache/openejb/tck/cdi/tomee/
openejb/trunk/openejb3/tck/cdi-tomee-embedded/src/main/java/org/apache/openejb/tck/cdi/tomee/embedded/
openejb/trunk/openejb3/tck/cdi-tomee-embedded/src/main/java/org/apache/openejb/tck/cdi/tomee/embedded/BeansImpl.java
- copied, changed from r1167603,
openejb/trunk/openejb3/tck/cdi-tomee/src/main/java/org/apache/openejb/tck/cdi/tomee/BeansImpl.java
openejb/trunk/openejb3/tck/cdi-tomee-embedded/src/main/java/org/apache/openejb/tck/cdi/tomee/embedded/ContainersImpl.java
openejb/trunk/openejb3/tck/cdi-tomee-embedded/src/main/java/org/apache/openejb/tck/cdi/tomee/embedded/ContextsImpl.java
- copied, changed from r1167603,
openejb/trunk/openejb3/tck/cdi-tomee/src/main/java/org/apache/openejb/tck/cdi/tomee/ContextsImpl.java
openejb/trunk/openejb3/tck/cdi-tomee-embedded/src/main/java/org/apache/openejb/tck/cdi/tomee/embedded/ELImpl.java
- copied, changed from r1167603,
openejb/trunk/openejb3/tck/cdi-tomee/src/main/java/org/apache/openejb/tck/cdi/tomee/ELImpl.java
openejb/trunk/openejb3/tck/cdi-tomee-embedded/src/main/java/org/apache/openejb/tck/cdi/tomee/embedded/EmbeddedTestListener.java
openejb/trunk/openejb3/tck/cdi-tomee-embedded/src/main/java/org/apache/openejb/tck/cdi/tomee/embedded/ManagersImpl.java
- copied, changed from r1167603,
openejb/trunk/openejb3/tck/cdi-tomee/src/main/java/org/apache/openejb/tck/cdi/tomee/ManagersImpl.java
openejb/trunk/openejb3/tck/cdi-tomee-embedded/src/main/java/org/apache/openejb/tck/cdi/tomee/embedded/Report.java
- copied, changed from r1167603,
openejb/trunk/openejb3/tck/cdi-tomee/src/main/java/org/apache/openejb/tck/cdi/tomee/Report.java
openejb/trunk/openejb3/tck/cdi-tomee-embedded/src/main/java/org/apache/openejb/tck/cdi/tomee/embedded/ResetStaticValve.java
openejb/trunk/openejb3/tck/cdi-tomee-embedded/src/main/resources/
openejb/trunk/openejb3/tck/cdi-tomee-embedded/src/main/resources/META-INF/
openejb/trunk/openejb3/tck/cdi-tomee-embedded/src/main/resources/META-INF/jboss-test-harness.properties
- copied, changed from r1167603,
openejb/trunk/openejb3/tck/cdi-tomee/src/main/resources/META-INF/jboss-test-harness.properties
openejb/trunk/openejb3/tck/cdi-tomee-embedded/src/test/
openejb/trunk/openejb3/tck/cdi-tomee-embedded/src/test/java/
openejb/trunk/openejb3/tck/cdi-tomee-embedded/src/test/resources/
openejb/trunk/openejb3/tck/cdi-tomee-embedded/src/test/resources/passing.xml
- copied, changed from r1167609,
openejb/trunk/openejb3/tck/cdi-tomee/src/test/resources/passing.xml
Copied: openejb/trunk/openejb3/tck/cdi-tomee-embedded/pom.xml (from r1167603,
openejb/trunk/openejb3/tck/cdi-tomee/pom.xml)
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/tck/cdi-tomee-embedded/pom.xml?p2=openejb/trunk/openejb3/tck/cdi-tomee-embedded/pom.xml&p1=openejb/trunk/openejb3/tck/cdi-tomee/pom.xml&r1=1167603&r2=1169630&rev=1169630&view=diff
==============================================================================
--- openejb/trunk/openejb3/tck/cdi-tomee/pom.xml (original)
+++ openejb/trunk/openejb3/tck/cdi-tomee-embedded/pom.xml Mon Sep 12 07:27:11
2011
@@ -23,17 +23,13 @@
<version>4.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>cdi-tomee</artifactId>
+ <artifactId>cdi-tomee-embedded</artifactId>
<packaging>jar</packaging>
- <name>OpenEJB :: TCK :: CDI TomEE</name>
- <properties>
- <!-- where we will unpack tomcat -->
-
<openejb.home>${project.build.directory}${file.separator}apache-tomee-${project.version}</openejb.home>
- </properties>
+ <name>OpenEJB :: TCK :: CDI TomEE Embedded</name>
<dependencies>
<dependency>
<groupId>org.apache.openejb</groupId>
- <artifactId>openejb-core</artifactId>
+ <artifactId>tomee-embedded</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
@@ -43,12 +39,6 @@
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
- <artifactId>apache-tomee</artifactId>
- <type>zip</type>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.openejb</groupId>
<artifactId>tck-common</artifactId>
<version>${project.version}</version>
</dependency>
@@ -70,6 +60,7 @@
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
+ <scope>compile</scope>
</dependency>
</dependencies>
<build>
@@ -108,24 +99,6 @@
<version>2.3</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>${project.version}</version>
- <type>zip</type>
- <outputDirectory>${project.build.directory}</outputDirectory>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- <execution>
<id>copy</id>
<phase>pre-integration-test</phase>
<goals>
@@ -141,7 +114,7 @@
</artifactItem>
<artifactItem>
<groupId>org.apache.openejb</groupId>
- <artifactId>cdi-tomee</artifactId>
+ <artifactId>cdi-tomee-embedded</artifactId>
<version>${project.version}</version>
<outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
</artifactItem>
@@ -150,43 +123,13 @@
</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>
- <version>1.5</version>
- <executions>
- <execution>
- <id>remove-apps</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <target>
- <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>
<version>2.9</version>
<configuration>
<suiteXmlFiles>
- <!--
<suiteXmlFile>src/test/resources/web-profile.xml</suiteXmlFile> -->
<suiteXmlFile>src/test/resources/passing.xml</suiteXmlFile>
- <!--<suiteXmlFile>src/test/resources/failing.xml</suiteXmlFile>-->
</suiteXmlFiles>
<!--<forkMode>once</forkMode>-->
<systemPropertyVariables>
@@ -194,18 +137,10 @@
<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>localhost:${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://localhost:${tomee.http.port}/openejb/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>-Xmx512m -Xms256m -XX:PermSize=64m -XX:MaxPermSize=256m
-XX:ReservedCodeCacheSize=64m</java.opts>
-
<openejb.home>${project.build.directory}${file.separator}apache-tomee-${project.version}</openejb.home>
</systemPropertyVariables>
</configuration>
<executions>
Copied:
openejb/trunk/openejb3/tck/cdi-tomee-embedded/src/main/java/org/apache/openejb/tck/cdi/tomee/embedded/BeansImpl.java
(from r1167603,
openejb/trunk/openejb3/tck/cdi-tomee/src/main/java/org/apache/openejb/tck/cdi/tomee/BeansImpl.java)
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/tck/cdi-tomee-embedded/src/main/java/org/apache/openejb/tck/cdi/tomee/embedded/BeansImpl.java?p2=openejb/trunk/openejb3/tck/cdi-tomee-embedded/src/main/java/org/apache/openejb/tck/cdi/tomee/embedded/BeansImpl.java&p1=openejb/trunk/openejb3/tck/cdi-tomee/src/main/java/org/apache/openejb/tck/cdi/tomee/BeansImpl.java&r1=1167603&r2=1169630&rev=1169630&view=diff
==============================================================================
---
openejb/trunk/openejb3/tck/cdi-tomee/src/main/java/org/apache/openejb/tck/cdi/tomee/BeansImpl.java
(original)
+++
openejb/trunk/openejb3/tck/cdi-tomee-embedded/src/main/java/org/apache/openejb/tck/cdi/tomee/embedded/BeansImpl.java
Mon Sep 12 07:27:11 2011
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.openejb.tck.cdi.tomee;
+package org.apache.openejb.tck.cdi.tomee.embedded;
import org.apache.openejb.core.ivm.IntraVmProxy;
Added:
openejb/trunk/openejb3/tck/cdi-tomee-embedded/src/main/java/org/apache/openejb/tck/cdi/tomee/embedded/ContainersImpl.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/tck/cdi-tomee-embedded/src/main/java/org/apache/openejb/tck/cdi/tomee/embedded/ContainersImpl.java?rev=1169630&view=auto
==============================================================================
---
openejb/trunk/openejb3/tck/cdi-tomee-embedded/src/main/java/org/apache/openejb/tck/cdi/tomee/embedded/ContainersImpl.java
(added)
+++
openejb/trunk/openejb3/tck/cdi-tomee-embedded/src/main/java/org/apache/openejb/tck/cdi/tomee/embedded/ContainersImpl.java
Mon Sep 12 07:27:11 2011
@@ -0,0 +1,159 @@
+/**
+ * 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.embedded;
+
+import org.apache.openejb.config.ValidationException;
+import org.apache.tomee.embedded.Container;
+import org.jboss.testharness.api.DeploymentException;
+import org.jboss.testharness.spi.Containers;
+
+import java.io.Closeable;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.Flushable;
+import java.io.IOException;
+import java.io.InputStream;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class ContainersImpl implements Containers {
+
+ private static int count = 0;
+ private static final String tmpDir = System.getProperty("java.io.tmpdir");
+ private Exception exception;
+ private final Container container;
+
+ public ContainersImpl() {
+ System.out.println("Initialized ContainersImpl " + (++count));
+ container = new Container();
+ System.setProperty("tomee.valves", ResetStaticValve.class.getName());
+ }
+
+ @Override
+ public boolean deploy(InputStream archive, String name) throws IOException
{
+ exception = null;
+
+ System.out.println("Deploying " + archive + " with name " + name);
+
+ File application = getFile(name);
+ System.out.println(application);
+ writeToFile(application, archive);
+
+ try {
+ container.deploy(name, application);
+ } catch (Exception ex) {
+ Exception e = ex;
+ if (e.getCause() instanceof ValidationException) {
+ e = (Exception) e.getCause();
+ }
+
+ if (name.contains(".broken.")) {
+ // Tests that contain the name '.broken.' are expected to fail
deployment
+ // This is how the TCK verifies the container is doing the
required error checking
+ exception = (DeploymentException) new
DeploymentException("deploy failed").initCause(e);
+ } else {
+ // This on the other hand is not good ....
+ System.out.println("FIX Deployment of " + name);
+ e.printStackTrace();
+ exception = e;
+ }
+
+ return false;
+ }
+ return true;
+ }
+
+ private void writeToFile(File file, InputStream archive) {
+ try {
+ FileOutputStream fos = new FileOutputStream(file);
+ byte[] buffer = new byte[4096];
+ int bytesRead = -1;
+ while ((bytesRead = archive.read(buffer)) > -1) {
+ fos.write(buffer, 0, bytesRead);
+ }
+ Util.close(fos);
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ private File getFile(String name) {
+ final File dir = new File(tmpDir, Math.random() + "");
+ dir.mkdir();
+
+ return new File(dir, name);
+ }
+
+ @Override
+ public DeploymentException getDeploymentException() {
+ try {
+ return (DeploymentException) exception;
+ } catch (Exception e) {
+ System.out.println("BADCAST");
+ return new DeploymentException("", exception);
+ }
+ }
+
+ @Override
+ public void undeploy(String name) throws IOException {
+ System.out.println("Undeploying " + name);
+ try {
+ container.undeploy(name);
+ } catch (Exception e) {
+ e.printStackTrace();
+ throw new RuntimeException(e);
+ }
+ }
+
+ @Override
+ public void setup() throws IOException {
+ try {
+ container.start();
+ } catch (Exception e) {
+ throw new IOException(e);
+ }
+ }
+
+ @Override
+ public void cleanup() throws IOException {
+ try {
+ container.stop();
+ } catch (Exception e) {
+ throw new IOException(e);
+ }
+ }
+
+ private static final class Util {
+ static void close(Closeable closeable) throws IOException {
+ if (closeable == null)
+ return;
+ try {
+ if (closeable instanceof Flushable) {
+ ((Flushable) closeable).flush();
+ }
+ } catch (IOException e) {
+ // no-op
+ }
+ try {
+ closeable.close();
+ } catch (IOException e) {
+ // no-op
+ }
+ }
+ }
+}
Copied:
openejb/trunk/openejb3/tck/cdi-tomee-embedded/src/main/java/org/apache/openejb/tck/cdi/tomee/embedded/ContextsImpl.java
(from r1167603,
openejb/trunk/openejb3/tck/cdi-tomee/src/main/java/org/apache/openejb/tck/cdi/tomee/ContextsImpl.java)
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/tck/cdi-tomee-embedded/src/main/java/org/apache/openejb/tck/cdi/tomee/embedded/ContextsImpl.java?p2=openejb/trunk/openejb3/tck/cdi-tomee-embedded/src/main/java/org/apache/openejb/tck/cdi/tomee/embedded/ContextsImpl.java&p1=openejb/trunk/openejb3/tck/cdi-tomee/src/main/java/org/apache/openejb/tck/cdi/tomee/ContextsImpl.java&r1=1167603&r2=1169630&rev=1169630&view=diff
==============================================================================
---
openejb/trunk/openejb3/tck/cdi-tomee/src/main/java/org/apache/openejb/tck/cdi/tomee/ContextsImpl.java
(original)
+++
openejb/trunk/openejb3/tck/cdi-tomee-embedded/src/main/java/org/apache/openejb/tck/cdi/tomee/embedded/ContextsImpl.java
Mon Sep 12 07:27:11 2011
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.openejb.tck.cdi.tomee;
+package org.apache.openejb.tck.cdi.tomee.embedded;
import org.apache.webbeans.config.WebBeansContext;
import org.apache.webbeans.context.AbstractContext;
Copied:
openejb/trunk/openejb3/tck/cdi-tomee-embedded/src/main/java/org/apache/openejb/tck/cdi/tomee/embedded/ELImpl.java
(from r1167603,
openejb/trunk/openejb3/tck/cdi-tomee/src/main/java/org/apache/openejb/tck/cdi/tomee/ELImpl.java)
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/tck/cdi-tomee-embedded/src/main/java/org/apache/openejb/tck/cdi/tomee/embedded/ELImpl.java?p2=openejb/trunk/openejb3/tck/cdi-tomee-embedded/src/main/java/org/apache/openejb/tck/cdi/tomee/embedded/ELImpl.java&p1=openejb/trunk/openejb3/tck/cdi-tomee/src/main/java/org/apache/openejb/tck/cdi/tomee/ELImpl.java&r1=1167603&r2=1169630&rev=1169630&view=diff
==============================================================================
---
openejb/trunk/openejb3/tck/cdi-tomee/src/main/java/org/apache/openejb/tck/cdi/tomee/ELImpl.java
(original)
+++
openejb/trunk/openejb3/tck/cdi-tomee-embedded/src/main/java/org/apache/openejb/tck/cdi/tomee/embedded/ELImpl.java
Mon Sep 12 07:27:11 2011
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.openejb.tck.cdi.tomee;
+package org.apache.openejb.tck.cdi.tomee.embedded;
import javax.el.ELContext;
Added:
openejb/trunk/openejb3/tck/cdi-tomee-embedded/src/main/java/org/apache/openejb/tck/cdi/tomee/embedded/EmbeddedTestListener.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/tck/cdi-tomee-embedded/src/main/java/org/apache/openejb/tck/cdi/tomee/embedded/EmbeddedTestListener.java?rev=1169630&view=auto
==============================================================================
---
openejb/trunk/openejb3/tck/cdi-tomee-embedded/src/main/java/org/apache/openejb/tck/cdi/tomee/embedded/EmbeddedTestListener.java
(added)
+++
openejb/trunk/openejb3/tck/cdi-tomee-embedded/src/main/java/org/apache/openejb/tck/cdi/tomee/embedded/EmbeddedTestListener.java
Mon Sep 12 07:27:11 2011
@@ -0,0 +1,57 @@
+/**
+ * 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.embedded;
+
+import org.jboss.testharness.AbstractTest;
+import org.testng.ITestContext;
+import org.testng.ITestListener;
+import org.testng.ITestResult;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class EmbeddedTestListener implements ITestListener {
+ @Override
+ public void onTestStart(ITestResult result) {
+// AbstractTest.setInContainer(false);
+ }
+
+ @Override
+ public void onTestSuccess(ITestResult result) {
+ }
+
+ @Override
+ public void onTestFailure(ITestResult result) {
+ }
+
+ @Override
+ public void onTestSkipped(ITestResult result) {
+ }
+
+ @Override
+ public void onTestFailedButWithinSuccessPercentage(ITestResult result) {
+ }
+
+ @Override
+ public void onStart(ITestContext context) {
+ AbstractTest.setInContainer(false);
+ }
+
+ @Override
+ public void onFinish(ITestContext context) {
+ }
+}
Copied:
openejb/trunk/openejb3/tck/cdi-tomee-embedded/src/main/java/org/apache/openejb/tck/cdi/tomee/embedded/ManagersImpl.java
(from r1167603,
openejb/trunk/openejb3/tck/cdi-tomee/src/main/java/org/apache/openejb/tck/cdi/tomee/ManagersImpl.java)
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/tck/cdi-tomee-embedded/src/main/java/org/apache/openejb/tck/cdi/tomee/embedded/ManagersImpl.java?p2=openejb/trunk/openejb3/tck/cdi-tomee-embedded/src/main/java/org/apache/openejb/tck/cdi/tomee/embedded/ManagersImpl.java&p1=openejb/trunk/openejb3/tck/cdi-tomee/src/main/java/org/apache/openejb/tck/cdi/tomee/ManagersImpl.java&r1=1167603&r2=1169630&rev=1169630&view=diff
==============================================================================
---
openejb/trunk/openejb3/tck/cdi-tomee/src/main/java/org/apache/openejb/tck/cdi/tomee/ManagersImpl.java
(original)
+++
openejb/trunk/openejb3/tck/cdi-tomee-embedded/src/main/java/org/apache/openejb/tck/cdi/tomee/embedded/ManagersImpl.java
Mon Sep 12 07:27:11 2011
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.openejb.tck.cdi.tomee;
+package org.apache.openejb.tck.cdi.tomee.embedded;
import org.apache.webbeans.container.InjectableBeanManager;
Copied:
openejb/trunk/openejb3/tck/cdi-tomee-embedded/src/main/java/org/apache/openejb/tck/cdi/tomee/embedded/Report.java
(from r1167603,
openejb/trunk/openejb3/tck/cdi-tomee/src/main/java/org/apache/openejb/tck/cdi/tomee/Report.java)
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/tck/cdi-tomee-embedded/src/main/java/org/apache/openejb/tck/cdi/tomee/embedded/Report.java?p2=openejb/trunk/openejb3/tck/cdi-tomee-embedded/src/main/java/org/apache/openejb/tck/cdi/tomee/embedded/Report.java&p1=openejb/trunk/openejb3/tck/cdi-tomee/src/main/java/org/apache/openejb/tck/cdi/tomee/Report.java&r1=1167603&r2=1169630&rev=1169630&view=diff
==============================================================================
---
openejb/trunk/openejb3/tck/cdi-tomee/src/main/java/org/apache/openejb/tck/cdi/tomee/Report.java
(original)
+++
openejb/trunk/openejb3/tck/cdi-tomee-embedded/src/main/java/org/apache/openejb/tck/cdi/tomee/embedded/Report.java
Mon Sep 12 07:27:11 2011
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.openejb.tck.cdi.tomee;
+package org.apache.openejb.tck.cdi.tomee.embedded;
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
Added:
openejb/trunk/openejb3/tck/cdi-tomee-embedded/src/main/java/org/apache/openejb/tck/cdi/tomee/embedded/ResetStaticValve.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/tck/cdi-tomee-embedded/src/main/java/org/apache/openejb/tck/cdi/tomee/embedded/ResetStaticValve.java?rev=1169630&view=auto
==============================================================================
---
openejb/trunk/openejb3/tck/cdi-tomee-embedded/src/main/java/org/apache/openejb/tck/cdi/tomee/embedded/ResetStaticValve.java
(added)
+++
openejb/trunk/openejb3/tck/cdi-tomee-embedded/src/main/java/org/apache/openejb/tck/cdi/tomee/embedded/ResetStaticValve.java
Mon Sep 12 07:27:11 2011
@@ -0,0 +1,43 @@
+/**
+ * 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.embedded;
+
+import org.apache.catalina.connector.Request;
+import org.apache.catalina.connector.Response;
+import org.apache.catalina.valves.ValveBase;
+import org.jboss.testharness.AbstractTest;
+
+import javax.servlet.ServletException;
+import java.io.IOException;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class ResetStaticValve extends ValveBase {
+
+
+ @Override
+ public void invoke(Request request, Response response) throws IOException,
ServletException {
+ try {
+ AbstractTest.setInContainer(true);
+ getNext().invoke(request, response);
+ } finally {
+ AbstractTest.setInContainer(false);
+ }
+
+ }
+}
Copied:
openejb/trunk/openejb3/tck/cdi-tomee-embedded/src/main/resources/META-INF/jboss-test-harness.properties
(from r1167603,
openejb/trunk/openejb3/tck/cdi-tomee/src/main/resources/META-INF/jboss-test-harness.properties)
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/tck/cdi-tomee-embedded/src/main/resources/META-INF/jboss-test-harness.properties?p2=openejb/trunk/openejb3/tck/cdi-tomee-embedded/src/main/resources/META-INF/jboss-test-harness.properties&p1=openejb/trunk/openejb3/tck/cdi-tomee/src/main/resources/META-INF/jboss-test-harness.properties&r1=1167603&r2=1169630&rev=1169630&view=diff
==============================================================================
---
openejb/trunk/openejb3/tck/cdi-tomee/src/main/resources/META-INF/jboss-test-harness.properties
(original)
+++
openejb/trunk/openejb3/tck/cdi-tomee-embedded/src/main/resources/META-INF/jboss-test-harness.properties
Mon Sep 12 07:27:11 2011
@@ -15,16 +15,15 @@
#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.jsr299.tck.spi.Managers=org.apache.openejb.tck.cdi.tomee.embedded.ManagersImpl
+org.jboss.jsr299.tck.spi.Beans=org.apache.openejb.tck.cdi.tomee.embedded.BeansImpl
+org.jboss.jsr299.tck.spi.Contexts=org.apache.openejb.tck.cdi.tomee.embedded.ContextsImpl
+org.jboss.jsr299.tck.spi.EL=org.apache.openejb.tck.cdi.tomee.embedded.ELImpl
+org.jboss.testharness.spi.Containers=org.apache.openejb.tck.cdi.tomee.embedded.ContainersImpl
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}
+org.jboss.testharness.container.forceRestart=true
+org.jboss.testharness.host=localhost:23880
Copied:
openejb/trunk/openejb3/tck/cdi-tomee-embedded/src/test/resources/passing.xml
(from r1167609,
openejb/trunk/openejb3/tck/cdi-tomee/src/test/resources/passing.xml)
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/tck/cdi-tomee-embedded/src/test/resources/passing.xml?p2=openejb/trunk/openejb3/tck/cdi-tomee-embedded/src/test/resources/passing.xml&p1=openejb/trunk/openejb3/tck/cdi-tomee/src/test/resources/passing.xml&r1=1167609&r2=1169630&rev=1169630&view=diff
==============================================================================
--- openejb/trunk/openejb3/tck/cdi-tomee/src/test/resources/passing.xml
(original)
+++
openejb/trunk/openejb3/tck/cdi-tomee-embedded/src/test/resources/passing.xml
Mon Sep 12 07:27:11 2011
@@ -18,144 +18,10 @@
-->
<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.conversation.ClientConversationContextTest">
- <methods>
- <exclude name="testBeanWithDefaultQualifier"/>
- <exclude name="testBeanWithNameJavaxEnterpriseContextConversation"/>
- <exclude name="testBeanWithRequestScope"/>
- <exclude
name="testBeginAlreadyLongRunningConversationThrowsException"/>
- <exclude name="testConversationActiveDuringNonFacesRequest"/>
- <exclude name="testConversationBeginMakesConversationLongRunning"/>
- <exclude name="testConversationEndMakesConversationTransient"/>
- <exclude name="testConversationHasDefaultTimeout"/>
- <exclude name="testConversationIdMayBeSetByApplication"/>
- <exclude name="testConversationIdMayBeSetByContainer"/>
- <exclude name="testConversationIdSetByContainerIsUnique"/>
- <exclude name="testConversationsDontCrossSessionBoundary1"/>
- <exclude name="testConversationsDontCrossSessionBoundary2"/>
- <exclude name="testEndTransientConversationThrowsException"/>
- <exclude
name="testLongRunningConversationInstancesNotDestroyedAtRequestEnd"/>
- <exclude name="testSetConversationTimeoutOverride"/>
- <exclude name="testTransientConversationHasNullId"/>
- <exclude
name="testTransientConversationInstancesDestroyedAtRequestEnd"/>
- </methods>
- </class>
- <class
name="org.jboss.jsr299.tck.tests.context.conversation.InvalidatingSessionDestroysConversationTest">
- <methods>
- <exclude name="testInvalidatingSessionDestroysConversation"/>
- </methods>
- </class>
- <class
name="org.jboss.jsr299.tck.tests.context.conversation.LongRunningConversationPropagatedByFacesContextTest">
- <methods>
- <exclude name="testConversationPropagated"/>
- <exclude name="testConversationPropagatedOverRedirect"/>
- </methods>
- </class>
- <class
name="org.jboss.jsr299.tck.tests.context.conversation.ManualCidPropagationTest">
- <methods>
- <exclude name="testManualCidPropagation"/>
- </methods>
- </class>
- <class
name="org.jboss.jsr299.tck.tests.context.dependent.DependentContextTest">
- <methods>
- <exclude name="testContextIsActiveWhenEvaluatingElExpression"/>
- <exclude name="testDependentsDestroyedWhenElEvaluationCompletes"/>
- <exclude name="testInstanceUsedForElEvaluationNotShared"/>
- </methods>
- </class>
- <class
name="org.jboss.jsr299.tck.tests.context.passivating.broken.dependentScopedProducerFieldReturnsNonSerializableObjectForInjectionIntoStatefulSessionBean.EnterpriseBeanWithIllegalDependencyTest">
- <methods>
- <exclude name="test"/>
- </methods>
- </class>
- <class
name="org.jboss.jsr299.tck.tests.context.passivating.broken.dependentScopedProducerMethodReturnsNonSerializableObjectForInjectionIntoStatefulSessionBean.EnterpriseBeanWithIllegalDependencyTest">
- <methods>
- <exclude name="test"/>
- </methods>
- </class>
- <class
name="org.jboss.jsr299.tck.tests.context.passivating.broken.enterpriseBeanWithNonPassivatingDecorator.EnterpriseBeanWithNonPassivatingDecoratorTest">
- <methods>
- <exclude name="testEnterpriseBeanWithNonPassivatingDecoratorFails"/>
- </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.deployment.packaging.bundledLibrary.LibraryInWarTest">
- <methods>
- <exclude name="test"/>
- </methods>
- </class>
- <class
name="org.jboss.jsr299.tck.tests.implementation.enterprise.lifecycle.EnterpriseBeanLifecycleTest">
- <methods>
- <exclude name="testCreateSFSB"/>
- <exclude name="testSerializeSFSB"/>
- </methods>
- </class>
- <class
name="org.jboss.jsr299.tck.tests.implementation.simple.resource.ejb.EjbInjectionTest">
- <methods>
- <exclude name="testPassivationOfEjbs"/>
- </methods>
- </class>
- <class
name="org.jboss.jsr299.tck.tests.implementation.simple.resource.persistenceContext.PersistenceContextInjectionTest">
- <methods>
- <exclude name="testBeanTypesAndBindingTypesOfPersistenceContext"/>
- <exclude name="testInjectionOfPersistenceContext"/>
- <exclude name="testInjectionOfPersistenceUnit"/>
- <exclude name="testPassivationOfPersistenceContext"/>
- <exclude name="testPassivationOfPersistenceUnit"/>
- </methods>
- </class>
- <class
name="org.jboss.jsr299.tck.tests.implementation.simple.resource.resource.InjectionOfResourceTest">
- <methods>
- <exclude name="testInjectionOfResource"/>
- <exclude name="testPassivatingResource"/>
- <exclude name="testProduceResourceProxy"/>
- </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.lookup.el.ResolutionByNameTest">
- <methods>
- <exclude name="testContextCreatesNewInstanceForInjection"/>
- <exclude name="testELResolverReturnsContextualInstance"/>
- <exclude name="testQualifiedNameLookup"/>
- </methods>
- </class>
- <class
name="org.jboss.jsr299.tck.tests.lookup.el.integration.IntegrationWithUnifiedELTest">
- <methods>
- <exclude name="testELResolverRegisteredWithJsf"/>
- <exclude name="testELResolverRegisteredWithServletContainer"/>
- </methods>
- </class>
<class
name="org.jboss.jsr299.tck.tests.lookup.injection.non.contextual.InjectionIntoNonContextualComponentTest">
<methods>
- <exclude name="testInjectionIntoJSFManagedBean"/>
- </methods>
- </class>
- <class
name="org.jboss.jsr299.tck.tests.lookup.injection.non.contextual.ws.InjectionIntoWebServiceEndPointTest">
- <methods>
- <exclude name="testInjectionIntoWebServiceEndpoint"/>
- </methods>
- </class>
- <class
name="org.jboss.jsr299.tck.tests.lookup.injectionpoint.broken.not.bean.InjectionPointTest">
- <methods>
- <exclude name="testDefinitionErrorDetected"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.lookup.manager.jndi.ManagerTest">
- <methods>
- <exclude name="testManagerLookupInJndi"/>
+ <include name="testInjectionIntoJSFManagedBean"/>
</methods>
</class>
</classes>
