Author: fmeschbe
Date: Tue Jul 27 11:49:15 2010
New Revision: 979648
URL: http://svn.apache.org/viewvc?rev=979648&view=rev
Log:
SLING-1575 Import o.a.s.api.auth package with an implementor's version range
(bundle plugin will log warnings, but it works correctly) and fix the
@scr.service tag to refer to the correct interface name in the
SlingAuthenticator class
Modified:
sling/trunk/bundles/commons/auth/pom.xml
sling/trunk/bundles/commons/auth/src/main/java/org/apache/sling/commons/auth/impl/SlingAuthenticator.java
Modified: sling/trunk/bundles/commons/auth/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/commons/auth/pom.xml?rev=979648&r1=979647&r2=979648&view=diff
==============================================================================
--- sling/trunk/bundles/commons/auth/pom.xml (original)
+++ sling/trunk/bundles/commons/auth/pom.xml Tue Jul 27 11:49:15 2010
@@ -63,6 +63,10 @@
org.apache.sling.commons.auth.spi;version=1.0.0,
org.apache.sling.engine.auth;version=2.0.6
</Export-Package>
+ <Import-Package>
+
org.apache.sling.api.auth;version="[$(version;==;$(@)),$(version;=+;$(@)))",
+ *
+ </Import-Package>
<Private-Package>
org.apache.sling.commons.auth.impl.*
</Private-Package>
Modified:
sling/trunk/bundles/commons/auth/src/main/java/org/apache/sling/commons/auth/impl/SlingAuthenticator.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/commons/auth/src/main/java/org/apache/sling/commons/auth/impl/SlingAuthenticator.java?rev=979648&r1=979647&r2=979648&view=diff
==============================================================================
---
sling/trunk/bundles/commons/auth/src/main/java/org/apache/sling/commons/auth/impl/SlingAuthenticator.java
(original)
+++
sling/trunk/bundles/commons/auth/src/main/java/org/apache/sling/commons/auth/impl/SlingAuthenticator.java
Tue Jul 27 11:49:15 2010
@@ -76,8 +76,8 @@ import org.slf4j.LoggerFactory;
* modified="modified" immediate="true"
*
* Register for three services
+ * @scr.service interface="org.apache.sling.api.auth.Authenticator"
* @scr.service interface="org.apache.sling.commons.auth.AuthenticationSupport"
- * @scr.service interface="org.apache.sling.commons.auth.Authenticator"
* @scr.service interface="javax.servlet.ServletRequestListener"
*
* @scr.property name="service.vendor" value="The Apache Software Foundation"
