Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Watson2008-04-24 17:55:55 +0000
committerThomas Watson2008-04-24 17:55:55 +0000
commit9c8ad809cea4db22dce6cf5299214bc17ced77aa (patch)
treeb2a20cf7272f07b6359a4ddc2df84c517e9ed5a5
parentbfe7efce1aabfbdf8fb56efcf5173c8cf7d26941 (diff)
downloadrt.equinox.bundles-9c8ad809cea4db22dce6cf5299214bc17ced77aa.tar.gz
rt.equinox.bundles-9c8ad809cea4db22dce6cf5299214bc17ced77aa.tar.xz
rt.equinox.bundles-9c8ad809cea4db22dce6cf5299214bc17ced77aa.zip
Bug 227593 [server] convert projects to use api tooling
-rw-r--r--bundles/org.eclipse.equinox.http.jetty5/META-INF/MANIFEST.MF2
-rw-r--r--bundles/org.eclipse.equinox.http.jetty5/src/org/eclipse/equinox/http/jetty/JettyConfigurator.java6
-rw-r--r--bundles/org.eclipse.equinox.http.jetty5/src/org/eclipse/equinox/http/jetty/JettyConstants.java3
-rw-r--r--bundles/org.eclipse.equinox.http.jetty6/META-INF/MANIFEST.MF2
-rw-r--r--bundles/org.eclipse.equinox.http.jetty6/src/org/eclipse/equinox/http/jetty/JettyConfigurator.java6
-rw-r--r--bundles/org.eclipse.equinox.http.jetty6/src/org/eclipse/equinox/http/jetty/JettyConstants.java3
-rw-r--r--bundles/org.eclipse.equinox.http.registry/.project6
-rw-r--r--bundles/org.eclipse.equinox.http.registry/src/org/eclipse/equinox/http/registry/HttpContextExtensionService.java4
-rw-r--r--bundles/org.eclipse.equinox.http.servlet/.project6
-rw-r--r--bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/HttpServiceServlet.java3
-rw-r--r--bundles/org.eclipse.equinox.http.servletbridge/.project6
-rw-r--r--bundles/org.eclipse.equinox.jsp.jasper.registry/.project6
-rw-r--r--bundles/org.eclipse.equinox.jsp.jasper.registry/src/org/eclipse/equinox/jsp/jasper/registry/JSPFactory.java2
-rw-r--r--bundles/org.eclipse.equinox.jsp.jasper/.project6
-rw-r--r--bundles/org.eclipse.equinox.jsp.jasper/src/org/eclipse/equinox/jsp/jasper/JspServlet.java11
-rw-r--r--bundles/org.eclipse.equinox.servletbridge/.project6
16 files changed, 67 insertions, 11 deletions
diff --git a/bundles/org.eclipse.equinox.http.jetty5/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.http.jetty5/META-INF/MANIFEST.MF
index 7915f4fce..4d83edbd0 100644
--- a/bundles/org.eclipse.equinox.http.jetty5/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.http.jetty5/META-INF/MANIFEST.MF
@@ -17,7 +17,7 @@ Import-Package: javax.servlet;version="[2.4.0,2.6.0)",
org.osgi.service.startlevel;version="1.0"
Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,
J2SE-1.3
-Export-Package: org.eclipse.equinox.http.jetty;version="1.0.0"
+Export-Package: org.eclipse.equinox.http.jetty;version="1.1.0"
Comment-Header: Both Eclipse-LazyStart and Bundle-ActivationPolicy are specified for compatibility with 3.2
Eclipse-LazyStart: true
Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.equinox.http.jetty5/src/org/eclipse/equinox/http/jetty/JettyConfigurator.java b/bundles/org.eclipse.equinox.http.jetty5/src/org/eclipse/equinox/http/jetty/JettyConfigurator.java
index 42f237bdc..8a5b2a08c 100644
--- a/bundles/org.eclipse.equinox.http.jetty5/src/org/eclipse/equinox/http/jetty/JettyConfigurator.java
+++ b/bundles/org.eclipse.equinox.http.jetty5/src/org/eclipse/equinox/http/jetty/JettyConfigurator.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others
+ * Copyright (c) 2007, 2008 IBM Corporation and others
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -12,9 +12,9 @@ package org.eclipse.equinox.http.jetty;
import java.security.Permission;
import java.util.Dictionary;
+import org.eclipse.equinox.http.jetty.internal.Activator;
import org.osgi.framework.Constants;
import org.osgi.service.cm.ConfigurationPermission;
-import org.eclipse.equinox.http.jetty.internal.Activator;
/**
* <p>
@@ -23,6 +23,8 @@ import org.eclipse.equinox.http.jetty.internal.Activator;
* </p>
*
* @see org.eclipse.equinox.http.jetty.JettyConstants
+ * @noextend This class is not intended to be subclassed by clients.
+ * @noinstantiate This class is not intended to be instantiated by clients.
*/
public class JettyConfigurator {
private static final String PID_PREFIX = "org.eclipse.equinox.http.jetty.JettyConfigurator."; //$NON-NLS-1$
diff --git a/bundles/org.eclipse.equinox.http.jetty5/src/org/eclipse/equinox/http/jetty/JettyConstants.java b/bundles/org.eclipse.equinox.http.jetty5/src/org/eclipse/equinox/http/jetty/JettyConstants.java
index 5153dbdf6..a1d9da849 100644
--- a/bundles/org.eclipse.equinox.http.jetty5/src/org/eclipse/equinox/http/jetty/JettyConstants.java
+++ b/bundles/org.eclipse.equinox.http.jetty5/src/org/eclipse/equinox/http/jetty/JettyConstants.java
@@ -14,6 +14,9 @@ package org.eclipse.equinox.http.jetty;
* <p>
* Provides configuration constants for use with JettyConfigurator.
* </p>
+ * @since 1.1
+ * @noextend This interface is not intended to be extended by clients.
+ * @noimplement This interface is not intended to be implemented by clients.
*/
public interface JettyConstants {
diff --git a/bundles/org.eclipse.equinox.http.jetty6/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.http.jetty6/META-INF/MANIFEST.MF
index 7915f4fce..4d83edbd0 100644
--- a/bundles/org.eclipse.equinox.http.jetty6/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.http.jetty6/META-INF/MANIFEST.MF
@@ -17,7 +17,7 @@ Import-Package: javax.servlet;version="[2.4.0,2.6.0)",
org.osgi.service.startlevel;version="1.0"
Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,
J2SE-1.3
-Export-Package: org.eclipse.equinox.http.jetty;version="1.0.0"
+Export-Package: org.eclipse.equinox.http.jetty;version="1.1.0"
Comment-Header: Both Eclipse-LazyStart and Bundle-ActivationPolicy are specified for compatibility with 3.2
Eclipse-LazyStart: true
Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.equinox.http.jetty6/src/org/eclipse/equinox/http/jetty/JettyConfigurator.java b/bundles/org.eclipse.equinox.http.jetty6/src/org/eclipse/equinox/http/jetty/JettyConfigurator.java
index 42f237bdc..8a5b2a08c 100644
--- a/bundles/org.eclipse.equinox.http.jetty6/src/org/eclipse/equinox/http/jetty/JettyConfigurator.java
+++ b/bundles/org.eclipse.equinox.http.jetty6/src/org/eclipse/equinox/http/jetty/JettyConfigurator.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others
+ * Copyright (c) 2007, 2008 IBM Corporation and others
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -12,9 +12,9 @@ package org.eclipse.equinox.http.jetty;
import java.security.Permission;
import java.util.Dictionary;
+import org.eclipse.equinox.http.jetty.internal.Activator;
import org.osgi.framework.Constants;
import org.osgi.service.cm.ConfigurationPermission;
-import org.eclipse.equinox.http.jetty.internal.Activator;
/**
* <p>
@@ -23,6 +23,8 @@ import org.eclipse.equinox.http.jetty.internal.Activator;
* </p>
*
* @see org.eclipse.equinox.http.jetty.JettyConstants
+ * @noextend This class is not intended to be subclassed by clients.
+ * @noinstantiate This class is not intended to be instantiated by clients.
*/
public class JettyConfigurator {
private static final String PID_PREFIX = "org.eclipse.equinox.http.jetty.JettyConfigurator."; //$NON-NLS-1$
diff --git a/bundles/org.eclipse.equinox.http.jetty6/src/org/eclipse/equinox/http/jetty/JettyConstants.java b/bundles/org.eclipse.equinox.http.jetty6/src/org/eclipse/equinox/http/jetty/JettyConstants.java
index 5153dbdf6..a1d9da849 100644
--- a/bundles/org.eclipse.equinox.http.jetty6/src/org/eclipse/equinox/http/jetty/JettyConstants.java
+++ b/bundles/org.eclipse.equinox.http.jetty6/src/org/eclipse/equinox/http/jetty/JettyConstants.java
@@ -14,6 +14,9 @@ package org.eclipse.equinox.http.jetty;
* <p>
* Provides configuration constants for use with JettyConfigurator.
* </p>
+ * @since 1.1
+ * @noextend This interface is not intended to be extended by clients.
+ * @noimplement This interface is not intended to be implemented by clients.
*/
public interface JettyConstants {
diff --git a/bundles/org.eclipse.equinox.http.registry/.project b/bundles/org.eclipse.equinox.http.registry/.project
index b05bbea7d..63af634c9 100644
--- a/bundles/org.eclipse.equinox.http.registry/.project
+++ b/bundles/org.eclipse.equinox.http.registry/.project
@@ -20,9 +20,15 @@
<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>
diff --git a/bundles/org.eclipse.equinox.http.registry/src/org/eclipse/equinox/http/registry/HttpContextExtensionService.java b/bundles/org.eclipse.equinox.http.registry/src/org/eclipse/equinox/http/registry/HttpContextExtensionService.java
index f09e8c580..4e0ae6e17 100644
--- a/bundles/org.eclipse.equinox.http.registry/src/org/eclipse/equinox/http/registry/HttpContextExtensionService.java
+++ b/bundles/org.eclipse.equinox.http.registry/src/org/eclipse/equinox/http/registry/HttpContextExtensionService.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2005-2007 Cognos Incorporated, IBM Corporation and others
+ * Copyright (c) 2005-2008 Cognos Incorporated, IBM Corporation and others
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -18,6 +18,8 @@ import org.osgi.service.http.HttpContext;
/**
* The HttpContextExtensionService provides access to an HttpContext instance whose resources and implementation
* are added via the "httpcontexts" extension point.
+ * @noimplement This interface is not intended to be implemented by clients.
+ * @noextend This interface is not intended to be extended by clients.
*/
public interface HttpContextExtensionService {
/**
diff --git a/bundles/org.eclipse.equinox.http.servlet/.project b/bundles/org.eclipse.equinox.http.servlet/.project
index b32d05a6c..25c020f01 100644
--- a/bundles/org.eclipse.equinox.http.servlet/.project
+++ b/bundles/org.eclipse.equinox.http.servlet/.project
@@ -20,9 +20,15 @@
<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>
diff --git a/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/HttpServiceServlet.java b/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/HttpServiceServlet.java
index be5a8c478..2a9be876a 100644
--- a/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/HttpServiceServlet.java
+++ b/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/HttpServiceServlet.java
@@ -18,7 +18,8 @@ import org.eclipse.equinox.http.servlet.internal.ProxyServlet;
* will in-turn register and provide an OSGi Http Service implementation.
* This class is not meant for extending or even using directly and is purely meant for registering
* in a servlet container.
+ * @noextend This class is not intended to be subclassed by clients.
*/
public class HttpServiceServlet extends ProxyServlet {
- private static final long serialVersionUID = -3647550992964861187L;
+ private static final long serialVersionUID = -3647550992964861187L;
}
diff --git a/bundles/org.eclipse.equinox.http.servletbridge/.project b/bundles/org.eclipse.equinox.http.servletbridge/.project
index 3db137a10..c11759434 100644
--- a/bundles/org.eclipse.equinox.http.servletbridge/.project
+++ b/bundles/org.eclipse.equinox.http.servletbridge/.project
@@ -20,9 +20,15 @@
<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>
diff --git a/bundles/org.eclipse.equinox.jsp.jasper.registry/.project b/bundles/org.eclipse.equinox.jsp.jasper.registry/.project
index b5660efe0..772aa1237 100644
--- a/bundles/org.eclipse.equinox.jsp.jasper.registry/.project
+++ b/bundles/org.eclipse.equinox.jsp.jasper.registry/.project
@@ -20,9 +20,15 @@
<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>
diff --git a/bundles/org.eclipse.equinox.jsp.jasper.registry/src/org/eclipse/equinox/jsp/jasper/registry/JSPFactory.java b/bundles/org.eclipse.equinox.jsp.jasper.registry/src/org/eclipse/equinox/jsp/jasper/registry/JSPFactory.java
index 842d81775..01f84ae67 100644
--- a/bundles/org.eclipse.equinox.jsp.jasper.registry/src/org/eclipse/equinox/jsp/jasper/registry/JSPFactory.java
+++ b/bundles/org.eclipse.equinox.jsp.jasper.registry/src/org/eclipse/equinox/jsp/jasper/registry/JSPFactory.java
@@ -26,6 +26,8 @@ import org.osgi.framework.Bundle;
* This parameter can be set using the ":" separator approach or by xml parameter.
* </p>
* e.g. class="org.eclipse.equinox.jsp.jasper.registry.JSPFactory:/A/PATH" or &lt;parameter name="path" value="/A/PATH"/&gt;
+ * @noextend This class is not intended to be subclassed by clients.
+ * @noinstantiate This class is not intended to be instantiated by clients.
*/
public class JSPFactory implements IExecutableExtensionFactory, IExecutableExtension {
diff --git a/bundles/org.eclipse.equinox.jsp.jasper/.project b/bundles/org.eclipse.equinox.jsp.jasper/.project
index 593a11a9f..ed50b4ab7 100644
--- a/bundles/org.eclipse.equinox.jsp.jasper/.project
+++ b/bundles/org.eclipse.equinox.jsp.jasper/.project
@@ -20,9 +20,15 @@
<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>
diff --git a/bundles/org.eclipse.equinox.jsp.jasper/src/org/eclipse/equinox/jsp/jasper/JspServlet.java b/bundles/org.eclipse.equinox.jsp.jasper/src/org/eclipse/equinox/jsp/jasper/JspServlet.java
index 39e44c8fd..f5f6d3ba1 100644
--- a/bundles/org.eclipse.equinox.jsp.jasper/src/org/eclipse/equinox/jsp/jasper/JspServlet.java
+++ b/bundles/org.eclipse.equinox.jsp.jasper/src/org/eclipse/equinox/jsp/jasper/JspServlet.java
@@ -21,7 +21,11 @@ import java.util.Enumeration;
import java.util.HashSet;
import java.util.Set;
-import javax.servlet.*;
+import javax.servlet.RequestDispatcher;
+import javax.servlet.Servlet;
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -53,6 +57,7 @@ import org.osgi.framework.Bundle;
* Other than the setting and resetting of the thread context classloader and additional resource lookups in the bundle the JSPServlet
* is behaviourally consistent with the JSP 2.0 specification and regular Jasper operation.
* </p>
+ * @noextend This class is not intended to be subclassed by clients.
*/
public class JspServlet extends HttpServlet {
@@ -159,7 +164,7 @@ public class JspServlet extends HttpServlet {
int lastSlash = resourceName.lastIndexOf('/');
if (lastSlash == -1)
return null;
-
+
String path = resourceName.substring(0, lastSlash);
if (path.length() == 0)
path = "/"; //$NON-NLS-1$
@@ -283,7 +288,7 @@ public class JspServlet extends HttpServlet {
public void setAttribute(String arg0, Object arg1) {
delegate.setAttribute(arg0, arg1);
}
-
+
// Added in Servlet 2.5
public String getContextPath() {
try {
diff --git a/bundles/org.eclipse.equinox.servletbridge/.project b/bundles/org.eclipse.equinox.servletbridge/.project
index f9b866de9..8a77785ef 100644
--- a/bundles/org.eclipse.equinox.servletbridge/.project
+++ b/bundles/org.eclipse.equinox.servletbridge/.project
@@ -20,9 +20,15 @@
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
</natures>
</projectDescription>

Back to the top