Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Replace embedded service.http sources in org.eclipse.osgi.services by original bundles and deprecate o.e.osgi.services #403

Merged
merged 2 commits into from
Dec 18, 2023
Merged

Replace embedded service.http sources in org.eclipse.osgi.services by original bundles and deprecate o.e.osgi.services #403

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6102c86
Replace http.whiteboard packages by OSGi-bundles from Maven-Central
HannesWell Sep 23, 2023
258a200
Deprecate Plug-in `org.eclipse.osgi.services`
HannesWell Nov 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions bundles/org.eclipse.equinox.http.service.api/.classpath
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
</classpath>
34 changes: 34 additions & 0 deletions bundles/org.eclipse.equinox.http.service.api/.project
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>org.eclipse.equinox.http.service.api</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.pde.ManifestBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.pde.SchemaBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
</natures>
</projectDescription>
2 changes: 2 additions & 0 deletions bundles/org.eclipse.equinox.http.service.api/.settings/org.eclipse.core.resources.prefs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
eclipse.preferences.version=1
encoding/<project>=UTF-8
8 changes: 8 additions & 0 deletions bundles/org.eclipse.equinox.http.service.api/.settings/org.eclipse.jdt.core.prefs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.release=disabled
org.eclipse.jdt.core.compiler.source=1.8
19 changes: 19 additions & 0 deletions bundles/org.eclipse.equinox.http.service.api/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: OSGi service http APIs
Bundle-SymbolicName: org.eclipse.equinox.http.service.api
Bundle-Version: 1.2.2.qualifier
Bundle-Vendor: Eclipse.org - Equinox
Automatic-Module-Name: org.eclipse.equinox.http.service.api
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Import-Package: javax.servlet;version="[2.1.0,5.0.0)",
javax.servlet.http;version="[2.1.0,5.0.0)"
Export-Package: org.osgi.service.http;version="1.2.2";uses:="javax.servlet,javax.servlet.http"
Bundle-Description: OSGi Companion Code for org.osgi.service.http Version 1.2.2
Bundle-License: Apache-2.0;description="This program and the accompanying materials
are made available under the terms of the Apache License, Version 2.0."
;link="https://opensource.org/licenses/Apache-2.0"
SPDX-License-Identifier: Apache-2.0
Provide-Capability: osgi.contract;osgi.contract=JavaServlet
;version:List<Version>="2.6,3.0,3.1,4.0"
;uses:="javax.servlet,javax.servlet.http,javax.servlet.descriptor,javax.servlet.annotation"
75 changes: 75 additions & 0 deletions bundles/org.eclipse.equinox.http.service.api/about.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
<title>About</title>
</head>
<body lang="EN-US">
<h2>About This Content</h2>

<p>December 14, 2023</p>
<h3>License</h3>

<p>
The Eclipse Foundation makes available all content in this plug-in
(&quot;Content&quot;). Unless otherwise indicated below, the Content
is provided to you under the terms and conditions of the Eclipse
Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is
available at <a href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>.
For purposes of the EPL, &quot;Program&quot; will mean the Content.
</p>

<p>
If you did not receive this Content directly from the Eclipse
Foundation, the Content is being redistributed by another party
(&quot;Redistributor&quot;) and different terms and conditions may
apply to your use of any object code in the Content. Check the
Redistributor's license that was provided with the Content. If no such
license exists, contact the Redistributor. Unless otherwise indicated
below, the terms and conditions of the EPL still apply to any source
code in the Content and such source code may be obtained at <a
href="http://www.eclipse.org/">http://www.eclipse.org</a>.
</p>


<h3>Third Party Content</h3>

<p>The Content includes items that have been sourced from third parties as set out below. If you
did not receive this Content directly from the Eclipse Foundation, the following is provided
for informational purposes only, and you should look to the Redistributor&rsquo;s license for
terms and conditions of use.</p>

<h4>OSGi Materials</h4>

<p>All files in the following sub-directories (and their sub-directories):</p>

<ul>
<li>org/osgi</li>
</ul>

<p>shall be defined as the &quot;OSGi Materials.&quot; The OSGi Materials are:</p>

<blockquote>
Copyright (c) 2000, 2006
<br /><br />
OSGi Alliance
Bishop Ranch 6<br/>
2400 Camino Ramon, Suite 375<br/>
San Ramon, CA 94583 USA
<br /><br />
All Rights Reserved.
</blockquote>

<p>The OSGi Materials are provided to you under the terms and conditions of the Apache License, Version 2.0. A copy of the license is contained
in the file <a href="about_files/LICENSE-2.0.txt" target="_blank">LICENSE-2.0.txt</a> and is also available at <a href="http://www.apache.org/licenses/LICENSE-2.0.html" target="_blank">http://www.apache.org/licenses/LICENSE-2.0.html</a>.</p>

<p>Implementation of certain elements of the OSGi Materials may be subject to third party intellectual property rights, including without limitation, patent rights (such a third party may
or may not be a member of the OSGi Alliance). The OSGi Alliance and its members are not responsible and shall not be held responsible in any manner for identifying or failing to identify any or all such third party
intellectual property rights.</p>

<small>OSGi&trade; is a trademark, registered trademark, or service mark of The OSGi Alliance in the US and other countries. Java is a trademark,
registered trademark, or service mark of Sun Microsystems, Inc. in the US and other countries. All other trademarks, registered trademarks, or
service marks used in the Content are the property of their respective owners and are hereby recognized.</small>
</body>
</html>
18 changes: 18 additions & 0 deletions bundles/org.eclipse.equinox.http.service.api/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
###############################################################################
# Copyright (c) 2023, 2023 IBM Corporation and others.
#
# This program and the accompanying materials
# are made available under the terms of the Eclipse Public License 2.0
# which accompanies this distribution, and is available at
# https://www.eclipse.org/legal/epl-2.0/
#
# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# IBM Corporation - initial API and implementation
###############################################################################
source.. = src/
output.. = bin/
bin.includes = META-INF/,\
.,\
about.html
11 changes: 7 additions & 4 deletions ...rc/org/osgi/service/http/HttpContext.java → ...rc/org/osgi/service/http/HttpContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,26 @@
/*
* Copyright (c) OSGi Alliance (2000, 2014). All Rights Reserved.
/*******************************************************************************
* Copyright (c) Contributors to the Eclipse Foundation
*
* 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
* 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.
*/
*
* SPDX-License-Identifier: Apache-2.0
*******************************************************************************/

package org.osgi.service.http;

import java.io.IOException;
import java.net.URL;

import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

Expand Down
11 changes: 7 additions & 4 deletions ...rc/org/osgi/service/http/HttpService.java → ...rc/org/osgi/service/http/HttpService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,25 @@
/*
* Copyright (c) OSGi Alliance (2000, 2015). All Rights Reserved.
/*******************************************************************************
* Copyright (c) Contributors to the Eclipse Foundation
*
* 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
* 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.
*/
*
* SPDX-License-Identifier: Apache-2.0
*******************************************************************************/

package org.osgi.service.http;

import java.util.Dictionary;

import javax.servlet.Servlet;
import javax.servlet.ServletException;

Expand Down
10 changes: 6 additions & 4 deletions ...osgi/service/http/NamespaceException.java → ...osgi/service/http/NamespaceException.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,20 @@
/*
* Copyright (c) OSGi Alliance (2000, 2015). All Rights Reserved.
/*******************************************************************************
* Copyright (c) Contributors to the Eclipse Foundation
*
* 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
* 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.
*/
*
* SPDX-License-Identifier: Apache-2.0
*******************************************************************************/

package org.osgi.service.http;

Expand Down
14 changes: 8 additions & 6 deletions ...c/org/osgi/service/http/package-info.java → ...c/org/osgi/service/http/package-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,20 @@
/*
* Copyright (c) OSGi Alliance (2010, 2016). All Rights Reserved.
*
/*******************************************************************************
* Copyright (c) Contributors to the Eclipse Foundation
*
* 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
* 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.
*/
*
* SPDX-License-Identifier: Apache-2.0
*******************************************************************************/

/**
* Http Service Package Version 1.2.
Expand All @@ -35,7 +37,7 @@
* @author $Id$
*/

@Version("1.2.1")
@Version("1.2.2")
package org.osgi.service.http;

import org.osgi.annotation.versioning.Version;
44 changes: 20 additions & 24 deletions bundles/org.eclipse.osgi.services/.settings/.api_filters
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,44 +1,40 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<component id="org.eclipse.osgi.services" version="2">
<resource path="META-INF/MANIFEST.MF" type="org.osgi.service.cm.ConfigurationConstants">
<filter comment="Removed source files replaced by required and reexported osgi-bundles" id="388194388">
<resource path="META-INF/MANIFEST.MF">
<filter id="926941240">
<message_arguments>
<message_argument value="org.osgi.service.cm.ConfigurationConstants"/>
<message_argument value="CONFIGURATION_ADMIN_SPECIFICATION_VERSION"/>
<message_argument value="1.6.0"/>
<message_argument value="3.12.0"/>
<message_argument value="3.11.100"/>
</message_arguments>
</filter>
</resource>
<resource path="META-INF/MANIFEST.MF" type="org.osgi.service.component.ComponentConstants">
<filter comment="Removed source files replaced by required and reexported osgi-bundles" id="388194388">
<filter id="926941240">
<message_arguments>
<message_argument value="org.osgi.service.component.ComponentConstants"/>
<message_argument value="COMPONENT_SPECIFICATION_VERSION"/>
<message_argument value="1.4.0"/>
<message_argument value="3.12.0"/>
<message_argument value="3.11.200"/>
</message_arguments>
</filter>
<filter comment="Removed source files replaced by required and reexported osgi-bundles" id="403767336">
</resource>
<resource path="META-INF/MANIFEST.MF" type="org.osgi.service.http.HttpContext">
<filter id="305324134">
<message_arguments>
<message_argument value="org.osgi.service.component.ComponentConstants"/>
<message_argument value="REFERENCE_NAME_SATISFYING_CONDITION"/>
<message_argument value="org.osgi.service.http.HttpContext"/>
<message_argument value="org.eclipse.osgi.services_3.12.0"/>
</message_arguments>
</filter>
</resource>
<resource path="META-INF/MANIFEST.MF" type="org.osgi.service.event.EventConstants">
<filter comment="Removed source files replaced by required and reexported osgi-bundles" id="388194388">
<resource path="META-INF/MANIFEST.MF" type="org.osgi.service.http.HttpService">
<filter id="305324134">
<message_arguments>
<message_argument value="org.osgi.service.event.EventConstants"/>
<message_argument value="EVENT_ADMIN_SPECIFICATION_VERSION"/>
<message_argument value="1.4.0"/>
<message_argument value="org.osgi.service.http.HttpService"/>
<message_argument value="org.eclipse.osgi.services_3.12.0"/>
</message_arguments>
</filter>
</resource>
<resource path="META-INF/MANIFEST.MF" type="org.osgi.service.metatype.MetaTypeService">
<filter comment="Removed source files replaced by required and reexported osgi-bundles" id="388194388">
<resource path="META-INF/MANIFEST.MF" type="org.osgi.service.http.NamespaceException">
<filter id="305324134">
<message_arguments>
<message_argument value="org.osgi.service.metatype.MetaTypeService"/>
<message_argument value="METATYPE_SPECIFICATION_VERSION"/>
<message_argument value="1.4.0"/>
<message_argument value="org.osgi.service.http.NamespaceException"/>
<message_argument value="org.eclipse.osgi.services_3.12.0"/>
</message_arguments>
</filter>
</resource>
Expand Down
Loading
Loading