Author: cziegeler
Date: Mon Aug 1 14:32:09 2016
New Revision: 1754757
URL: http://svn.apache.org/viewvc?rev=1754757&view=rev
Log:
Move to OSGi annotations
Modified:
sling/trunk/bundles/engine/pom.xml
sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/RequestLog.java
sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/SlingRequestProcessor.java
sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/SlingSettingsService.java
sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/jmx/FilterProcessorMBean.java
sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/jmx/RequestProcessorMBean.java
sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/jmx/package-info.java
sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/package-info.java
sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/servlets/AbstractServiceReferenceConfig.java
sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/servlets/ErrorHandler.java
sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/servlets/package-info.java
Modified: sling/trunk/bundles/engine/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/engine/pom.xml?rev=1754757&r1=1754756&r2=1754757&view=diff
==============================================================================
--- sling/trunk/bundles/engine/pom.xml (original)
+++ sling/trunk/bundles/engine/pom.xml Mon Aug 1 14:32:09 2016
@@ -33,7 +33,7 @@
<name>Apache Sling Engine Implementation</name>
<description>
- Bundle implementing the core of Sling.
+ Bundle implementing the core of Apache Sling.
</description>
<scm>
@@ -63,7 +63,6 @@
javax.servlet;javax.servlet.http;version="[2.6,4)",
javax.servlet.descriptor;version="[2.6,4)",
org.osgi.service.useradmin;
- org.apache.commons.math.*;resolution:=optional,
*
</Import-Package>
</instructions>
Modified:
sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/RequestLog.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/RequestLog.java?rev=1754757&r1=1754756&r2=1754757&view=diff
==============================================================================
---
sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/RequestLog.java
(original)
+++
sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/RequestLog.java
Mon Aug 1 14:32:09 2016
@@ -18,7 +18,7 @@
*/
package org.apache.sling.engine;
-import aQute.bnd.annotation.ConsumerType;
+import org.osgi.annotation.versioning.ConsumerType;
/**
* The <code>RequestLog</code> interface defines the API to be implemented by
Modified:
sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/SlingRequestProcessor.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/SlingRequestProcessor.java?rev=1754757&r1=1754756&r2=1754757&view=diff
==============================================================================
---
sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/SlingRequestProcessor.java
(original)
+++
sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/SlingRequestProcessor.java
Mon Aug 1 14:32:09 2016
@@ -25,8 +25,7 @@ import javax.servlet.http.HttpServletReq
import javax.servlet.http.HttpServletResponse;
import org.apache.sling.api.resource.ResourceResolver;
-
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
/**
* The <code>SlingRequestProcessor</code> interface defines the service which
@@ -48,8 +47,8 @@ public interface SlingRequestProcessor {
* <p>
* This method does <b>not</b> close the provided resource resolver!
* <p>
- * The org.apache.sling.servlet-helpers module provides synthetic
- * request/response classes which can be useful when using this service.
+ * The org.apache.sling.servlet-helpers module provides synthetic
+ * request/response classes which can be useful when using this service.
*
* @param request Usually a "synthetic" request, i.e. not supplied by
* servlet container
Modified:
sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/SlingSettingsService.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/SlingSettingsService.java?rev=1754757&r1=1754756&r2=1754757&view=diff
==============================================================================
---
sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/SlingSettingsService.java
(original)
+++
sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/SlingSettingsService.java
Mon Aug 1 14:32:09 2016
@@ -18,7 +18,7 @@
*/
package org.apache.sling.engine;
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
/**
* The <code>SlingSettingsService</code> provides basic Sling settings.
Modified:
sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/jmx/FilterProcessorMBean.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/jmx/FilterProcessorMBean.java?rev=1754757&r1=1754756&r2=1754757&view=diff
==============================================================================
---
sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/jmx/FilterProcessorMBean.java
(original)
+++
sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/jmx/FilterProcessorMBean.java
Mon Aug 1 14:32:09 2016
@@ -16,14 +16,14 @@
*/
package org.apache.sling.engine.jmx;
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
/**
* This is the management interface for the Filter.
*/
@ProviderType
public interface FilterProcessorMBean {
-
+
/**
* Returns the number of invocations collected since last resetting the
* statistics.
@@ -32,7 +32,7 @@ public interface FilterProcessorMBean {
* @see #resetStatistics()
*/
long getInvocationsCount();
-
+
/**
* Returns the mean filter invocation time in milliseconds since resetting
* the statistics.
@@ -41,7 +41,7 @@ public interface FilterProcessorMBean {
* @see #resetStatistics()
*/
double getMeanFilterDurationMsec();
-
+
/**
* Resets all statistics values and restarts from zero.
*/
Modified:
sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/jmx/RequestProcessorMBean.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/jmx/RequestProcessorMBean.java?rev=1754757&r1=1754756&r2=1754757&view=diff
==============================================================================
---
sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/jmx/RequestProcessorMBean.java
(original)
+++
sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/jmx/RequestProcessorMBean.java
Mon Aug 1 14:32:09 2016
@@ -16,7 +16,7 @@
*/
package org.apache.sling.engine.jmx;
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
/**
* This is the management interface for the SlingRequestProcessor.
@@ -65,7 +65,7 @@ public interface RequestProcessorMBean {
* statistics. If zero or one requests have been collected only, this
method
* returns zero.
*
- * @return Standard deviation
+ * @return Standard deviation
* @see #resetStatistics()
*/
double getStandardDeviationDurationMsec();
Modified:
sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/jmx/package-info.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/jmx/package-info.java?rev=1754757&r1=1754756&r2=1754757&view=diff
==============================================================================
---
sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/jmx/package-info.java
(original)
+++
sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/jmx/package-info.java
Mon Aug 1 14:32:09 2016
@@ -17,8 +17,7 @@
* under the License.
*/
-@Version("1.1")
[email protected]("1.1.1")
package org.apache.sling.engine.jmx;
-import aQute.bnd.annotation.Version;
Modified:
sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/package-info.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/package-info.java?rev=1754757&r1=1754756&r2=1754757&view=diff
==============================================================================
---
sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/package-info.java
(original)
+++
sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/package-info.java
Mon Aug 1 14:32:09 2016
@@ -17,8 +17,6 @@
* under the License.
*/
-@Version("2.2")
[email protected]("2.2.1")
package org.apache.sling.engine;
-import aQute.bnd.annotation.Version;
-
Modified:
sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/servlets/AbstractServiceReferenceConfig.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/servlets/AbstractServiceReferenceConfig.java?rev=1754757&r1=1754756&r2=1754757&view=diff
==============================================================================
---
sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/servlets/AbstractServiceReferenceConfig.java
(original)
+++
sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/servlets/AbstractServiceReferenceConfig.java
Mon Aug 1 14:32:09 2016
@@ -30,9 +30,9 @@ import java.util.List;
import javax.servlet.ServletContext;
+import org.osgi.annotation.versioning.ConsumerType;
import org.osgi.framework.ServiceReference;
-import aQute.bnd.annotation.ConsumerType;
/**
* The <code>AbstractServiceReferenceConfig</code> may be used as a base class
Modified:
sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/servlets/ErrorHandler.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/servlets/ErrorHandler.java?rev=1754757&r1=1754756&r2=1754757&view=diff
==============================================================================
---
sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/servlets/ErrorHandler.java
(original)
+++
sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/servlets/ErrorHandler.java
Mon Aug 1 14:32:09 2016
@@ -22,8 +22,7 @@ import java.io.IOException;
import org.apache.sling.api.SlingHttpServletRequest;
import org.apache.sling.api.SlingHttpServletResponse;
-
-import aQute.bnd.annotation.ConsumerType;
+import org.osgi.annotation.versioning.ConsumerType;
/**
* The <code>ErrorHandler</code> defines the interface of the service used by
Modified:
sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/servlets/package-info.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/servlets/package-info.java?rev=1754757&r1=1754756&r2=1754757&view=diff
==============================================================================
---
sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/servlets/package-info.java
(original)
+++
sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/servlets/package-info.java
Mon Aug 1 14:32:09 2016
@@ -17,8 +17,7 @@
* under the License.
*/
-@Version("2.0.8")
[email protected]("2.0.9")
package org.apache.sling.engine.servlets;
-import aQute.bnd.annotation.Version;
