Return-Path: 
 <scm-return-44952-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 93692 invoked from network); 12 Dec 2010 17:37:45 -0000
Received: from unknown (HELO mail.apache.org) (140.211.11.3)
  by 140.211.11.9 with SMTP; 12 Dec 2010 17:37:45 -0000
Received: (qmail 75407 invoked by uid 500); 12 Dec 2010 17:37:44 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 75276 invoked by uid 500); 12 Dec 2010 17:37:43 -0000
Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:scm-help@geronimo.apache.org>
list-unsubscribe: <mailto:scm-unsubscribe@geronimo.apache.org>
List-Post: <mailto:scm@geronimo.apache.org>
Reply-To: dev@geronimo.apache.org
List-Id: <scm.geronimo.apache.org>
Delivered-To: mailing list scm@geronimo.apache.org
Received: (qmail 75269 invoked by uid 99); 12 Dec 2010 17:37:41 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 12 Dec 2010 17:37:41 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 12 Dec 2010 17:37:39 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id C238C23889C5; Sun, 12 Dec 2010 17:37:17 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1044860 - in /geronimo/tck/branches/3.0:
 geronimo-porting/pom.xml
 geronimo-porting/src/main/java/org/apache/geronimo/test/tck/BeansImpl.java
 jcdi-tck-runner/pom.xml pom.xml
Date: Sun, 12 Dec 2010 17:37:17 -0000
To: scm@geronimo.apache.org
From: djencks@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20101212173717.C238C23889C5@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: djencks
Date: Sun Dec 12 17:37:17 2010
New Revision: 1044860

URL: http://svn.apache.org/viewvc?rev=1044860&view=rev
Log:
Use the corresponding harness for the jcdi tck version

Modified:
    geronimo/tck/branches/3.0/geronimo-porting/pom.xml
    geronimo/tck/branches/3.0/geronimo-porting/src/main/java/org/apache/geronimo/test/tck/BeansImpl.java
    geronimo/tck/branches/3.0/jcdi-tck-runner/pom.xml
    geronimo/tck/branches/3.0/pom.xml

Modified: geronimo/tck/branches/3.0/geronimo-porting/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/tck/branches/3.0/geronimo-porting/pom.xml?rev=1044860&r1=1044859&r2=1044860&view=diff
==============================================================================
--- geronimo/tck/branches/3.0/geronimo-porting/pom.xml (original)
+++ geronimo/tck/branches/3.0/geronimo-porting/pom.xml Sun Dec 12 17:37:17 2010
@@ -35,7 +35,7 @@
         <dependency>
             <groupId>org.jboss.jsr299.tck</groupId>
             <artifactId>jsr299-tck-api</artifactId>
-            <version>1.0.2.CR1</version>
+            <version>1.0.2.CR3</version>
             <exclusions>
                 <exclusion>
                     <groupId>javax.enterprise</groupId>
@@ -46,6 +46,7 @@
                     <artifactId>el-api</artifactId>
                 </exclusion>
             </exclusions>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>

Modified: geronimo/tck/branches/3.0/geronimo-porting/src/main/java/org/apache/geronimo/test/tck/BeansImpl.java
URL: http://svn.apache.org/viewvc/geronimo/tck/branches/3.0/geronimo-porting/src/main/java/org/apache/geronimo/test/tck/BeansImpl.java?rev=1044860&r1=1044859&r2=1044860&view=diff
==============================================================================
--- geronimo/tck/branches/3.0/geronimo-porting/src/main/java/org/apache/geronimo/test/tck/BeansImpl.java (original)
+++ geronimo/tck/branches/3.0/geronimo-porting/src/main/java/org/apache/geronimo/test/tck/BeansImpl.java Sun Dec 12 17:37:17 2010
@@ -18,6 +18,12 @@
  */
 package org.apache.geronimo.test.tck;
 
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+
 import org.jboss.jsr299.tck.spi.Beans;
 
 public class BeansImpl implements Beans {
@@ -27,4 +33,20 @@ public class BeansImpl implements Beans 
         return instance.getClass().getName().contains("$$");
     }
 
+    @Override
+    public byte[] serialize(Object instance) throws IOException {
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        ObjectOutputStream os = new ObjectOutputStream(baos);
+        os.writeObject(instance);
+        os.flush();
+        return baos.toByteArray();
+    }
+
+    @Override
+    public Object deserialize(byte[] bytes) throws IOException, ClassNotFoundException {
+        ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
+        ObjectInputStream is = new ObjectInputStream(bais);
+        return is.readObject();
+    }
+
 }

Modified: geronimo/tck/branches/3.0/jcdi-tck-runner/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/tck/branches/3.0/jcdi-tck-runner/pom.xml?rev=1044860&r1=1044859&r2=1044860&view=diff
==============================================================================
--- geronimo/tck/branches/3.0/jcdi-tck-runner/pom.xml (original)
+++ geronimo/tck/branches/3.0/jcdi-tck-runner/pom.xml Sun Dec 12 17:37:17 2010
@@ -38,6 +38,21 @@
             <artifactId>jsr299-tck-impl</artifactId>
             <version>${tckVersion}</version>
         </dependency>
+        <dependency>
+            <groupId>org.jboss.jsr299.tck</groupId>
+            <artifactId>jsr299-tck-api</artifactId>
+            <version>${tckVersion}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>javax.enterprise</groupId>
+                    <artifactId>cdi-api</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>javax.el</groupId>
+                    <artifactId>el-api</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
 
         <!-- geronimo deployer -->
         <dependency>

Modified: geronimo/tck/branches/3.0/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/tck/branches/3.0/pom.xml?rev=1044860&r1=1044859&r2=1044860&view=diff
==============================================================================
--- geronimo/tck/branches/3.0/pom.xml (original)
+++ geronimo/tck/branches/3.0/pom.xml Sun Dec 12 17:37:17 2010
@@ -57,6 +57,7 @@
 
     <repositories>
         <repository>
+            <!-- for jcdi tck 1.0.1-Final -->
             <id>jboss</id>
             <name>jboss</name>
             <layout>default</layout>
@@ -68,6 +69,19 @@
                 <enabled>true</enabled>
             </releases>
         </repository>
+        <repository>
+            <!-- for jcdi tck 1.0.2.CR3 etc -->
+            <id>jboss-current</id>
+            <name>jboss-current</name>
+            <layout>default</layout>
+            <url>http://repository.jboss.org/nexus/content/groups/public</url>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+        </repository>
     </repositories>
 
     <modules>