openwebbeans-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From strub...@apache.org
Subject svn commit: r1561563 [2/2] - in /openwebbeans/trunk: ./ distribution/ samples/conversation-sample/ samples/ejb-sample/ samples/ejb-telephone/ samples/guess/ samples/jms-sample/ samples/jsf2sample/ samples/reservation/ samples/standalone-sample/ samples...
Date Sun, 26 Jan 2014 22:25:35 GMT
Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/portable/ExtensionTest.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/portable/ExtensionTest.java?rev=1561563&r1=1561562&r2=1561563&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/portable/ExtensionTest.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/portable/ExtensionTest.java Sun Jan 26 22:25:33 2014
@@ -29,7 +29,7 @@ import junit.framework.Assert;
 
 import org.apache.webbeans.annotation.DefaultLiteral;
 import org.apache.webbeans.config.WebBeansContext;
-import org.apache.webbeans.exception.inject.DefinitionException;
+import javax.enterprise.inject.spi.DefinitionException;
 import org.apache.webbeans.newtests.AbstractUnitTest;
 import org.apache.webbeans.newtests.contexts.SerializationTest;
 import org.apache.webbeans.newtests.portable.alternative.Egg;

Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/producer/AmbigousProducerTest.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/producer/AmbigousProducerTest.java?rev=1561563&r1=1561562&r2=1561563&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/producer/AmbigousProducerTest.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/producer/AmbigousProducerTest.java Sun Jan 26 22:25:33 2014
@@ -26,7 +26,7 @@ import javax.enterprise.inject.Ambiguous
 import junit.framework.Assert;
 
 import org.apache.webbeans.exception.WebBeansConfigurationException;
-import org.apache.webbeans.exception.inject.DeploymentException;
+import javax.enterprise.inject.spi.DeploymentException;
 import org.apache.webbeans.newtests.AbstractUnitTest;
 import org.junit.Test;
 

Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/specalization/multiple/MultipleSpecializationTest.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/specalization/multiple/MultipleSpecializationTest.java?rev=1561563&r1=1561562&r2=1561563&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/specalization/multiple/MultipleSpecializationTest.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/specalization/multiple/MultipleSpecializationTest.java Sun Jan 26 22:25:33 2014
@@ -22,7 +22,7 @@ import java.util.ArrayList;
 import java.util.Collection;
 import junit.framework.Assert;
 import org.apache.webbeans.exception.WebBeansConfigurationException;
-import org.apache.webbeans.exception.inject.DefinitionException;
+import javax.enterprise.inject.spi.DefinitionException;
 import org.apache.webbeans.exception.inject.InconsistentSpecializationException;
 import org.apache.webbeans.newtests.AbstractUnitTest;
 import org.junit.Test;

Modified: openwebbeans/trunk/webbeans-jee5-ejb-resource/pom.xml
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-jee5-ejb-resource/pom.xml?rev=1561563&r1=1561562&r2=1561563&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-jee5-ejb-resource/pom.xml (original)
+++ openwebbeans/trunk/webbeans-jee5-ejb-resource/pom.xml Sun Jan 26 22:25:33 2014
@@ -51,7 +51,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jcdi_1.0_spec</artifactId>
+            <artifactId>geronimo-jcdi_1.1_spec</artifactId>
             <optional>true</optional>
         </dependency>
         <dependency>

Modified: openwebbeans/trunk/webbeans-jms/pom.xml
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-jms/pom.xml?rev=1561563&r1=1561562&r2=1561563&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-jms/pom.xml (original)
+++ openwebbeans/trunk/webbeans-jms/pom.xml Sun Jan 26 22:25:33 2014
@@ -49,7 +49,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jcdi_1.0_spec</artifactId>
+            <artifactId>geronimo-jcdi_1.1_spec</artifactId>
             <optional>true</optional>
         </dependency>
 

Modified: openwebbeans/trunk/webbeans-jms/src/main/java/org/apache/webbeans/jms/component/JmsBean.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-jms/src/main/java/org/apache/webbeans/jms/component/JmsBean.java?rev=1561563&r1=1561562&r2=1561563&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-jms/src/main/java/org/apache/webbeans/jms/component/JmsBean.java (original)
+++ openwebbeans/trunk/webbeans-jms/src/main/java/org/apache/webbeans/jms/component/JmsBean.java Sun Jan 26 22:25:33 2014
@@ -18,13 +18,13 @@
  */
 package org.apache.webbeans.jms.component;
 
+import javax.enterprise.inject.spi.BeanAttributes;
 import javax.enterprise.inject.spi.Producer;
 import javax.jms.Destination;
 
 import org.apache.webbeans.component.AbstractOwbBean;
 import org.apache.webbeans.component.JmsBeanMarker;
 import org.apache.webbeans.component.WebBeansType;
-import org.apache.webbeans.component.spi.BeanAttributes;
 import org.apache.webbeans.config.WebBeansContext;
 import org.apache.webbeans.jms.JMSModel;
 

Modified: openwebbeans/trunk/webbeans-jsf/pom.xml
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-jsf/pom.xml?rev=1561563&r1=1561562&r2=1561563&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-jsf/pom.xml (original)
+++ openwebbeans/trunk/webbeans-jsf/pom.xml Sun Jan 26 22:25:33 2014
@@ -52,13 +52,13 @@
 
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-servlet_2.5_spec</artifactId>
+            <artifactId>geronimo-servlet_3.0_spec</artifactId>
             <optional>true</optional>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jcdi_1.0_spec</artifactId>
+            <artifactId>geronimo-jcdi_1.1_spec</artifactId>
             <optional>true</optional>
         </dependency>
 

Modified: openwebbeans/trunk/webbeans-jsf12/pom.xml
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-jsf12/pom.xml?rev=1561563&r1=1561562&r2=1561563&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-jsf12/pom.xml (original)
+++ openwebbeans/trunk/webbeans-jsf12/pom.xml Sun Jan 26 22:25:33 2014
@@ -55,13 +55,13 @@
 
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-servlet_2.5_spec</artifactId>
+            <artifactId>geronimo-servlet_3.0_spec</artifactId>
             <optional>true</optional>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jcdi_1.0_spec</artifactId>
+            <artifactId>geronimo-jcdi_1.1_spec</artifactId>
             <optional>true</optional>
         </dependency>
 

Modified: openwebbeans/trunk/webbeans-osgi/pom.xml
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-osgi/pom.xml?rev=1561563&r1=1561562&r2=1561563&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-osgi/pom.xml (original)
+++ openwebbeans/trunk/webbeans-osgi/pom.xml Sun Jan 26 22:25:33 2014
@@ -31,7 +31,7 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-servlet_2.5_spec</artifactId>
+            <artifactId>geronimo-servlet_3.0_spec</artifactId>
         </dependency>
         
         <dependency>
@@ -54,7 +54,7 @@
         
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jcdi_1.0_spec</artifactId>
+            <artifactId>geronimo-jcdi_1.1_spec</artifactId>
             <scope>provided</scope>
         </dependency>
 

Modified: openwebbeans/trunk/webbeans-porting/pom.xml
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-porting/pom.xml?rev=1561563&r1=1561562&r2=1561563&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-porting/pom.xml (original)
+++ openwebbeans/trunk/webbeans-porting/pom.xml Sun Jan 26 22:25:33 2014
@@ -51,7 +51,7 @@
             </snapshots>
         </repository>
     </repositories>
-    
+
     <dependencies>
 
         <dependency>
@@ -76,7 +76,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-servlet_2.5_spec</artifactId>
+            <artifactId>geronimo-servlet_3.0_spec</artifactId>
         </dependency>
 
         <dependency>
@@ -86,7 +86,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-annotation_1.1_spec</artifactId>
+            <artifactId>geronimo-annotation_1.2_spec</artifactId>
             <version>${geronimo_annotation.version}</version>
         </dependency>
 
@@ -99,7 +99,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-interceptor_1.1_spec</artifactId>
+            <artifactId>geronimo-interceptor_1.2_spec</artifactId>
         </dependency>
 
         <dependency>
@@ -120,7 +120,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jcdi_1.0_spec</artifactId>
+            <artifactId>geronimo-jcdi_1.1_spec</artifactId>
         </dependency>
 
         <dependency>

Modified: openwebbeans/trunk/webbeans-resource/pom.xml
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-resource/pom.xml?rev=1561563&r1=1561562&r2=1561563&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-resource/pom.xml (original)
+++ openwebbeans/trunk/webbeans-resource/pom.xml Sun Jan 26 22:25:33 2014
@@ -43,7 +43,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jcdi_1.0_spec</artifactId>
+            <artifactId>geronimo-jcdi_1.1_spec</artifactId>
             <optional>true</optional>
         </dependency>
         <dependency>

Modified: openwebbeans/trunk/webbeans-spi/pom.xml
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-spi/pom.xml?rev=1561563&r1=1561562&r2=1561563&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-spi/pom.xml (original)
+++ openwebbeans/trunk/webbeans-spi/pom.xml Sun Jan 26 22:25:33 2014
@@ -48,12 +48,12 @@
 
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-servlet_2.5_spec</artifactId>
+            <artifactId>geronimo-servlet_3.0_spec</artifactId>
             <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jcdi_1.0_spec</artifactId>
+            <artifactId>geronimo-jcdi_1.1_spec</artifactId>
             <optional>true</optional>
         </dependency>
         <dependency>

Modified: openwebbeans/trunk/webbeans-tck/pom.xml
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-tck/pom.xml?rev=1561563&r1=1561562&r2=1561563&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-tck/pom.xml (original)
+++ openwebbeans/trunk/webbeans-tck/pom.xml Sun Jan 26 22:25:33 2014
@@ -55,7 +55,7 @@
         
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-interceptor_1.1_spec</artifactId>
+            <artifactId>geronimo-interceptor_1.2_spec</artifactId>
         </dependency>
 
         <dependency>

Modified: openwebbeans/trunk/webbeans-test/cditest-owb/pom.xml
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-test/cditest-owb/pom.xml?rev=1561563&r1=1561562&r2=1561563&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-test/cditest-owb/pom.xml (original)
+++ openwebbeans/trunk/webbeans-test/cditest-owb/pom.xml Sun Jan 26 22:25:33 2014
@@ -44,7 +44,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jcdi_1.0_spec</artifactId>
+            <artifactId>geronimo-jcdi_1.1_spec</artifactId>
         </dependency>
     
         <dependency>
@@ -65,7 +65,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-servlet_2.5_spec</artifactId>
+            <artifactId>geronimo-servlet_3.0_spec</artifactId>
             <optional>true</optional>
         </dependency>
         
@@ -77,7 +77,7 @@
         
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-interceptor_1.1_spec</artifactId>
+            <artifactId>geronimo-interceptor_1.2_spec</artifactId>
             <optional>true</optional>
         </dependency>
 

Modified: openwebbeans/trunk/webbeans-test/cditest-owb/src/main/java/org/apache/webbeans/cditest/owb/MockServletContext.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-test/cditest-owb/src/main/java/org/apache/webbeans/cditest/owb/MockServletContext.java?rev=1561563&r1=1561562&r2=1561563&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-test/cditest-owb/src/main/java/org/apache/webbeans/cditest/owb/MockServletContext.java (original)
+++ openwebbeans/trunk/webbeans-test/cditest-owb/src/main/java/org/apache/webbeans/cditest/owb/MockServletContext.java Sun Jan 26 22:25:33 2014
@@ -22,14 +22,22 @@ import java.io.InputStream;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.Enumeration;
+import java.util.EventListener;
 import java.util.Hashtable;
+import java.util.Map;
 import java.util.Set;
 import java.util.StringTokenizer;
 
+import javax.servlet.Filter;
+import javax.servlet.FilterRegistration;
 import javax.servlet.RequestDispatcher;
 import javax.servlet.Servlet;
 import javax.servlet.ServletContext;
 import javax.servlet.ServletException;
+import javax.servlet.ServletRegistration;
+import javax.servlet.SessionCookieConfig;
+import javax.servlet.SessionTrackingMode;
+import javax.servlet.descriptor.JspConfigDescriptor;
 
 /**
  * Mock ServletContext needed to startup the container.
@@ -199,4 +207,159 @@ public class MockServletContext implemen
         attributes.put(name, object);
     }
 
+    @Override
+    public boolean setInitParameter(String name, String value)
+    {
+        return false;
+    }
+
+    @Override
+    public ServletRegistration.Dynamic addServlet(String servletName, String className) throws IllegalArgumentException, IllegalStateException
+    {
+        return null;
+    }
+
+    @Override
+    public ServletRegistration.Dynamic addServlet(String servletName, Servlet servlet) throws IllegalArgumentException, IllegalStateException
+    {
+        return null;
+    }
+
+    @Override
+    public ServletRegistration.Dynamic addServlet(String servletName, Class<? extends Servlet> clazz) throws IllegalArgumentException, IllegalStateException
+    {
+        return null;
+    }
+
+    @Override
+    public <T extends Servlet> T createServlet(Class<T> clazz) throws ServletException
+    {
+        return null;
+    }
+
+    @Override
+    public ServletRegistration getServletRegistration(String servletName)
+    {
+        return null;
+    }
+
+    @Override
+    public Map<String, ? extends ServletRegistration> getServletRegistrations()
+    {
+        return null;
+    }
+
+    @Override
+    public FilterRegistration.Dynamic addFilter(String filterName, String className) throws IllegalArgumentException, IllegalStateException
+    {
+        return null;
+    }
+
+    @Override
+    public FilterRegistration.Dynamic addFilter(String filterName, Filter filter) throws IllegalArgumentException, IllegalStateException
+    {
+        return null;
+    }
+
+    @Override
+    public FilterRegistration.Dynamic addFilter(String filterName, Class<? extends Filter> filterClass) throws IllegalArgumentException, IllegalStateException
+    {
+        return null;
+    }
+
+    @Override
+    public <T extends Filter> T createFilter(Class<T> clazz) throws ServletException
+    {
+        return null;
+    }
+
+    @Override
+    public FilterRegistration getFilterRegistration(String filterName)
+    {
+        return null;
+    }
+
+    @Override
+    public Map<String, ? extends FilterRegistration> getFilterRegistrations()
+    {
+        return null;
+    }
+
+    @Override
+    public void addListener(Class<? extends EventListener> listenerClass)
+    {
+
+    }
+
+    @Override
+    public void addListener(String className)
+    {
+
+    }
+
+    @Override
+    public <T extends EventListener> void addListener(T t)
+    {
+
+    }
+
+    @Override
+    public <T extends EventListener> T createListener(Class<T> clazz) throws ServletException
+    {
+        return null;
+    }
+
+    @Override
+    public void declareRoles(String... roleNames)
+    {
+
+    }
+
+    @Override
+    public SessionCookieConfig getSessionCookieConfig()
+    {
+        return null;
+    }
+
+    @Override
+    public void setSessionTrackingModes(Set<SessionTrackingMode> sessionTrackingModes)
+    {
+
+    }
+
+    @Override
+    public Set<SessionTrackingMode> getDefaultSessionTrackingModes()
+    {
+        return null;
+    }
+
+    @Override
+    public int getEffectiveMajorVersion() throws UnsupportedOperationException
+    {
+        return 0;
+    }
+
+    @Override
+    public int getEffectiveMinorVersion() throws UnsupportedOperationException
+    {
+        return 0;
+    }
+
+    @Override
+    public Set<SessionTrackingMode> getEffectiveSessionTrackingModes()
+    {
+        return null;
+    }
+
+    @Override
+    public ClassLoader getClassLoader()
+    {
+        return null;
+    }
+
+    @Override
+    public JspConfigDescriptor getJspConfigDescriptor()
+    {
+        return null;
+    }
 }

Modified: openwebbeans/trunk/webbeans-test/cditest/pom.xml
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-test/cditest/pom.xml?rev=1561563&r1=1561562&r2=1561563&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-test/cditest/pom.xml (original)
+++ openwebbeans/trunk/webbeans-test/cditest/pom.xml Sun Jan 26 22:25:33 2014
@@ -37,7 +37,7 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jcdi_1.0_spec</artifactId>
+            <artifactId>geronimo-jcdi_1.1_spec</artifactId>
             <optional>true</optional>
         </dependency>
 
@@ -49,7 +49,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-interceptor_1.1_spec</artifactId>
+            <artifactId>geronimo-interceptor_1.2_spec</artifactId>
             <optional>true</optional>
         </dependency>
     </dependencies>

Modified: openwebbeans/trunk/webbeans-tomcat6/pom.xml
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-tomcat6/pom.xml?rev=1561563&r1=1561562&r2=1561563&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-tomcat6/pom.xml (original)
+++ openwebbeans/trunk/webbeans-tomcat6/pom.xml Sun Jan 26 22:25:33 2014
@@ -37,7 +37,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jcdi_1.0_spec</artifactId>
+            <artifactId>geronimo-jcdi_1.1_spec</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>

Modified: openwebbeans/trunk/webbeans-tomcat6/src/it/servletinjection/pom.xml
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-tomcat6/src/it/servletinjection/pom.xml?rev=1561563&r1=1561562&r2=1561563&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-tomcat6/src/it/servletinjection/pom.xml (original)
+++ openwebbeans/trunk/webbeans-tomcat6/src/it/servletinjection/pom.xml Sun Jan 26 22:25:33 2014
@@ -55,7 +55,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jcdi_1.0_spec</artifactId>
+            <artifactId>geronimo-jcdi_1.1_spec</artifactId>
             <scope>provided</scope>
         </dependency>
 
@@ -165,7 +165,7 @@
 
                     <dependency>
                         <groupId>org.apache.geronimo.specs</groupId>
-                        <artifactId>geronimo-jcdi_1.0_spec</artifactId>
+                        <artifactId>geronimo-jcdi_1.1_spec</artifactId>
                         <version>1.0</version>
                     </dependency>
 
@@ -177,7 +177,7 @@
 
                     <dependency>
                         <groupId>org.apache.geronimo.specs</groupId>
-                        <artifactId>geronimo-interceptor_1.1_spec</artifactId>
+                        <artifactId>geronimo-interceptor_1.2_spec</artifactId>
                         <version>1.0</version>
                     </dependency>
 

Modified: openwebbeans/trunk/webbeans-tomcat6/src/main/java/org/apache/webbeans/web/tomcat/TomcatWebPlugin.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-tomcat6/src/main/java/org/apache/webbeans/web/tomcat/TomcatWebPlugin.java?rev=1561563&r1=1561562&r2=1561563&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-tomcat6/src/main/java/org/apache/webbeans/web/tomcat/TomcatWebPlugin.java (original)
+++ openwebbeans/trunk/webbeans-tomcat6/src/main/java/org/apache/webbeans/web/tomcat/TomcatWebPlugin.java Sun Jan 26 22:25:33 2014
@@ -30,7 +30,7 @@ import javax.servlet.http.HttpSessionAtt
 import javax.servlet.http.HttpSessionBindingListener;
 import javax.servlet.http.HttpSessionListener;
 
-import org.apache.webbeans.exception.inject.DefinitionException;
+import javax.enterprise.inject.spi.DefinitionException;
 import org.apache.webbeans.spi.SecurityService;
 import org.apache.webbeans.spi.plugins.AbstractOwbPlugin;
 import org.apache.webbeans.spi.plugins.OpenWebBeansWebPlugin;

Modified: openwebbeans/trunk/webbeans-tomcat7/pom.xml
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-tomcat7/pom.xml?rev=1561563&r1=1561562&r2=1561563&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-tomcat7/pom.xml (original)
+++ openwebbeans/trunk/webbeans-tomcat7/pom.xml Sun Jan 26 22:25:33 2014
@@ -37,7 +37,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jcdi_1.0_spec</artifactId>
+            <artifactId>geronimo-jcdi_1.1_spec</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>

Modified: openwebbeans/trunk/webbeans-tomcat7/src/it/servletinjection/pom.xml
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-tomcat7/src/it/servletinjection/pom.xml?rev=1561563&r1=1561562&r2=1561563&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-tomcat7/src/it/servletinjection/pom.xml (original)
+++ openwebbeans/trunk/webbeans-tomcat7/src/it/servletinjection/pom.xml Sun Jan 26 22:25:33 2014
@@ -55,7 +55,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jcdi_1.0_spec</artifactId>
+            <artifactId>geronimo-jcdi_1.1_spec</artifactId>
             <scope>provided</scope>
         </dependency>
 
@@ -232,7 +232,7 @@
 
                         <dependency>
                             <groupId>org.apache.geronimo.specs</groupId>
-                            <artifactId>geronimo-jcdi_1.0_spec</artifactId>
+                            <artifactId>geronimo-jcdi_1.1_spec</artifactId>
                             <version>1.0</version>
                         </dependency>
 
@@ -244,7 +244,7 @@
 
                         <dependency>
                             <groupId>org.apache.geronimo.specs</groupId>
-                            <artifactId>geronimo-interceptor_1.1_spec</artifactId>
+                            <artifactId>geronimo-interceptor_1.2_spec</artifactId>
                             <version>1.0</version>
                         </dependency>
                     </dependencies>

Modified: openwebbeans/trunk/webbeans-tomcat7/src/main/java/org/apache/webbeans/web/tomcat/TomcatWebPlugin.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-tomcat7/src/main/java/org/apache/webbeans/web/tomcat/TomcatWebPlugin.java?rev=1561563&r1=1561562&r2=1561563&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-tomcat7/src/main/java/org/apache/webbeans/web/tomcat/TomcatWebPlugin.java (original)
+++ openwebbeans/trunk/webbeans-tomcat7/src/main/java/org/apache/webbeans/web/tomcat/TomcatWebPlugin.java Sun Jan 26 22:25:33 2014
@@ -30,7 +30,7 @@ import javax.servlet.http.HttpSessionAtt
 import javax.servlet.http.HttpSessionBindingListener;
 import javax.servlet.http.HttpSessionListener;
 
-import org.apache.webbeans.exception.inject.DefinitionException;
+import javax.enterprise.inject.spi.DefinitionException;
 import org.apache.webbeans.spi.SecurityService;
 import org.apache.webbeans.spi.plugins.AbstractOwbPlugin;
 import org.apache.webbeans.spi.plugins.OpenWebBeansWebPlugin;

Modified: openwebbeans/trunk/webbeans-web/pom.xml
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-web/pom.xml?rev=1561563&r1=1561562&r2=1561563&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-web/pom.xml (original)
+++ openwebbeans/trunk/webbeans-web/pom.xml Sun Jan 26 22:25:33 2014
@@ -47,7 +47,7 @@
         
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-servlet_2.5_spec</artifactId>
+            <artifactId>geronimo-servlet_3.0_spec</artifactId>
             <optional>true</optional>
         </dependency>
 
@@ -77,7 +77,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jcdi_1.0_spec</artifactId>
+            <artifactId>geronimo-jcdi_1.1_spec</artifactId>
             <optional>true</optional>
         </dependency>
         <dependency>
@@ -94,7 +94,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-interceptor_1.1_spec</artifactId>
+            <artifactId>geronimo-interceptor_1.2_spec</artifactId>
             <optional>true</optional>
         </dependency>
 

Modified: openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/lifecycle/test/MockServletContext.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/lifecycle/test/MockServletContext.java?rev=1561563&r1=1561562&r2=1561563&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/lifecycle/test/MockServletContext.java (original)
+++ openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/lifecycle/test/MockServletContext.java Sun Jan 26 22:25:33 2014
@@ -22,14 +22,20 @@ import java.io.InputStream;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.Enumeration;
-import java.util.Hashtable;
+import java.util.EventListener;
+import java.util.Map;
 import java.util.Set;
-import java.util.StringTokenizer;
 
+import javax.servlet.Filter;
+import javax.servlet.FilterRegistration;
 import javax.servlet.RequestDispatcher;
 import javax.servlet.Servlet;
 import javax.servlet.ServletContext;
 import javax.servlet.ServletException;
+import javax.servlet.ServletRegistration;
+import javax.servlet.SessionCookieConfig;
+import javax.servlet.SessionTrackingMode;
+import javax.servlet.descriptor.JspConfigDescriptor;
 
 /**
  * Implement the ServletContext interface for testing.
@@ -37,63 +43,58 @@ import javax.servlet.ServletException;
 public class MockServletContext implements ServletContext
 {
 
-    @SuppressWarnings("unchecked")
-    private Hashtable attributes = new Hashtable();
-
     @Override
-    public Object getAttribute(String name)
+    public String getContextPath()
     {
-        return attributes.get(name);
+        return null;
     }
 
     @Override
-    @SuppressWarnings("unchecked")
-    public Enumeration getAttributeNames()
+    public ServletContext getContext(String uripath)
     {
-        return attributes.keys();
+        return null;
     }
 
     @Override
-    public ServletContext getContext(String uripath)
+    public int getMajorVersion()
     {
-        return this;
+        return 0;
     }
 
     @Override
-    public String getContextPath()
+    public int getMinorVersion()
     {
-        return "mockContextpath";
+        return 0;
     }
 
     @Override
-    public String getInitParameter(String name)
+    public String getMimeType(String file)
     {
         return null;
     }
 
     @Override
-    @SuppressWarnings("unchecked")
-    public Enumeration getInitParameterNames()
+    public Set<String> getResourcePaths(String path)
     {
-        return new StringTokenizer(""); // 'standard' empty Enumeration
+        return null;
     }
 
     @Override
-    public int getMajorVersion()
+    public URL getResource(String path) throws MalformedURLException
     {
-        return 2;
+        return null;
     }
 
     @Override
-    public String getMimeType(String file)
+    public InputStream getResourceAsStream(String path)
     {
         return null;
     }
 
     @Override
-    public int getMinorVersion()
+    public RequestDispatcher getRequestDispatcher(String path)
     {
-        return 0;
+        return null;
     }
 
     @Override
@@ -103,191 +104,248 @@ public class MockServletContext implemen
     }
 
     @Override
-    public String getRealPath(String path)
+    public Servlet getServlet(String name) throws ServletException
     {
-        return "mockRealPath";
+        return null;
     }
 
     @Override
-    public RequestDispatcher getRequestDispatcher(String path)
+    public Enumeration<Servlet> getServlets()
     {
         return null;
     }
 
     @Override
-    public URL getResource(String path) throws MalformedURLException
+    public Enumeration<String> getServletNames()
     {
         return null;
     }
 
     @Override
-    public InputStream getResourceAsStream(String path)
+    public void log(String msg)
     {
-        return null;
+
     }
 
     @Override
-    @SuppressWarnings("unchecked")
-    public Set getResourcePaths(String path)
+    public void log(Exception exception, String msg)
     {
-        return null;
+
     }
 
     @Override
-    public String getServerInfo()
+    public void log(String message, Throwable throwable)
     {
-        return "mockServer";
+
     }
 
     @Override
-    public Servlet getServlet(String name) throws ServletException
+    public String getRealPath(String path)
     {
         return null;
     }
 
     @Override
-    public String getServletContextName()
+    public String getServerInfo()
     {
         return null;
     }
 
     @Override
-    @SuppressWarnings("unchecked")
-    public Enumeration getServletNames()
+    public String getInitParameter(String name)
     {
         return null;
     }
 
     @Override
-    @SuppressWarnings("unchecked")
-    public Enumeration getServlets()
+    public Enumeration<String> getInitParameterNames()
     {
         return null;
     }
 
     @Override
-    public void log(String msg)
+    public boolean setInitParameter(String name, String value)
     {
-        // TODO
+        return false;
     }
 
     @Override
-    public void log(Exception exception, String msg)
+    public Object getAttribute(String name)
     {
-        // TODO
+        return null;
+    }
 
+    @Override
+    public Enumeration<String> getAttributeNames()
+    {
+        return null;
     }
 
     @Override
-    public void log(String message, Throwable throwable)
+    public void setAttribute(String name, Object object)
     {
-        // TODO
 
     }
 
     @Override
     public void removeAttribute(String name)
     {
-        attributes.remove(name);
+
     }
 
     @Override
-    @SuppressWarnings("unchecked")
-    public void setAttribute(String name, Object object)
+    public String getServletContextName()
     {
-        attributes.put(name, object);
+        return null;
     }
 
-    /*--- NEW SERVLET 3.0 FUNCTIONS! -- */
-    /*X
-    public Dynamic addFilter(String arg0, String arg1) {
-        // TODO Auto-generated method stub
+    @Override
+    public ServletRegistration.Dynamic addServlet(String servletName, String className) throws IllegalArgumentException, IllegalStateException
+    {
         return null;
     }
 
-    public Dynamic addFilter(String arg0, Filter arg1) {
-        // TODO Auto-generated method stub
+    @Override
+    public ServletRegistration.Dynamic addServlet(String servletName, Servlet servlet) throws IllegalArgumentException, IllegalStateException
+    {
         return null;
     }
 
-    public Dynamic addFilter(String arg0, Class<? extends Filter> arg1) {
-        // TODO Auto-generated method stub
+    @Override
+    public ServletRegistration.Dynamic addServlet(String servletName, Class<? extends Servlet> clazz) throws IllegalArgumentException, IllegalStateException
+    {
         return null;
     }
 
-    public javax.servlet.ServletRegistration.Dynamic addServlet(String arg0,
-                                                                String arg1) {
-        // TODO Auto-generated method stub
+    @Override
+    public <T extends Servlet> T createServlet(Class<T> clazz) throws ServletException
+    {
         return null;
     }
 
-    public javax.servlet.ServletRegistration.Dynamic addServlet(String arg0,
-                                                                Servlet arg1) {
-        // TODO Auto-generated method stub
+    @Override
+    public ServletRegistration getServletRegistration(String servletName)
+    {
         return null;
     }
 
-    public javax.servlet.ServletRegistration.Dynamic addServlet(String arg0,
-                                                                Class<? extends Servlet> arg1) {
-        // TODO Auto-generated method stub
+    @Override
+    public Map<String, ? extends ServletRegistration> getServletRegistrations()
+    {
         return null;
     }
 
-    public <T extends Filter> T createFilter(Class<T> arg0)
-            throws ServletException {
-        // TODO Auto-generated method stub
+    @Override
+    public FilterRegistration.Dynamic addFilter(String filterName, String className) throws IllegalArgumentException, IllegalStateException
+    {
         return null;
     }
 
-    public <T extends Servlet> T createServlet(Class<T> arg0)
-            throws ServletException {
-        // TODO Auto-generated method stub
+    @Override
+    public FilterRegistration.Dynamic addFilter(String filterName, Filter filter) throws IllegalArgumentException, IllegalStateException
+    {
         return null;
     }
 
-    public Set<SessionTrackingMode> getDefaultSessionTrackingModes() {
-        // TODO Auto-generated method stub
+    @Override
+    public FilterRegistration.Dynamic addFilter(String filterName, Class<? extends Filter> filterClass) throws IllegalArgumentException, IllegalStateException
+    {
         return null;
     }
 
-    public Set<SessionTrackingMode> getEffectiveSessionTrackingModes() {
-        // TODO Auto-generated method stub
+    @Override
+    public <T extends Filter> T createFilter(Class<T> clazz) throws ServletException
+    {
         return null;
     }
 
-    public FilterRegistration getFilterRegistration(String arg0) {
-        // TODO Auto-generated method stub
+    @Override
+    public FilterRegistration getFilterRegistration(String filterName)
+    {
         return null;
     }
 
-    public Map<String, FilterRegistration> getFilterRegistrations() {
-        // TODO Auto-generated method stub
+    @Override
+    public Map<String, ? extends FilterRegistration> getFilterRegistrations()
+    {
         return null;
     }
 
-    public ServletRegistration getServletRegistration(String arg0) {
-        // TODO Auto-generated method stub
+    @Override
+    public void addListener(Class<? extends EventListener> listenerClass)
+    {
+
+    }
+
+    @Override
+    public void addListener(String className)
+    {
+
+    }
+
+    @Override
+    public <T extends EventListener> void addListener(T t)
+    {
+
+    }
+
+    @Override
+    public <T extends EventListener> T createListener(Class<T> clazz) throws ServletException
+    {
         return null;
     }
 
-    public Map<String, ServletRegistration> getServletRegistrations() {
-        // TODO Auto-generated method stub
+    @Override
+    public void declareRoles(String... roleNames)
+    {
+
+    }
+
+    @Override
+    public SessionCookieConfig getSessionCookieConfig()
+    {
         return null;
     }
 
-    public SessionCookieConfig getSessionCookieConfig() {
-        // TODO Auto-generated method stub
+    @Override
+    public void setSessionTrackingModes(Set<SessionTrackingMode> sessionTrackingModes)
+    {
+
+    }
+
+    @Override
+    public Set<SessionTrackingMode> getDefaultSessionTrackingModes()
+    {
         return null;
     }
 
-    public boolean setInitParameter(String arg0, String arg1) {
-        // TODO Auto-generated method stub
-        return false;
+    @Override
+    public int getEffectiveMajorVersion() throws UnsupportedOperationException
+    {
+        return 0;
     }
 
-    public void setSessionTrackingModes(Set<SessionTrackingMode> arg0) {
-        // TODO Auto-generated method stub
+    @Override
+    public int getEffectiveMinorVersion() throws UnsupportedOperationException
+    {
+        return 0;
+    }
+
+    @Override
+    public Set<SessionTrackingMode> getEffectiveSessionTrackingModes()
+    {
+        return null;
+    }
 
+    @Override
+    public ClassLoader getClassLoader()
+    {
+        return null;
+    }
+
+    @Override
+    public JspConfigDescriptor getJspConfigDescriptor()
+    {
+        return null;
     }
-    */
 }

Modified: openwebbeans/trunk/webbeans-web/src/test/java/org/apache/webbeans/web/tests/MockServletRequest.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-web/src/test/java/org/apache/webbeans/web/tests/MockServletRequest.java?rev=1561563&r1=1561562&r2=1561563&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-web/src/test/java/org/apache/webbeans/web/tests/MockServletRequest.java (original)
+++ openwebbeans/trunk/webbeans-web/src/test/java/org/apache/webbeans/web/tests/MockServletRequest.java Sun Jan 26 22:25:33 2014
@@ -18,15 +18,24 @@
  */
 package org.apache.webbeans.web.tests;
 
+import javax.servlet.AsyncContext;
+import javax.servlet.DispatcherType;
 import javax.servlet.RequestDispatcher;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
 import javax.servlet.ServletInputStream;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
 import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
+import javax.servlet.http.Part;
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.security.Principal;
+import java.util.Collection;
 import java.util.Enumeration;
 import java.util.Locale;
 import java.util.Map;
@@ -38,323 +47,398 @@ public class MockServletRequest implemen
 {
 
     @Override
-    public Object getAttribute(String name)
+    public boolean authenticate(HttpServletResponse response) throws IOException, ServletException
     {
-        return null;
+        return false;
     }
 
     @Override
-    public Enumeration getAttributeNames()
+    public String getAuthType()
     {
         return null;
     }
 
     @Override
-    public String getCharacterEncoding()
+    public String getContextPath()
     {
         return null;
     }
 
     @Override
-    public void setCharacterEncoding(String env) throws UnsupportedEncodingException
+    public Cookie[] getCookies()
     {
+        return new Cookie[0];
     }
 
     @Override
-    public int getContentLength()
+    public long getDateHeader(String name)
     {
         return 0;
     }
 
     @Override
-    public String getContentType()
+    public String getHeader(String name)
     {
         return null;
     }
 
     @Override
-    public ServletInputStream getInputStream() throws IOException
+    public Enumeration<String> getHeaderNames()
     {
         return null;
     }
 
     @Override
-    public String getParameter(String name)
+    public Enumeration<String> getHeaders(String name)
     {
         return null;
     }
 
     @Override
-    public Enumeration getParameterNames()
+    public int getIntHeader(String name)
+    {
+        return 0;
+    }
+
+    @Override
+    public String getMethod()
     {
         return null;
     }
 
     @Override
-    public String[] getParameterValues(String name)
+    public Part getPart(String name) throws IOException, ServletException
     {
-        return new String[0];
+        return null;
     }
 
     @Override
-    public Map getParameterMap()
+    public Collection<Part> getParts() throws IOException, ServletException
     {
         return null;
     }
 
     @Override
-    public String getProtocol()
+    public String getPathInfo()
     {
         return null;
     }
 
     @Override
-    public String getScheme()
+    public String getPathTranslated()
     {
         return null;
     }
 
     @Override
-    public String getServerName()
+    public String getQueryString()
     {
         return null;
     }
 
     @Override
-    public int getServerPort()
+    public String getRemoteUser()
     {
-        return 0;
+        return null;
     }
 
     @Override
-    public BufferedReader getReader() throws IOException
+    public String getRequestedSessionId()
     {
         return null;
     }
 
     @Override
-    public String getRemoteAddr()
+    public String getRequestURI()
     {
         return null;
     }
 
     @Override
-    public String getRemoteHost()
+    public StringBuffer getRequestURL()
     {
         return null;
     }
 
     @Override
-    public void setAttribute(String name, Object o)
+    public String getServletPath()
     {
+        return null;
     }
 
     @Override
-    public void removeAttribute(String name)
+    public HttpSession getSession()
     {
+        return null;
     }
 
     @Override
-    public Locale getLocale()
+    public HttpSession getSession(boolean create)
     {
         return null;
     }
 
     @Override
-    public Enumeration getLocales()
+    public Principal getUserPrincipal()
     {
         return null;
     }
 
     @Override
-    public boolean isSecure()
+    public boolean isRequestedSessionIdFromCookie()
     {
         return false;
     }
 
     @Override
-    public RequestDispatcher getRequestDispatcher(String path)
+    public boolean isRequestedSessionIdFromUrl()
     {
-        return null;
+        return false;
     }
 
     @Override
-    public String getRealPath(String path)
+    public boolean isRequestedSessionIdFromURL()
+    {
+        return false;
+    }
+
+    @Override
+    public boolean isRequestedSessionIdValid()
+    {
+        return false;
+    }
+
+    @Override
+    public boolean isUserInRole(String role)
+    {
+        return false;
+    }
+
+    @Override
+    public void login(String username, String password) throws ServletException
+    {
+
+    }
+
+    @Override
+    public void logout() throws ServletException
+    {
+
+    }
+
+    @Override
+    public AsyncContext getAsyncContext()
     {
         return null;
     }
 
     @Override
-    public int getRemotePort()
+    public Object getAttribute(String name)
     {
-        return 0;
+        return null;
     }
 
     @Override
-    public String getLocalName()
+    public Enumeration<String> getAttributeNames()
     {
         return null;
     }
 
     @Override
-    public String getLocalAddr()
+    public String getCharacterEncoding()
     {
         return null;
     }
 
     @Override
-    public int getLocalPort()
+    public int getContentLength()
     {
         return 0;
     }
 
     @Override
-    public String getAuthType()
+    public String getContentType()
     {
         return null;
     }
 
     @Override
-    public Cookie[] getCookies()
+    public DispatcherType getDispatcherType()
     {
-        return new Cookie[0];
+        return null;
     }
 
     @Override
-    public long getDateHeader(String name)
+    public ServletInputStream getInputStream() throws IOException
     {
-        return 0;
+        return null;
     }
 
     @Override
-    public String getHeader(String name)
+    public String getLocalAddr()
     {
         return null;
     }
 
     @Override
-    public Enumeration getHeaders(String name)
+    public Locale getLocale()
     {
         return null;
     }
 
     @Override
-    public Enumeration getHeaderNames()
+    public Enumeration<Locale> getLocales()
     {
         return null;
     }
 
     @Override
-    public int getIntHeader(String name)
+    public String getLocalName()
+    {
+        return null;
+    }
+
+    @Override
+    public int getLocalPort()
     {
         return 0;
     }
 
     @Override
-    public String getMethod()
+    public String getParameter(String name)
     {
         return null;
     }
 
     @Override
-    public String getPathInfo()
+    public Map<String, String[]> getParameterMap()
     {
         return null;
     }
 
     @Override
-    public String getPathTranslated()
+    public Enumeration<String> getParameterNames()
     {
-        return null; 
+        return null;
     }
 
     @Override
-    public String getContextPath()
+    public String[] getParameterValues(String name)
     {
-        return null;
+        return new String[0];
     }
 
     @Override
-    public String getQueryString()
+    public String getProtocol()
     {
         return null;
     }
 
     @Override
-    public String getRemoteUser()
+    public BufferedReader getReader() throws IOException
     {
         return null;
     }
 
     @Override
-    public boolean isUserInRole(String role)
+    public String getRealPath(String path)
     {
-        return false;
+        return null;
     }
 
     @Override
-    public Principal getUserPrincipal()
+    public String getRemoteAddr()
     {
         return null;
     }
 
     @Override
-    public String getRequestedSessionId()
+    public String getRemoteHost()
     {
         return null;
     }
 
     @Override
-    public String getRequestURI()
+    public int getRemotePort()
     {
-        return null;
+        return 0;
     }
 
     @Override
-    public StringBuffer getRequestURL()
+    public RequestDispatcher getRequestDispatcher(String path)
     {
         return null;
     }
 
     @Override
-    public String getServletPath()
+    public String getScheme()
     {
         return null;
     }
 
     @Override
-    public HttpSession getSession(boolean create)
+    public String getServerName()
     {
         return null;
     }
 
     @Override
-    public HttpSession getSession()
+    public int getServerPort()
+    {
+        return 0;
+    }
+
+    @Override
+    public ServletContext getServletContext()
     {
         return null;
     }
 
     @Override
-    public boolean isRequestedSessionIdValid()
+    public boolean isAsyncStarted()
     {
         return false;
     }
 
     @Override
-    public boolean isRequestedSessionIdFromCookie()
+    public boolean isAsyncSupported()
     {
         return false;
     }
 
     @Override
-    public boolean isRequestedSessionIdFromURL()
+    public boolean isSecure()
     {
         return false;
     }
 
     @Override
-    public boolean isRequestedSessionIdFromUrl()
+    public void removeAttribute(String name)
     {
-        return false;
+
+    }
+
+    @Override
+    public void setAttribute(String name, Object o)
+    {
+
+    }
+
+    @Override
+    public void setCharacterEncoding(String env) throws UnsupportedEncodingException
+    {
+
+    }
+
+    @Override
+    public AsyncContext startAsync()
+    {
+        return null;
+    }
+
+    @Override
+    public AsyncContext startAsync(ServletRequest request, ServletResponse response)
+    {
+        return null;
     }
 }

Modified: openwebbeans/trunk/webbeans-web/src/test/java/org/apache/webbeans/web/tests/interceptor/CachedInterceptorHandlerTest.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-web/src/test/java/org/apache/webbeans/web/tests/interceptor/CachedInterceptorHandlerTest.java?rev=1561563&r1=1561562&r2=1561563&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-web/src/test/java/org/apache/webbeans/web/tests/interceptor/CachedInterceptorHandlerTest.java (original)
+++ openwebbeans/trunk/webbeans-web/src/test/java/org/apache/webbeans/web/tests/interceptor/CachedInterceptorHandlerTest.java Sun Jan 26 22:25:33 2014
@@ -25,7 +25,7 @@ import org.apache.webbeans.newtests.inte
 import org.apache.webbeans.newtests.interceptors.beans.DependentScopedBean;
 import org.apache.webbeans.newtests.interceptors.beans.RequestScopedBean;
 import org.apache.webbeans.newtests.interceptors.common.TransactionInterceptor;
-import org.apache.webbeans.web.tests.MockServletContext;
+import org.apache.webbeans.web.lifecycle.test.MockServletContext;
 import org.apache.webbeans.web.tests.MockServletRequest;
 import org.junit.Test;
 

Modified: openwebbeans/trunk/webbeans-web/src/test/java/org/apache/webbeans/web/tests/interceptor/SerializationTest.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-web/src/test/java/org/apache/webbeans/web/tests/interceptor/SerializationTest.java?rev=1561563&r1=1561562&r2=1561563&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-web/src/test/java/org/apache/webbeans/web/tests/interceptor/SerializationTest.java (original)
+++ openwebbeans/trunk/webbeans-web/src/test/java/org/apache/webbeans/web/tests/interceptor/SerializationTest.java Sun Jan 26 22:25:33 2014
@@ -21,7 +21,7 @@ package org.apache.webbeans.web.tests.in
 
 import junit.framework.Assert;
 import org.apache.webbeans.newtests.AbstractUnitTest;
-import org.apache.webbeans.web.tests.MockServletContext;
+import org.apache.webbeans.web.lifecycle.test.MockServletContext;
 import org.apache.webbeans.web.tests.MockServletRequest;
 import org.junit.Test;
 



Mime
View raw message