This is an automated email from the ASF dual-hosted git repository. struberg pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/openwebbeans.git
commit 8eef18a9884ef1b08a32005de2f4b140bc610ef3 Author: Mark Struberg <[email protected]> AuthorDate: Mon Jan 23 23:26:31 2023 +0100 OWB-1417 re-enable more owb modules --- pom.xml | 123 ++++----------------- .../apache/webbeans/sample/bean/LogoutBean.java | 2 +- samples/jsf2sample/pom.xml | 2 +- samples/reservation/pom.xml | 2 +- .../webbeans/reservation/beans/LogoutBean.java | 2 +- .../webbeans/reservation/util/JSFUtility.java | 2 +- .../webbeans/samples/tomcat/InjectorServlet.java | 8 +- .../apache/webbeans/samples/tomcat/MyFilter.java | 12 +- .../owb-arquillian-standalone/pom.xml | 11 +- webbeans-el22/pom.xml | 43 ++++--- .../apache/webbeans/web/jetty9/test/TestBean.java | 2 +- .../webbeans/web/jetty9/test/TestServlet.java | 12 +- .../apache/webbeans/web/jetty9/test/TestBean.java | 2 +- .../webbeans/web/jetty9/test/TestServlet.java | 12 +- .../apache/webbeans/web/jetty9/test/TestBean.java | 2 +- .../webbeans/web/jetty9/test/TestServlet.java | 12 +- .../webbeans/web/jetty9/JettySecurityFilter.java | 14 +-- .../apache/webbeans/web/jetty9/JettyWebPlugin.java | 20 ++-- .../webbeans/web/jetty9/OwbConfiguration.java | 4 +- .../test/JettyNormalScopeProxyFactoryTest.java | 4 +- webbeans-jsf/pom.xml | 2 +- .../main/java/org/apache/webbeans/jsf/JSFUtil.java | 2 +- webbeans-osgi/pom.xml | 2 +- .../osgi/scanner/OsgiMetaDataScannerService.java | 2 +- webbeans-porting/pom.xml | 6 +- webbeans-se/pom.xml | 84 +++++++------- .../org/apache/openwebbeans/se/OWBContainer.java | 14 +++ ...ta.enterprise.inject.se.SeContainerInitializer} | 0 .../java/org/apache/openwebbeans/se/CDISETest.java | 2 +- webbeans-tck/pom.xml | 6 +- {webbeans-tomcat7 => webbeans-tomcat}/pom.xml | 46 ++++---- .../src/it/fatwar/pom.xml | 0 .../apache/webbeans/web/tomcat7/test/TestBean.java | 2 +- .../webbeans/web/tomcat7/test/TestRequestBean.java | 0 .../webbeans/web/tomcat7/test/TestServlet.java | 14 +-- .../webbeans/web/tomcat7/test/TestSessionBean.java | 0 .../it/fatwar/src/main/webapp/META-INF/context.xml | 0 .../it/fatwar/src/main/webapp/WEB-INF/beans.xml | 0 .../src/it/fatwar/src/main/webapp/WEB-INF/web.xml | 0 .../web/tomcat7/test/OwbTomcatPluginIT.java | 0 .../src/it/servletinjection/pom.xml | 0 .../apache/webbeans/web/tomcat7/test/TestBean.java | 2 +- .../webbeans/web/tomcat7/test/TestServlet.java | 12 +- .../src/main/webapp/META-INF/context.xml | 2 +- .../src/main/webapp/WEB-INF/beans.xml | 0 .../src/main/webapp/WEB-INF/web.xml | 0 .../web/tomcat7/test/OwbTomcatPluginIT.java | 0 .../src/it/settings.xml | 0 .../web/tomcat}/ContextLifecycleListener.java | 8 +- .../web/tomcat}/TomcatInstanceManager.java | 2 +- .../webbeans/web/tomcat}/TomcatSecurityFilter.java | 16 +-- .../web/tomcat}/TomcatSecurityService.java | 2 +- .../apache/webbeans/web/tomcat}/TomcatUtil.java | 2 +- .../webbeans/web/tomcat}/TomcatWebPlugin.java | 22 ++-- .../META-INF/openwebbeans/openwebbeans.properties | 2 +- ....apache.webbeans.spi.plugins.OpenWebBeansPlugin | 2 +- .../src/main/resources/META-INF/web-fragment.xml | 2 +- .../src/site/site.xml | 0 .../webbeans/web/tomcat}/test/MySessionScoped.java | 2 +- .../webbeans/web/tomcat}/test/MyWrapper.java | 2 +- .../test/TomcatNormalScopeProxyFactoryTest.java | 12 +- webbeans-web/pom.xml | 80 ++++++-------- .../org/apache/openwebbeans/web/it/ForwardIT.java | 2 +- .../src/main/java/org/superbiz/TestServlet.java | 10 +- .../conversation/ConversationITServlet.java | 10 +- .../openwebbeans/web/it/ConversationScopedIT.java | 2 +- .../openwebbeans/web/it/RequestScopedIT.java | 2 +- .../servlet/WebBeansConfigurationFilter.java | 18 +-- .../WebBeansConfigurationHttpSessionListener.java | 4 +- .../servlet/WebBeansConfigurationListener.java | 16 +-- .../web/context/ServletRequestContext.java | 2 +- .../webbeans/web/context/WebContextsService.java | 8 +- .../web/context/WebConversationFilter.java | 12 +- .../web/context/WebConversationService.java | 6 +- .../webbeans/web/lifecycle/ServletContextBean.java | 2 +- .../webbeans/web/lifecycle/ServletRequestBean.java | 2 +- .../web/lifecycle/WebContainerLifecycle.java | 8 +- .../web/lifecycle/test/MockHttpSession.java | 40 +------ .../web/lifecycle/test/MockServletContext.java | 93 ++++++++++------ .../lifecycle/test/MockServletContextEvent.java | 2 +- .../webbeans/web/scanner/WebScannerService.java | 2 +- .../web/util/ServletCompatibilityUtil.java | 2 +- .../java/WebBeansConfigurationListenerTest.java | 4 +- .../web/tests/ConversationLoggingTest.java | 2 +- .../apache/webbeans/web/tests/MockHttpSession.java | 35 +----- .../webbeans/web/tests/MockServletRequest.java | 76 ++++++++----- .../apache/webbeans/web/tests/WebBeansTest.java | 6 +- .../InitializedSessionScopedTest.java | 2 +- .../web/tests/initialization/MySessionHandler.java | 2 +- .../interceptor/CachedInterceptorHandlerTest.java | 2 +- .../web/tests/interceptor/SerializationTest.java | 2 +- 91 files changed, 466 insertions(+), 551 deletions(-) diff --git a/pom.xml b/pom.xml index bf25af695..c98012a4d 100644 --- a/pom.xml +++ b/pom.xml @@ -84,7 +84,14 @@ <jakarta.transaction-api.version>2.0.0</jakarta.transaction-api.version> <jakarta.validation-api.version>3.0.0</jakarta.validation-api.version> + <tomcat.version>10.1.5</tomcat.version> + + <httpclient.version>4.5.14</httpclient.version> + <xbean.version>4.22</xbean.version> + <arquillian.version>1.7.0.Alpha10</arquillian.version> + +<!-- OLD remove: --> <geronimo_jaxws.version>1.2</geronimo_jaxws.version> <geronimo_servlet.version>1.0</geronimo_servlet.version> <geronimo_ejb.version>1.0.2</geronimo_ejb.version> @@ -92,14 +99,10 @@ <geronimo_jta.version>1.1.1</geronimo_jta.version> <geronimo_jsp.version>1.0.1</geronimo_jsp.version> <geronimo_validation.version>1.1</geronimo_validation.version> - <tomcat7.version>7.0.109</tomcat7.version> <!-- jetty 9.4.13+ broke session persistence: https://github.com/eclipse/jetty.project/issues/3597 --> <jetty.version>9.4.12.v20180830</jetty.version> <myfaces.version>2.3.6</myfaces.version> - <xbean.version>4.22</xbean.version> - <arquillian.version>1.7.0.Alpha10</arquillian.version> <cdi.tck.version>2.0.5.Final</cdi.tck.version> - <httpclient.version>4.5.13</httpclient.version> <osgi.servlet.range>2.4</osgi.servlet.range> <osgi.el.range>2.2</osgi.el.range> @@ -375,96 +378,6 @@ </configuration> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-shade-plugin</artifactId> - <version>${maven-shade-plugin.version}</version> - <executions> - <execution> - <phase>package</phase> - <goals> - <goal>shade</goal> - </goals> - <configuration> - <shadedArtifactAttached>true</shadedArtifactAttached> - <shadedClassifierName>jakarta</shadedClassifierName> - <createDependencyReducedPom>false</createDependencyReducedPom> - <transformers> - <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" /> - </transformers> - <artifactSet> <!-- don't include transitive deps --> - <includes> - <include>${project.groupId}:${project.artifactId}</include> - </includes> - </artifactSet> - <relocations> - <relocation> - <pattern>jakarta.annotation.</pattern> - <shadedPattern>jakarta.annotation</shadedPattern> - <excludes> - <exclude>jakarta.annotation.processing.**</exclude> - </excludes> - </relocation> - <relocation> - <pattern>jakarta.el</pattern> - <shadedPattern>jakarta.el</shadedPattern> - </relocation> - <relocation> - <pattern>javax.enterprise</pattern> - <shadedPattern>jakarta.enterprise</shadedPattern> - <excludes> - <exclude>jakarta.enterprise.deploy.**</exclude> - </excludes> - </relocation> - <relocation> - <pattern>javax.decorator</pattern> - <shadedPattern>jakarta.decorator</shadedPattern> - </relocation> - <relocation> - <pattern>jakarta.inject</pattern> - <shadedPattern>jakarta.inject</shadedPattern> - </relocation> - <relocation> - <pattern>jakarta.interceptor</pattern> - <shadedPattern>jakarta.interceptor</shadedPattern> - </relocation> - <relocation> - <pattern>javax.servlet</pattern> - <shadedPattern>jakarta.servlet</shadedPattern> - </relocation> - <relocation> - <pattern>javax.transaction</pattern> - <shadedPattern>jakarta.transaction</shadedPattern> - <excludes> - <exclude>javax.transaction.xa.**</exclude> - </excludes> - </relocation> - <relocation> - <pattern>javax.validation</pattern> - <shadedPattern>jakarta.validation</shadedPattern> - </relocation> - <relocation> - <pattern>javax.persistence</pattern> - <shadedPattern>jakarta.persistence</shadedPattern> - </relocation> - <relocation> - <pattern>javax.faces</pattern> - <shadedPattern>jakarta.faces</shadedPattern> - </relocation> - <relocation> - <pattern>javax.ejb</pattern> - <shadedPattern>jakarta.ejb</shadedPattern> - </relocation> - <relocation> - <pattern>javax.jms</pattern> - <shadedPattern>jakarta.jms</shadedPattern> - </relocation> - </relocations> - </configuration> - </execution> - </executions> - </plugin> - <plugin> <groupId>org.apache.felix</groupId> <artifactId>maven-bundle-plugin</artifactId> @@ -665,27 +578,27 @@ <modules> <module>webbeans-spi</module> <module>webbeans-impl</module> + <module>webbeans-el22</module> + <module>webbeans-se</module> + <module>webbeans-web</module> + <module>webbeans-tomcat</module> + <module>webbeans-arquillian</module> <!--X TODO re-enable <module>webbeans-ee-common</module> - <module>webbeans-web</module> <module>webbeans-ejb</module> <module>webbeans-ee</module> - <module>webbeans-tomcat7</module> <module>webbeans-jetty9</module> <module>webbeans-jms</module> <module>webbeans-jsf</module> - <module>webbeans-el22</module> <module>webbeans-resource</module> <module>webbeans-osgi</module> <module>webbeans-porting</module> - <module>webbeans-arquillian</module> <module>samples</module> <module>atinject-tck</module> <module>webbeans-tck</module> <module>webbeans-tck-jakarta</module> <module>distribution</module> <module>webbeans-gradle</module> - <module>webbeans-se</module> <module>webbeans-junit5</module> <module>webbeans-slf4j</module> <module>bom</module> @@ -743,7 +656,19 @@ <version>${jakarta.validation-api.version}</version> </dependency> + <dependency> + <groupId>org.apache.tomcat</groupId> + <artifactId>tomcat-servlet-api</artifactId> + <version>${tomcat.version}</version> + </dependency> + <dependency> + <groupId>org.apache.tomcat</groupId> + <artifactId>tomcat-jsp-api</artifactId> + <version>${tomcat.version}</version> + </dependency> + +<!-- OLD REMOVE --> <dependency> <groupId>org.apache.geronimo.specs</groupId> <artifactId>geronimo-jaxws_2.2_spec</artifactId> diff --git a/samples/guess/src/main/java/org/apache/webbeans/sample/bean/LogoutBean.java b/samples/guess/src/main/java/org/apache/webbeans/sample/bean/LogoutBean.java index 2a00f83de..cc1321abe 100644 --- a/samples/guess/src/main/java/org/apache/webbeans/sample/bean/LogoutBean.java +++ b/samples/guess/src/main/java/org/apache/webbeans/sample/bean/LogoutBean.java @@ -21,7 +21,7 @@ package org.apache.webbeans.sample.bean; import jakarta.inject.Inject; import jakarta.inject.Named; import javax.faces.context.FacesContext; -import javax.servlet.http.HttpSession; +import jakarta.servlet.http.HttpSession; import org.apache.webbeans.sample.bindings.LoggedInUser; import org.apache.webbeans.sample.model.User; diff --git a/samples/jsf2sample/pom.xml b/samples/jsf2sample/pom.xml index 9c7943069..1140707c5 100644 --- a/samples/jsf2sample/pom.xml +++ b/samples/jsf2sample/pom.xml @@ -111,7 +111,7 @@ under the License. <!-- JSTL --> <dependency> - <groupId>javax.servlet</groupId> + <groupId>jakarta.servlet</groupId> <artifactId>jstl</artifactId> <version>1.2</version> </dependency> diff --git a/samples/reservation/pom.xml b/samples/reservation/pom.xml index 934c3ab9b..35c5aa0ab 100644 --- a/samples/reservation/pom.xml +++ b/samples/reservation/pom.xml @@ -58,7 +58,7 @@ under the License. <scope>runtime</scope> </dependency> <dependency> - <groupId>javax.servlet</groupId> + <groupId>jakarta.servlet</groupId> <artifactId>jstl</artifactId> <version>1.2</version> </dependency> diff --git a/samples/reservation/src/main/java/org/apache/webbeans/reservation/beans/LogoutBean.java b/samples/reservation/src/main/java/org/apache/webbeans/reservation/beans/LogoutBean.java index 07e63bfdf..82a285a4e 100644 --- a/samples/reservation/src/main/java/org/apache/webbeans/reservation/beans/LogoutBean.java +++ b/samples/reservation/src/main/java/org/apache/webbeans/reservation/beans/LogoutBean.java @@ -20,7 +20,7 @@ package org.apache.webbeans.reservation.beans; import jakarta.enterprise.context.RequestScoped; import jakarta.inject.Named; -import javax.servlet.http.HttpSession; +import jakarta.servlet.http.HttpSession; import org.apache.webbeans.reservation.util.JSFUtility; diff --git a/samples/reservation/src/main/java/org/apache/webbeans/reservation/util/JSFUtility.java b/samples/reservation/src/main/java/org/apache/webbeans/reservation/util/JSFUtility.java index 07fb8516f..e5430ec73 100644 --- a/samples/reservation/src/main/java/org/apache/webbeans/reservation/util/JSFUtility.java +++ b/samples/reservation/src/main/java/org/apache/webbeans/reservation/util/JSFUtility.java @@ -21,7 +21,7 @@ package org.apache.webbeans.reservation.util; import javax.faces.application.FacesMessage; import javax.faces.application.FacesMessage.Severity; import javax.faces.context.FacesContext; -import javax.servlet.http.HttpSession; +import jakarta.servlet.http.HttpSession; /** * Simple JSF Utility methods. diff --git a/samples/tomcat7-sample/src/main/java/org/apache/webbeans/samples/tomcat/InjectorServlet.java b/samples/tomcat7-sample/src/main/java/org/apache/webbeans/samples/tomcat/InjectorServlet.java index e5f43aeb2..2d7418b61 100644 --- a/samples/tomcat7-sample/src/main/java/org/apache/webbeans/samples/tomcat/InjectorServlet.java +++ b/samples/tomcat7-sample/src/main/java/org/apache/webbeans/samples/tomcat/InjectorServlet.java @@ -24,10 +24,10 @@ import java.io.PrintWriter; import jakarta.enterprise.inject.spi.BeanManager; import jakarta.enterprise.inject.spi.CDI; import jakarta.inject.Inject; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; public class InjectorServlet extends HttpServlet { diff --git a/samples/tomcat7-sample/src/main/java/org/apache/webbeans/samples/tomcat/MyFilter.java b/samples/tomcat7-sample/src/main/java/org/apache/webbeans/samples/tomcat/MyFilter.java index 36c52f19a..d60ee87a2 100644 --- a/samples/tomcat7-sample/src/main/java/org/apache/webbeans/samples/tomcat/MyFilter.java +++ b/samples/tomcat7-sample/src/main/java/org/apache/webbeans/samples/tomcat/MyFilter.java @@ -25,12 +25,12 @@ import java.util.logging.Logger; import jakarta.enterprise.inject.spi.Bean; import jakarta.enterprise.inject.spi.BeanManager; import jakarta.inject.Inject; -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.FilterConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; public class MyFilter implements Filter diff --git a/webbeans-arquillian/owb-arquillian-standalone/pom.xml b/webbeans-arquillian/owb-arquillian-standalone/pom.xml index 72ea89731..9d60d00aa 100644 --- a/webbeans-arquillian/owb-arquillian-standalone/pom.xml +++ b/webbeans-arquillian/owb-arquillian-standalone/pom.xml @@ -25,6 +25,7 @@ <artifactId>owb-arquillian-parent</artifactId> <version>4.0.0-SNAPSHOT</version> </parent> + <artifactId>owb-arquillian-standalone</artifactId> <packaging>jar</packaging> @@ -58,8 +59,8 @@ </dependency> <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-el_2.2_spec</artifactId> + <groupId>jakarta.el</groupId> + <artifactId>jakarta.el-api</artifactId> <scope>provided</scope> </dependency> @@ -91,6 +92,12 @@ <scope>compile</scope> <optional>true</optional> </dependency> + <dependency> + <groupId>org.apache.openwebbeans</groupId> + <artifactId>openwebbeans-el22</artifactId> + <scope>compile</scope> + <optional>true</optional> + </dependency> </dependencies> diff --git a/webbeans-el22/pom.xml b/webbeans-el22/pom.xml index 1eadba9d9..289620ef0 100644 --- a/webbeans-el22/pom.xml +++ b/webbeans-el22/pom.xml @@ -31,11 +31,28 @@ <dependencies> <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-el_2.2_spec</artifactId> + <groupId>jakarta.inject</groupId> + <artifactId>jakarta.inject-api</artifactId> + </dependency> + <dependency> + <groupId>jakarta.enterprise</groupId> + <artifactId>jakarta.enterprise.cdi-api</artifactId> + </dependency> + <dependency> + <groupId>jakarta.interceptor</groupId> + <artifactId>jakarta.interceptor-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>jakarta.annotation</groupId> + <artifactId>jakarta.annotation-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>jakarta.el</groupId> + <artifactId>jakarta.el-api</artifactId> <scope>provided</scope> </dependency> - <dependency> <groupId>org.apache.openwebbeans</groupId> @@ -51,26 +68,6 @@ <optional>true</optional> </dependency> - <dependency> - <groupId>jakarta.enterprise</groupId> - <artifactId>jakarta.enterprise.cdi-api</artifactId> - </dependency> - - <dependency> - <groupId>jakarta.inject</groupId> - <artifactId>jakarta.inject-api</artifactId> - </dependency> - - <dependency> - <groupId>jakarta.interceptor</groupId> - <artifactId>jakarta.interceptor-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>jakarta.annotation</groupId> - <artifactId>jakarta.annotation-api</artifactId> - <scope>provided</scope> - </dependency> <dependency> diff --git a/webbeans-jetty9/src/it/fatwar/src/main/java/org/apache/webbeans/web/jetty9/test/TestBean.java b/webbeans-jetty9/src/it/fatwar/src/main/java/org/apache/webbeans/web/jetty9/test/TestBean.java index eb921b184..446aea6d4 100644 --- a/webbeans-jetty9/src/it/fatwar/src/main/java/org/apache/webbeans/web/jetty9/test/TestBean.java +++ b/webbeans-jetty9/src/it/fatwar/src/main/java/org/apache/webbeans/web/jetty9/test/TestBean.java @@ -20,7 +20,7 @@ package org.apache.webbeans.web.jetty9.test; import jakarta.enterprise.context.ApplicationScoped; import jakarta.inject.Inject; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; /** * Test bean which gets used in the TestServlet. diff --git a/webbeans-jetty9/src/it/fatwar/src/main/java/org/apache/webbeans/web/jetty9/test/TestServlet.java b/webbeans-jetty9/src/it/fatwar/src/main/java/org/apache/webbeans/web/jetty9/test/TestServlet.java index 4eec945a3..b1f2344c8 100644 --- a/webbeans-jetty9/src/it/fatwar/src/main/java/org/apache/webbeans/web/jetty9/test/TestServlet.java +++ b/webbeans-jetty9/src/it/fatwar/src/main/java/org/apache/webbeans/web/jetty9/test/TestServlet.java @@ -19,12 +19,12 @@ package org.apache.webbeans.web.jetty9.test; import jakarta.inject.Inject; -import javax.servlet.Servlet; -import javax.servlet.ServletConfig; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; +import jakarta.servlet.Servlet; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; import java.io.IOException; /** diff --git a/webbeans-jetty9/src/it/module/src/main/java/org/apache/webbeans/web/jetty9/test/TestBean.java b/webbeans-jetty9/src/it/module/src/main/java/org/apache/webbeans/web/jetty9/test/TestBean.java index eb921b184..446aea6d4 100644 --- a/webbeans-jetty9/src/it/module/src/main/java/org/apache/webbeans/web/jetty9/test/TestBean.java +++ b/webbeans-jetty9/src/it/module/src/main/java/org/apache/webbeans/web/jetty9/test/TestBean.java @@ -20,7 +20,7 @@ package org.apache.webbeans.web.jetty9.test; import jakarta.enterprise.context.ApplicationScoped; import jakarta.inject.Inject; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; /** * Test bean which gets used in the TestServlet. diff --git a/webbeans-jetty9/src/it/module/src/main/java/org/apache/webbeans/web/jetty9/test/TestServlet.java b/webbeans-jetty9/src/it/module/src/main/java/org/apache/webbeans/web/jetty9/test/TestServlet.java index 8052a560a..305a9ad9d 100644 --- a/webbeans-jetty9/src/it/module/src/main/java/org/apache/webbeans/web/jetty9/test/TestServlet.java +++ b/webbeans-jetty9/src/it/module/src/main/java/org/apache/webbeans/web/jetty9/test/TestServlet.java @@ -19,12 +19,12 @@ package org.apache.webbeans.web.jetty9.test; import jakarta.inject.Inject; -import javax.servlet.Servlet; -import javax.servlet.ServletConfig; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; +import jakarta.servlet.Servlet; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; import java.io.IOException; /** diff --git a/webbeans-jetty9/src/it/servletinjection/src/main/java/org/apache/webbeans/web/jetty9/test/TestBean.java b/webbeans-jetty9/src/it/servletinjection/src/main/java/org/apache/webbeans/web/jetty9/test/TestBean.java index eb921b184..446aea6d4 100644 --- a/webbeans-jetty9/src/it/servletinjection/src/main/java/org/apache/webbeans/web/jetty9/test/TestBean.java +++ b/webbeans-jetty9/src/it/servletinjection/src/main/java/org/apache/webbeans/web/jetty9/test/TestBean.java @@ -20,7 +20,7 @@ package org.apache.webbeans.web.jetty9.test; import jakarta.enterprise.context.ApplicationScoped; import jakarta.inject.Inject; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; /** * Test bean which gets used in the TestServlet. diff --git a/webbeans-jetty9/src/it/servletinjection/src/main/java/org/apache/webbeans/web/jetty9/test/TestServlet.java b/webbeans-jetty9/src/it/servletinjection/src/main/java/org/apache/webbeans/web/jetty9/test/TestServlet.java index 8052a560a..305a9ad9d 100644 --- a/webbeans-jetty9/src/it/servletinjection/src/main/java/org/apache/webbeans/web/jetty9/test/TestServlet.java +++ b/webbeans-jetty9/src/it/servletinjection/src/main/java/org/apache/webbeans/web/jetty9/test/TestServlet.java @@ -19,12 +19,12 @@ package org.apache.webbeans.web.jetty9.test; import jakarta.inject.Inject; -import javax.servlet.Servlet; -import javax.servlet.ServletConfig; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; +import jakarta.servlet.Servlet; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; import java.io.IOException; /** diff --git a/webbeans-jetty9/src/main/java/org/apache/webbeans/web/jetty9/JettySecurityFilter.java b/webbeans-jetty9/src/main/java/org/apache/webbeans/web/jetty9/JettySecurityFilter.java index 359294f41..090e9769b 100644 --- a/webbeans-jetty9/src/main/java/org/apache/webbeans/web/jetty9/JettySecurityFilter.java +++ b/webbeans-jetty9/src/main/java/org/apache/webbeans/web/jetty9/JettySecurityFilter.java @@ -21,13 +21,13 @@ package org.apache.webbeans.web.jetty9; import java.io.IOException; import java.security.Principal; -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.FilterConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServletRequest; public class JettySecurityFilter implements Filter { diff --git a/webbeans-jetty9/src/main/java/org/apache/webbeans/web/jetty9/JettyWebPlugin.java b/webbeans-jetty9/src/main/java/org/apache/webbeans/web/jetty9/JettyWebPlugin.java index b506480a8..86533207e 100644 --- a/webbeans-jetty9/src/main/java/org/apache/webbeans/web/jetty9/JettyWebPlugin.java +++ b/webbeans-jetty9/src/main/java/org/apache/webbeans/web/jetty9/JettyWebPlugin.java @@ -20,16 +20,16 @@ package org.apache.webbeans.web.jetty9; import java.util.EventListener; -import javax.servlet.Filter; -import javax.servlet.Servlet; -import javax.servlet.ServletContextAttributeListener; -import javax.servlet.ServletContextListener; -import javax.servlet.ServletRequestAttributeListener; -import javax.servlet.ServletRequestListener; -import javax.servlet.http.HttpSessionActivationListener; -import javax.servlet.http.HttpSessionAttributeListener; -import javax.servlet.http.HttpSessionBindingListener; -import javax.servlet.http.HttpSessionListener; +import jakarta.servlet.Filter; +import jakarta.servlet.Servlet; +import jakarta.servlet.ServletContextAttributeListener; +import jakarta.servlet.ServletContextListener; +import jakarta.servlet.ServletRequestAttributeListener; +import jakarta.servlet.ServletRequestListener; +import jakarta.servlet.http.HttpSessionActivationListener; +import jakarta.servlet.http.HttpSessionAttributeListener; +import jakarta.servlet.http.HttpSessionBindingListener; +import jakarta.servlet.http.HttpSessionListener; import org.apache.webbeans.exception.WebBeansConfigurationException; import org.apache.webbeans.spi.SecurityService; diff --git a/webbeans-jetty9/src/main/java/org/apache/webbeans/web/jetty9/OwbConfiguration.java b/webbeans-jetty9/src/main/java/org/apache/webbeans/web/jetty9/OwbConfiguration.java index 2ae934205..1f21beb81 100644 --- a/webbeans-jetty9/src/main/java/org/apache/webbeans/web/jetty9/OwbConfiguration.java +++ b/webbeans-jetty9/src/main/java/org/apache/webbeans/web/jetty9/OwbConfiguration.java @@ -22,8 +22,8 @@ import java.net.MalformedURLException; import java.net.URL; import java.util.EventListener; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletException; import org.eclipse.jetty.server.handler.ContextHandler; import org.eclipse.jetty.servlet.ServletContextHandler; diff --git a/webbeans-jetty9/src/test/java/org/apache/webbeans/web/jetty9/test/JettyNormalScopeProxyFactoryTest.java b/webbeans-jetty9/src/test/java/org/apache/webbeans/web/jetty9/test/JettyNormalScopeProxyFactoryTest.java index e99f89729..faea8392d 100644 --- a/webbeans-jetty9/src/test/java/org/apache/webbeans/web/jetty9/test/JettyNormalScopeProxyFactoryTest.java +++ b/webbeans-jetty9/src/test/java/org/apache/webbeans/web/jetty9/test/JettyNormalScopeProxyFactoryTest.java @@ -27,8 +27,8 @@ import jakarta.enterprise.context.RequestScoped; import jakarta.enterprise.context.SessionScoped; import jakarta.enterprise.inject.spi.BeanManager; import jakarta.enterprise.inject.spi.CDI; -import javax.servlet.ServletRequestEvent; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletRequestEvent; +import jakarta.servlet.http.HttpSession; import org.apache.commons.io.IOUtils; import org.apache.webbeans.config.WebBeansContext; diff --git a/webbeans-jsf/pom.xml b/webbeans-jsf/pom.xml index 697a00854..92117752d 100644 --- a/webbeans-jsf/pom.xml +++ b/webbeans-jsf/pom.xml @@ -86,7 +86,7 @@ <configuration> <instructions> <Import-Package> - javax.servlet.*;version="[${osgi.servlet.range},5)", + jakarta.servlet.*;version="[${osgi.servlet.range},5)", jakarta.el.*;version="[${osgi.el.range},3)", javax.faces.*;version="[${osgi.faces.range},3)", * diff --git a/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/JSFUtil.java b/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/JSFUtil.java index f7d8687ba..555265cee 100644 --- a/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/JSFUtil.java +++ b/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/JSFUtil.java @@ -21,7 +21,7 @@ package org.apache.webbeans.jsf; import javax.faces.component.UIViewRoot; import javax.faces.context.ExternalContext; import javax.faces.context.FacesContext; -import javax.servlet.http.HttpSession; +import jakarta.servlet.http.HttpSession; import org.apache.webbeans.util.Asserts; diff --git a/webbeans-osgi/pom.xml b/webbeans-osgi/pom.xml index c61b0c9f8..cf06ac11f 100644 --- a/webbeans-osgi/pom.xml +++ b/webbeans-osgi/pom.xml @@ -79,7 +79,7 @@ <configuration> <instructions> <Import-Package> - javax.servlet.*;version="[${osgi.servlet.range},5)", + jakarta.servlet.*;version="[${osgi.servlet.range},5)", * </Import-Package> </instructions> diff --git a/webbeans-osgi/src/main/java/org/apache/webbeans/osgi/scanner/OsgiMetaDataScannerService.java b/webbeans-osgi/src/main/java/org/apache/webbeans/osgi/scanner/OsgiMetaDataScannerService.java index accb5f84a..131633c88 100644 --- a/webbeans-osgi/src/main/java/org/apache/webbeans/osgi/scanner/OsgiMetaDataScannerService.java +++ b/webbeans-osgi/src/main/java/org/apache/webbeans/osgi/scanner/OsgiMetaDataScannerService.java @@ -34,7 +34,7 @@ import org.osgi.framework.Bundle; import org.osgi.framework.ServiceReference; import org.osgi.service.packageadmin.PackageAdmin; -import javax.servlet.ServletContext; +import jakarta.servlet.ServletContext; import java.io.InputStream; import java.lang.annotation.Annotation; import java.lang.reflect.Constructor; diff --git a/webbeans-porting/pom.xml b/webbeans-porting/pom.xml index 77fed21c1..5f5f4acdb 100644 --- a/webbeans-porting/pom.xml +++ b/webbeans-porting/pom.xml @@ -47,11 +47,11 @@ <artifactId>jsf-api</artifactId> </exclusion> <exclusion> - <groupId>javax.servlet</groupId> - <artifactId>javax.servlet-api</artifactId> + <groupId>jakarta.servlet</groupId> + <artifactId>jakarta.servlet-api</artifactId> </exclusion> <exclusion> - <groupId>javax.servlet.jsp</groupId> + <groupId>jakarta.servlet.jsp</groupId> <artifactId>jsp-api</artifactId> </exclusion> <exclusion> diff --git a/webbeans-se/pom.xml b/webbeans-se/pom.xml index 319429670..f23aad4a3 100644 --- a/webbeans-se/pom.xml +++ b/webbeans-se/pom.xml @@ -16,52 +16,46 @@ License. --> <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation=" http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> - <parent> - <artifactId>openwebbeans</artifactId> - <groupId>org.apache.openwebbeans</groupId> - <version>4.0.0-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> + <parent> + <artifactId>openwebbeans</artifactId> + <groupId>org.apache.openwebbeans</groupId> + <version>4.0.0-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> - <artifactId>openwebbeans-se</artifactId> - <name>Apache OpenWebBeans CDI Java SE Implementation</name> + <artifactId>openwebbeans-se</artifactId> + <name>Apache OpenWebBeans CDI Java SE Implementation</name> - <dependencies> - <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-jcdi_2.0_spec</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-el_2.2_spec</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-annotation_1.3_spec</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-atinject_1.0_spec</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-interceptor_1.2_spec</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>openwebbeans-impl</artifactId> - <version>${project.version}</version> - </dependency> + <dependencies> + <dependency> + <groupId>jakarta.inject</groupId> + <artifactId>jakarta.inject-api</artifactId> + </dependency> + <dependency> + <groupId>jakarta.enterprise</groupId> + <artifactId>jakarta.enterprise.cdi-api</artifactId> + </dependency> + <dependency> + <groupId>jakarta.interceptor</groupId> + <artifactId>jakarta.interceptor-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>jakarta.annotation</groupId> + <artifactId>jakarta.annotation-api</artifactId> + <scope>provided</scope> + </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> - </dependencies> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>openwebbeans-impl</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + </dependencies> </project> \ No newline at end of file diff --git a/webbeans-se/src/main/java/org/apache/openwebbeans/se/OWBContainer.java b/webbeans-se/src/main/java/org/apache/openwebbeans/se/OWBContainer.java index 36371f3c5..c1fe34667 100644 --- a/webbeans-se/src/main/java/org/apache/openwebbeans/se/OWBContainer.java +++ b/webbeans-se/src/main/java/org/apache/openwebbeans/se/OWBContainer.java @@ -92,6 +92,20 @@ public class OWBContainer implements SeContainer return instance().isAmbiguous(); } + @Override + public Handle<Object> getHandle() + { + //X TODO implement, new in CDI-4.0 + return null; + } + + @Override + public Iterable<? extends Handle<Object>> handles() + { + //X TODO implement, new in CDI-4.0 + return null; + } + @Override public void destroy(Object instance) // not sure it is the right impl { diff --git a/webbeans-se/src/main/resources/META-INF/services/javax.enterprise.inject.se.SeContainerInitializer b/webbeans-se/src/main/resources/META-INF/services/jakarta.enterprise.inject.se.SeContainerInitializer similarity index 100% rename from webbeans-se/src/main/resources/META-INF/services/javax.enterprise.inject.se.SeContainerInitializer rename to webbeans-se/src/main/resources/META-INF/services/jakarta.enterprise.inject.se.SeContainerInitializer diff --git a/webbeans-se/src/test/java/org/apache/openwebbeans/se/CDISETest.java b/webbeans-se/src/test/java/org/apache/openwebbeans/se/CDISETest.java index 1f22e315f..323f069d3 100644 --- a/webbeans-se/src/test/java/org/apache/openwebbeans/se/CDISETest.java +++ b/webbeans-se/src/test/java/org/apache/openwebbeans/se/CDISETest.java @@ -79,7 +79,7 @@ public class CDISETest try (final SeContainer container = SeContainerInitializer.newInstance() .disableDiscovery() .initialize()) { - container.getBeanManager().fireEvent(new Object()); + container.getBeanManager().getEvent().fire(new Object()); } } diff --git a/webbeans-tck/pom.xml b/webbeans-tck/pom.xml index 6b29e4424..02749de6d 100644 --- a/webbeans-tck/pom.xml +++ b/webbeans-tck/pom.xml @@ -100,11 +100,11 @@ <artifactId>jsf-api</artifactId> </exclusion> <exclusion> - <groupId>javax.servlet</groupId> - <artifactId>javax.servlet-api</artifactId> + <groupId>jakarta.servlet</groupId> + <artifactId>jakarta.servlet-api</artifactId> </exclusion> <exclusion> - <groupId>javax.servlet.jsp</groupId> + <groupId>jakarta.servlet.jsp</groupId> <artifactId>jsp-api</artifactId> </exclusion> <exclusion> diff --git a/webbeans-tomcat7/pom.xml b/webbeans-tomcat/pom.xml similarity index 92% rename from webbeans-tomcat7/pom.xml rename to webbeans-tomcat/pom.xml index faa2992fd..e3b0e3623 100644 --- a/webbeans-tomcat7/pom.xml +++ b/webbeans-tomcat/pom.xml @@ -23,18 +23,10 @@ <version>4.0.0-SNAPSHOT</version> </parent> - <artifactId>openwebbeans-tomcat7</artifactId> - <name>Tomcat 7 plugin</name> - <description>Apache OpenWebBeans Tomcat 7 Web Profile</description> + <artifactId>openwebbeans-tomcat</artifactId> + <name>Tomcat plugin</name> <dependencies> - <dependency> - <groupId>org.apache.tomcat</groupId> - <artifactId>tomcat-catalina</artifactId> - <version>${tomcat7.version}</version> - <scope>provided</scope> - </dependency> - <dependency> <groupId>jakarta.enterprise</groupId> <artifactId>jakarta.enterprise.cdi-api</artifactId> @@ -43,6 +35,11 @@ <groupId>jakarta.inject</groupId> <artifactId>jakarta.inject-api</artifactId> </dependency> + <dependency> + <groupId>jakarta.interceptor</groupId> + <artifactId>jakarta.interceptor-api</artifactId> + <scope>test</scope> + </dependency> <dependency> <groupId>org.apache.openwebbeans</groupId> @@ -60,44 +57,51 @@ <artifactId>openwebbeans-web</artifactId> <version>${project.version}</version> </dependency> - + <dependency> + <groupId>org.apache.openwebbeans</groupId> + <artifactId>openwebbeans-el22</artifactId> + <optional> true</optional> + </dependency> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> </dependency> + <dependency> - <groupId>org.apache.tomcat.embed</groupId> - <artifactId>tomcat-embed-core</artifactId> - <version>${tomcat7.version}</version> - <scope>test</scope> + <groupId>org.apache.tomcat</groupId> + <artifactId>tomcat-catalina</artifactId> + <version>${tomcat.version}</version> + <scope>provided</scope> </dependency> + <dependency> - <groupId>jakarta.interceptor</groupId> - <artifactId>jakarta.interceptor-api</artifactId> + <groupId>org.apache.tomcat.embed</groupId> + <artifactId>tomcat-embed-core</artifactId> + <version>${tomcat.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.tomcat</groupId> <artifactId>tomcat-jasper-el</artifactId> - <version>${tomcat7.version}</version> + <version>${tomcat.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.tomcat</groupId> <artifactId>tomcat-el-api</artifactId> - <version>${tomcat7.version}</version> + <version>${tomcat.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.tomcat</groupId> <artifactId>tomcat-jsp-api</artifactId> - <version>${tomcat7.version}</version> + <version>${tomcat.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.tomcat</groupId> <artifactId>tomcat-jasper</artifactId> - <version>${tomcat7.version}</version> + <version>${tomcat.version}</version> <scope>test</scope> </dependency> </dependencies> diff --git a/webbeans-tomcat7/src/it/fatwar/pom.xml b/webbeans-tomcat/src/it/fatwar/pom.xml similarity index 100% rename from webbeans-tomcat7/src/it/fatwar/pom.xml rename to webbeans-tomcat/src/it/fatwar/pom.xml diff --git a/webbeans-tomcat7/src/it/servletinjection/src/main/java/org/apache/webbeans/web/tomcat7/test/TestBean.java b/webbeans-tomcat/src/it/fatwar/src/main/java/org/apache/webbeans/web/tomcat7/test/TestBean.java similarity index 96% rename from webbeans-tomcat7/src/it/servletinjection/src/main/java/org/apache/webbeans/web/tomcat7/test/TestBean.java rename to webbeans-tomcat/src/it/fatwar/src/main/java/org/apache/webbeans/web/tomcat7/test/TestBean.java index 5e1181734..6081ccbac 100644 --- a/webbeans-tomcat7/src/it/servletinjection/src/main/java/org/apache/webbeans/web/tomcat7/test/TestBean.java +++ b/webbeans-tomcat/src/it/fatwar/src/main/java/org/apache/webbeans/web/tomcat7/test/TestBean.java @@ -20,7 +20,7 @@ package org.apache.webbeans.web.tomcat7.test; import jakarta.enterprise.context.ApplicationScoped; import jakarta.inject.Inject; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; /** * Test bean which gets used in the TestServlet. diff --git a/webbeans-tomcat7/src/it/fatwar/src/main/java/org/apache/webbeans/web/tomcat7/test/TestRequestBean.java b/webbeans-tomcat/src/it/fatwar/src/main/java/org/apache/webbeans/web/tomcat7/test/TestRequestBean.java similarity index 100% rename from webbeans-tomcat7/src/it/fatwar/src/main/java/org/apache/webbeans/web/tomcat7/test/TestRequestBean.java rename to webbeans-tomcat/src/it/fatwar/src/main/java/org/apache/webbeans/web/tomcat7/test/TestRequestBean.java diff --git a/webbeans-tomcat7/src/it/fatwar/src/main/java/org/apache/webbeans/web/tomcat7/test/TestServlet.java b/webbeans-tomcat/src/it/fatwar/src/main/java/org/apache/webbeans/web/tomcat7/test/TestServlet.java similarity index 92% rename from webbeans-tomcat7/src/it/fatwar/src/main/java/org/apache/webbeans/web/tomcat7/test/TestServlet.java rename to webbeans-tomcat/src/it/fatwar/src/main/java/org/apache/webbeans/web/tomcat7/test/TestServlet.java index 60c075d4f..f541fd912 100644 --- a/webbeans-tomcat7/src/it/fatwar/src/main/java/org/apache/webbeans/web/tomcat7/test/TestServlet.java +++ b/webbeans-tomcat/src/it/fatwar/src/main/java/org/apache/webbeans/web/tomcat7/test/TestServlet.java @@ -20,13 +20,13 @@ package org.apache.webbeans.web.tomcat7.test; import jakarta.enterprise.inject.spi.CDI; import jakarta.inject.Inject; -import javax.servlet.Servlet; -import javax.servlet.ServletConfig; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.Servlet; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServletRequest; import java.io.IOException; /** diff --git a/webbeans-tomcat7/src/it/fatwar/src/main/java/org/apache/webbeans/web/tomcat7/test/TestSessionBean.java b/webbeans-tomcat/src/it/fatwar/src/main/java/org/apache/webbeans/web/tomcat7/test/TestSessionBean.java similarity index 100% rename from webbeans-tomcat7/src/it/fatwar/src/main/java/org/apache/webbeans/web/tomcat7/test/TestSessionBean.java rename to webbeans-tomcat/src/it/fatwar/src/main/java/org/apache/webbeans/web/tomcat7/test/TestSessionBean.java diff --git a/webbeans-tomcat7/src/it/fatwar/src/main/webapp/META-INF/context.xml b/webbeans-tomcat/src/it/fatwar/src/main/webapp/META-INF/context.xml similarity index 100% rename from webbeans-tomcat7/src/it/fatwar/src/main/webapp/META-INF/context.xml rename to webbeans-tomcat/src/it/fatwar/src/main/webapp/META-INF/context.xml diff --git a/webbeans-tomcat7/src/it/fatwar/src/main/webapp/WEB-INF/beans.xml b/webbeans-tomcat/src/it/fatwar/src/main/webapp/WEB-INF/beans.xml similarity index 100% rename from webbeans-tomcat7/src/it/fatwar/src/main/webapp/WEB-INF/beans.xml rename to webbeans-tomcat/src/it/fatwar/src/main/webapp/WEB-INF/beans.xml diff --git a/webbeans-tomcat7/src/it/fatwar/src/main/webapp/WEB-INF/web.xml b/webbeans-tomcat/src/it/fatwar/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from webbeans-tomcat7/src/it/fatwar/src/main/webapp/WEB-INF/web.xml rename to webbeans-tomcat/src/it/fatwar/src/main/webapp/WEB-INF/web.xml diff --git a/webbeans-tomcat7/src/it/fatwar/src/test/java/org/apache/webbeans/web/tomcat7/test/OwbTomcatPluginIT.java b/webbeans-tomcat/src/it/fatwar/src/test/java/org/apache/webbeans/web/tomcat7/test/OwbTomcatPluginIT.java similarity index 100% rename from webbeans-tomcat7/src/it/fatwar/src/test/java/org/apache/webbeans/web/tomcat7/test/OwbTomcatPluginIT.java rename to webbeans-tomcat/src/it/fatwar/src/test/java/org/apache/webbeans/web/tomcat7/test/OwbTomcatPluginIT.java diff --git a/webbeans-tomcat7/src/it/servletinjection/pom.xml b/webbeans-tomcat/src/it/servletinjection/pom.xml similarity index 100% rename from webbeans-tomcat7/src/it/servletinjection/pom.xml rename to webbeans-tomcat/src/it/servletinjection/pom.xml diff --git a/webbeans-tomcat7/src/it/fatwar/src/main/java/org/apache/webbeans/web/tomcat7/test/TestBean.java b/webbeans-tomcat/src/it/servletinjection/src/main/java/org/apache/webbeans/web/tomcat7/test/TestBean.java similarity index 96% rename from webbeans-tomcat7/src/it/fatwar/src/main/java/org/apache/webbeans/web/tomcat7/test/TestBean.java rename to webbeans-tomcat/src/it/servletinjection/src/main/java/org/apache/webbeans/web/tomcat7/test/TestBean.java index 5e1181734..6081ccbac 100644 --- a/webbeans-tomcat7/src/it/fatwar/src/main/java/org/apache/webbeans/web/tomcat7/test/TestBean.java +++ b/webbeans-tomcat/src/it/servletinjection/src/main/java/org/apache/webbeans/web/tomcat7/test/TestBean.java @@ -20,7 +20,7 @@ package org.apache.webbeans.web.tomcat7.test; import jakarta.enterprise.context.ApplicationScoped; import jakarta.inject.Inject; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; /** * Test bean which gets used in the TestServlet. diff --git a/webbeans-tomcat7/src/it/servletinjection/src/main/java/org/apache/webbeans/web/tomcat7/test/TestServlet.java b/webbeans-tomcat/src/it/servletinjection/src/main/java/org/apache/webbeans/web/tomcat7/test/TestServlet.java similarity index 89% rename from webbeans-tomcat7/src/it/servletinjection/src/main/java/org/apache/webbeans/web/tomcat7/test/TestServlet.java rename to webbeans-tomcat/src/it/servletinjection/src/main/java/org/apache/webbeans/web/tomcat7/test/TestServlet.java index 178784ce3..363063b79 100644 --- a/webbeans-tomcat7/src/it/servletinjection/src/main/java/org/apache/webbeans/web/tomcat7/test/TestServlet.java +++ b/webbeans-tomcat/src/it/servletinjection/src/main/java/org/apache/webbeans/web/tomcat7/test/TestServlet.java @@ -19,12 +19,12 @@ package org.apache.webbeans.web.tomcat7.test; import jakarta.inject.Inject; -import javax.servlet.Servlet; -import javax.servlet.ServletConfig; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; +import jakarta.servlet.Servlet; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; import java.io.IOException; /** diff --git a/webbeans-tomcat7/src/it/servletinjection/src/main/webapp/META-INF/context.xml b/webbeans-tomcat/src/it/servletinjection/src/main/webapp/META-INF/context.xml similarity index 91% rename from webbeans-tomcat7/src/it/servletinjection/src/main/webapp/META-INF/context.xml rename to webbeans-tomcat/src/it/servletinjection/src/main/webapp/META-INF/context.xml index cfeb3eebc..1de779675 100644 --- a/webbeans-tomcat7/src/it/servletinjection/src/main/webapp/META-INF/context.xml +++ b/webbeans-tomcat/src/it/servletinjection/src/main/webapp/META-INF/context.xml @@ -16,5 +16,5 @@ License. --> <Context> - <Listener className="org.apache.webbeans.web.tomcat7.ContextLifecycleListener" /> + <Listener className="org.apache.webbeans.web.tomcat.ContextLifecycleListener" /> </Context> diff --git a/webbeans-tomcat7/src/it/servletinjection/src/main/webapp/WEB-INF/beans.xml b/webbeans-tomcat/src/it/servletinjection/src/main/webapp/WEB-INF/beans.xml similarity index 100% rename from webbeans-tomcat7/src/it/servletinjection/src/main/webapp/WEB-INF/beans.xml rename to webbeans-tomcat/src/it/servletinjection/src/main/webapp/WEB-INF/beans.xml diff --git a/webbeans-tomcat7/src/it/servletinjection/src/main/webapp/WEB-INF/web.xml b/webbeans-tomcat/src/it/servletinjection/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from webbeans-tomcat7/src/it/servletinjection/src/main/webapp/WEB-INF/web.xml rename to webbeans-tomcat/src/it/servletinjection/src/main/webapp/WEB-INF/web.xml diff --git a/webbeans-tomcat7/src/it/servletinjection/src/test/java/org/apache/webbeans/web/tomcat7/test/OwbTomcatPluginIT.java b/webbeans-tomcat/src/it/servletinjection/src/test/java/org/apache/webbeans/web/tomcat7/test/OwbTomcatPluginIT.java similarity index 100% rename from webbeans-tomcat7/src/it/servletinjection/src/test/java/org/apache/webbeans/web/tomcat7/test/OwbTomcatPluginIT.java rename to webbeans-tomcat/src/it/servletinjection/src/test/java/org/apache/webbeans/web/tomcat7/test/OwbTomcatPluginIT.java diff --git a/webbeans-tomcat7/src/it/settings.xml b/webbeans-tomcat/src/it/settings.xml similarity index 100% rename from webbeans-tomcat7/src/it/settings.xml rename to webbeans-tomcat/src/it/settings.xml diff --git a/webbeans-tomcat7/src/main/java/org/apache/webbeans/web/tomcat7/ContextLifecycleListener.java b/webbeans-tomcat/src/main/java/org/apache/webbeans/web/tomcat/ContextLifecycleListener.java similarity index 96% rename from webbeans-tomcat7/src/main/java/org/apache/webbeans/web/tomcat7/ContextLifecycleListener.java rename to webbeans-tomcat/src/main/java/org/apache/webbeans/web/tomcat/ContextLifecycleListener.java index 4511b897c..a4adaa34d 100644 --- a/webbeans-tomcat7/src/main/java/org/apache/webbeans/web/tomcat7/ContextLifecycleListener.java +++ b/webbeans-tomcat/src/main/java/org/apache/webbeans/web/tomcat/ContextLifecycleListener.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.webbeans.web.tomcat7; +package org.apache.webbeans.web.tomcat; import org.apache.catalina.Lifecycle; import org.apache.catalina.LifecycleEvent; @@ -26,9 +26,9 @@ import org.apache.tomcat.InstanceManager; import org.apache.webbeans.exception.WebBeansException; import org.apache.webbeans.servlet.WebBeansConfigurationListener; -import javax.servlet.ServletContext; -import javax.servlet.ServletContextAttributeEvent; -import javax.servlet.ServletContextAttributeListener; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletContextAttributeEvent; +import jakarta.servlet.ServletContextAttributeListener; import java.lang.reflect.Field; import java.net.MalformedURLException; import java.net.URL; diff --git a/webbeans-tomcat7/src/main/java/org/apache/webbeans/web/tomcat7/TomcatInstanceManager.java b/webbeans-tomcat/src/main/java/org/apache/webbeans/web/tomcat/TomcatInstanceManager.java similarity index 99% rename from webbeans-tomcat7/src/main/java/org/apache/webbeans/web/tomcat7/TomcatInstanceManager.java rename to webbeans-tomcat/src/main/java/org/apache/webbeans/web/tomcat/TomcatInstanceManager.java index 5d2551f06..19f8c4ccc 100644 --- a/webbeans-tomcat7/src/main/java/org/apache/webbeans/web/tomcat7/TomcatInstanceManager.java +++ b/webbeans-tomcat/src/main/java/org/apache/webbeans/web/tomcat/TomcatInstanceManager.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.webbeans.web.tomcat7; +package org.apache.webbeans.web.tomcat; import java.lang.reflect.InvocationTargetException; import java.util.Map; diff --git a/webbeans-tomcat7/src/main/java/org/apache/webbeans/web/tomcat7/TomcatSecurityFilter.java b/webbeans-tomcat/src/main/java/org/apache/webbeans/web/tomcat/TomcatSecurityFilter.java similarity index 86% rename from webbeans-tomcat7/src/main/java/org/apache/webbeans/web/tomcat7/TomcatSecurityFilter.java rename to webbeans-tomcat/src/main/java/org/apache/webbeans/web/tomcat/TomcatSecurityFilter.java index c2972fb1a..c090c8bb2 100644 --- a/webbeans-tomcat7/src/main/java/org/apache/webbeans/web/tomcat7/TomcatSecurityFilter.java +++ b/webbeans-tomcat/src/main/java/org/apache/webbeans/web/tomcat/TomcatSecurityFilter.java @@ -16,18 +16,18 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.webbeans.web.tomcat7; +package org.apache.webbeans.web.tomcat; import java.io.IOException; import java.security.Principal; -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.FilterConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServletRequest; /** diff --git a/webbeans-tomcat7/src/main/java/org/apache/webbeans/web/tomcat7/TomcatSecurityService.java b/webbeans-tomcat/src/main/java/org/apache/webbeans/web/tomcat/TomcatSecurityService.java similarity index 98% rename from webbeans-tomcat7/src/main/java/org/apache/webbeans/web/tomcat7/TomcatSecurityService.java rename to webbeans-tomcat/src/main/java/org/apache/webbeans/web/tomcat/TomcatSecurityService.java index 4e4313a51..67be9580f 100644 --- a/webbeans-tomcat7/src/main/java/org/apache/webbeans/web/tomcat7/TomcatSecurityService.java +++ b/webbeans-tomcat/src/main/java/org/apache/webbeans/web/tomcat/TomcatSecurityService.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.webbeans.web.tomcat7; +package org.apache.webbeans.web.tomcat; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Proxy; diff --git a/webbeans-tomcat7/src/main/java/org/apache/webbeans/web/tomcat7/TomcatUtil.java b/webbeans-tomcat/src/main/java/org/apache/webbeans/web/tomcat/TomcatUtil.java similarity index 98% rename from webbeans-tomcat7/src/main/java/org/apache/webbeans/web/tomcat7/TomcatUtil.java rename to webbeans-tomcat/src/main/java/org/apache/webbeans/web/tomcat/TomcatUtil.java index 4d37339a9..aa5b35e32 100644 --- a/webbeans-tomcat7/src/main/java/org/apache/webbeans/web/tomcat7/TomcatUtil.java +++ b/webbeans-tomcat/src/main/java/org/apache/webbeans/web/tomcat/TomcatUtil.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.webbeans.web.tomcat7; +package org.apache.webbeans.web.tomcat; import org.apache.webbeans.config.WebBeansContext; import org.apache.webbeans.container.BeanManagerImpl; diff --git a/webbeans-tomcat7/src/main/java/org/apache/webbeans/web/tomcat7/TomcatWebPlugin.java b/webbeans-tomcat/src/main/java/org/apache/webbeans/web/tomcat/TomcatWebPlugin.java similarity index 86% rename from webbeans-tomcat7/src/main/java/org/apache/webbeans/web/tomcat7/TomcatWebPlugin.java rename to webbeans-tomcat/src/main/java/org/apache/webbeans/web/tomcat/TomcatWebPlugin.java index ba00ef427..0ce1e98d1 100644 --- a/webbeans-tomcat7/src/main/java/org/apache/webbeans/web/tomcat7/TomcatWebPlugin.java +++ b/webbeans-tomcat/src/main/java/org/apache/webbeans/web/tomcat/TomcatWebPlugin.java @@ -16,18 +16,18 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.webbeans.web.tomcat7; +package org.apache.webbeans.web.tomcat; -import javax.servlet.Filter; -import javax.servlet.Servlet; -import javax.servlet.ServletContextAttributeListener; -import javax.servlet.ServletContextListener; -import javax.servlet.ServletRequestAttributeListener; -import javax.servlet.ServletRequestListener; -import javax.servlet.http.HttpSessionActivationListener; -import javax.servlet.http.HttpSessionAttributeListener; -import javax.servlet.http.HttpSessionBindingListener; -import javax.servlet.http.HttpSessionListener; +import jakarta.servlet.Filter; +import jakarta.servlet.Servlet; +import jakarta.servlet.ServletContextAttributeListener; +import jakarta.servlet.ServletContextListener; +import jakarta.servlet.ServletRequestAttributeListener; +import jakarta.servlet.ServletRequestListener; +import jakarta.servlet.http.HttpSessionActivationListener; +import jakarta.servlet.http.HttpSessionAttributeListener; +import jakarta.servlet.http.HttpSessionBindingListener; +import jakarta.servlet.http.HttpSessionListener; import java.util.EventListener; diff --git a/webbeans-tomcat7/src/main/resources/META-INF/openwebbeans/openwebbeans.properties b/webbeans-tomcat/src/main/resources/META-INF/openwebbeans/openwebbeans.properties similarity index 97% rename from webbeans-tomcat7/src/main/resources/META-INF/openwebbeans/openwebbeans.properties rename to webbeans-tomcat/src/main/resources/META-INF/openwebbeans/openwebbeans.properties index 75e5aa5b4..3220be0c6 100644 --- a/webbeans-tomcat7/src/main/resources/META-INF/openwebbeans/openwebbeans.properties +++ b/webbeans-tomcat/src/main/resources/META-INF/openwebbeans/openwebbeans.properties @@ -21,4 +21,4 @@ # use a special securityService for Principal injection -org.apache.webbeans.spi.SecurityService=org.apache.webbeans.web.tomcat7.TomcatSecurityService \ No newline at end of file +org.apache.webbeans.spi.SecurityService=org.apache.webbeans.web.tomcat.TomcatSecurityService \ No newline at end of file diff --git a/webbeans-tomcat7/src/main/resources/META-INF/services/org.apache.webbeans.spi.plugins.OpenWebBeansPlugin b/webbeans-tomcat/src/main/resources/META-INF/services/org.apache.webbeans.spi.plugins.OpenWebBeansPlugin similarity index 94% rename from webbeans-tomcat7/src/main/resources/META-INF/services/org.apache.webbeans.spi.plugins.OpenWebBeansPlugin rename to webbeans-tomcat/src/main/resources/META-INF/services/org.apache.webbeans.spi.plugins.OpenWebBeansPlugin index 3fab96735..f5b90c117 100644 --- a/webbeans-tomcat7/src/main/resources/META-INF/services/org.apache.webbeans.spi.plugins.OpenWebBeansPlugin +++ b/webbeans-tomcat/src/main/resources/META-INF/services/org.apache.webbeans.spi.plugins.OpenWebBeansPlugin @@ -14,4 +14,4 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -org.apache.webbeans.web.tomcat7.TomcatWebPlugin \ No newline at end of file +org.apache.webbeans.web.tomcat.TomcatWebPlugin \ No newline at end of file diff --git a/webbeans-tomcat7/src/main/resources/META-INF/web-fragment.xml b/webbeans-tomcat/src/main/resources/META-INF/web-fragment.xml similarity index 93% rename from webbeans-tomcat7/src/main/resources/META-INF/web-fragment.xml rename to webbeans-tomcat/src/main/resources/META-INF/web-fragment.xml index 0e01ae4e5..69619143f 100644 --- a/webbeans-tomcat7/src/main/resources/META-INF/web-fragment.xml +++ b/webbeans-tomcat/src/main/resources/META-INF/web-fragment.xml @@ -26,7 +26,7 @@ <filter> <icon/> <filter-name>OwbSecurityFilter</filter-name> - <filter-class>org.apache.webbeans.web.tomcat7.TomcatSecurityFilter</filter-class> + <filter-class>org.apache.webbeans.web.tomcat.TomcatSecurityFilter</filter-class> </filter> <filter-mapping> <filter-name>OwbSecurityFilter</filter-name> diff --git a/webbeans-tomcat7/src/site/site.xml b/webbeans-tomcat/src/site/site.xml similarity index 100% rename from webbeans-tomcat7/src/site/site.xml rename to webbeans-tomcat/src/site/site.xml diff --git a/webbeans-tomcat7/src/test/java/org/apache/webbeans/web/tomcat7/test/MySessionScoped.java b/webbeans-tomcat/src/test/java/org/apache/webbeans/web/tomcat/test/MySessionScoped.java similarity index 96% rename from webbeans-tomcat7/src/test/java/org/apache/webbeans/web/tomcat7/test/MySessionScoped.java rename to webbeans-tomcat/src/test/java/org/apache/webbeans/web/tomcat/test/MySessionScoped.java index 3d14ec139..e9b487520 100644 --- a/webbeans-tomcat7/src/test/java/org/apache/webbeans/web/tomcat7/test/MySessionScoped.java +++ b/webbeans-tomcat/src/test/java/org/apache/webbeans/web/tomcat/test/MySessionScoped.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.webbeans.web.tomcat7.test; +package org.apache.webbeans.web.tomcat.test; import jakarta.enterprise.context.SessionScoped; import java.io.Serializable; diff --git a/webbeans-tomcat7/src/test/java/org/apache/webbeans/web/tomcat7/test/MyWrapper.java b/webbeans-tomcat/src/test/java/org/apache/webbeans/web/tomcat/test/MyWrapper.java similarity index 95% rename from webbeans-tomcat7/src/test/java/org/apache/webbeans/web/tomcat7/test/MyWrapper.java rename to webbeans-tomcat/src/test/java/org/apache/webbeans/web/tomcat/test/MyWrapper.java index 692e2a669..0e20e7805 100644 --- a/webbeans-tomcat7/src/test/java/org/apache/webbeans/web/tomcat7/test/MyWrapper.java +++ b/webbeans-tomcat/src/test/java/org/apache/webbeans/web/tomcat/test/MyWrapper.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.webbeans.web.tomcat7.test; +package org.apache.webbeans.web.tomcat.test; import jakarta.enterprise.context.SessionScoped; import jakarta.inject.Inject; diff --git a/webbeans-tomcat7/src/test/java/org/apache/webbeans/web/tomcat7/test/TomcatNormalScopeProxyFactoryTest.java b/webbeans-tomcat/src/test/java/org/apache/webbeans/web/tomcat/test/TomcatNormalScopeProxyFactoryTest.java similarity index 95% rename from webbeans-tomcat7/src/test/java/org/apache/webbeans/web/tomcat7/test/TomcatNormalScopeProxyFactoryTest.java rename to webbeans-tomcat/src/test/java/org/apache/webbeans/web/tomcat/test/TomcatNormalScopeProxyFactoryTest.java index 315a35782..c53c33ce8 100644 --- a/webbeans-tomcat7/src/test/java/org/apache/webbeans/web/tomcat7/test/TomcatNormalScopeProxyFactoryTest.java +++ b/webbeans-tomcat/src/test/java/org/apache/webbeans/web/tomcat/test/TomcatNormalScopeProxyFactoryTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.webbeans.web.tomcat7.test; +package org.apache.webbeans.web.tomcat.test; import org.apache.catalina.Context; import org.apache.catalina.connector.Request; @@ -26,14 +26,14 @@ import org.apache.catalina.startup.Tomcat; import org.apache.tomcat.util.http.fileupload.IOUtils; import org.apache.webbeans.config.WebBeansContext; import org.apache.webbeans.spi.ContextsService; -import org.apache.webbeans.web.tomcat7.ContextLifecycleListener; +import org.apache.webbeans.web.tomcat.ContextLifecycleListener; import org.junit.Test; import jakarta.enterprise.context.RequestScoped; import jakarta.enterprise.context.SessionScoped; import jakarta.enterprise.inject.spi.BeanManager; import jakarta.enterprise.inject.spi.CDI; -import javax.servlet.ServletRequestEvent; +import jakarta.servlet.ServletRequestEvent; import java.io.File; import java.io.FileOutputStream; import java.io.FileWriter; @@ -94,11 +94,11 @@ public class TomcatNormalScopeProxyFactoryTest final BeanManager bm = CDI.current().getBeanManager(); final Response response = new Response(); - response.setConnector(tomcat.getConnector()); + //Xresponse.setConnector(tomcat.getConnector()); response.setCoyoteResponse(new org.apache.coyote.Response()); - final Request request = new Request(); - request.setContext(ctx); + final Request request = new Request(tomcat.getConnector()); + //X request.setContext(ctx); request.setResponse(response); request.setRequestedSessionId(sessionId); diff --git a/webbeans-web/pom.xml b/webbeans-web/pom.xml index 2997ffc8b..efc5cdaaf 100644 --- a/webbeans-web/pom.xml +++ b/webbeans-web/pom.xml @@ -28,84 +28,74 @@ <description>Apache OpenWebBeans Java EE Web and Serlvet plugin</description> <dependencies> - <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-el_2.2_spec</artifactId> - <scope>provided</scope> - </dependency> <dependency> <groupId>jakarta.annotation</groupId> <artifactId>jakarta.annotation-api</artifactId> <scope>provided</scope> </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> + <groupId>jakarta.inject</groupId> + <artifactId>jakarta.inject-api</artifactId> </dependency> <dependency> - <!-- we actually only need that in the ITs, but that way it's easier for the IDE --> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpclient</artifactId> - <version>${httpclient.version}</version> - <scope>test</scope> + <groupId>jakarta.enterprise</groupId> + <artifactId>jakarta.enterprise.cdi-api</artifactId> + </dependency> + <dependency> + <groupId>jakarta.interceptor</groupId> + <artifactId>jakarta.interceptor-api</artifactId> + <scope>provided</scope> </dependency> <dependency> - <groupId>org.apache.xbean</groupId> - <artifactId>xbean-finder-shaded</artifactId> + <groupId>org.apache.tomcat</groupId> + <artifactId>tomcat-servlet-api</artifactId> + <scope>provided</scope> </dependency> - <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-servlet_3.0_spec</artifactId> + <groupId>org.apache.tomcat</groupId> + <artifactId>tomcat-jsp-api</artifactId> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.openwebbeans</groupId> - <artifactId>openwebbeans-impl</artifactId> + <artifactId>openwebbeans-spi</artifactId> </dependency> <dependency> <groupId>org.apache.openwebbeans</groupId> - <artifactId>openwebbeans-el22</artifactId> - <version>${project.version}</version> + <artifactId>openwebbeans-impl</artifactId> </dependency> - <dependency> <groupId>org.apache.openwebbeans</groupId> - <artifactId>openwebbeans-impl</artifactId> + <artifactId>openwebbeans-el22</artifactId> + <optional>true</optional> <version>${project.version}</version> - <classifier>tests</classifier> - <scope>test</scope> </dependency> - <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-jsp_2.1_spec</artifactId> - <scope>provided</scope> + <groupId>org.apache.xbean</groupId> + <artifactId>xbean-finder-shaded</artifactId> </dependency> + <!-- test dependencies --> <dependency> - <groupId>jakarta.enterprise</groupId> - <artifactId>jakarta.enterprise.cdi-api</artifactId> - </dependency> - <dependency> - <groupId>jakarta.inject</groupId> - <artifactId>jakarta.inject-api</artifactId> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> </dependency> - <dependency> <groupId>org.apache.openwebbeans</groupId> - <artifactId>openwebbeans-spi</artifactId> - <optional>true</optional> + <artifactId>openwebbeans-impl</artifactId> + <version>${project.version}</version> + <classifier>tests</classifier> + <scope>test</scope> </dependency> - <dependency> - <groupId>jakarta.interceptor</groupId> - <artifactId>jakarta.interceptor-api</artifactId> - <scope>provided</scope> + <!-- we actually only need that in the ITs, but that way it's easier for the IDE --> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpclient</artifactId> + <version>${httpclient.version}</version> + <scope>test</scope> </dependency> </dependencies> @@ -118,8 +108,8 @@ <configuration> <instructions> <Import-Package> - javax.servlet.jsp*;version="[2.1,3)", - javax.servlet.*;version="[${osgi.servlet.range},5)", + jakarta.servlet.jsp*;version="[2.1,3)", + jakarta.servlet.*;version="[${osgi.servlet.range},5)", jakarta.el.*;version="[${osgi.el.range},3)";resolution:="optional", * </Import-Package> diff --git a/webbeans-web/src/it/forward/b/src/test/java/org/apache/openwebbeans/web/it/ForwardIT.java b/webbeans-web/src/it/forward/b/src/test/java/org/apache/openwebbeans/web/it/ForwardIT.java index e6be5362a..f1c0b2dc3 100644 --- a/webbeans-web/src/it/forward/b/src/test/java/org/apache/openwebbeans/web/it/ForwardIT.java +++ b/webbeans-web/src/it/forward/b/src/test/java/org/apache/openwebbeans/web/it/ForwardIT.java @@ -18,7 +18,7 @@ */ package org.apache.openwebbeans.web.it; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import java.io.BufferedReader; import java.io.IOException; diff --git a/webbeans-web/src/it/webcdiapp/src/main/java/org/superbiz/TestServlet.java b/webbeans-web/src/it/webcdiapp/src/main/java/org/superbiz/TestServlet.java index 3a4d1492b..1462b00ba 100644 --- a/webbeans-web/src/it/webcdiapp/src/main/java/org/superbiz/TestServlet.java +++ b/webbeans-web/src/it/webcdiapp/src/main/java/org/superbiz/TestServlet.java @@ -21,11 +21,11 @@ package org.superbiz; import org.superbiz.beans.ContextEventCounter; import org.superbiz.beans.RequestScopedBean; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; @WebServlet(urlPatterns = "/check/*") diff --git a/webbeans-web/src/it/webcdiapp/src/main/java/org/superbiz/conversation/ConversationITServlet.java b/webbeans-web/src/it/webcdiapp/src/main/java/org/superbiz/conversation/ConversationITServlet.java index 4be3b090e..730573804 100644 --- a/webbeans-web/src/it/webcdiapp/src/main/java/org/superbiz/conversation/ConversationITServlet.java +++ b/webbeans-web/src/it/webcdiapp/src/main/java/org/superbiz/conversation/ConversationITServlet.java @@ -19,11 +19,11 @@ package org.superbiz.conversation; import jakarta.enterprise.inject.spi.CDI; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.logging.Logger; diff --git a/webbeans-web/src/it/webcdiapp/src/test/java/org/apache/openwebbeans/web/it/ConversationScopedIT.java b/webbeans-web/src/it/webcdiapp/src/test/java/org/apache/openwebbeans/web/it/ConversationScopedIT.java index 3a4d5c22a..8e15fd0f6 100644 --- a/webbeans-web/src/it/webcdiapp/src/test/java/org/apache/openwebbeans/web/it/ConversationScopedIT.java +++ b/webbeans-web/src/it/webcdiapp/src/test/java/org/apache/openwebbeans/web/it/ConversationScopedIT.java @@ -19,7 +19,7 @@ package org.apache.openwebbeans.web.it; import jakarta.enterprise.context.NonexistentConversationException; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import org.apache.http.impl.client.DefaultHttpClient; import org.junit.Assert; diff --git a/webbeans-web/src/it/webcdiapp/src/test/java/org/apache/openwebbeans/web/it/RequestScopedIT.java b/webbeans-web/src/it/webcdiapp/src/test/java/org/apache/openwebbeans/web/it/RequestScopedIT.java index cedba7dce..81b7ac297 100644 --- a/webbeans-web/src/it/webcdiapp/src/test/java/org/apache/openwebbeans/web/it/RequestScopedIT.java +++ b/webbeans-web/src/it/webcdiapp/src/test/java/org/apache/openwebbeans/web/it/RequestScopedIT.java @@ -18,7 +18,7 @@ */ package org.apache.openwebbeans.web.it; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import org.apache.http.impl.client.DefaultHttpClient; diff --git a/webbeans-web/src/main/java/org/apache/webbeans/servlet/WebBeansConfigurationFilter.java b/webbeans-web/src/main/java/org/apache/webbeans/servlet/WebBeansConfigurationFilter.java index 2e981b5f3..d1b377ab1 100644 --- a/webbeans-web/src/main/java/org/apache/webbeans/servlet/WebBeansConfigurationFilter.java +++ b/webbeans-web/src/main/java/org/apache/webbeans/servlet/WebBeansConfigurationFilter.java @@ -29,15 +29,15 @@ import org.apache.webbeans.web.context.WebContextsService; import org.apache.webbeans.web.util.ServletCompatibilityUtil; import jakarta.enterprise.context.RequestScoped; -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletContext; -import javax.servlet.ServletContextEvent; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletRequestEvent; -import javax.servlet.ServletResponse; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.FilterConfig; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletContextEvent; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletRequestEvent; +import jakarta.servlet.ServletResponse; import java.io.IOException; import java.util.logging.Level; import java.util.logging.Logger; diff --git a/webbeans-web/src/main/java/org/apache/webbeans/servlet/WebBeansConfigurationHttpSessionListener.java b/webbeans-web/src/main/java/org/apache/webbeans/servlet/WebBeansConfigurationHttpSessionListener.java index 3f9632511..3a7b561b6 100644 --- a/webbeans-web/src/main/java/org/apache/webbeans/servlet/WebBeansConfigurationHttpSessionListener.java +++ b/webbeans-web/src/main/java/org/apache/webbeans/servlet/WebBeansConfigurationHttpSessionListener.java @@ -26,8 +26,8 @@ import org.apache.webbeans.util.WebBeansUtil; import jakarta.enterprise.context.ConversationScoped; import jakarta.enterprise.context.SessionScoped; -import javax.servlet.http.HttpSessionEvent; -import javax.servlet.http.HttpSessionListener; +import jakarta.servlet.http.HttpSessionEvent; +import jakarta.servlet.http.HttpSessionListener; import java.util.logging.Level; import java.util.logging.Logger; diff --git a/webbeans-web/src/main/java/org/apache/webbeans/servlet/WebBeansConfigurationListener.java b/webbeans-web/src/main/java/org/apache/webbeans/servlet/WebBeansConfigurationListener.java index 2e21b5cb5..71aae2922 100644 --- a/webbeans-web/src/main/java/org/apache/webbeans/servlet/WebBeansConfigurationListener.java +++ b/webbeans-web/src/main/java/org/apache/webbeans/servlet/WebBeansConfigurationListener.java @@ -30,14 +30,14 @@ import org.apache.webbeans.web.util.ServletCompatibilityUtil; import jakarta.enterprise.context.RequestScoped; import jakarta.enterprise.context.SessionScoped; import jakarta.enterprise.context.spi.Context; -import javax.servlet.ServletContainerInitializer; -import javax.servlet.ServletContext; -import javax.servlet.ServletContextEvent; -import javax.servlet.ServletContextListener; -import javax.servlet.ServletRequestEvent; -import javax.servlet.ServletRequestListener; -import javax.servlet.http.HttpSessionEvent; -import javax.servlet.http.HttpSessionListener; +import jakarta.servlet.ServletContainerInitializer; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletContextEvent; +import jakarta.servlet.ServletContextListener; +import jakarta.servlet.ServletRequestEvent; +import jakarta.servlet.ServletRequestListener; +import jakarta.servlet.http.HttpSessionEvent; +import jakarta.servlet.http.HttpSessionListener; import java.util.Set; import java.util.logging.Level; diff --git a/webbeans-web/src/main/java/org/apache/webbeans/web/context/ServletRequestContext.java b/webbeans-web/src/main/java/org/apache/webbeans/web/context/ServletRequestContext.java index 5a6fdad8d..92092b124 100644 --- a/webbeans-web/src/main/java/org/apache/webbeans/web/context/ServletRequestContext.java +++ b/webbeans-web/src/main/java/org/apache/webbeans/web/context/ServletRequestContext.java @@ -18,7 +18,7 @@ */ package org.apache.webbeans.web.context; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.apache.webbeans.context.RequestContext; diff --git a/webbeans-web/src/main/java/org/apache/webbeans/web/context/WebContextsService.java b/webbeans-web/src/main/java/org/apache/webbeans/web/context/WebContextsService.java index 917947996..a70ead14f 100644 --- a/webbeans-web/src/main/java/org/apache/webbeans/web/context/WebContextsService.java +++ b/webbeans-web/src/main/java/org/apache/webbeans/web/context/WebContextsService.java @@ -45,10 +45,10 @@ import jakarta.enterprise.context.RequestScoped; import jakarta.enterprise.context.SessionScoped; import jakarta.enterprise.context.spi.Context; import jakarta.inject.Singleton; -import javax.servlet.ServletContext; -import javax.servlet.ServletRequestEvent; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletRequestEvent; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpSession; import java.lang.annotation.Annotation; import java.util.concurrent.TimeUnit; import java.util.logging.Level; diff --git a/webbeans-web/src/main/java/org/apache/webbeans/web/context/WebConversationFilter.java b/webbeans-web/src/main/java/org/apache/webbeans/web/context/WebConversationFilter.java index 5c4fa4a7f..b760a4739 100644 --- a/webbeans-web/src/main/java/org/apache/webbeans/web/context/WebConversationFilter.java +++ b/webbeans-web/src/main/java/org/apache/webbeans/web/context/WebConversationFilter.java @@ -19,12 +19,12 @@ package org.apache.webbeans.web.context; import jakarta.enterprise.context.ConversationScoped; -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.FilterConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; import java.io.IOException; import org.apache.webbeans.config.WebBeansContext; diff --git a/webbeans-web/src/main/java/org/apache/webbeans/web/context/WebConversationService.java b/webbeans-web/src/main/java/org/apache/webbeans/web/context/WebConversationService.java index feb190325..820472b11 100644 --- a/webbeans-web/src/main/java/org/apache/webbeans/web/context/WebConversationService.java +++ b/webbeans-web/src/main/java/org/apache/webbeans/web/context/WebConversationService.java @@ -18,9 +18,9 @@ */ package org.apache.webbeans.web.context; -import javax.servlet.ServletRequest; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpSession; import java.util.concurrent.atomic.AtomicInteger; import org.apache.webbeans.config.WebBeansContext; diff --git a/webbeans-web/src/main/java/org/apache/webbeans/web/lifecycle/ServletContextBean.java b/webbeans-web/src/main/java/org/apache/webbeans/web/lifecycle/ServletContextBean.java index fb24647bc..7eb0d2eaf 100644 --- a/webbeans-web/src/main/java/org/apache/webbeans/web/lifecycle/ServletContextBean.java +++ b/webbeans-web/src/main/java/org/apache/webbeans/web/lifecycle/ServletContextBean.java @@ -25,7 +25,7 @@ import org.apache.webbeans.config.WebBeansContext; import org.apache.webbeans.portable.ProviderBasedProducer; import jakarta.inject.Provider; -import javax.servlet.ServletContext; +import jakarta.servlet.ServletContext; class ServletContextBean extends BuiltInOwbBean<ServletContext> { diff --git a/webbeans-web/src/main/java/org/apache/webbeans/web/lifecycle/ServletRequestBean.java b/webbeans-web/src/main/java/org/apache/webbeans/web/lifecycle/ServletRequestBean.java index 15cee41a0..4ee46dbab 100644 --- a/webbeans-web/src/main/java/org/apache/webbeans/web/lifecycle/ServletRequestBean.java +++ b/webbeans-web/src/main/java/org/apache/webbeans/web/lifecycle/ServletRequestBean.java @@ -27,7 +27,7 @@ import org.apache.webbeans.web.context.ServletRequestContext; import org.apache.webbeans.web.context.WebContextsService; import jakarta.inject.Provider; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; class ServletRequestBean extends BuiltInOwbBean<HttpServletRequest> { diff --git a/webbeans-web/src/main/java/org/apache/webbeans/web/lifecycle/WebContainerLifecycle.java b/webbeans-web/src/main/java/org/apache/webbeans/web/lifecycle/WebContainerLifecycle.java index e3ba82065..45fd63521 100644 --- a/webbeans-web/src/main/java/org/apache/webbeans/web/lifecycle/WebContainerLifecycle.java +++ b/webbeans-web/src/main/java/org/apache/webbeans/web/lifecycle/WebContainerLifecycle.java @@ -38,10 +38,10 @@ import jakarta.enterprise.context.RequestScoped; import jakarta.enterprise.context.SessionScoped; import jakarta.enterprise.inject.spi.BeanManager; import jakarta.inject.Singleton; -import javax.servlet.ServletContext; -import javax.servlet.ServletContextEvent; -import javax.servlet.jsp.JspApplicationContext; -import javax.servlet.jsp.JspFactory; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletContextEvent; +import jakarta.servlet.jsp.JspApplicationContext; +import jakarta.servlet.jsp.JspFactory; import java.util.logging.Level; /** diff --git a/webbeans-web/src/main/java/org/apache/webbeans/web/lifecycle/test/MockHttpSession.java b/webbeans-web/src/main/java/org/apache/webbeans/web/lifecycle/test/MockHttpSession.java index d8ff5f2b0..46f35eb9b 100644 --- a/webbeans-web/src/main/java/org/apache/webbeans/web/lifecycle/test/MockHttpSession.java +++ b/webbeans-web/src/main/java/org/apache/webbeans/web/lifecycle/test/MockHttpSession.java @@ -18,9 +18,8 @@ */ package org.apache.webbeans.web.lifecycle.test; -import javax.servlet.ServletContext; -import javax.servlet.http.HttpSession; -import javax.servlet.http.HttpSessionContext; +import jakarta.servlet.ServletContext; +import jakarta.servlet.http.HttpSession; import java.util.Enumeration; import java.util.concurrent.atomic.AtomicInteger; @@ -84,27 +83,6 @@ public class MockHttpSession implements HttpSession return null; } - @Override - public HttpSessionContext getSessionContext() - { - // TODO Auto-generated method stub - return null; - } - - @Override - public Object getValue(String arg0) - { - // TODO Auto-generated method stub - return null; - } - - @Override - public String[] getValueNames() - { - // TODO Auto-generated method stub - return null; - } - @Override public void invalidate() { @@ -119,13 +97,6 @@ public class MockHttpSession implements HttpSession return false; } - @Override - public void putValue(String arg0, Object arg1) - { - // TODO Auto-generated method stub - - } - @Override public void removeAttribute(String arg0) { @@ -133,13 +104,6 @@ public class MockHttpSession implements HttpSession } - @Override - public void removeValue(String arg0) - { - // TODO Auto-generated method stub - - } - @Override public void setAttribute(String arg0, Object arg1) { diff --git a/webbeans-web/src/main/java/org/apache/webbeans/web/lifecycle/test/MockServletContext.java b/webbeans-web/src/main/java/org/apache/webbeans/web/lifecycle/test/MockServletContext.java index 164eeac93..600ac30fe 100644 --- a/webbeans-web/src/main/java/org/apache/webbeans/web/lifecycle/test/MockServletContext.java +++ b/webbeans-web/src/main/java/org/apache/webbeans/web/lifecycle/test/MockServletContext.java @@ -28,16 +28,16 @@ import java.util.Iterator; import java.util.Map; import java.util.Set; -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; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterRegistration; +import jakarta.servlet.RequestDispatcher; +import jakarta.servlet.Servlet; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRegistration; +import jakarta.servlet.SessionCookieConfig; +import jakarta.servlet.SessionTrackingMode; +import jakarta.servlet.descriptor.JspConfigDescriptor; import static java.util.Collections.enumeration; @@ -81,6 +81,7 @@ public class MockServletContext implements ServletContext return null; } + @Override public Set<String> getResourcePaths(String path) { @@ -111,36 +112,12 @@ public class MockServletContext implements ServletContext return null; } - @Override - public Servlet getServlet(String name) throws ServletException - { - return null; - } - - @Override - public Enumeration<Servlet> getServlets() - { - return null; - } - - @Override - public Enumeration<String> getServletNames() - { - return null; - } - @Override public void log(String msg) { } - @Override - public void log(Exception exception, String msg) - { - - } - @Override public void log(String message, Throwable throwable) { @@ -372,4 +349,52 @@ public class MockServletContext implements ServletContext { return null; } + + @Override + public ServletRegistration.Dynamic addJspFile(String s, String s1) + { + return null; + } + + @Override + public String getVirtualServerName() + { + return null; + } + + @Override + public int getSessionTimeout() + { + return 120; + } + + @Override + public void setSessionTimeout(int i) + { + + } + + @Override + public String getRequestCharacterEncoding() + { + return null; + } + + @Override + public void setRequestCharacterEncoding(String s) + { + + } + + @Override + public String getResponseCharacterEncoding() + { + return null; + } + + @Override + public void setResponseCharacterEncoding(String s) + { + + } } diff --git a/webbeans-web/src/main/java/org/apache/webbeans/web/lifecycle/test/MockServletContextEvent.java b/webbeans-web/src/main/java/org/apache/webbeans/web/lifecycle/test/MockServletContextEvent.java index 6ada40591..f1285dade 100644 --- a/webbeans-web/src/main/java/org/apache/webbeans/web/lifecycle/test/MockServletContextEvent.java +++ b/webbeans-web/src/main/java/org/apache/webbeans/web/lifecycle/test/MockServletContextEvent.java @@ -18,7 +18,7 @@ */ package org.apache.webbeans.web.lifecycle.test; -import javax.servlet.ServletContextEvent; +import jakarta.servlet.ServletContextEvent; public class MockServletContextEvent extends ServletContextEvent diff --git a/webbeans-web/src/main/java/org/apache/webbeans/web/scanner/WebScannerService.java b/webbeans-web/src/main/java/org/apache/webbeans/web/scanner/WebScannerService.java index d92201ba7..bf5b67d5d 100644 --- a/webbeans-web/src/main/java/org/apache/webbeans/web/scanner/WebScannerService.java +++ b/webbeans-web/src/main/java/org/apache/webbeans/web/scanner/WebScannerService.java @@ -24,7 +24,7 @@ import org.apache.webbeans.logger.WebBeansLoggerFacade; import org.apache.webbeans.util.ExceptionUtil; import org.apache.webbeans.util.WebBeansUtil; -import javax.servlet.ServletContext; +import jakarta.servlet.ServletContext; import java.net.MalformedURLException; import java.net.URL; import java.util.logging.Logger; diff --git a/webbeans-web/src/main/java/org/apache/webbeans/web/util/ServletCompatibilityUtil.java b/webbeans-web/src/main/java/org/apache/webbeans/web/util/ServletCompatibilityUtil.java index 9a1e3df44..611700690 100644 --- a/webbeans-web/src/main/java/org/apache/webbeans/web/util/ServletCompatibilityUtil.java +++ b/webbeans-web/src/main/java/org/apache/webbeans/web/util/ServletCompatibilityUtil.java @@ -18,7 +18,7 @@ */ package org.apache.webbeans.web.util; -import javax.servlet.ServletContext; +import jakarta.servlet.ServletContext; /** * This utility helps to be compatible with Servlet API 2.4 diff --git a/webbeans-web/src/test/java/WebBeansConfigurationListenerTest.java b/webbeans-web/src/test/java/WebBeansConfigurationListenerTest.java index d4c2440fb..c8c7c5eae 100644 --- a/webbeans-web/src/test/java/WebBeansConfigurationListenerTest.java +++ b/webbeans-web/src/test/java/WebBeansConfigurationListenerTest.java @@ -23,8 +23,8 @@ import static org.apache.webbeans.util.Asserts.assertNotNull; import java.util.EventListener; import java.util.concurrent.atomic.AtomicReference; -import javax.servlet.ServletContextEvent; -import javax.servlet.ServletContextListener; +import jakarta.servlet.ServletContextEvent; +import jakarta.servlet.ServletContextListener; import org.apache.webbeans.servlet.WebBeansConfigurationListener; import org.apache.webbeans.spi.ContainerLifecycle; diff --git a/webbeans-web/src/test/java/org/apache/webbeans/web/tests/ConversationLoggingTest.java b/webbeans-web/src/test/java/org/apache/webbeans/web/tests/ConversationLoggingTest.java index 04a263c57..c33a2f175 100644 --- a/webbeans-web/src/test/java/org/apache/webbeans/web/tests/ConversationLoggingTest.java +++ b/webbeans-web/src/test/java/org/apache/webbeans/web/tests/ConversationLoggingTest.java @@ -32,7 +32,7 @@ import java.util.logging.LogRecord; import java.util.logging.Logger; import jakarta.enterprise.context.ConversationScoped; -import javax.servlet.ServletContextEvent; +import jakarta.servlet.ServletContextEvent; import org.apache.webbeans.config.WebBeansContext; import org.apache.webbeans.servlet.WebBeansConfigurationListener; diff --git a/webbeans-web/src/test/java/org/apache/webbeans/web/tests/MockHttpSession.java b/webbeans-web/src/test/java/org/apache/webbeans/web/tests/MockHttpSession.java index 31abf9fbb..11952029f 100644 --- a/webbeans-web/src/test/java/org/apache/webbeans/web/tests/MockHttpSession.java +++ b/webbeans-web/src/test/java/org/apache/webbeans/web/tests/MockHttpSession.java @@ -20,9 +20,8 @@ package org.apache.webbeans.web.tests; import java.util.Enumeration; import java.util.HashMap; -import javax.servlet.ServletContext; -import javax.servlet.http.HttpSession; -import javax.servlet.http.HttpSessionContext; +import jakarta.servlet.ServletContext; +import jakarta.servlet.http.HttpSession; public class MockHttpSession implements HttpSession { @@ -64,60 +63,30 @@ public class MockHttpSession implements HttpSession throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. } - @Override - public HttpSessionContext getSessionContext() - { - throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. - } - @Override public Object getAttribute(String string) { return attributes.get(string); } - @Override - public Object getValue(String string) - { - throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. - } - @Override public Enumeration<String> getAttributeNames() { throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. } - @Override - public String[] getValueNames() - { - throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. - } - @Override public void setAttribute(String string, Object o) { attributes.put(string, o); } - @Override - public void putValue(String string, Object o) - { - throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. - } - @Override public void removeAttribute(String string) { throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. } - @Override - public void removeValue(String string) - { - throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. - } - @Override public void invalidate() { diff --git a/webbeans-web/src/test/java/org/apache/webbeans/web/tests/MockServletRequest.java b/webbeans-web/src/test/java/org/apache/webbeans/web/tests/MockServletRequest.java index 0c44dbc44..991b32fb0 100644 --- a/webbeans-web/src/test/java/org/apache/webbeans/web/tests/MockServletRequest.java +++ b/webbeans-web/src/test/java/org/apache/webbeans/web/tests/MockServletRequest.java @@ -18,19 +18,21 @@ */ 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 jakarta.servlet.AsyncContext; +import jakarta.servlet.DispatcherType; +import jakarta.servlet.RequestDispatcher; +import jakarta.servlet.ServletConnection; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletInputStream; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; +import jakarta.servlet.http.HttpUpgradeHandler; +import jakarta.servlet.http.Part; import java.io.BufferedReader; import java.io.IOException; import java.io.UnsupportedEncodingException; @@ -190,12 +192,6 @@ public class MockServletRequest implements HttpServletRequest return false; } - @Override - public boolean isRequestedSessionIdFromUrl() - { - return false; - } - @Override public boolean isRequestedSessionIdFromURL() { @@ -340,12 +336,6 @@ public class MockServletRequest implements HttpServletRequest return null; } - @Override - public String getRealPath(String path) - { - return null; - } - @Override public String getRemoteAddr() { @@ -441,4 +431,40 @@ public class MockServletRequest implements HttpServletRequest { return null; } + + @Override + public String changeSessionId() + { + return null; + } + + @Override + public <T extends HttpUpgradeHandler> T upgrade(Class<T> aClass) throws IOException, ServletException + { + return null; + } + + @Override + public long getContentLengthLong() + { + return 0; + } + + @Override + public String getRequestId() + { + return null; + } + + @Override + public String getProtocolRequestId() + { + return null; + } + + @Override + public ServletConnection getServletConnection() + { + return null; + } } diff --git a/webbeans-web/src/test/java/org/apache/webbeans/web/tests/WebBeansTest.java b/webbeans-web/src/test/java/org/apache/webbeans/web/tests/WebBeansTest.java index bcad78dda..cfc14e77b 100644 --- a/webbeans-web/src/test/java/org/apache/webbeans/web/tests/WebBeansTest.java +++ b/webbeans-web/src/test/java/org/apache/webbeans/web/tests/WebBeansTest.java @@ -33,9 +33,9 @@ import org.junit.Test; import jakarta.enterprise.inject.spi.Bean; import jakarta.enterprise.inject.spi.BeanManager; -import javax.servlet.ServletContext; -import javax.servlet.ServletContextEvent; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletContextEvent; +import jakarta.servlet.http.HttpServletRequest; import java.net.URL; import java.util.HashMap; import java.util.Properties; diff --git a/webbeans-web/src/test/java/org/apache/webbeans/web/tests/initialization/InitializedSessionScopedTest.java b/webbeans-web/src/test/java/org/apache/webbeans/web/tests/initialization/InitializedSessionScopedTest.java index 79e659824..19b275281 100644 --- a/webbeans-web/src/test/java/org/apache/webbeans/web/tests/initialization/InitializedSessionScopedTest.java +++ b/webbeans-web/src/test/java/org/apache/webbeans/web/tests/initialization/InitializedSessionScopedTest.java @@ -22,7 +22,7 @@ import java.util.ArrayList; import java.util.Collection; import jakarta.enterprise.context.RequestScoped; import jakarta.enterprise.context.SessionScoped; -import javax.servlet.ServletRequestEvent; +import jakarta.servlet.ServletRequestEvent; import org.junit.Assert; import org.apache.webbeans.test.AbstractUnitTest; import org.apache.webbeans.web.lifecycle.test.MockServletContext; diff --git a/webbeans-web/src/test/java/org/apache/webbeans/web/tests/initialization/MySessionHandler.java b/webbeans-web/src/test/java/org/apache/webbeans/web/tests/initialization/MySessionHandler.java index 1e170f540..8f1042e3b 100644 --- a/webbeans-web/src/test/java/org/apache/webbeans/web/tests/initialization/MySessionHandler.java +++ b/webbeans-web/src/test/java/org/apache/webbeans/web/tests/initialization/MySessionHandler.java @@ -25,7 +25,7 @@ import jakarta.enterprise.context.SessionScoped; import jakarta.enterprise.event.Observes; import jakarta.enterprise.inject.Produces; import jakarta.inject.Inject; -import javax.servlet.http.HttpSession; +import jakarta.servlet.http.HttpSession; @RequestScoped public class MySessionHandler diff --git a/webbeans-web/src/test/java/org/apache/webbeans/web/tests/interceptor/CachedInterceptorHandlerTest.java b/webbeans-web/src/test/java/org/apache/webbeans/web/tests/interceptor/CachedInterceptorHandlerTest.java index 6e3794b21..93f738751 100644 --- a/webbeans-web/src/test/java/org/apache/webbeans/web/tests/interceptor/CachedInterceptorHandlerTest.java +++ b/webbeans-web/src/test/java/org/apache/webbeans/web/tests/interceptor/CachedInterceptorHandlerTest.java @@ -32,7 +32,7 @@ import org.junit.Test; import jakarta.enterprise.context.RequestScoped; import jakarta.enterprise.context.spi.CreationalContext; import jakarta.enterprise.inject.spi.Bean; -import javax.servlet.ServletRequestEvent; +import jakarta.servlet.ServletRequestEvent; import java.util.ArrayList; import java.util.Collection; import java.util.Set; diff --git a/webbeans-web/src/test/java/org/apache/webbeans/web/tests/interceptor/SerializationTest.java b/webbeans-web/src/test/java/org/apache/webbeans/web/tests/interceptor/SerializationTest.java index 41c8ba1e6..9a294c63d 100644 --- a/webbeans-web/src/test/java/org/apache/webbeans/web/tests/interceptor/SerializationTest.java +++ b/webbeans-web/src/test/java/org/apache/webbeans/web/tests/interceptor/SerializationTest.java @@ -28,7 +28,7 @@ import org.junit.Test; import jakarta.enterprise.context.RequestScoped; import jakarta.enterprise.inject.spi.Bean; import jakarta.enterprise.inject.spi.BeanManager; -import javax.servlet.ServletRequestEvent; +import jakarta.servlet.ServletRequestEvent; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException;
