You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by cz...@apache.org on 2017/11/15 16:52:30 UTC
svn commit: r1815337 - in
/felix/trunk/http/api/src/main/java/org/osgi/service/http: context/
runtime/ runtime/dto/ whiteboard/
Author: cziegeler
Date: Wed Nov 15 16:52:30 2017
New Revision: 1815337
URL: http://svn.apache.org/viewvc?rev=1815337&view=rev
Log:
Updates to latest OSGi API
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/context/package-info.java
felix/trunk/http/api/src/main/java/org/osgi/service/http/runtime/HttpServiceRuntime.java
felix/trunk/http/api/src/main/java/org/osgi/service/http/runtime/HttpServiceRuntimeConstants.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/runtime/dto/FailedServletDTO.java
felix/trunk/http/api/src/main/java/org/osgi/service/http/runtime/package-info.java
felix/trunk/http/api/src/main/java/org/osgi/service/http/whiteboard/Preprocessor.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=1815337&r1=1815336&r2=1815337&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 Wed Nov 15 16:52:30 2017
@@ -1,5 +1,5 @@
/*
- * Copyright (c) OSGi Alliance (2000, 2015). All Rights Reserved.
+ * Copyright (c) OSGi Alliance (2000, 2017). All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Modified: felix/trunk/http/api/src/main/java/org/osgi/service/http/context/package-info.java
URL: http://svn.apache.org/viewvc/felix/trunk/http/api/src/main/java/org/osgi/service/http/context/package-info.java?rev=1815337&r1=1815336&r2=1815337&view=diff
==============================================================================
--- felix/trunk/http/api/src/main/java/org/osgi/service/http/context/package-info.java (original)
+++ felix/trunk/http/api/src/main/java/org/osgi/service/http/context/package-info.java Wed Nov 15 16:52:30 2017
@@ -1,5 +1,5 @@
/*
- * Copyright (c) OSGi Alliance (2010, 2015). All Rights Reserved.
+ * Copyright (c) OSGi Alliance (2010, 2017). All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Modified: felix/trunk/http/api/src/main/java/org/osgi/service/http/runtime/HttpServiceRuntime.java
URL: http://svn.apache.org/viewvc/felix/trunk/http/api/src/main/java/org/osgi/service/http/runtime/HttpServiceRuntime.java?rev=1815337&r1=1815336&r2=1815337&view=diff
==============================================================================
--- felix/trunk/http/api/src/main/java/org/osgi/service/http/runtime/HttpServiceRuntime.java (original)
+++ felix/trunk/http/api/src/main/java/org/osgi/service/http/runtime/HttpServiceRuntime.java Wed Nov 15 16:52:30 2017
@@ -1,5 +1,5 @@
/*
- * Copyright (c) OSGi Alliance (2012, 2015). All Rights Reserved.
+ * Copyright (c) OSGi Alliance (2012, 2017). All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Modified: felix/trunk/http/api/src/main/java/org/osgi/service/http/runtime/HttpServiceRuntimeConstants.java
URL: http://svn.apache.org/viewvc/felix/trunk/http/api/src/main/java/org/osgi/service/http/runtime/HttpServiceRuntimeConstants.java?rev=1815337&r1=1815336&r2=1815337&view=diff
==============================================================================
--- felix/trunk/http/api/src/main/java/org/osgi/service/http/runtime/HttpServiceRuntimeConstants.java (original)
+++ felix/trunk/http/api/src/main/java/org/osgi/service/http/runtime/HttpServiceRuntimeConstants.java Wed Nov 15 16:52:30 2017
@@ -1,5 +1,5 @@
/*
- * Copyright (c) OSGi Alliance (2012, 2015). All Rights Reserved.
+ * Copyright (c) OSGi Alliance (2012, 2017). All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
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=1815337&r1=1815336&r2=1815337&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 Wed Nov 15 16:52:30 2017
@@ -1,6 +1,6 @@
/*
* Copyright (c) OSGi Alliance (2012, 2017). All Rights Reserved.
- *
+ *
* 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
Modified: felix/trunk/http/api/src/main/java/org/osgi/service/http/runtime/dto/FailedServletDTO.java
URL: http://svn.apache.org/viewvc/felix/trunk/http/api/src/main/java/org/osgi/service/http/runtime/dto/FailedServletDTO.java?rev=1815337&r1=1815336&r2=1815337&view=diff
==============================================================================
--- felix/trunk/http/api/src/main/java/org/osgi/service/http/runtime/dto/FailedServletDTO.java (original)
+++ felix/trunk/http/api/src/main/java/org/osgi/service/http/runtime/dto/FailedServletDTO.java Wed Nov 15 16:52:30 2017
@@ -42,5 +42,5 @@ public class FailedServletDTO extends Se
* @see DTOConstants#FAILURE_REASON_WHITEBOARD_WRITE_TO_DEFAULT_DENIED
* @see DTOConstants#FAILURE_REASON_SERVLET_READ_FROM_DEFAULT_DENIED
*/
- public int failureReason;
+ public int failureReason;
}
Modified: felix/trunk/http/api/src/main/java/org/osgi/service/http/runtime/package-info.java
URL: http://svn.apache.org/viewvc/felix/trunk/http/api/src/main/java/org/osgi/service/http/runtime/package-info.java?rev=1815337&r1=1815336&r2=1815337&view=diff
==============================================================================
--- felix/trunk/http/api/src/main/java/org/osgi/service/http/runtime/package-info.java (original)
+++ felix/trunk/http/api/src/main/java/org/osgi/service/http/runtime/package-info.java Wed Nov 15 16:52:30 2017
@@ -1,5 +1,5 @@
/*
- * Copyright (c) OSGi Alliance (2010, 2015). All Rights Reserved.
+ * Copyright (c) OSGi Alliance (2010, 2017). All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -15,27 +15,25 @@
*/
/**
- * Http Runtime Package Version 1.0.
- *
+ * Http Runtime Package Version 1.1.
* <p>
* Bundles wishing to use this package must list the package in the
* Import-Package header of the bundle's manifest. This package has two types of
* users: the consumers that use the API in this package and the providers that
* implement the API in this package.
- *
* <p>
* Example import for consumers using the API in this package:
* <p>
- * {@code Import-Package: org.osgi.service.http.runtime; version="[1.0,2.0)"}
+ * {@code Import-Package: org.osgi.service.http.runtime; version="[1.1,2.0)"}
* <p>
* Example import for providers implementing the API in this package:
* <p>
- * {@code Import-Package: org.osgi.service.http.runtime; version="[1.0,1.1)"}
+ * {@code Import-Package: org.osgi.service.http.runtime; version="[1.1,1.2)"}
*
* @author $Id$
*/
-@Version("1.0")
+@Version("1.1")
package org.osgi.service.http.runtime;
import org.osgi.annotation.versioning.Version;
Modified: felix/trunk/http/api/src/main/java/org/osgi/service/http/whiteboard/Preprocessor.java
URL: http://svn.apache.org/viewvc/felix/trunk/http/api/src/main/java/org/osgi/service/http/whiteboard/Preprocessor.java?rev=1815337&r1=1815336&r2=1815337&view=diff
==============================================================================
--- felix/trunk/http/api/src/main/java/org/osgi/service/http/whiteboard/Preprocessor.java (original)
+++ felix/trunk/http/api/src/main/java/org/osgi/service/http/whiteboard/Preprocessor.java Wed Nov 15 16:52:30 2017
@@ -1,5 +1,5 @@
/*
- * Copyright (c) OSGi Alliance (2000, 2017). All Rights Reserved.
+ * Copyright (c) OSGi Alliance (2017). All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.