Author: struberg
Date: Mon Dec 20 23:48:55 2010
New Revision: 1051320
URL: http://svn.apache.org/viewvc?rev=1051320&view=rev
Log:
OWB-490 upgrade to new JBoss repos for the TCK + 1.0.4.CR1 TCK
this contains the ObserverMethod fixes in the TCK
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/WebBeansContext.java
openwebbeans/trunk/webbeans-porting/pom.xml
openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/BeansImpl.java
openwebbeans/trunk/webbeans-tck/pom.xml
openwebbeans/trunk/webbeans-tck/src/test/resources/META-INF/jboss-test-harness.properties
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/WebBeansContext.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/WebBeansContext.java?rev=1051320&r1=1051319&r2=1051320&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/WebBeansContext.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/WebBeansContext.java
Mon Dec 20 23:48:55 2010
@@ -29,7 +29,7 @@ import org.apache.webbeans.context.type.
/**
* Defines spi for contexts.
- *
+ *
* @version $Rev$Â $Date$
*/
public interface WebBeansContext extends javax.enterprise.context.spi.Context
Modified: openwebbeans/trunk/webbeans-porting/pom.xml
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-porting/pom.xml?rev=1051320&r1=1051319&r2=1051320&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-porting/pom.xml (original)
+++ openwebbeans/trunk/webbeans-porting/pom.xml Mon Dec 20 23:48:55 2010
@@ -34,7 +34,7 @@
<description>Apache OpenWebBeans TCK Porting Package</description>
<properties>
- <webbeans.tck.version>1.0.2.CR1</webbeans.tck.version>
+ <webbeans.tck.version>1.0.4.CR1</webbeans.tck.version>
</properties>
<!--Used for jboss-test-harness-api not in central maven -->
@@ -43,7 +43,7 @@
<repository>
<id>repository.jboss.org</id>
<name>JBoss Repository</name>
- <url>http://repository.jboss.org/maven2</url>
+
<url>http://repository.jboss.org/nexus/content/groups/public-jboss/</url>
<releases>
<enabled>true</enabled>
</releases>
Modified:
openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/BeansImpl.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/BeansImpl.java?rev=1051320&r1=1051319&r2=1051320&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/BeansImpl.java
(original)
+++
openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/BeansImpl.java
Mon Dec 20 23:48:55 2010
@@ -18,6 +18,11 @@
*/
package org.apache.webbeans.test.tck;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
import java.lang.reflect.Method;
import javax.enterprise.inject.spi.Bean;
@@ -67,6 +72,23 @@ public class BeansImpl implements Beans
return instance.getClass().getName().contains("$$");
}
+ @Override
+ public byte[] serialize(Object o) throws IOException
+ {
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ ObjectOutputStream oos = new ObjectOutputStream(baos);
+ oos.writeObject(o);
+ return baos.toByteArray();
+ }
+
+ @Override
+ public Object deserialize(byte[] bytes) throws IOException,
ClassNotFoundException
+ {
+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
+ ObjectInputStream ois = new ObjectInputStream(bais);
+ return ois.readObject();
+ }
+
public boolean isStatefulBean( Class<?> clazz )
{
return false;
Modified: openwebbeans/trunk/webbeans-tck/pom.xml
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-tck/pom.xml?rev=1051320&r1=1051319&r2=1051320&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-tck/pom.xml (original)
+++ openwebbeans/trunk/webbeans-tck/pom.xml Mon Dec 20 23:48:55 2010
@@ -33,7 +33,7 @@
<properties>
<!-- <webbeans.tck.version>1.0.1-Final</webbeans.tck.version> -->
- <webbeans.tck.version>1.0.2.CR1</webbeans.tck.version>
+ <webbeans.tck.version>1.0.4.CR1</webbeans.tck.version>
</properties>
<!--Used for jboss-test-harness-api not in central maven -->
@@ -42,7 +42,7 @@
<repository>
<id>repository.jboss.org</id>
<name>JBoss Repository</name>
- <url>http://repository.jboss.org/maven2</url>
+
<url>http://repository.jboss.org/nexus/content/groups/public-jboss/</url>
<releases>
<enabled>true</enabled>
</releases>
@@ -181,7 +181,7 @@
<!-- EJB API -->
<artifactItem>
<groupId>org.apache.geronimo.specs</groupId>
-
<artifactId>geronimo-ejb_3.0_spec</artifactId>
+
<artifactId>geronimo-ejb_3.1_spec</artifactId>
<overWrite>true</overWrite>
<outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
</artifactItem>
Modified:
openwebbeans/trunk/webbeans-tck/src/test/resources/META-INF/jboss-test-harness.properties
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-tck/src/test/resources/META-INF/jboss-test-harness.properties?rev=1051320&r1=1051319&r2=1051320&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-tck/src/test/resources/META-INF/jboss-test-harness.properties
(original)
+++
openwebbeans/trunk/webbeans-tck/src/test/resources/META-INF/jboss-test-harness.properties
Mon Dec 20 23:48:55 2010
@@ -22,12 +22,12 @@ org.jboss.testharness.spi.StandaloneCont
org.jboss.testharness.spi.Containers=org.apache.webbeans.test.tck.ContainersImpl
org.jboss.jsr299.tck.spi.EL=org.apache.webbeans.test.tck.ELImpl
-org.jboss.testharness.standalone=false
+org.jboss.testharness.standalone=true
#jboss-as.dir=/tmp
#jboss.force.restart=false
org.jboss.testharness.libraryDirectory=target/dependency/lib
-org.jboss.testharness.runIntegrationTests=true
+org.jboss.testharness.runIntegrationTests=false
org.jboss.testharness.api.TestLauncher=org.jboss.testharness.impl.runner.servlet.ServletTestLauncher
-tomcat.home=/opt/apache/tomcat
+#tomcat.home=/opt/apache/tomcat
