You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ol...@apache.org on 2016/11/10 19:16:59 UTC
svn commit: r1769187 -
/sling/trunk/bundles/jcr/oak-server/src/main/java/org/apache/sling/jcr/oak/server/internal/LoginAdminWhitelist.java
Author: olli
Date: Thu Nov 10 19:16:59 2016
New Revision: 1769187
URL: http://svn.apache.org/viewvc?rev=1769187&view=rev
Log:
cleanup (imports)
Modified:
sling/trunk/bundles/jcr/oak-server/src/main/java/org/apache/sling/jcr/oak/server/internal/LoginAdminWhitelist.java
Modified: sling/trunk/bundles/jcr/oak-server/src/main/java/org/apache/sling/jcr/oak/server/internal/LoginAdminWhitelist.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/oak-server/src/main/java/org/apache/sling/jcr/oak/server/internal/LoginAdminWhitelist.java?rev=1769187&r1=1769186&r2=1769187&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/oak-server/src/main/java/org/apache/sling/jcr/oak/server/internal/LoginAdminWhitelist.java (original)
+++ sling/trunk/bundles/jcr/oak-server/src/main/java/org/apache/sling/jcr/oak/server/internal/LoginAdminWhitelist.java Thu Nov 10 19:16:59 2016
@@ -19,18 +19,15 @@
package org.apache.sling.jcr.oak.server.internal;
import java.util.Arrays;
-import java.util.Map;
import java.util.Set;
import java.util.TreeSet;
import java.util.regex.Pattern;
-import org.apache.felix.scr.annotations.Component;
-import org.apache.felix.scr.annotations.Property;
-import org.apache.felix.scr.annotations.Service;
import org.apache.sling.jcr.api.SlingRepository;
import org.osgi.framework.Bundle;
import org.osgi.framework.Constants;
import org.osgi.service.component.annotations.Activate;
+import org.osgi.service.component.annotations.Component;
import org.osgi.service.metatype.annotations.Designate;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -42,7 +39,7 @@ import org.slf4j.LoggerFactory;
* The default configuration lets a few trusted Sling bundles
* use the loginAdministrative method.
*/
-@org.osgi.service.component.annotations.Component(
+@Component(
service = LoginAdminWhitelist.class,
property = {
Constants.SERVICE_DESCRIPTION + "=Apache Sling Login Admin Whitelist",
Re: svn commit: r1769187 - /sling/trunk/bundles/jcr/oak-server/src/main/java/org/apache/sling/jcr/oak/server/internal/LoginAdminWhitelist.java
Posted by Julian Sedding <js...@gmail.com>.
Thanks! Must have missed this one.
Regards
Julian
On Thu, Nov 10, 2016 at 8:16 PM, <ol...@apache.org> wrote:
> Author: olli
> Date: Thu Nov 10 19:16:59 2016
> New Revision: 1769187
>
> URL: http://svn.apache.org/viewvc?rev=1769187&view=rev
> Log:
> cleanup (imports)
>
> Modified:
> sling/trunk/bundles/jcr/oak-server/src/main/java/org/apache/sling/jcr/oak/server/internal/LoginAdminWhitelist.java
>
> Modified: sling/trunk/bundles/jcr/oak-server/src/main/java/org/apache/sling/jcr/oak/server/internal/LoginAdminWhitelist.java
> URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/oak-server/src/main/java/org/apache/sling/jcr/oak/server/internal/LoginAdminWhitelist.java?rev=1769187&r1=1769186&r2=1769187&view=diff
> ==============================================================================
> --- sling/trunk/bundles/jcr/oak-server/src/main/java/org/apache/sling/jcr/oak/server/internal/LoginAdminWhitelist.java (original)
> +++ sling/trunk/bundles/jcr/oak-server/src/main/java/org/apache/sling/jcr/oak/server/internal/LoginAdminWhitelist.java Thu Nov 10 19:16:59 2016
> @@ -19,18 +19,15 @@
> package org.apache.sling.jcr.oak.server.internal;
>
> import java.util.Arrays;
> -import java.util.Map;
> import java.util.Set;
> import java.util.TreeSet;
> import java.util.regex.Pattern;
>
> -import org.apache.felix.scr.annotations.Component;
> -import org.apache.felix.scr.annotations.Property;
> -import org.apache.felix.scr.annotations.Service;
> import org.apache.sling.jcr.api.SlingRepository;
> import org.osgi.framework.Bundle;
> import org.osgi.framework.Constants;
> import org.osgi.service.component.annotations.Activate;
> +import org.osgi.service.component.annotations.Component;
> import org.osgi.service.metatype.annotations.Designate;
> import org.slf4j.Logger;
> import org.slf4j.LoggerFactory;
> @@ -42,7 +39,7 @@ import org.slf4j.LoggerFactory;
> * The default configuration lets a few trusted Sling bundles
> * use the loginAdministrative method.
> */
> -@org.osgi.service.component.annotations.Component(
> +@Component(
> service = LoginAdminWhitelist.class,
> property = {
> Constants.SERVICE_DESCRIPTION + "=Apache Sling Login Admin Whitelist",
>
>