geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
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 GMT
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>



Mime
View raw message