openwebbeans-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From strub...@apache.org
Subject svn commit: r747876 - in /incubator/openwebbeans/trunk/webbeans-tck: ./ src/test/java/org/apache/webbeans/test/tck/
Date Wed, 25 Feb 2009 18:09:16 GMT
Author: struberg
Date: Wed Feb 25 18:09:15 2009
New Revision: 747876

URL: http://svn.apache.org/viewvc?rev=747876&view=rev
Log:
OWB-56 make our TCK at least compileable against the latest jsr299-tck

Modified:
    incubator/openwebbeans/trunk/webbeans-tck/   (props changed)
    incubator/openwebbeans/trunk/webbeans-tck/pom.xml
    incubator/openwebbeans/trunk/webbeans-tck/src/test/java/org/apache/webbeans/test/tck/BeansImpl.java
    incubator/openwebbeans/trunk/webbeans-tck/src/test/java/org/apache/webbeans/test/tck/ContainersImpl.java
    incubator/openwebbeans/trunk/webbeans-tck/src/test/java/org/apache/webbeans/test/tck/ContextsImpl.java
    incubator/openwebbeans/trunk/webbeans-tck/src/test/java/org/apache/webbeans/test/tck/ManagersImpl.java

Propchange: incubator/openwebbeans/trunk/webbeans-tck/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Feb 25 18:09:15 2009
@@ -0,0 +1,4 @@
+.settings
+target
+.classpath
+.project

Modified: incubator/openwebbeans/trunk/webbeans-tck/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-tck/pom.xml?rev=747876&r1=747875&r2=747876&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-tck/pom.xml (original)
+++ incubator/openwebbeans/trunk/webbeans-tck/pom.xml Wed Feb 25 18:09:15 2009
@@ -54,14 +54,14 @@
             <artifactId>openwebbeans-impl</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.jboss.webbeans.tck</groupId>
-            <artifactId>webbeans-tck-api</artifactId>
+            <groupId>org.jboss.jsr299.tck</groupId>
+            <artifactId>jsr299-tck-api</artifactId>
             <version>${webbeans.tck.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.jboss.webbeans.tck</groupId>
-            <artifactId>webbeans-tck-impl</artifactId>
+            <groupId>org.jboss.jsr299.tck</groupId>
+            <artifactId>jsr299-tck-impl</artifactId>
             <version>${webbeans.tck.version}</version>
             <scope>test</scope>
         </dependency>
@@ -97,8 +97,8 @@
                         <configuration>
                             <artifactItems>
                                 <artifactItem>
-                                    <groupId>org.jboss.webbeans.tck</groupId>
-                                    <artifactId>webbeans-tck-impl</artifactId>
+                                    <groupId>org.jboss.jsr299.tck</groupId>
+                                    <artifactId>jsr299-tck-impl</artifactId>
                                     <version>${webbeans.tck.version}</version>
                                     <type>xml</type>
                                     <classifier>suite</classifier>
@@ -114,7 +114,7 @@
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
                     <suiteXmlFiles>
-                        <suiteXmlFile>${project.build.directory}/dependency/webbeans-tck-impl-${webbeans.tck.version}-suite.xml</suiteXmlFile>
+                        <suiteXmlFile>${project.build.directory}/dependency/jsr299-tck-impl-${webbeans.tck.version}-suite.xml</suiteXmlFile>
                     </suiteXmlFiles>
                 </configuration>
             </plugin>

Modified: incubator/openwebbeans/trunk/webbeans-tck/src/test/java/org/apache/webbeans/test/tck/BeansImpl.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-tck/src/test/java/org/apache/webbeans/test/tck/BeansImpl.java?rev=747876&r1=747875&r2=747876&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-tck/src/test/java/org/apache/webbeans/test/tck/BeansImpl.java
(original)
+++ incubator/openwebbeans/trunk/webbeans-tck/src/test/java/org/apache/webbeans/test/tck/BeansImpl.java
Wed Feb 25 18:09:15 2009
@@ -17,7 +17,8 @@
 import java.lang.reflect.Method;
 import java.util.List;
 
-import javax.webbeans.manager.Bean;
+import javax.inject.manager.Bean;
+
 
 import org.apache.webbeans.component.AbstractComponent;
 import org.apache.webbeans.component.ComponentImpl;
@@ -25,7 +26,7 @@
 import org.apache.webbeans.config.SimpleWebBeansConfigurator;
 import org.apache.webbeans.decorator.DecoratorUtil;
 import org.apache.webbeans.test.mock.MockManager;
-import org.jboss.webbeans.tck.api.Beans;
+import org.jboss.jsr299.tck.spi.Beans;
 
 public class BeansImpl implements Beans
 {

Modified: incubator/openwebbeans/trunk/webbeans-tck/src/test/java/org/apache/webbeans/test/tck/ContainersImpl.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-tck/src/test/java/org/apache/webbeans/test/tck/ContainersImpl.java?rev=747876&r1=747875&r2=747876&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-tck/src/test/java/org/apache/webbeans/test/tck/ContainersImpl.java
(original)
+++ incubator/openwebbeans/trunk/webbeans-tck/src/test/java/org/apache/webbeans/test/tck/ContainersImpl.java
Wed Feb 25 18:09:15 2009
@@ -13,15 +13,19 @@
  */
 package org.apache.webbeans.test.tck;
 
+import java.io.IOException;
+import java.io.InputStream;
 import java.lang.annotation.Annotation;
 import java.util.Arrays;
 import java.util.List;
 
-import javax.webbeans.manager.Manager;
+import javax.inject.manager.Manager;
+
 
 import org.apache.log4j.Logger;
 import org.apache.webbeans.test.mock.MockManager;
-import org.jboss.webbeans.tck.api.Containers;
+import org.jboss.jsr299.tck.api.DeploymentException;
+import org.jboss.jsr299.tck.spi.Containers;
 
 public class ContainersImpl implements Containers {
 
@@ -48,4 +52,35 @@
         return null;
     }
 
+    public <T> T evaluateMethodExpression( String expression, Class<T> expectedType,
Class<?>[] expectedParamTypes,
+            Object[] expectedParams ) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    public <T> T evaluateValueExpression( String expression, Class<T> expectedType
) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    public void cleanup() throws IOException {
+        // TODO Auto-generated method stub
+        
+    }
+
+    public void deploy( InputStream archive, String name ) throws DeploymentException, IOException
{
+        // TODO Auto-generated method stub
+        
+    }
+
+    public void setup() throws IOException {
+        // TODO Auto-generated method stub
+        
+    }
+
+    public void undeploy( String name ) throws IOException {
+        // TODO Auto-generated method stub
+        
+    }
+
 }

Modified: incubator/openwebbeans/trunk/webbeans-tck/src/test/java/org/apache/webbeans/test/tck/ContextsImpl.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-tck/src/test/java/org/apache/webbeans/test/tck/ContextsImpl.java?rev=747876&r1=747875&r2=747876&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-tck/src/test/java/org/apache/webbeans/test/tck/ContextsImpl.java
(original)
+++ incubator/openwebbeans/trunk/webbeans-tck/src/test/java/org/apache/webbeans/test/tck/ContextsImpl.java
Wed Feb 25 18:09:15 2009
@@ -16,7 +16,7 @@
 import org.apache.webbeans.context.AbstractContext;
 import org.apache.webbeans.context.ContextFactory;
 import org.apache.webbeans.context.type.ContextTypes;
-import org.jboss.webbeans.tck.api.Contexts;
+import org.jboss.jsr299.tck.spi.Contexts;
 
 public class ContextsImpl implements Contexts<AbstractContext>
 {

Modified: incubator/openwebbeans/trunk/webbeans-tck/src/test/java/org/apache/webbeans/test/tck/ManagersImpl.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-tck/src/test/java/org/apache/webbeans/test/tck/ManagersImpl.java?rev=747876&r1=747875&r2=747876&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-tck/src/test/java/org/apache/webbeans/test/tck/ManagersImpl.java
(original)
+++ incubator/openwebbeans/trunk/webbeans-tck/src/test/java/org/apache/webbeans/test/tck/ManagersImpl.java
Wed Feb 25 18:09:15 2009
@@ -16,13 +16,13 @@
 import java.lang.annotation.Annotation;
 import java.util.List;
 
-import javax.webbeans.manager.Manager;
+import javax.inject.manager.Manager;
 
 import org.apache.webbeans.context.ContextFactory;
 import org.apache.webbeans.deployment.DeploymentTypeManager;
 import org.apache.webbeans.test.mock.MockHttpSession;
 import org.apache.webbeans.test.mock.MockManager;
-import org.jboss.webbeans.tck.api.Managers;
+import org.jboss.jsr299.tck.spi.Managers;
 
 public class ManagersImpl implements Managers
 {
@@ -49,9 +49,9 @@
         }
     }
 
-    public Manager createManager( List<Class<? extends Annotation>> enabledDeploymentTypes
) {
+
+    public Manager getManager() {
         Manager manager = createManager();
-        setEnabledDeploymentTypes(enabledDeploymentTypes);
         return manager;
     }
 



Mime
View raw message