Author: dblevins
Date: Tue Jul 19 21:32:40 2011
New Revision: 1148550
URL: http://svn.apache.org/viewvc?rev=1148550&view=rev
Log:
Tweak all the TCK setups to use the tck-common a bit more. Fixed issues with
both CDI TCK setups -- both now hooked up.
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi/ThreadSingletonServiceImpl.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/RemoteServer.java
openejb/trunk/openejb3/tck/bval-embedded/pom.xml
openejb/trunk/openejb3/tck/cdi-embedded/pom.xml
openejb/trunk/openejb3/tck/cdi-embedded/src/test/java/org/apache/openejb/tck/cdi/embedded/Report.java
openejb/trunk/openejb3/tck/cdi-tomee/pom.xml
openejb/trunk/openejb3/tck/cdi-tomee/src/test/resources/passing.xml
openejb/trunk/openejb3/tck/pom.xml
openejb/trunk/openejb3/tck/tck-common/pom.xml
openejb/trunk/openejb3/tck/tck-common/src/main/java/org/apache/openejb/tck/impl/ContainersImpl.java
openejb/trunk/openejb3/tck/tck-common/src/main/java/org/apache/openejb/tck/impl/ContainersImplTomEE.java
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi/ThreadSingletonServiceImpl.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi/ThreadSingletonServiceImpl.java?rev=1148550&r1=1148549&r2=1148550&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi/ThreadSingletonServiceImpl.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi/ThreadSingletonServiceImpl.java
Tue Jul 19 21:32:40 2011
@@ -27,11 +27,14 @@ import org.apache.openejb.util.LogCatego
import org.apache.openejb.util.Logger;
import org.apache.webbeans.config.OpenWebBeansConfiguration;
import org.apache.webbeans.config.WebBeansContext;
+import org.apache.webbeans.container.BeanManagerImpl;
import org.apache.webbeans.spi.ContainerLifecycle;
import org.apache.webbeans.spi.ResourceInjectionService;
import org.apache.webbeans.spi.SecurityService;
import org.apache.webbeans.spi.ValidatorService;
+import java.util.Collections;
+import java.util.Comparator;
import java.util.List;
/**
@@ -122,13 +125,23 @@ public class ThreadSingletonServiceImpl
final List<AppContext> appContexts =
containerSystem.getAppContexts();
- if (appContexts.size() > 0) return
appContexts.get(0).getWebBeansContext();
+ if (appContexts.size() > 0) return getWebBeansContext(appContexts);
throw new IllegalStateException("On a thread without an
initialized context");
}
return context;
}
+ private static WebBeansContext getWebBeansContext(List<AppContext>
appContexts) {
+ Collections.sort(appContexts, new Comparator<AppContext>() {
+ @Override
+ public int compare(AppContext appContext, AppContext appContext1) {
+ return
appContext1.getWebBeansContext().getBeanManagerImpl().getBeans().size() -
appContext.getWebBeansContext().getBeanManagerImpl().getBeans().size();
+ }
+ });
+ return appContexts.get(0).getWebBeansContext();
+ }
+
@Override
public WebBeansContext get(Object key) {
return getContext();
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/RemoteServer.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/RemoteServer.java?rev=1148550&r1=1148549&r2=1148550&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/RemoteServer.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/RemoteServer.java
Tue Jul 19 21:32:40 2011
@@ -182,8 +182,8 @@ public class RemoteServer {
argsList.add("-Dcatalina.home=" + home.getAbsolutePath());
argsList.add("-Dcatalina.ext.dirs=" +
tlib.getAbsolutePath());
argsList.add("-Dopenejb.servicemanager.enabled=" +
Boolean.getBoolean("openejb.servicemanager.enabled"));
+ argsList.add("-ea");
argsList.add("-classpath");
- argsList.add("-ea");
String ps = File.pathSeparator;
if (commonsLoggingJar.exists()) {
argsList.add(bootstrapJar.getAbsolutePath() + ps +
juliJar.getAbsolutePath() + ps + commonsLoggingJar.getAbsolutePath());
Modified: openejb/trunk/openejb3/tck/bval-embedded/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/tck/bval-embedded/pom.xml?rev=1148550&r1=1148549&r2=1148550&view=diff
==============================================================================
--- openejb/trunk/openejb3/tck/bval-embedded/pom.xml (original)
+++ openejb/trunk/openejb3/tck/bval-embedded/pom.xml Tue Jul 19 21:32:40 2011
@@ -71,17 +71,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.jboss.test-harness</groupId>
- <artifactId>jboss-test-harness</artifactId>
- <version>1.1.0-CR5</version>
- <exclusions>
- <exclusion>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
<groupId>org.hibernate.jsr303.tck</groupId>
<artifactId>jsr303-tck</artifactId>
<version>1.0.3.GA</version>
Modified: openejb/trunk/openejb3/tck/cdi-embedded/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/tck/cdi-embedded/pom.xml?rev=1148550&r1=1148549&r2=1148550&view=diff
==============================================================================
--- openejb/trunk/openejb3/tck/cdi-embedded/pom.xml (original)
+++ openejb/trunk/openejb3/tck/cdi-embedded/pom.xml Tue Jul 19 21:32:40 2011
@@ -49,12 +49,15 @@
<groupId>org.jboss.jsr299.tck</groupId>
<artifactId>jsr299-tck-impl</artifactId>
<version>1.0.4.SP1</version>
- <scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.jboss.ejb3</groupId>
+ <artifactId>jboss-ejb3-api</artifactId>
+ </exclusion>
</exclusions>
</dependency>
Modified:
openejb/trunk/openejb3/tck/cdi-embedded/src/test/java/org/apache/openejb/tck/cdi/embedded/Report.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/tck/cdi-embedded/src/test/java/org/apache/openejb/tck/cdi/embedded/Report.java?rev=1148550&r1=1148549&r2=1148550&view=diff
==============================================================================
---
openejb/trunk/openejb3/tck/cdi-embedded/src/test/java/org/apache/openejb/tck/cdi/embedded/Report.java
(original)
+++
openejb/trunk/openejb3/tck/cdi-embedded/src/test/java/org/apache/openejb/tck/cdi/embedded/Report.java
Tue Jul 19 21:32:40 2011
@@ -49,6 +49,7 @@ public class Report {
// 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/uber/openejb/tck/cdi-embedded/target/surefire-reports/testng-results.xml");
// final File file = new
File("/Users/dblevins/work/uber/testng-results.xml");
+// final File file = new
File("/Users/dblevins/work/uber/openejb/tck/cdi-tomee/target/failsafe-reports/testng-results.xml");
final SAXParser parser = SAXParserFactory.newInstance().newSAXParser();
@@ -68,9 +69,10 @@ public class Report {
Collections.sort(classes);
- textReport(file);
+// textReport(file);
passingXml(file);
- failingXml(file);
+// passingXml2(file);
+// failingXml(file);
// printResults(System.out);
}
@@ -82,6 +84,35 @@ public class Report {
out.close();
}
+ private void passingXml2(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("" +
+ "<suite name=\"CDI TCK\" verbose=\"0\">\n" +
+ " <listeners>\n" +
+ " <listener
class-name=\"org.apache.openejb.tck.cdi.embedded.RequestScopeTestListener\"
/>\n" +
+ " </listeners>\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.println(" </classes>");
+ out.println(" </test>");
+ out.println("</suite>");
+
+ 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));
Modified: openejb/trunk/openejb3/tck/cdi-tomee/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/tck/cdi-tomee/pom.xml?rev=1148550&r1=1148549&r2=1148550&view=diff
==============================================================================
--- openejb/trunk/openejb3/tck/cdi-tomee/pom.xml (original)
+++ openejb/trunk/openejb3/tck/cdi-tomee/pom.xml Tue Jul 19 21:32:40 2011
@@ -53,17 +53,6 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.jboss.test-harness</groupId>
- <artifactId>jboss-test-harness</artifactId>
- <version>1.1.0-CR5</version>
- <exclusions>
- <exclusion>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
<groupId>org.jboss.jsr299.tck</groupId>
<artifactId>jsr299-tck-impl</artifactId>
<version>1.0.4.SP1</version>
@@ -72,6 +61,10 @@
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.jboss.ejb3</groupId>
+ <artifactId>jboss-ejb3-api</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
Modified: openejb/trunk/openejb3/tck/cdi-tomee/src/test/resources/passing.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/tck/cdi-tomee/src/test/resources/passing.xml?rev=1148550&r1=1148549&r2=1148550&view=diff
==============================================================================
--- openejb/trunk/openejb3/tck/cdi-tomee/src/test/resources/passing.xml
(original)
+++ openejb/trunk/openejb3/tck/cdi-tomee/src/test/resources/passing.xml Tue Jul
19 21:32:40 2011
@@ -16,16 +16,49 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<suite name="CDI TCK" verbose="2">
-
+<suite name="CDI TCK" verbose="0">
<test name="CDI TCK">
- <packages>
+ <!--<packages>-->
<!--<package name="org.jboss.jsr299.tck.tests.*"/>-->
<!--<package name="org.jboss.jsr299.tck.interceptors.tests.*"/>-->
- </packages>
-
+ <!--</packages>-->
<classes>
+ <class
name="org.jboss.jsr299.tck.interceptors.tests.aroundInvoke.AroundInvokeInterceptorTest"/>
+ <class
name="org.jboss.jsr299.tck.interceptors.tests.aroundInvoke.exception.ExceptionTest"/>
+ <class
name="org.jboss.jsr299.tck.interceptors.tests.aroundInvoke.order.InvocationOrderTest"/>
+ <class
name="org.jboss.jsr299.tck.interceptors.tests.definition.DefinitionTest"/>
+ <class
name="org.jboss.jsr299.tck.interceptors.tests.invocationContext.InvocationContextTest"/>
+ <class
name="org.jboss.jsr299.tck.interceptors.tests.lifecycleCallback.LifecycleCallbackInterceptorTest"/>
+ <class
name="org.jboss.jsr299.tck.interceptors.tests.lifecycleCallback.exceptions.LifecycleCallbackInterceptorExceptionTest"/>
+ <class
name="org.jboss.jsr299.tck.interceptors.tests.lifecycleCallback.order.InvocationOrderTest"/>
+ <class
name="org.jboss.jsr299.tck.interceptors.tests.method.MethodLevelInterceptorTest"/>
+ <class
name="org.jboss.jsr299.tck.tests.context.GetOnInactiveContextTest"/>
+ <class
name="org.jboss.jsr299.tck.tests.decorators.custom.CustomDecoratorTest"/>
<class
name="org.jboss.jsr299.tck.tests.decorators.definition.DecoratorDefinitionTest"/>
+ <class
name="org.jboss.jsr299.tck.tests.decorators.definition.inject.delegateConstructor.DelegateInjectionPointTest"/>
+ <class
name="org.jboss.jsr299.tck.tests.decorators.definition.inject.delegateField.DelegateFieldInjectionPointTest"/>
+ <class
name="org.jboss.jsr299.tck.tests.decorators.definition.inject.delegateInitializerMethod.DelegateInjectionPointTest"/>
+ <class
name="org.jboss.jsr299.tck.tests.decorators.interceptor.DecoratorAndInterceptorTest"/>
+ <class
name="org.jboss.jsr299.tck.tests.decorators.invocation.DecoratorInvocationTest"/>
+ <class
name="org.jboss.jsr299.tck.tests.decorators.invocation.observer.DecoratorInvocationTest"/>
+ <class
name="org.jboss.jsr299.tck.tests.decorators.invocation.producer.method.DecoratorInvocationTest"/>
+ <class
name="org.jboss.jsr299.tck.tests.decorators.resolution.DecoratorResolutionTest"/>
+ <class
name="org.jboss.jsr299.tck.tests.implementation.simple.definition.constructorHasDisposesParameter.ConstructorHasDisposesParameterTest"/>
+ <class
name="org.jboss.jsr299.tck.tests.implementation.simple.definition.constructorHasObservesParameter.ConstructorHasObservesParameterTest"/>
+ <class
name="org.jboss.jsr299.tck.tests.implementation.simple.definition.dependentWithPublicField.DependentWithPublicFieldTest"/>
+ <class
name="org.jboss.jsr299.tck.tests.implementation.simple.definition.tooManyInitializerAnnotatedConstructors.TooManyInitializerAnnotatedConstructorsTest"/>
+ <class
name="org.jboss.jsr299.tck.tests.implementation.simple.lifecycle.unproxyable.UnproxyableManagedBeanTest"/>
+ <class
name="org.jboss.jsr299.tck.tests.lookup.binding.members.annotation.BindingAnnotationWithMemberTest"/>
+ <class
name="org.jboss.jsr299.tck.tests.lookup.binding.members.array.BindingAnnotationWithMemberTest"/>
+ <class
name="org.jboss.jsr299.tck.tests.lookup.byname.duplicateNameResolution.DuplicateNameResolutionTest"/>
+ <class
name="org.jboss.jsr299.tck.tests.lookup.byname.duplicatePrefixResolution.DuplicateNamePrefixResolutionTest"/>
+ <class
name="org.jboss.jsr299.tck.tests.lookup.clientProxy.unproxyable.array.ArrayTest"/>
+ <class
name="org.jboss.jsr299.tck.tests.lookup.clientProxy.unproxyable.finalClass.FinalClassTest"/>
+ <class
name="org.jboss.jsr299.tck.tests.lookup.clientProxy.unproxyable.finalMethod.FinalMethodTest"/>
+ <class
name="org.jboss.jsr299.tck.tests.lookup.clientProxy.unproxyable.primitive.UnproxyableTest"/>
+ <class
name="org.jboss.jsr299.tck.tests.lookup.clientProxy.unproxyable.privateConstructor.PrivateConstructorTest"/>
+ <class
name="org.jboss.jsr299.tck.tests.lookup.injection.nullableBean.NullableBeanTest"/>
+ <class
name="org.jboss.jsr299.tck.tests.lookup.typesafe.resolution.decorator.DecoratorNotInjectedTest"/>
</classes>
</test>
</suite>
Modified: openejb/trunk/openejb3/tck/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/tck/pom.xml?rev=1148550&r1=1148549&r2=1148550&view=diff
==============================================================================
--- openejb/trunk/openejb3/tck/pom.xml (original)
+++ openejb/trunk/openejb3/tck/pom.xml Tue Jul 19 21:32:40 2011
@@ -31,6 +31,7 @@
<modules>
<module>cdi-embedded</module>
+ <module>cdi-tomee</module>
<module>bval-embedded</module>
<module>tck-common</module>
</modules>
Modified: openejb/trunk/openejb3/tck/tck-common/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/tck/tck-common/pom.xml?rev=1148550&r1=1148549&r2=1148550&view=diff
==============================================================================
--- openejb/trunk/openejb3/tck/tck-common/pom.xml (original)
+++ openejb/trunk/openejb3/tck/tck-common/pom.xml Tue Jul 19 21:32:40 2011
@@ -35,16 +35,9 @@
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
</exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.jboss.jsr299.tck</groupId>
- <artifactId>jsr299-tck-impl</artifactId>
- <version>1.0.4.SP1</version>
- <exclusions>
<exclusion>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
+ <groupId>org.jboss.ejb3</groupId>
+ <artifactId>jboss-ejb3-api</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -57,6 +50,7 @@
<groupId>${project.groupId}</groupId>
<artifactId>openejb-core</artifactId>
<version>${project.version}</version>
+ <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
Modified:
openejb/trunk/openejb3/tck/tck-common/src/main/java/org/apache/openejb/tck/impl/ContainersImpl.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/tck/tck-common/src/main/java/org/apache/openejb/tck/impl/ContainersImpl.java?rev=1148550&r1=1148549&r2=1148550&view=diff
==============================================================================
---
openejb/trunk/openejb3/tck/tck-common/src/main/java/org/apache/openejb/tck/impl/ContainersImpl.java
(original)
+++
openejb/trunk/openejb3/tck/tck-common/src/main/java/org/apache/openejb/tck/impl/ContainersImpl.java
Tue Jul 19 21:32:40 2011
@@ -69,12 +69,6 @@ public class ContainersImpl implements C
@Override
public boolean deploy(InputStream archive, String name) {
- try {
- final File file = writeToFile2(archive, name);
- System.out.println(file);
- } catch (IOException e) {
- e.printStackTrace();
- }
if (!OpenEJB.isInitialized()) stuck = name;
else System.out.println("STUCK " + stuck);
Modified:
openejb/trunk/openejb3/tck/tck-common/src/main/java/org/apache/openejb/tck/impl/ContainersImplTomEE.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/tck/tck-common/src/main/java/org/apache/openejb/tck/impl/ContainersImplTomEE.java?rev=1148550&r1=1148549&r2=1148550&view=diff
==============================================================================
---
openejb/trunk/openejb3/tck/tck-common/src/main/java/org/apache/openejb/tck/impl/ContainersImplTomEE.java
(original)
+++
openejb/trunk/openejb3/tck/tck-common/src/main/java/org/apache/openejb/tck/impl/ContainersImplTomEE.java
Tue Jul 19 21:32:40 2011
@@ -28,6 +28,7 @@ import javax.naming.Context;
import javax.naming.InitialContext;
import org.apache.openejb.assembler.Deployer;
+import org.apache.openejb.assembler.classic.AppInfo;
import org.apache.openejb.client.RemoteInitialContextFactory;
import org.apache.openejb.config.RemoteServer;
import org.jboss.testharness.api.DeploymentException;
@@ -42,6 +43,7 @@ public class ContainersImplTomEE impleme
private Deployer deployer = null;
private static final String tmpDir = System.getProperty("java.io.tmpdir");
private DeploymentException exception;
+ private AppInfo appInfo;
public ContainersImplTomEE() {
System.out.println("Initialized ContainersImplTomEE " + (++count));
@@ -61,6 +63,7 @@ public class ContainersImplTomEE impleme
@Override
public boolean deploy(InputStream archive, String name) throws IOException
{
exception = null;
+ appInfo = null;
System.out.println("Deploying " + archive + " with name " + name);
@@ -71,7 +74,7 @@ public class ContainersImplTomEE impleme
if (deployer == null) {
deployer = lookup();
}
- deployer.deploy(fileName.getAbsolutePath());
+ appInfo = deployer.deploy(fileName.getAbsolutePath());
} catch (Exception e) {
exception = (DeploymentException) new DeploymentException("deploy
failed").initCause(e);
e.printStackTrace();
@@ -107,9 +110,14 @@ public class ContainersImplTomEE impleme
@Override
public void undeploy(String name) throws IOException {
+ if (appInfo == null) {
+ System.out.println("Nothing to undeploy" + name);
+ return;
+ }
+
System.out.println("Undeploying " + name);
try {
- deployer.undeploy(getFile(name).getAbsolutePath());
+ deployer.undeploy(appInfo.path);
} catch (Exception e) {
e.printStackTrace();
throw new RuntimeException(e);
