Author: jsedding
Date: Tue Oct 31 14:45:55 2017
New Revision: 1813889
URL: http://svn.apache.org/viewvc?rev=1813889&view=rev
Log:
OAK-6889 - Followup on OAK-6755: fix OSGi component descriptors
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/datastore/DataStoreTextProviderService.java
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/user/UserConfigurationImpl.java
jackrabbit/oak/trunk/oak-security-spi/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/plugins/index/datastore/DataStoreTextProviderService.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/datastore/DataStoreTextProviderService.java?rev=1813889&r1=1813888&r2=1813889&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/datastore/DataStoreTextProviderService.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/datastore/DataStoreTextProviderService.java
Tue Oct 31 14:45:55 2017
@@ -39,7 +39,7 @@ import static com.google.common.base.Pre
@Component(
configurationPolicy = ConfigurationPolicy.REQUIRE,
service = {},
- configurationPid =
"org.apache.jackrabbit.oak.plugins.blob.datastore.DataStoreTextProviderService")
+ name =
"org.apache.jackrabbit.oak.plugins.blob.datastore.DataStoreTextProviderService")
@Designate(ocd = DataStoreTextProviderService.Configuration.class)
public class DataStoreTextProviderService {
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=1813889&r1=1813888&r2=1813889&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
Tue Oct 31 14:45:55 2017
@@ -82,7 +82,8 @@ public class AuthenticationConfiguration
@SuppressWarnings("UnusedDeclaration")
@Activate
- private void activate(Map<String, Object> properties) {
+ // reference to @Configuration class needed for correct DS xml generation
+ private void activate(Configuration configuration, 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=1813889&r1=1813888&r2=1813889&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
Tue Oct 31 14:45:55 2017
@@ -112,7 +112,8 @@ public class TokenConfigurationImpl exte
//----------------------------------------------------------------< SCR
>---
@SuppressWarnings("UnusedDeclaration")
@Activate
- private void activate(Map<String, Object> properties) {
+ // reference to @Configuration class needed for correct DS xml generation
+ private void activate(Configuration configuration, 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=1813889&r1=1813888&r2=1813889&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
Tue Oct 31 14:45:55 2017
@@ -64,6 +64,7 @@ import org.osgi.service.component.annota
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
import org.osgi.service.metatype.annotations.AttributeDefinition;
+import org.osgi.service.metatype.annotations.Designate;
import org.osgi.service.metatype.annotations.ObjectClassDefinition;
import org.osgi.service.metatype.annotations.Option;
@@ -73,6 +74,7 @@ import org.osgi.service.metatype.annotat
@Component(
service = {AuthorizationConfiguration.class,
SecurityConfiguration.class},
property = OAK_SECURITY_NAME +
"=org.apache.jackrabbit.oak.security.authorization.AuthorizationConfigurationImpl")
+@Designate(ocd = AuthorizationConfigurationImpl.Configuration.class)
public class AuthorizationConfigurationImpl extends ConfigurationBase
implements AuthorizationConfiguration {
@ObjectClassDefinition(name = "Apache Jackrabbit Oak
AuthorizationConfiguration")
@@ -94,7 +96,7 @@ public class AuthorizationConfigurationI
@Option(label = ImportBehavior.NAME_BESTEFFORT, value
= ImportBehavior.NAME_BESTEFFORT),
@Option(label = ImportBehavior.NAME_IGNORE, value =
ImportBehavior.NAME_IGNORE)
})
- String importBehaviour() default ImportBehavior.NAME_ABORT;
+ String importBehavior() default ImportBehavior.NAME_ABORT;
@AttributeDefinition(
name = "Readable Paths",
@@ -125,7 +127,8 @@ public class AuthorizationConfigurationI
@SuppressWarnings("UnusedDeclaration")
@Activate
- private void activate(Map<String, Object> properties) {
+ // reference to @Configuration class needed for correct DS xml generation
+ private void activate(Configuration configuration, 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=1813889&r1=1813888&r2=1813889&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
Tue Oct 31 14:45:55 2017
@@ -172,7 +172,8 @@ public class UserConfigurationImpl exten
@SuppressWarnings("UnusedDeclaration")
@Activate
- private void activate(Map<String, Object> properties) {
+ // reference to @Configuration class needed for correct DS xml generation
+ private void activate(Configuration configuration, Map<String, Object>
properties) {
setParameters(ConfigurationParameters.of(properties));
}
Modified:
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/user/action/DefaultAuthorizableActionProvider.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/user/action/DefaultAuthorizableActionProvider.java?rev=1813889&r1=1813888&r2=1813889&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/user/action/DefaultAuthorizableActionProvider.java
(original)
+++
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/user/action/DefaultAuthorizableActionProvider.java
Tue Oct 31 14:45:55 2017
@@ -52,10 +52,10 @@ public class DefaultAuthorizableActionPr
description = "The set of actions that is supported by this
provider implementation.",
cardinality = 4,
options = {
- @Option(label =
"org.apache.jackrabbit.oak.spi.security.user.action.AccessControlAction", value
= "AccessControlAction"),
- @Option(label =
"org.apache.jackrabbit.oak.spi.security.user.action.PasswordValidationAction",
value = "PasswordValidationAction"),
- @Option(label =
"org.apache.jackrabbit.oak.spi.security.user.action.PasswordChangeAction",
value = "PasswordChangeAction"),
- @Option(label =
"org.apache.jackrabbit.oak.spi.security.user.action.ClearMembershipAction",
value = "ClearMembershipAction")
+ @Option(label = "AccessControlAction", value =
"org.apache.jackrabbit.oak.spi.security.user.action.AccessControlAction"),
+ @Option(label = "PasswordValidationAction", value =
"org.apache.jackrabbit.oak.spi.security.user.action.PasswordValidationAction"),
+ @Option(label = "PasswordChangeAction", value =
"org.apache.jackrabbit.oak.spi.security.user.action.PasswordChangeAction"),
+ @Option(label = "ClearMembershipAction", value =
"org.apache.jackrabbit.oak.spi.security.user.action.ClearMembershipAction")
})
String[] enabledActions();
