Author: arne
Date: Wed Nov 13 23:35:15 2013
New Revision: 1541759
URL: http://svn.apache.org/r1541759
Log:
OWB-846: Added implementation for org.jboss.cdi.tck.spi.Beans
Added:
openwebbeans/trunk/webbeans-cdi11/src/test/java/org/
openwebbeans/trunk/webbeans-cdi11/src/test/java/org/apache/
openwebbeans/trunk/webbeans-cdi11/src/test/java/org/apache/webbeans/
openwebbeans/trunk/webbeans-cdi11/src/test/java/org/apache/webbeans/test/
openwebbeans/trunk/webbeans-cdi11/src/test/java/org/apache/webbeans/test/tck11/
openwebbeans/trunk/webbeans-cdi11/src/test/java/org/apache/webbeans/test/tck11/BeansImpl.java
Modified:
openwebbeans/trunk/webbeans-cdi11/pom.xml
openwebbeans/trunk/webbeans-cdi11/src/main/resources/META-INF/cdi-tck.properties
openwebbeans/trunk/webbeans-cdi11/standalone-suite.xml
Modified: openwebbeans/trunk/webbeans-cdi11/pom.xml
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-cdi11/pom.xml?rev=1541759&r1=1541758&r2=1541759&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-cdi11/pom.xml (original)
+++ openwebbeans/trunk/webbeans-cdi11/pom.xml Wed Nov 13 23:35:15 2013
@@ -115,6 +115,36 @@
</dependency>
<dependency>
+ <groupId>org.jboss.cdi.tck</groupId>
+ <artifactId>cdi-tck-impl</artifactId>
+ <version>${cdi11-tck.version}</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <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>javax.servlet.jsp</groupId>
+ <artifactId>jsp-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.transaction</groupId>
+ <artifactId>jta</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
@@ -315,34 +345,6 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.jboss.cdi.tck</groupId>
- <artifactId>cdi-tck-impl</artifactId>
- <version>${cdi11-tck.version}</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <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>javax.servlet.jsp</groupId>
- <artifactId>jsp-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.transaction</groupId>
- <artifactId>jta</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-api</artifactId>
<version>2.1.11</version>
Modified:
openwebbeans/trunk/webbeans-cdi11/src/main/resources/META-INF/cdi-tck.properties
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-cdi11/src/main/resources/META-INF/cdi-tck.properties?rev=1541759&r1=1541758&r2=1541759&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-cdi11/src/main/resources/META-INF/cdi-tck.properties
(original)
+++
openwebbeans/trunk/webbeans-cdi11/src/main/resources/META-INF/cdi-tck.properties
Wed Nov 13 23:35:15 2013
@@ -19,3 +19,4 @@ org.jboss.cdi.tck.testDataSource=java\:d
org.jboss.cdi.tck.testJmsConnectionFactory=java\:default
org.jboss.cdi.tck.testJmsQueue=java\:default
org.jboss.cdi.tck.testJmsTopic=java\:default
+org.jboss.cdi.tck.spi.Beans=org.apache.webbeans.test.tck11.BeansImpl
Added:
openwebbeans/trunk/webbeans-cdi11/src/test/java/org/apache/webbeans/test/tck11/BeansImpl.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-cdi11/src/test/java/org/apache/webbeans/test/tck11/BeansImpl.java?rev=1541759&view=auto
==============================================================================
---
openwebbeans/trunk/webbeans-cdi11/src/test/java/org/apache/webbeans/test/tck11/BeansImpl.java
(added)
+++
openwebbeans/trunk/webbeans-cdi11/src/test/java/org/apache/webbeans/test/tck11/BeansImpl.java
Wed Nov 13 23:35:15 2013
@@ -0,0 +1,51 @@
+/*
+ * 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.webbeans.test.tck11;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+
+import org.jboss.cdi.tck.spi.Beans;
+
+public class BeansImpl implements Beans {
+
+ @Override
+ public boolean isProxy(Object instance) {
+ return instance.getClass().getName().contains("$Owb");
+ }
+
+ @Override
+ public Object activate(byte[] bytes) throws IOException,
ClassNotFoundException {
+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
+ ObjectInputStream ois = new ObjectInputStream(bais);
+ return ois.readObject();
+ }
+
+ @Override
+ public byte[] passivate(Object instance) throws IOException {
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ ObjectOutputStream oos = new ObjectOutputStream(baos);
+ oos.writeObject(instance);
+ return baos.toByteArray();
+ }
+
+}
Modified: openwebbeans/trunk/webbeans-cdi11/standalone-suite.xml
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-cdi11/standalone-suite.xml?rev=1541759&r1=1541758&r2=1541759&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-cdi11/standalone-suite.xml (original)
+++ openwebbeans/trunk/webbeans-cdi11/standalone-suite.xml Wed Nov 13 23:35:15
2013
@@ -79,12 +79,12 @@
<exclude
name="org.jboss.cdi.tck.tests.lookup.byname.ambiguous.broken" />
<exclude
name="org.jboss.cdi.tck.tests.lookup.dynamic.broken.raw" />
<exclude name="org.jboss.cdi.tck.tests.deployment.exclude" />
- <exclude name="org.jboss.cdi.tck.tests.inheritance.generics" />
<exclude
name="org.jboss.cdi.tck.tests.implementation.simple.lifecycle.unproxyable" />
<exclude
name="org.jboss.cdi.tck.tests.implementation.producer.field.definition" />
<exclude
name="org.jboss.cdi.tck.tests.implementation.producer.field.lifecycle" />
<exclude
name="org.jboss.cdi.tck.tests.implementation.disposal.method.definition.inheritance"
/>
<exclude
name="org.jboss.cdi.tck.tests.implementation.disposal.method.definition" />
+ <exclude name="org.jboss.cdi.tck.tests.inheritance.generics" />
<exclude
name="org.jboss.cdi.tck.tests.interceptors.definition.custom" />
<exclude
name="org.jboss.cdi.tck.tests.interceptors.definition.interceptorNotListedInBeansXml"
/>
<exclude
name="org.jboss.cdi.tck.tests.definition.stereotype.interceptor" />
@@ -95,7 +95,9 @@
<exclude
name="org.jboss.cdi.tck.tests.extensions.registration" />
<exclude
name="org.jboss.cdi.tck.tests.extensions.lifecycle.processBeanAttributes.builtin"
/>
<exclude
name="org.jboss.cdi.tck.tests.extensions.beanManager.bean" />
+ <exclude
name="org.jboss.cdi.tck.tests.extensions.beanManager.injectionPoint" />
<exclude
name="org.jboss.cdi.tck.tests.extensions.beanManager.producer" />
+ <exclude
name="org.jboss.cdi.tck.tests.extensions.beanManager.bootstrap.unavailable.methods"
/>
<exclude
name="org.jboss.cdi.tck.tests.extensions.alternative.metadata.annotated" />
<exclude
name="org.jboss.cdi.tck.tests.extensions.alternative.metadata" />
<exclude
name="org.jboss.cdi.tck.tests.lookup.typesafe.resolution.interceptor" />
@@ -114,6 +116,8 @@
<exclude
name="org.jboss.cdi.tck.tests.context.passivating.transientreference" />
<exclude
name="org.jboss.cdi.tck.tests.decorators.builtin.event.complex" />
<exclude name="org.jboss.cdi.tck.tests.decorators.custom" />
+ <exclude
name="org.jboss.cdi.tck.tests.decorators.custom.broken.nodelegateinjectionpoint"
/>
+ <exclude
name="org.jboss.cdi.tck.tests.decorators.custom.broken.toomanydelegateinjectionpoints"
/>
<exclude
name="org.jboss.cdi.tck.tests.alternative.selection.stereotype" />
<exclude name="org.jboss.cdi.tck.tests.vetoed" />
<exclude name="org.jboss.cdi.tck.tests.vetoed.enterprise" />
