felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r1655578 - in /felix/sandbox/http-rfc189/api/src/main/java/org/apache/felix/http/api: ExtHttpService.java ExtHttpServiceRuntime.java FilterInfo.java ServletInfo.java package-info.java
Date Thu, 29 Jan 2015 10:23:26 GMT
Author: cziegeler
Date: Thu Jan 29 10:23:25 2015
New Revision: 1655578

URL: http://svn.apache.org/r1655578
Log:
Move 189 whiteboard handling to base

Removed:
    felix/sandbox/http-rfc189/api/src/main/java/org/apache/felix/http/api/ExtHttpServiceRuntime.java
    felix/sandbox/http-rfc189/api/src/main/java/org/apache/felix/http/api/FilterInfo.java
    felix/sandbox/http-rfc189/api/src/main/java/org/apache/felix/http/api/ServletInfo.java
Modified:
    felix/sandbox/http-rfc189/api/src/main/java/org/apache/felix/http/api/ExtHttpService.java
    felix/sandbox/http-rfc189/api/src/main/java/org/apache/felix/http/api/package-info.java
  (contents, props changed)

Modified: felix/sandbox/http-rfc189/api/src/main/java/org/apache/felix/http/api/ExtHttpService.java
URL: http://svn.apache.org/viewvc/felix/sandbox/http-rfc189/api/src/main/java/org/apache/felix/http/api/ExtHttpService.java?rev=1655578&r1=1655577&r2=1655578&view=diff
==============================================================================
--- felix/sandbox/http-rfc189/api/src/main/java/org/apache/felix/http/api/ExtHttpService.java
(original)
+++ felix/sandbox/http-rfc189/api/src/main/java/org/apache/felix/http/api/ExtHttpService.java
Thu Jan 29 10:23:25 2015
@@ -24,71 +24,45 @@ import javax.servlet.ServletException;
 
 import org.osgi.service.http.HttpContext;
 import org.osgi.service.http.HttpService;
-import org.osgi.service.http.NamespaceException;
 
 import aQute.bnd.annotation.ProviderType;
 
 /**
  * The {@link ExtHttpService} allows other bundles in the OSGi environment to dynamically
- * register resources, {@link Filter}s and {@link Servlet}s into the URI namespace of a 
+ * register resources, {@link Filter}s and {@link Servlet}s into the URI namespace of a
  * HTTP service implementation. A bundle may later unregister its resources, {@link Filter}s
  * or {@link Servlet}s.
- * 
+ *
  * @see HttpContext
  */
 @ProviderType
 public interface ExtHttpService extends HttpService
 {
     /**
-     * Allows for programmatic registration of a {@link Filter} instance. 
-     * 
+     * Allows for programmatic registration of a {@link Filter} instance.
+     *
      * @param filter the {@link Filter} to register, cannot be <code>null</code>;
-     * @param pattern the filter pattern to register the for, cannot be <code>null</code>
and 
+     * @param pattern the filter pattern to register the for, cannot be <code>null</code>
and
      *        should be a valid regular expression;
-     * @param initParams the initialization parameters passed to the given filter during
its 
-     *        initialization, can be <code>null</code> in case no additional
parameters should 
+     * @param initParams the initialization parameters passed to the given filter during
its
+     *        initialization, can be <code>null</code> in case no additional
parameters should
      *        be provided;
-     * @param ranking defines the order in which filters are called. A higher ranking causes

+     * @param ranking defines the order in which filters are called. A higher ranking causes
      *        the filter to be placed earlier in the filter chain;
      * @param context the optional {@link HttpContext} to associate with this filter, can
be
      *        <code>null</code> in case a default context should be associated.
-     * @throws ServletException in case the registration failed, for example because the

+     * @throws ServletException in case the registration failed, for example because the
      *         initialization failed or due any other problem;
      * @throws IllegalArgumentException in case the given filter was <code>null</code>.
      */
     void registerFilter(Filter filter, String pattern, Dictionary initParams, int ranking,
HttpContext context) throws ServletException;
 
     /**
-     * Allows for programmatic registration of a {@link Filter} instance. 
-     * 
-     * @param filter the {@link Filter} to register, cannot be <code>null</code>;
-     * @param filterInfo the registration details, cannot be <code>null</code>.

-     * @throws ServletException in case the registration failed, for example because the

-     *         initialization failed or due any other problem.
-     * @throws IllegalArgumentException in case the given filter and/or filter information

-     *         was <code>null</code>.
-     */
-    void registerFilter(Filter filter, FilterInfo filterInfo) throws ServletException;
-
-    /**
-     * Allows for programmatic registration of a {@link Servlet} instance.
-     * 
-     * @param servlet the {@link Servlet} to register, cannot be <code>null</code>;
-     * @param servletInfo the registration details, cannot be <code>null</code>.
-     * @throws ServletException in case the registration of the servlet failed, for example
-     *         because the initialization failed or due to any other problem;
-     * @throws NamespaceException in case one of the servlet paths is already in use. 
-     * @throws IllegalArgumentException in case the given servlet and/or servlet information

-     *         was <code>null</code>.
-     */
-    void registerServlet(Servlet servlet, ServletInfo servletInfo) throws ServletException,
NamespaceException;
-
-    /**
      * Unregisters a previously registered {@link Filter}.
      * <p>
      * In case the given filter is not registered, this method is essentially a no-op.
      * </p>
-     * 
+     *
      * @param filter the {@link Filter} to unregister, cannot be <code>null</code>.
      */
     void unregisterFilter(Filter filter);
@@ -98,7 +72,7 @@ public interface ExtHttpService extends
      * <p>
      * In case the given servlet is not registered, this method is essentially a no-op.
      * </p>
-     * 
+     *
      * @param servlet the {@link Servlet} to unregister, cannot be <code>null</code>.
      */
     void unregisterServlet(Servlet servlet);

Modified: felix/sandbox/http-rfc189/api/src/main/java/org/apache/felix/http/api/package-info.java
URL: http://svn.apache.org/viewvc/felix/sandbox/http-rfc189/api/src/main/java/org/apache/felix/http/api/package-info.java?rev=1655578&r1=1655577&r2=1655578&view=diff
==============================================================================
--- felix/sandbox/http-rfc189/api/src/main/java/org/apache/felix/http/api/package-info.java
(original)
+++ felix/sandbox/http-rfc189/api/src/main/java/org/apache/felix/http/api/package-info.java
Thu Jan 29 10:23:25 2015
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-@Version("2.1.0")
+@Version("2.0.6")
 package org.apache.felix.http.api;
 
 import aQute.bnd.annotation.Version;

Propchange: felix/sandbox/http-rfc189/api/src/main/java/org/apache/felix/http/api/package-info.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain



Mime
View raw message