-
Notifications
You must be signed in to change notification settings - Fork 66
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Replace http.whiteboard packages by OSGi-bundles from Maven-Central
Part of #18 Move the sources from org.osgi.service.http to a new org.eclipse.equinox.http.service.api Plug-in project that contains since o.o.service.http imports javax.servlet packages in versions that are not available as OSGi bundles.
- Loading branch information
1 parent
9658936
commit 50a907d
Showing
44 changed files
with
254 additions
and
2,970 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| /src/ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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.m2e.core.maven2Builder</name> | ||
| <arguments> | ||
| </arguments> | ||
| </buildCommand> | ||
| </buildSpec> | ||
| <natures> | ||
| <nature>org.eclipse.m2e.core.maven2Nature</nature> | ||
| <nature>org.eclipse.pde.PluginNature</nature> | ||
| <nature>org.eclipse.jdt.core.javanature</nature> | ||
| </natures> | ||
| </projectDescription> |
2 changes: 2 additions & 0 deletions
2
bundles/org.eclipse.equinox.http.service.api/.settings/org.eclipse.core.resources.prefs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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
8
bundles/org.eclipse.equinox.http.service.api/.settings/org.eclipse.jdt.core.prefs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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 |
4 changes: 4 additions & 0 deletions
4
bundles/org.eclipse.equinox.http.service.api/.settings/org.eclipse.m2e.core.prefs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| activeProfiles= | ||
| eclipse.preferences.version=1 | ||
| resolveWorkspaceProjects=true | ||
| version=1 |
19 changes: 19 additions & 0 deletions
19
bundles/org.eclipse.equinox.http.service.api/META-INF/MANIFEST.MF
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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 | ||
| ("Content"). Unless otherwise indicated below, the Content | ||
| is provided to you under the terms and conditions of the Eclipse | ||
| Public License Version 2.0 ("EPL"). 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, "Program" 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 | ||
| ("Redistributor") 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’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 "OSGi Materials." 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™ 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
18
bundles/org.eclipse.equinox.http.service.api/build.properties
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,60 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <project | ||
| xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" | ||
| xmlns="http://maven.apache.org/POM/4.0.0" | ||
| xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> | ||
| <modelVersion>4.0.0</modelVersion> | ||
| <parent> | ||
| <groupId>org.eclipse.equinox</groupId> | ||
| <artifactId>parent</artifactId> | ||
| <version>4.31.0-SNAPSHOT</version> | ||
| <relativePath>../..</relativePath> | ||
| </parent> | ||
| <artifactId>org.eclipse.equinox.http.service.api</artifactId> | ||
| <version>1.2.2-SNAPSHOT</version> | ||
| <packaging>eclipse-plugin</packaging> | ||
| <name>[bundle] OSGi service http APIs</name> | ||
| <build> | ||
| <sourceDirectory>src</sourceDirectory> | ||
| <plugins> | ||
| <plugin> | ||
| <groupId>org.apache.maven.plugins</groupId> | ||
| <artifactId>maven-clean-plugin</artifactId> | ||
| <configuration> | ||
| <filesets> | ||
| <fileset> | ||
| <directory>src</directory> | ||
| </fileset> | ||
| </filesets> | ||
| </configuration> | ||
| </plugin> | ||
| <plugin> | ||
| <groupId>org.apache.maven.plugins</groupId> | ||
| <artifactId>maven-dependency-plugin</artifactId> | ||
| <executions> | ||
| <execution> | ||
| <id>unpack-sources</id> | ||
| <phase>generate-sources</phase> | ||
| <goals> | ||
| <goal>unpack</goal> | ||
| </goals> | ||
| <configuration> | ||
| <artifactItems> | ||
| <artifactItem> | ||
| <groupId>org.osgi</groupId> | ||
| <artifactId>org.osgi.service.http</artifactId> | ||
| <version>1.2.2</version> | ||
| <classifier>sources</classifier> | ||
| <outputDirectory>src</outputDirectory> | ||
| <includes>**/*.java</includes> | ||
| <overWrite>true</overWrite> | ||
| </artifactItem> | ||
| </artifactItems> | ||
| <overWriteReleases>true</overWriteReleases> | ||
| </configuration> | ||
| </execution> | ||
| </executions> | ||
| </plugin> | ||
| </plugins> | ||
| </build> | ||
| </project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.