This is an automated email from the ASF dual-hosted git repository.
cziegeler pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/felix-dev.git
The following commit(s) were added to refs/heads/master by this push:
new e7d17aca51 Update sample to servlet service
e7d17aca51 is described below
commit e7d17aca517949dd65a913f9ac5088e653a4a2dc
Author: Carsten Ziegeler <[email protected]>
AuthorDate: Sun Nov 13 09:43:47 2022 +0100
Update sample to servlet service
---
http/samples/bridge/DEPENDENCIES | 23 ---
http/samples/bridge/LICENSE | 203 ---------------------
http/samples/bridge/NOTICE | 11 --
http/samples/bridge/pom.xml | 142 --------------
.../http/samples/bridge/FrameworkService.java | 93 ----------
.../http/samples/bridge/ProvisionActivator.java | 75 --------
.../felix/http/samples/bridge/StartupListener.java | 37 ----
.../src/main/webapp/WEB-INF/framework.properties | 23 ---
.../samples/bridge/src/main/webapp/WEB-INF/web.xml | 43 -----
http/samples/whiteboard/pom.xml | 24 ++-
.../felix/http/samples/whiteboard/Activator.java | 20 +-
.../felix/http/samples/whiteboard/TestFilter.java | 2 +-
.../felix/http/samples/whiteboard/TestServlet.java | 10 +-
.../samples/whiteboard/TestServletContext.java | 2 +-
14 files changed, 29 insertions(+), 679 deletions(-)
diff --git a/http/samples/bridge/DEPENDENCIES b/http/samples/bridge/DEPENDENCIES
deleted file mode 100644
index c336596efd..0000000000
--- a/http/samples/bridge/DEPENDENCIES
+++ /dev/null
@@ -1,23 +0,0 @@
-Apache Felix HTTP Service Bridge Sample
-Copyright 2011 The Apache Software Foundation
-
-This software was developed at the Apache Software Foundation
-(http://www.apache.org) and may have dependencies on other
-Apache software licensed under Apache License 2.0.
-
-I. Included Third-Party Software
-
-This product includes software developed at
-The OSGi Alliance (http://www.osgi.org/).
-Copyright (c) OSGi Alliance (2000, 2009).
-Licensed under the Apache License 2.0.
-
-II. Used Third-Party Software
-
-This product uses software developed at
-The OSGi Alliance (http://www.osgi.org).
-Copyright (c) OSGi Alliance (2000, 2009).
-Licensed under the Apache License 2.0.
-
-III. License Summary
-- Apache License 2.0
diff --git a/http/samples/bridge/LICENSE b/http/samples/bridge/LICENSE
deleted file mode 100644
index 6b0b1270ff..0000000000
--- a/http/samples/bridge/LICENSE
+++ /dev/null
@@ -1,203 +0,0 @@
-
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
diff --git a/http/samples/bridge/NOTICE b/http/samples/bridge/NOTICE
deleted file mode 100644
index 514604df21..0000000000
--- a/http/samples/bridge/NOTICE
+++ /dev/null
@@ -1,11 +0,0 @@
-Apache Felix Http Service Bridge Sample
-Copyright 2011 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-Licensed under the Apache License 2.0.
-
-This product includes software developed at
-The OSGi Alliance (http://www.osgi.org/).
-Copyright (c) OSGi Alliance (2000, 2009).
-Licensed under the Apache License 2.0.
diff --git a/http/samples/bridge/pom.xml b/http/samples/bridge/pom.xml
deleted file mode 100644
index 0008624249..0000000000
--- a/http/samples/bridge/pom.xml
+++ /dev/null
@@ -1,142 +0,0 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the 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/maven-v4_0_0.xsd";>
-
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.http.parent</artifactId>
- <version>9</version>
- <relativePath>../../parent/pom.xml</relativePath>
- </parent>
-
- <name>Apache Felix Http Samples - Bridge</name>
- <artifactId>org.apache.felix.http.samples.bridge</artifactId>
- <version>2.4.0-SNAPSHOT</version>
- <packaging>war</packaging>
-
- <scm>
-
<connection>scm:git:https://github.com/apache/felix-dev.git</connection>
-
<developerConnection>scm:git:https://github.com/apache/felix-dev.git</developerConnection>
- <url>https://gitbox.apache.org/repos/asf?p=felix-dev.git</url>
- </scm>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>maven-jetty-plugin</artifactId>
- <version>6.1.26</version>
- <configuration>
- <contextPath>/</contextPath>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>copy-bundles</id>
- <goals>
- <goal>copy-dependencies</goal>
- </goals>
- <configuration>
- <includeArtifactIds>
-
org.apache.felix.http.bridge,org.apache.felix.http.samples.filter,org.apache.felix.webconsole
- </includeArtifactIds>
- <stripVersion>true</stripVersion>
- <outputDirectory>
- ${project.build.directory}/bundles
- </outputDirectory>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
- <version>2.5</version>
- <configuration>
- <webResources>
- <resource>
- <directory>
- ${project.build.directory}/bundles
- </directory>
- <targetPath>WEB-INF/bundles</targetPath>
- </resource>
- <resource>
- <directory>.</directory>
- <targetPath>META-INF</targetPath>
- <includes>
- <include>LICENSE</include>
- <include>NOTICE</include>
- </includes>
- </resource>
- </webResources>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-sources</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi.cmpn</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.framework</artifactId>
- <version>5.2.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.http.proxy</artifactId>
- <version>3.0.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.http.bridge</artifactId>
- <version>3.0.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.webconsole</artifactId>
- <version>4.2.0</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-
-</project>
diff --git
a/http/samples/bridge/src/main/java/org/apache/felix/http/samples/bridge/FrameworkService.java
b/http/samples/bridge/src/main/java/org/apache/felix/http/samples/bridge/FrameworkService.java
deleted file mode 100644
index cb66857feb..0000000000
---
a/http/samples/bridge/src/main/java/org/apache/felix/http/samples/bridge/FrameworkService.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.felix.http.samples.bridge;
-
-import org.apache.felix.framework.Felix;
-import org.apache.felix.framework.util.FelixConstants;
-import javax.servlet.ServletContext;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.Properties;
-import java.util.Arrays;
-
-public final class FrameworkService
-{
- private final ServletContext context;
- private Felix felix;
-
- public FrameworkService(ServletContext context)
- {
- this.context = context;
- }
-
- public void start()
- {
- try {
- doStart();
- } catch (Exception e) {
- log("Failed to start framework", e);
- }
- }
-
- public void stop()
- {
- try {
- doStop();
- } catch (Exception e) {
- log("Error stopping framework", e);
- }
- }
-
- private void doStart()
- throws Exception
- {
- Felix tmp = new Felix(createConfig());
- tmp.start();
- this.felix = tmp;
- log("OSGi framework started", null);
- }
-
- private void doStop()
- throws Exception
- {
- if (this.felix != null) {
- this.felix.stop();
- }
-
- log("OSGi framework stopped", null);
- }
-
- private Map<String, Object> createConfig()
- throws Exception
- {
- Properties props = new Properties();
-
props.load(this.context.getResourceAsStream("/WEB-INF/framework.properties"));
-
- HashMap<String, Object> map = new HashMap<String, Object>();
- for (Object key : props.keySet()) {
- map.put(key.toString(), props.get(key));
- }
-
- map.put(FelixConstants.SYSTEMBUNDLE_ACTIVATORS_PROP, Arrays.asList(new
ProvisionActivator(this.context)));
- return map;
- }
-
- private void log(String message, Throwable cause)
- {
- this.context.log(message, cause);
- }
-}
diff --git
a/http/samples/bridge/src/main/java/org/apache/felix/http/samples/bridge/ProvisionActivator.java
b/http/samples/bridge/src/main/java/org/apache/felix/http/samples/bridge/ProvisionActivator.java
deleted file mode 100644
index a85cebe227..0000000000
---
a/http/samples/bridge/src/main/java/org/apache/felix/http/samples/bridge/ProvisionActivator.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.felix.http.samples.bridge;
-
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.Bundle;
-import javax.servlet.ServletContext;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
-
-public final class ProvisionActivator
- implements BundleActivator
-{
- private final ServletContext servletContext;
-
- public ProvisionActivator(ServletContext servletContext)
- {
- this.servletContext = servletContext;
- }
-
- public void start(BundleContext context)
- throws Exception
- {
- servletContext.setAttribute(BundleContext.class.getName(), context);
-
- ArrayList<Bundle> installed = new ArrayList<Bundle>();
- for (URL url : findBundles()) {
- this.servletContext.log("Installing bundle [" + url + "]");
- Bundle bundle = context.installBundle(url.toExternalForm());
- installed.add(bundle);
- }
-
- for (Bundle bundle : installed) {
- bundle.start();
- }
- }
-
- public void stop(BundleContext context)
- throws Exception
- {
- }
-
- private List<URL> findBundles()
- throws Exception
- {
- ArrayList<URL> list = new ArrayList<URL>();
- for (Object o :
this.servletContext.getResourcePaths("/WEB-INF/bundles/")) {
- String name = (String)o;
- if (name.endsWith(".jar")) {
- URL url = this.servletContext.getResource(name);
- if (url != null) {
- list.add(url);
- }
- }
- }
-
- return list;
- }
-}
diff --git
a/http/samples/bridge/src/main/java/org/apache/felix/http/samples/bridge/StartupListener.java
b/http/samples/bridge/src/main/java/org/apache/felix/http/samples/bridge/StartupListener.java
deleted file mode 100644
index 1b7ad607c1..0000000000
---
a/http/samples/bridge/src/main/java/org/apache/felix/http/samples/bridge/StartupListener.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.felix.http.samples.bridge;
-
-import javax.servlet.ServletContextListener;
-import javax.servlet.ServletContextEvent;
-
-public final class StartupListener
- implements ServletContextListener
-{
- private FrameworkService service;
-
- public void contextInitialized(ServletContextEvent event)
- {
- this.service = new FrameworkService(event.getServletContext());
- this.service.start();
- }
-
- public void contextDestroyed(ServletContextEvent event)
- {
- this.service.stop();
- }
-}
diff --git a/http/samples/bridge/src/main/webapp/WEB-INF/framework.properties
b/http/samples/bridge/src/main/webapp/WEB-INF/framework.properties
deleted file mode 100644
index 95cfffaa27..0000000000
--- a/http/samples/bridge/src/main/webapp/WEB-INF/framework.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-org.osgi.framework.storage.clean = onFirstInit
-
-org.osgi.framework.system.packages.extra = \
- javax.servlet;javax.servlet.http;version=2.5
diff --git a/http/samples/bridge/src/main/webapp/WEB-INF/web.xml
b/http/samples/bridge/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 86252368f2..0000000000
--- a/http/samples/bridge/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application
2.3//EN"
- "http://java.sun.com/dtd/web-app_2_3.dtd";>
-<web-app>
-
- <listener>
-
<listener-class>org.apache.felix.http.samples.bridge.StartupListener</listener-class>
- </listener>
-
- <listener>
-
<listener-class>org.apache.felix.http.proxy.ProxyListener</listener-class>
- </listener>
-
- <servlet>
- <servlet-name>proxy</servlet-name>
- <servlet-class>org.apache.felix.http.proxy.ProxyServlet</servlet-class>
- <load-on-startup>1</load-on-startup>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>proxy</servlet-name>
- <url-pattern>/*</url-pattern>
- </servlet-mapping>
-
-</web-app>
diff --git a/http/samples/whiteboard/pom.xml b/http/samples/whiteboard/pom.xml
index 526f4bfde1..ec9314eb4e 100644
--- a/http/samples/whiteboard/pom.xml
+++ b/http/samples/whiteboard/pom.xml
@@ -22,12 +22,12 @@
<parent>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.http.parent</artifactId>
- <version>9</version>
+ <version>13</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
<name>Apache Felix Http Samples - Whiteboard</name>
- <description>This example shows how to register servlets and filters using
the Http Whiteboard Service.</description>
+ <description>This example shows how to register servlets and filters using
the Servlet Whiteboard Service.</description>
<artifactId>org.apache.felix.http.samples.whiteboard</artifactId>
<version>3.0.0-SNAPSHOT</version>
<packaging>bundle</packaging>
@@ -43,22 +43,16 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>3.0.1</version>
+ <version>5.1.4</version>
<extensions>true</extensions>
<configuration>
<instructions>
<Bundle-Activator>
org.apache.felix.http.samples.whiteboard.Activator
</Bundle-Activator>
- <Private-Package>
- org.apache.felix.http.samples.whiteboard
- </Private-Package>
<Export-Package>
- !org.apache.felix.http.samples.whiteboard
+ !org.apache.felix.http.samples.whiteboard
</Export-Package>
- <Require-Capability>
- osgi.contract;
filter:="(&(osgi.contract=JavaServlet)(version>=3.1))"
- </Require-Capability>
</instructions>
</configuration>
</plugin>
@@ -67,8 +61,10 @@
<dependencies>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
+ <version>5.0.0</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
@@ -76,7 +72,9 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.cmpn</artifactId>
+ <artifactId>org.osgi.service.servlet</artifactId>
+ <version>2.0.0-RC1</version>
+ <scope>provided</scope>
</dependency>
</dependencies>
</project>
diff --git
a/http/samples/whiteboard/src/main/java/org/apache/felix/http/samples/whiteboard/Activator.java
b/http/samples/whiteboard/src/main/java/org/apache/felix/http/samples/whiteboard/Activator.java
index d628edbc72..5b92209475 100644
---
a/http/samples/whiteboard/src/main/java/org/apache/felix/http/samples/whiteboard/Activator.java
+++
b/http/samples/whiteboard/src/main/java/org/apache/felix/http/samples/whiteboard/Activator.java
@@ -19,14 +19,16 @@ package org.apache.felix.http.samples.whiteboard;
import java.util.Dictionary;
import java.util.Hashtable;
-import javax.servlet.Filter;
-import javax.servlet.Servlet;
+import jakarta.servlet.Filter;
+import jakarta.servlet.Servlet;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
-import org.osgi.service.http.context.ServletContextHelper;
-import org.osgi.service.http.whiteboard.HttpWhiteboardConstants;
+import org.osgi.service.servlet.context.ServletContextHelper;
+import org.osgi.service.servlet.whiteboard.HttpWhiteboardConstants;
+import org.osgi.service.servlet.whiteboard.annotations.RequireHttpWhiteboard;
+@RequireHttpWhiteboard
public final class Activator
implements BundleActivator
{
@@ -39,21 +41,21 @@ public final class Activator
final TestServletContext servletContext = new
TestServletContext(context.getBundle());
// register the servlet context with name "filtersample" at
"/filtersample"
- final Dictionary<String, Object> servletContextProps = new
Hashtable<String, Object>();
+ final Dictionary<String, Object> servletContextProps = new
Hashtable<>();
servletContextProps.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_CONTEXT_NAME,
"filtersample");
servletContextProps.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_CONTEXT_PATH,
"/filtersample");
context.registerService(ServletContextHelper.class, servletContext,
servletContextProps);
// create and register servlets
final TestServlet servlet1 = new TestServlet("servlet1");
- final Dictionary<String, Object> servlet1Props = new Hashtable<String,
Object>();
+ final Dictionary<String, Object> servlet1Props = new Hashtable<>();
servlet1Props.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_SERVLET_PATTERN, "/");
servlet1Props.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_CONTEXT_SELECT,
"(" + HttpWhiteboardConstants.HTTP_WHITEBOARD_CONTEXT_NAME +
"=filtersample)");
context.registerService(Servlet.class, servlet1, servlet1Props);
final TestServlet servlet2 = new TestServlet("servlet2");
- final Dictionary<String, Object> servlet2Props = new Hashtable<String,
Object>();
+ final Dictionary<String, Object> servlet2Props = new Hashtable<>();
servlet2Props.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_SERVLET_PATTERN,
"/other/*");
servlet2Props.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_CONTEXT_SELECT,
"(" + HttpWhiteboardConstants.HTTP_WHITEBOARD_CONTEXT_NAME +
"=filtersample)");
@@ -61,14 +63,14 @@ public final class Activator
// create and register filters
final TestFilter filter1 = new TestFilter("filter1");
- final Dictionary<String, Object> filter1Props = new Hashtable<String,
Object>();
+ final Dictionary<String, Object> filter1Props = new Hashtable<>();
filter1Props.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_FILTER_PATTERN, "/*");
filter1Props.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_CONTEXT_SELECT,
"(" + HttpWhiteboardConstants.HTTP_WHITEBOARD_CONTEXT_NAME +
"=filtersample)");
context.registerService(Filter.class, filter1, filter1Props);
final TestFilter filter2 = new TestFilter("filter2");
- final Dictionary<String, Object> filter2Props = new Hashtable<String,
Object>();
+ final Dictionary<String, Object> filter2Props = new Hashtable<>();
filter2Props.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_FILTER_PATTERN,
"/other/*");
filter2Props.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_CONTEXT_SELECT,
"(" + HttpWhiteboardConstants.HTTP_WHITEBOARD_CONTEXT_NAME +
"=filtersample)");
diff --git
a/http/samples/whiteboard/src/main/java/org/apache/felix/http/samples/whiteboard/TestFilter.java
b/http/samples/whiteboard/src/main/java/org/apache/felix/http/samples/whiteboard/TestFilter.java
index 8a73afd65f..0d47566a66 100644
---
a/http/samples/whiteboard/src/main/java/org/apache/felix/http/samples/whiteboard/TestFilter.java
+++
b/http/samples/whiteboard/src/main/java/org/apache/felix/http/samples/whiteboard/TestFilter.java
@@ -16,7 +16,7 @@
*/
package org.apache.felix.http.samples.whiteboard;
-import javax.servlet.*;
+import jakarta.servlet.*;
import java.io.IOException;
public class TestFilter
diff --git
a/http/samples/whiteboard/src/main/java/org/apache/felix/http/samples/whiteboard/TestServlet.java
b/http/samples/whiteboard/src/main/java/org/apache/felix/http/samples/whiteboard/TestServlet.java
index 22ca8836f6..01d90c387e 100644
---
a/http/samples/whiteboard/src/main/java/org/apache/felix/http/samples/whiteboard/TestServlet.java
+++
b/http/samples/whiteboard/src/main/java/org/apache/felix/http/samples/whiteboard/TestServlet.java
@@ -16,11 +16,11 @@
*/
package org.apache.felix.http.samples.whiteboard;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletConfig;
+import jakarta.servlet.ServletException;
import java.io.IOException;
import java.io.PrintWriter;
diff --git
a/http/samples/whiteboard/src/main/java/org/apache/felix/http/samples/whiteboard/TestServletContext.java
b/http/samples/whiteboard/src/main/java/org/apache/felix/http/samples/whiteboard/TestServletContext.java
index 9e42ffa592..79644d4a73 100644
---
a/http/samples/whiteboard/src/main/java/org/apache/felix/http/samples/whiteboard/TestServletContext.java
+++
b/http/samples/whiteboard/src/main/java/org/apache/felix/http/samples/whiteboard/TestServletContext.java
@@ -17,7 +17,7 @@
package org.apache.felix.http.samples.whiteboard;
import org.osgi.framework.Bundle;
-import org.osgi.service.http.context.ServletContextHelper;
+import org.osgi.service.servlet.context.ServletContextHelper;
/**
* Simple sample servlet context
