Author: dblevins
Date: Tue Jan 3 01:59:05 2012
New Revision: 1226601
URL: http://svn.apache.org/viewvc?rev=1226601&view=rev
Log:
Allow the webapp based run to be a profile
Modified:
openejb/trunk/openejb/tck/cdi-tomee/pom.xml
openejb/trunk/openejb/tck/cdi-tomee/src/main/resources/META-INF/jboss-test-harness.properties
openejb/trunk/openejb/tck/tck-common/src/main/java/org/apache/openejb/tck/impl/ContainersImplTomEE.java
openejb/trunk/openejb/tck/tck-common/src/main/java/org/apache/openejb/tck/impl/FullRestartContainer.java
Modified: openejb/trunk/openejb/tck/cdi-tomee/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tck/cdi-tomee/pom.xml?rev=1226601&r1=1226600&r2=1226601&view=diff
==============================================================================
--- openejb/trunk/openejb/tck/cdi-tomee/pom.xml (original)
+++ openejb/trunk/openejb/tck/cdi-tomee/pom.xml Tue Jan 3 01:59:05 2012
@@ -27,9 +27,9 @@
<name>OpenEJB :: TCK :: CDI TomEE</name>
<properties>
- <!-- where we will unpack tomcat -->
<openejb.home>${project.build.directory}${file.separator}apache-tomee-webprofile-1.0.0-beta-2-SNAPSHOT</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>
</properties>
<dependencies>
@@ -233,6 +233,7 @@
<java.opts>-Xmx512m -Xms256m -XX:PermSize=64m -XX:MaxPermSize=512m
-XX:ReservedCodeCacheSize=64m</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>
</configuration>
<executions>
@@ -260,7 +261,7 @@
<profile>
<id>webapp-deployer</id>
<properties>
-
<openejb.deployer.jndiname>openejb/WebappDeployerRemote</openejb.deployer.jndiname>
+
<org.jboss.testharness.spi.Containers>org.apache.openejb.tck.impl.FullRestartContainer</org.jboss.testharness.spi.Containers>
</properties>
</profile>
</profiles>
Modified:
openejb/trunk/openejb/tck/cdi-tomee/src/main/resources/META-INF/jboss-test-harness.properties
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tck/cdi-tomee/src/main/resources/META-INF/jboss-test-harness.properties?rev=1226601&r1=1226600&r2=1226601&view=diff
==============================================================================
---
openejb/trunk/openejb/tck/cdi-tomee/src/main/resources/META-INF/jboss-test-harness.properties
(original)
+++
openejb/trunk/openejb/tck/cdi-tomee/src/main/resources/META-INF/jboss-test-harness.properties
Tue Jan 3 01:59:05 2012
@@ -20,8 +20,8 @@ org.jboss.jsr299.tck.spi.Beans=org.apach
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.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
Modified:
openejb/trunk/openejb/tck/tck-common/src/main/java/org/apache/openejb/tck/impl/ContainersImplTomEE.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tck/tck-common/src/main/java/org/apache/openejb/tck/impl/ContainersImplTomEE.java?rev=1226601&r1=1226600&r2=1226601&view=diff
==============================================================================
---
openejb/trunk/openejb/tck/tck-common/src/main/java/org/apache/openejb/tck/impl/ContainersImplTomEE.java
(original)
+++
openejb/trunk/openejb/tck/tck-common/src/main/java/org/apache/openejb/tck/impl/ContainersImplTomEE.java
Tue Jan 3 01:59:05 2012
@@ -64,6 +64,7 @@ public class ContainersImplTomEE extends
}
}
public ContainersImplTomEE() {
+ System.out.println("ContainersImpl=" +
ContainersImplTomEE.class.getName());
System.out.println("Initialized ContainersImplTomEE " + (++count));
server = new RemoteServer();
}
Modified:
openejb/trunk/openejb/tck/tck-common/src/main/java/org/apache/openejb/tck/impl/FullRestartContainer.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tck/tck-common/src/main/java/org/apache/openejb/tck/impl/FullRestartContainer.java?rev=1226601&r1=1226600&r2=1226601&view=diff
==============================================================================
---
openejb/trunk/openejb/tck/tck-common/src/main/java/org/apache/openejb/tck/impl/FullRestartContainer.java
(original)
+++
openejb/trunk/openejb/tck/tck-common/src/main/java/org/apache/openejb/tck/impl/FullRestartContainer.java
Tue Jan 3 01:59:05 2012
@@ -45,6 +45,10 @@ public class FullRestartContainer extend
private Exception exception;
private File currentFile;
+ public FullRestartContainer() {
+ System.out.println("ContainersImpl=" +
FullRestartContainer.class.getName());
+ }
+
@Override
public DeploymentException getDeploymentException() {
if (exception instanceof DeploymentException) {
