jackrabbit-oak-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ang...@apache.org
Subject svn commit: r1448259 - in /jackrabbit/oak/trunk/oak-core: ./ src/main/java/org/apache/jackrabbit/oak/security/ src/main/java/org/apache/jackrabbit/oak/security/authentication/ src/test/java/org/apache/jackrabbit/oak/ src/test/java/org/apache/jackrabbit...
Date Wed, 20 Feb 2013 15:52:04 GMT
Author: angela
Date: Wed Feb 20 15:52:04 2013
New Revision: 1448259

URL: http://svn.apache.org/r1448259
Log:
OAK-645 : Add OSGi package export for o.a.j.oak.security.authentication  (revert changes and
move Util to the security package)

Added:
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/ConfigurationUtil.java
      - copied, changed from r1448157, jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/ConfigurationUtil.java
Removed:
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/ConfigurationUtil.java
Modified:
    jackrabbit/oak/trunk/oak-core/pom.xml
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/AuthenticationConfigurationImpl.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/AbstractSecurityTest.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authentication/DefaultLoginModuleTest.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authentication/Jackrabbit2ConfigurationTest.java

Modified: jackrabbit/oak/trunk/oak-core/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/pom.xml?rev=1448259&r1=1448258&r2=1448259&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-core/pom.xml Wed Feb 20 15:52:04 2013
@@ -17,7 +17,9 @@
    limitations under the License.
   -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd
">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd
">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
@@ -39,38 +41,37 @@
         <configuration>
           <instructions>
             <Export-Package>
-                org.apache.jackrabbit.oak,
-                org.apache.jackrabbit.oak.api,
-                org.apache.jackrabbit.oak.core,
-                org.apache.jackrabbit.oak.kernel,
-                org.apache.jackrabbit.oak.util,
-                org.apache.jackrabbit.oak.namepath,
-                org.apache.jackrabbit.oak.plugins.value,
-                org.apache.jackrabbit.oak.plugins.commit,
-                org.apache.jackrabbit.oak.plugins.identifier,
-                org.apache.jackrabbit.oak.plugins.index,
-                org.apache.jackrabbit.oak.plugins.index.nodetype,
-                org.apache.jackrabbit.oak.plugins.index.property,
-                org.apache.jackrabbit.oak.plugins.index.p2,
-                org.apache.jackrabbit.oak.plugins.memory,
-                org.apache.jackrabbit.oak.plugins.name,
-                org.apache.jackrabbit.oak.plugins.nodetype,
-                org.apache.jackrabbit.oak.plugins.nodetype.write,
-                org.apache.jackrabbit.oak.plugins.observation,
-                org.apache.jackrabbit.oak.plugins.version,
-                org.apache.jackrabbit.oak.spi.query,
-                org.apache.jackrabbit.oak.spi.commit,
-                org.apache.jackrabbit.oak.spi.lifecycle,
-                org.apache.jackrabbit.oak.spi.state,
-                org.apache.jackrabbit.oak.spi.security,
-                org.apache.jackrabbit.oak.spi.security.authentication,
-                org.apache.jackrabbit.oak.spi.security.principal,
-                org.apache.jackrabbit.oak.spi.security.privilege,
-                org.apache.jackrabbit.oak.spi.security.user,
-                org.apache.jackrabbit.oak.spi.security.user.action,
-                org.apache.jackrabbit.oak.spi.security.user.util,
-                org.apache.jackrabbit.oak.security,
-                org.apache.jackrabbit.oak.security.authentication
+              org.apache.jackrabbit.oak,
+              org.apache.jackrabbit.oak.api,
+              org.apache.jackrabbit.oak.core,
+              org.apache.jackrabbit.oak.kernel,
+              org.apache.jackrabbit.oak.util,
+              org.apache.jackrabbit.oak.namepath,
+              org.apache.jackrabbit.oak.plugins.value,
+              org.apache.jackrabbit.oak.plugins.commit,
+              org.apache.jackrabbit.oak.plugins.identifier,
+              org.apache.jackrabbit.oak.plugins.index,
+              org.apache.jackrabbit.oak.plugins.index.nodetype,
+              org.apache.jackrabbit.oak.plugins.index.property,
+              org.apache.jackrabbit.oak.plugins.index.p2,
+              org.apache.jackrabbit.oak.plugins.memory,
+              org.apache.jackrabbit.oak.plugins.name,
+              org.apache.jackrabbit.oak.plugins.nodetype,
+              org.apache.jackrabbit.oak.plugins.nodetype.write,
+              org.apache.jackrabbit.oak.plugins.observation,
+              org.apache.jackrabbit.oak.plugins.version,
+              org.apache.jackrabbit.oak.spi.query,
+              org.apache.jackrabbit.oak.spi.commit,
+              org.apache.jackrabbit.oak.spi.lifecycle,
+              org.apache.jackrabbit.oak.spi.state,
+              org.apache.jackrabbit.oak.spi.security,
+              org.apache.jackrabbit.oak.spi.security.authentication,
+              org.apache.jackrabbit.oak.spi.security.principal,
+              org.apache.jackrabbit.oak.spi.security.privilege,
+              org.apache.jackrabbit.oak.spi.security.user,
+              org.apache.jackrabbit.oak.spi.security.user.action,
+              org.apache.jackrabbit.oak.spi.security.user.util,
+              org.apache.jackrabbit.oak.security
             </Export-Package>
             <Bundle-Activator>
               org.apache.jackrabbit.oak.osgi.Activator
@@ -101,7 +102,9 @@
           <artifactId>apache-rat-plugin</artifactId>
           <configuration>
             <excludes>
-              <exclude>src/test/resources/org/apache/jackrabbit/oak/util/test.json</exclude>
+              <exclude>
+                src/test/resources/org/apache/jackrabbit/oak/util/test.json
+              </exclude>
             </excludes>
           </configuration>
         </plugin>
@@ -157,8 +160,8 @@
     </dependency>
 
     <dependency>
-        <groupId>com.google.guava</groupId>
-        <artifactId>guava</artifactId>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
     </dependency>
 
     <!-- Optional dependencies for different persistence backends -->
@@ -224,16 +227,16 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-        <groupId>ch.qos.logback</groupId>
-        <artifactId>logback-classic</artifactId>
-        <version>1.0.1</version>
-        <scope>test</scope>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+      <version>1.0.1</version>
+      <scope>test</scope>
     </dependency>
     <dependency>
-        <groupId>org.apache.directory.server</groupId>
-        <artifactId>apacheds-server-unit</artifactId>
-        <version>1.5.5</version>
-        <scope>test</scope>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-server-unit</artifactId>
+      <version>1.5.5</version>
+      <scope>test</scope>
     </dependency>
   </dependencies>
 </project>

Copied: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/ConfigurationUtil.java
(from r1448157, jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/ConfigurationUtil.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/ConfigurationUtil.java?p2=jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/ConfigurationUtil.java&p1=jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/ConfigurationUtil.java&r1=1448157&r2=1448259&rev=1448259&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/ConfigurationUtil.java
(original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/ConfigurationUtil.java
Wed Feb 20 15:52:04 2013
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.jackrabbit.oak.security.authentication;
+package org.apache.jackrabbit.oak.security;
 
 import java.util.Collections;
 import java.util.Map;

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=1448259&r1=1448258&r2=1448259&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
Wed Feb 20 15:52:04 2013
@@ -20,6 +20,7 @@ import javax.annotation.Nonnull;
 import javax.security.auth.login.Configuration;
 
 import org.apache.jackrabbit.oak.api.Root;
+import org.apache.jackrabbit.oak.security.ConfigurationUtil;
 import org.apache.jackrabbit.oak.security.authentication.token.TokenProviderImpl;
 import org.apache.jackrabbit.oak.spi.commit.CommitHook;
 import org.apache.jackrabbit.oak.spi.query.QueryIndexProvider;

Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/AbstractSecurityTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/AbstractSecurityTest.java?rev=1448259&r1=1448258&r2=1448259&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/AbstractSecurityTest.java
(original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/AbstractSecurityTest.java
Wed Feb 20 15:52:04 2013
@@ -31,8 +31,8 @@ import org.apache.jackrabbit.oak.namepat
 import org.apache.jackrabbit.oak.plugins.index.p2.Property2IndexHookProvider;
 import org.apache.jackrabbit.oak.plugins.index.p2.Property2IndexProvider;
 import org.apache.jackrabbit.oak.plugins.nodetype.write.InitialContent;
+import org.apache.jackrabbit.oak.security.ConfigurationUtil;
 import org.apache.jackrabbit.oak.security.SecurityProviderImpl;
-import org.apache.jackrabbit.oak.security.authentication.ConfigurationUtil;
 import org.apache.jackrabbit.oak.spi.security.ConfigurationParameters;
 import org.apache.jackrabbit.oak.spi.security.SecurityProvider;
 import org.apache.jackrabbit.oak.spi.security.user.UserConfiguration;

Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authentication/DefaultLoginModuleTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authentication/DefaultLoginModuleTest.java?rev=1448259&r1=1448258&r2=1448259&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authentication/DefaultLoginModuleTest.java
(original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authentication/DefaultLoginModuleTest.java
Wed Feb 20 15:52:04 2013
@@ -27,6 +27,7 @@ import org.apache.jackrabbit.api.securit
 import org.apache.jackrabbit.oak.AbstractSecurityTest;
 import org.apache.jackrabbit.oak.api.AuthInfo;
 import org.apache.jackrabbit.oak.api.ContentSession;
+import org.apache.jackrabbit.oak.security.ConfigurationUtil;
 import org.apache.jackrabbit.oak.spi.security.ConfigurationParameters;
 import org.apache.jackrabbit.oak.spi.security.authentication.ImpersonationCredentials;
 import org.apache.jackrabbit.oak.spi.security.user.UserConstants;

Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authentication/Jackrabbit2ConfigurationTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authentication/Jackrabbit2ConfigurationTest.java?rev=1448259&r1=1448258&r2=1448259&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authentication/Jackrabbit2ConfigurationTest.java
(original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authentication/Jackrabbit2ConfigurationTest.java
Wed Feb 20 15:52:04 2013
@@ -20,6 +20,7 @@ import javax.security.auth.login.Configu
 
 import org.apache.jackrabbit.oak.api.AuthInfo;
 import org.apache.jackrabbit.oak.api.ContentSession;
+import org.apache.jackrabbit.oak.security.ConfigurationUtil;
 import org.apache.jackrabbit.oak.spi.security.ConfigurationParameters;
 import org.apache.jackrabbit.oak.spi.security.user.util.UserUtility;
 import org.junit.Test;



Mime
View raw message