You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by tr...@apache.org on 2014/02/27 19:37:37 UTC
svn commit: r1572673 - in
/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak:
security/authentication/ security/authentication/token/
security/authorization/ security/principal/ security/privilege/
security/user/ spi/security/user/a...
Author: tripod
Date: Thu Feb 27 18:37:36 2014
New Revision: 1572673
URL: http://svn.apache.org/r1572673
Log:
OAK-1474 ConfigurationBase must not use 'componentAbstract'
- now with correct activate signatures :-)
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/AuthenticationConfigurationImpl.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/token/TokenConfigurationImpl.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/AuthorizationConfigurationImpl.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/principal/PrincipalConfigurationImpl.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeConfigurationImpl.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserConfigurationImpl.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/user/action/DefaultAuthorizableActionProvider.java
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/AuthenticationConfigurationImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/AuthenticationConfigurationImpl.java?rev=1572673&r1=1572672&r2=1572673&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/AuthenticationConfigurationImpl.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/AuthenticationConfigurationImpl.java Thu Feb 27 18:37:36 2014
@@ -16,7 +16,7 @@
*/
package org.apache.jackrabbit.oak.security.authentication;
-import java.util.Dictionary;
+import java.util.Map;
import javax.annotation.Nonnull;
import javax.security.auth.login.Configuration;
@@ -63,7 +63,7 @@ public class AuthenticationConfiguration
}
@Activate
- private void activate(Dictionary<String, Object> properties) {
+ private void activate(Map<String, Object> properties) {
setParameters(ConfigurationParameters.of(properties));
}
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/token/TokenConfigurationImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/token/TokenConfigurationImpl.java?rev=1572673&r1=1572672&r2=1572673&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/token/TokenConfigurationImpl.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/token/TokenConfigurationImpl.java Thu Feb 27 18:37:36 2014
@@ -16,7 +16,7 @@
*/
package org.apache.jackrabbit.oak.security.authentication.token;
-import java.util.Dictionary;
+import java.util.Map;
import javax.annotation.Nonnull;
@@ -48,7 +48,7 @@ public class TokenConfigurationImpl exte
}
@Activate
- private void activate(Dictionary<String, Object> properties) {
+ private void activate(Map<String, Object> properties) {
setParameters(ConfigurationParameters.of(properties));
}
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/AuthorizationConfigurationImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/AuthorizationConfigurationImpl.java?rev=1572673&r1=1572672&r2=1572673&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/AuthorizationConfigurationImpl.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/AuthorizationConfigurationImpl.java Thu Feb 27 18:37:36 2014
@@ -18,8 +18,8 @@ package org.apache.jackrabbit.oak.securi
import java.security.Principal;
import java.util.Collections;
-import java.util.Dictionary;
import java.util.List;
+import java.util.Map;
import java.util.Set;
import javax.annotation.Nonnull;
@@ -71,7 +71,7 @@ public class AuthorizationConfigurationI
}
@Activate
- private void activate(Dictionary<String, Object> properties) {
+ private void activate(Map<String, Object> properties) {
setParameters(ConfigurationParameters.of(properties));
}
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/principal/PrincipalConfigurationImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/principal/PrincipalConfigurationImpl.java?rev=1572673&r1=1572672&r2=1572673&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/principal/PrincipalConfigurationImpl.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/principal/PrincipalConfigurationImpl.java Thu Feb 27 18:37:36 2014
@@ -16,7 +16,7 @@
*/
package org.apache.jackrabbit.oak.security.principal;
-import java.util.Dictionary;
+import java.util.Map;
import javax.annotation.Nonnull;
@@ -51,7 +51,7 @@ public class PrincipalConfigurationImpl
}
@Activate
- private void activate(Dictionary<String, Object> properties) {
+ private void activate(Map<String, Object> properties) {
setParameters(ConfigurationParameters.of(properties));
}
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeConfigurationImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeConfigurationImpl.java?rev=1572673&r1=1572672&r2=1572673&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeConfigurationImpl.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeConfigurationImpl.java Thu Feb 27 18:37:36 2014
@@ -18,8 +18,8 @@ package org.apache.jackrabbit.oak.securi
import java.security.Principal;
import java.util.Collections;
-import java.util.Dictionary;
import java.util.List;
+import java.util.Map;
import java.util.Set;
import javax.annotation.Nonnull;
@@ -55,7 +55,7 @@ public class PrivilegeConfigurationImpl
}
@Activate
- private void activate(Dictionary<String, Object> properties) {
+ private void activate(Map<String, Object> properties) {
setParameters(ConfigurationParameters.of(properties));
}
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserConfigurationImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserConfigurationImpl.java?rev=1572673&r1=1572672&r2=1572673&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserConfigurationImpl.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserConfigurationImpl.java Thu Feb 27 18:37:36 2014
@@ -18,8 +18,8 @@ package org.apache.jackrabbit.oak.securi
import java.security.Principal;
import java.util.Collections;
-import java.util.Dictionary;
import java.util.List;
+import java.util.Map;
import java.util.Set;
import javax.annotation.Nonnull;
@@ -59,7 +59,7 @@ public class UserConfigurationImpl exten
}
@Activate
- private void activate(Dictionary<String, Object> properties) {
+ private void activate(Map<String, Object> properties) {
setParameters(ConfigurationParameters.of(properties));
}
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/user/action/DefaultAuthorizableActionProvider.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/user/action/DefaultAuthorizableActionProvider.java?rev=1572673&r1=1572672&r2=1572673&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/user/action/DefaultAuthorizableActionProvider.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/user/action/DefaultAuthorizableActionProvider.java Thu Feb 27 18:37:36 2014
@@ -17,8 +17,8 @@
package org.apache.jackrabbit.oak.spi.security.user.action;
import java.util.List;
+import java.util.Map;
-import com.google.common.collect.Lists;
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Property;
@@ -26,10 +26,11 @@ import org.apache.felix.scr.annotations.
import org.apache.felix.scr.annotations.Service;
import org.apache.jackrabbit.oak.spi.security.ConfigurationParameters;
import org.apache.jackrabbit.oak.spi.security.SecurityProvider;
-import org.osgi.service.component.ComponentContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import com.google.common.collect.Lists;
+
/**
* Default implementation of the {@link AuthorizableActionProvider} interface
* that allows to config all actions provided by the OAK.
@@ -83,7 +84,7 @@ public class DefaultAuthorizableActionPr
//----------------------------------------------------< SCR Integration >---
@Activate
- protected void activate(ComponentContext context) {
- config = ConfigurationParameters.of(context.getProperties());
+ private void activate(Map<String, Object> properties) {
+ config = ConfigurationParameters.of(properties);
}
}
\ No newline at end of file