You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by my...@apache.org on 2013/03/21 11:42:05 UTC
svn commit: r1459221 - in /sling/trunk/bundles: api/src/main/java/org/apache/sling/api/resource/ api/src/main/java/org/apache/sling/api/security/ resourceaccesssecurity/src/main/java/org/apache/sling/resourceaccesssecurity/ resourceaccesssecurity/src/m...

Author: mykee
Date: Thu Mar 21 10:42:04 2013
New Revision: 1459221

URL: http://svn.apache.org/r1459221
Log:
SLING 2698 - resource access security service for resource providers without backing ACLs, Part 3

Added:
    sling/trunk/bundles/api/src/main/java/org/apache/sling/api/security/
    sling/trunk/bundles/api/src/main/java/org/apache/sling/api/security/AccessSecurityException.java
      - copied, changed from r1458712, sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/AccessSecurityException.java
    sling/trunk/bundles/api/src/main/java/org/apache/sling/api/security/ResourceAccessSecurity.java
      - copied, changed from r1458712, sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/ResourceAccessSecurity.java
Removed:
    sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/AccessSecurityException.java
    sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/ResourceAccessSecurity.java
Modified:
    sling/trunk/bundles/resourceaccesssecurity/src/main/java/org/apache/sling/resourceaccesssecurity/ResourceAccessGate.java
    sling/trunk/bundles/resourceaccesssecurity/src/main/java/org/apache/sling/resourceaccesssecurity/impl/ResourceAccessSecurityImpl.java

Copied: sling/trunk/bundles/api/src/main/java/org/apache/sling/api/security/AccessSecurityException.java (from r1458712, sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/AccessSecurityException.java)
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/api/src/main/java/org/apache/sling/api/security/AccessSecurityException.java?p2=sling/trunk/bundles/api/src/main/java/org/apache/sling/api/security/AccessSecurityException.java&p1=sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/AccessSecurityException.java&r1=1458712&r2=1459221&rev=1459221&view=diff
==============================================================================
--- sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/AccessSecurityException.java (original)
+++ sling/trunk/bundles/api/src/main/java/org/apache/sling/api/security/AccessSecurityException.java Thu Mar 21 10:42:04 2013
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.api.resource;
+package org.apache.sling.api.security;
 
 
 /**

Copied: sling/trunk/bundles/api/src/main/java/org/apache/sling/api/security/ResourceAccessSecurity.java (from r1458712, sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/ResourceAccessSecurity.java)
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/api/src/main/java/org/apache/sling/api/security/ResourceAccessSecurity.java?p2=sling/trunk/bundles/api/src/main/java/org/apache/sling/api/security/ResourceAccessSecurity.java&p1=sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/ResourceAccessSecurity.java&r1=1458712&r2=1459221&rev=1459221&view=diff
==============================================================================
--- sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/ResourceAccessSecurity.java (original)
+++ sling/trunk/bundles/api/src/main/java/org/apache/sling/api/security/ResourceAccessSecurity.java Thu Mar 21 10:42:04 2013
@@ -16,7 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.api.resource;
+package org.apache.sling.api.security;
+
+import org.apache.sling.api.resource.Resource;
 
 
 /**

Modified: sling/trunk/bundles/resourceaccesssecurity/src/main/java/org/apache/sling/resourceaccesssecurity/ResourceAccessGate.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/resourceaccesssecurity/src/main/java/org/apache/sling/resourceaccesssecurity/ResourceAccessGate.java?rev=1459221&r1=1459220&r2=1459221&view=diff
==============================================================================
--- sling/trunk/bundles/resourceaccesssecurity/src/main/java/org/apache/sling/resourceaccesssecurity/ResourceAccessGate.java (original)
+++ sling/trunk/bundles/resourceaccesssecurity/src/main/java/org/apache/sling/resourceaccesssecurity/ResourceAccessGate.java Thu Mar 21 10:42:04 2013
@@ -18,8 +18,8 @@
  */
 package org.apache.sling.resourceaccesssecurity;
 
-import org.apache.sling.api.resource.AccessSecurityException;
 import org.apache.sling.api.resource.Resource;
+import org.apache.sling.api.security.AccessSecurityException;
 
 
 /**

Modified: sling/trunk/bundles/resourceaccesssecurity/src/main/java/org/apache/sling/resourceaccesssecurity/impl/ResourceAccessSecurityImpl.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/resourceaccesssecurity/src/main/java/org/apache/sling/resourceaccesssecurity/impl/ResourceAccessSecurityImpl.java?rev=1459221&r1=1459220&r2=1459221&view=diff
==============================================================================
--- sling/trunk/bundles/resourceaccesssecurity/src/main/java/org/apache/sling/resourceaccesssecurity/impl/ResourceAccessSecurityImpl.java (original)
+++ sling/trunk/bundles/resourceaccesssecurity/src/main/java/org/apache/sling/resourceaccesssecurity/impl/ResourceAccessSecurityImpl.java Thu Mar 21 10:42:04 2013
@@ -27,10 +27,10 @@ import org.apache.felix.scr.annotations.
 import org.apache.felix.scr.annotations.Properties;
 import org.apache.felix.scr.annotations.Property;
 import org.apache.felix.scr.annotations.Service;
-import org.apache.sling.api.resource.AccessSecurityException;
+import org.apache.sling.api.security.AccessSecurityException;
 import org.apache.sling.api.resource.NonExistingResource;
 import org.apache.sling.api.resource.Resource;
-import org.apache.sling.api.resource.ResourceAccessSecurity;
+import org.apache.sling.api.security.ResourceAccessSecurity;
 import org.apache.sling.api.resource.ResourceResolver;
 import org.apache.sling.resourceaccesssecurity.ResourceAccessGate;
 import org.apache.sling.resourceaccesssecurity.ResourceAccessGate.GateResult;
@@ -38,7 +38,7 @@ import org.osgi.framework.Constants;
 import org.osgi.service.component.ComponentContext;
 
 @Component(
-        name = "org.apache.sling.api.resource.ResourceAccessSecurity",
+        name = "org.apache.sling.api.security.ResourceAccessSecurity",
         immediate = true )
 @Service( value={ResourceAccessSecurity.class})
    @Properties({