Author: frm
Date: Mon Sep 21 10:19:20 2015
New Revision: 1704256
URL: http://svn.apache.org/viewvc?rev=1704256&view=rev
Log:
OAK-3431 - SecurityProviderRegistration should not be part of an exported
package
Added:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/internal/
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/internal/Preconditions.java
- copied, changed from r1703758,
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/Preconditions.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/internal/SecurityProviderRegistration.java
- copied, changed from r1703758,
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/SecurityProviderRegistration.java
Removed:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/Preconditions.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/SecurityProviderRegistration.java
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/SecurityProviderImpl.java
jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/SecurityProviderRegistrationTest.groovy
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/SecurityProviderImpl.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/SecurityProviderImpl.java?rev=1704256&r1=1704255&r2=1704256&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/SecurityProviderImpl.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/SecurityProviderImpl.java
Mon Sep 21 10:19:20 2015
@@ -82,27 +82,27 @@ public class SecurityProviderImpl implem
this.tokenConfiguration = new TokenConfigurationImpl(this);
}
- protected void setAuthenticationConfiguration(AuthenticationConfiguration
authenticationConfiguration) {
+ public void setAuthenticationConfiguration(AuthenticationConfiguration
authenticationConfiguration) {
this.authenticationConfiguration =
checkNotNull(authenticationConfiguration);
}
- protected void setAuthorizationConfiguration(AuthorizationConfiguration
authorizationConfiguration) {
+ public void setAuthorizationConfiguration(AuthorizationConfiguration
authorizationConfiguration) {
this.authorizationConfiguration = authorizationConfiguration;
}
- protected void setUserConfiguration(UserConfiguration userConfiguration) {
+ public void setUserConfiguration(UserConfiguration userConfiguration) {
this.userConfiguration = userConfiguration;
}
- protected void setPrincipalConfiguration(PrincipalConfiguration
principalConfiguration) {
+ public void setPrincipalConfiguration(PrincipalConfiguration
principalConfiguration) {
this.principalConfiguration = principalConfiguration;
}
- protected void setPrivilegeConfiguration(PrivilegeConfiguration
privilegeConfiguration) {
+ public void setPrivilegeConfiguration(PrivilegeConfiguration
privilegeConfiguration) {
this.privilegeConfiguration = privilegeConfiguration;
}
- protected void setTokenConfiguration(TokenConfiguration
tokenConfiguration) {
+ public void setTokenConfiguration(TokenConfiguration tokenConfiguration) {
this.tokenConfiguration = tokenConfiguration;
}
Copied:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/internal/Preconditions.java
(from r1703758,
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/Preconditions.java)
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/internal/Preconditions.java?p2=jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/internal/Preconditions.java&p1=jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/Preconditions.java&r1=1703758&r2=1704256&rev=1704256&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/Preconditions.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/internal/Preconditions.java
Mon Sep 21 10:19:20 2015
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jackrabbit.oak.security;
+package org.apache.jackrabbit.oak.security.internal;
import java.util.Set;
Copied:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/internal/SecurityProviderRegistration.java
(from r1703758,
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/SecurityProviderRegistration.java)
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/internal/SecurityProviderRegistration.java?p2=jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/internal/SecurityProviderRegistration.java&p1=jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/SecurityProviderRegistration.java&r1=1703758&r2=1704256&rev=1704256&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/SecurityProviderRegistration.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/internal/SecurityProviderRegistration.java
Mon Sep 21 10:19:20 2015
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jackrabbit.oak.security;
+package org.apache.jackrabbit.oak.security.internal;
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
@@ -29,6 +29,7 @@ import org.apache.felix.scr.annotations.
import org.apache.felix.scr.annotations.References;
import org.apache.jackrabbit.oak.commons.PropertiesUtil;
import org.apache.jackrabbit.oak.osgi.OsgiWhiteboard;
+import org.apache.jackrabbit.oak.security.SecurityProviderImpl;
import org.apache.jackrabbit.oak.security.user.UserConfigurationImpl;
import org.apache.jackrabbit.oak.spi.security.ConfigurationBase;
import org.apache.jackrabbit.oak.spi.security.ConfigurationParameters;
@@ -131,6 +132,7 @@ import static com.google.common.collect.
policy = ReferencePolicy.DYNAMIC
)
})
+@SuppressWarnings("unused")
public class SecurityProviderRegistration {
private static final Logger log =
LoggerFactory.getLogger(SecurityProviderRegistration.class);
Modified:
jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/SecurityProviderRegistrationTest.groovy
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/SecurityProviderRegistrationTest.groovy?rev=1704256&r1=1704255&r2=1704256&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/SecurityProviderRegistrationTest.groovy
(original)
+++
jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/SecurityProviderRegistrationTest.groovy
Mon Sep 21 10:19:20 2015
@@ -165,7 +165,7 @@ class SecurityProviderRegistrationTest e
private void setRequiredServicePids(String... pids) {
setConfiguration([
-
"org.apache.jackrabbit.oak.security.SecurityProviderRegistration": [
+
"org.apache.jackrabbit.oak.security.internal.SecurityProviderRegistration": [
"requiredServicePids": pids
]
])
