felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r1812816 - in /felix/trunk/http/api/src/main/java/org/osgi/service/http: context/ServletContextHelper.java runtime/dto/DTOConstants.java whiteboard/HttpWhiteboardConstants.java whiteboard/package-info.java
Date Sat, 21 Oct 2017 10:25:51 GMT
Author: cziegeler
Date: Sat Oct 21 10:25:51 2017
New Revision: 1812816

URL: http://svn.apache.org/viewvc?rev=1812816&view=rev
Log:
Update to latest OSGi R7 API. OSGi commit id 8781e36834e238cac583170995cb79b51a21fa60

Modified:
    felix/trunk/http/api/src/main/java/org/osgi/service/http/context/ServletContextHelper.java
    felix/trunk/http/api/src/main/java/org/osgi/service/http/runtime/dto/DTOConstants.java
    felix/trunk/http/api/src/main/java/org/osgi/service/http/whiteboard/HttpWhiteboardConstants.java
    felix/trunk/http/api/src/main/java/org/osgi/service/http/whiteboard/package-info.java

Modified: felix/trunk/http/api/src/main/java/org/osgi/service/http/context/ServletContextHelper.java
URL: http://svn.apache.org/viewvc/felix/trunk/http/api/src/main/java/org/osgi/service/http/context/ServletContextHelper.java?rev=1812816&r1=1812815&r2=1812816&view=diff
==============================================================================
--- felix/trunk/http/api/src/main/java/org/osgi/service/http/context/ServletContextHelper.java
(original)
+++ felix/trunk/http/api/src/main/java/org/osgi/service/http/context/ServletContextHelper.java
Sat Oct 21 10:25:51 2017
@@ -218,7 +218,7 @@ public abstract class ServletContextHelp
 	 * {@link #handleSecurity(HttpServletRequest, HttpServletResponse)}.
 	 * <p>
 	 * This method is only called if 
-	 * {@link #handleSecurity((HttpServletRequest, HttpServletResponse)} returned 
+	 * {@link #handleSecurity(HttpServletRequest, HttpServletResponse)} returned 
 	 * {@code true} for the specified request.
 	 * <p>
 	 * The default implementation of this method does nothing.

Modified: felix/trunk/http/api/src/main/java/org/osgi/service/http/runtime/dto/DTOConstants.java
URL: http://svn.apache.org/viewvc/felix/trunk/http/api/src/main/java/org/osgi/service/http/runtime/dto/DTOConstants.java?rev=1812816&r1=1812815&r2=1812816&view=diff
==============================================================================
--- felix/trunk/http/api/src/main/java/org/osgi/service/http/runtime/dto/DTOConstants.java
(original)
+++ felix/trunk/http/api/src/main/java/org/osgi/service/http/runtime/dto/DTOConstants.java
Sat Oct 21 10:25:51 2017
@@ -78,7 +78,7 @@ public final class DTOConstants {
 	 * The servlet is not registered as it is configured to have multipart
 	 * enabled, but the bundle containing the servlet has no write permission to
 	 * the provided location for the uploaded files.
-	 *
+	 * 
 	 * @since 1.1
 	 */
 	public static final int	FAILURE_REASON_SERVLET_WRITE_TO_LOCATION_DENIED		= 8;
@@ -87,7 +87,7 @@ public final class DTOConstants {
 	 * The servlet is not registered as it is configured to have multipart
 	 * enabled, but the whiteboard implementation has no write permission to the
 	 * default location for the uploaded files.
-	 *
+	 * 
 	 * @since 1.1
 	 */
 	public static final int	FAILURE_REASON_WHITEBOARD_WRITE_TO_DEFAULT_DENIED	= 9;
@@ -96,7 +96,7 @@ public final class DTOConstants {
 	 * The servlet is not registered as it is configured to have multipart
 	 * enabled, but the bundle containing the servlet has no read permission to
 	 * the default location for the uploaded files.
-	 *
+	 * 
 	 * @since 1.1
 	 */
 	public static final int	FAILURE_REASON_SERVLET_READ_FROM_DEFAULT_DENIED		= 10;

Modified: felix/trunk/http/api/src/main/java/org/osgi/service/http/whiteboard/HttpWhiteboardConstants.java
URL: http://svn.apache.org/viewvc/felix/trunk/http/api/src/main/java/org/osgi/service/http/whiteboard/HttpWhiteboardConstants.java?rev=1812816&r1=1812815&r2=1812816&view=diff
==============================================================================
--- felix/trunk/http/api/src/main/java/org/osgi/service/http/whiteboard/HttpWhiteboardConstants.java
(original)
+++ felix/trunk/http/api/src/main/java/org/osgi/service/http/whiteboard/HttpWhiteboardConstants.java
Sat Oct 21 10:25:51 2017
@@ -565,4 +565,20 @@ public final class HttpWhiteboardConstan
 	 * @since 1.1
 	 */
 	public static final String	HTTP_SERVICE_CONTEXT_PROPERTY						= "osgi.http.whiteboard.context.httpservice";
+
+	/**
+	 * The name of the implementation capability for the Http Whiteboard
+	 * specification
+	 * 
+	 * @since 1.1
+	 */
+	public static final String	HTTP_WHITEBOARD_IMPLEMENTATION						= "osgi.http";
+
+	/**
+	 * The version of the implementation capability for the Http Whiteboard
+	 * specification
+	 * 
+	 * @since 1.1
+	 */
+	public static final String	HTTP_WHITEBOARD_SPECIFICATION_VERSION				= "1.1.0";
 }

Modified: felix/trunk/http/api/src/main/java/org/osgi/service/http/whiteboard/package-info.java
URL: http://svn.apache.org/viewvc/felix/trunk/http/api/src/main/java/org/osgi/service/http/whiteboard/package-info.java?rev=1812816&r1=1812815&r2=1812816&view=diff
==============================================================================
--- felix/trunk/http/api/src/main/java/org/osgi/service/http/whiteboard/package-info.java
(original)
+++ felix/trunk/http/api/src/main/java/org/osgi/service/http/whiteboard/package-info.java
Sat Oct 21 10:25:51 2017
@@ -33,8 +33,10 @@
  * @author $Id$
  */
 
-@Version("1.1")
+@Version(HTTP_WHITEBOARD_SPECIFICATION_VERSION)
 package org.osgi.service.http.whiteboard;
 
+import static org.osgi.service.http.whiteboard.HttpWhiteboardConstants.HTTP_WHITEBOARD_SPECIFICATION_VERSION;
+
 import org.osgi.annotation.versioning.Version;
 



Mime
View raw message