You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2013/01/04 18:33:43 UTC
svn commit: r1428994 - in /archiva/redback/redback-core/trunk: ./
redback-authorization/redback-authorization-providers/
redback-authorization/redback-authorization-providers/redback-authorization-ldap/
redback-authorization/redback-authorization-provi...
Author: olamy
Date: Fri Jan 4 17:33:43 2013
New Revision: 1428994
URL: http://svn.apache.org/viewvc?rev=1428994&view=rev
Log:
add structure for redback-authorization-ldap new module
Added:
archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-providers/redback-authorization-ldap/
archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-providers/redback-authorization-ldap/pom.xml (with props)
archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-providers/redback-authorization-ldap/src/
archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-providers/redback-authorization-ldap/src/main/
archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-providers/redback-authorization-ldap/src/main/java/
archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-providers/redback-authorization-ldap/src/main/java/org/
archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-providers/redback-authorization-ldap/src/main/java/org/apache/
archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-providers/redback-authorization-ldap/src/main/java/org/apache/archiva/
archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-providers/redback-authorization-ldap/src/main/java/org/apache/archiva/redback/
archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-providers/redback-authorization-ldap/src/main/java/org/apache/archiva/redback/authorization/
archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-providers/redback-authorization-ldap/src/main/java/org/apache/archiva/redback/authorization/ldap/
archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-providers/redback-authorization-ldap/src/main/java/org/apache/archiva/redback/authorization/ldap/LdapAuthorizer.java
- copied, changed from r1428909, archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-memory/src/main/java/org/apache/archiva/redback/rbac/memory/MemoryAuthorizer.java
archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-providers/redback-authorization-ldap/src/main/resources/
archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-providers/redback-authorization-ldap/src/main/resources/META-INF/
archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-providers/redback-authorization-ldap/src/main/resources/META-INF/spring-context.xml
- copied, changed from r1428909, archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-providers/pom.xml
Removed:
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-ldap/src/main/java/org/apache/archiva/redback/rbac/ldap/LdapRbacManager.java
Modified:
archiva/redback/redback-core/trunk/pom.xml
archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-providers/pom.xml
archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-providers/redback-authorization-open/src/main/java/org/apache/archiva/redback/authorization/open/OpenAuthorizer.java
archiva/redback/redback-core/trunk/redback-rbac/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/RbacAuthorizer.java
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-memory/src/main/java/org/apache/archiva/redback/rbac/memory/MemoryAuthorizer.java
Modified: archiva/redback/redback-core/trunk/pom.xml
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/pom.xml?rev=1428994&r1=1428993&r2=1428994&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/pom.xml (original)
+++ archiva/redback/redback-core/trunk/pom.xml Fri Jan 4 17:33:43 2013
@@ -279,6 +279,11 @@
</dependency>
<dependency>
<groupId>org.apache.archiva.redback</groupId>
+ <artifactId>redback-rbac-ldap</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.archiva.redback</groupId>
<artifactId>redback-rbac-role-manager</artifactId>
<version>${project.version}</version>
</dependency>
Modified: archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-providers/pom.xml
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-providers/pom.xml?rev=1428994&r1=1428993&r2=1428994&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-providers/pom.xml (original)
+++ archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-providers/pom.xml Fri Jan 4 17:33:43 2013
@@ -29,5 +29,6 @@
<packaging>pom</packaging>
<modules>
<module>redback-authorization-open</module>
+ <module>redback-authorization-ldap</module>
</modules>
</project>
Added: archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-providers/redback-authorization-ldap/pom.xml
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-providers/redback-authorization-ldap/pom.xml?rev=1428994&view=auto
==============================================================================
--- archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-providers/redback-authorization-ldap/pom.xml (added)
+++ archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-providers/redback-authorization-ldap/pom.xml Fri Jan 4 17:33:43 2013
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and 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">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.archiva.redback</groupId>
+ <artifactId>redback-authorization-providers</artifactId>
+ <version>2.1-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>redback-authorization-ldap</artifactId>
+ <packaging>bundle</packaging>
+ <name>Redback :: Authorization Provider :: Ldap</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.archiva.redback</groupId>
+ <artifactId>redback-authorization-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context-support</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.archiva.redback</groupId>
+ <artifactId>redback-rbac-ldap</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>jsr250-api</artifactId>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Export-Package>
+ org.apache.archiva.redback.authorization.ldap;version=${project.version};-split-package:=merge-first
+ </Export-Package>
+ <Import-Package>
+ org.apache.archiva.redback.authorization;version=${project.version},
+ org.springframework.stereotype;version="[3,4)"
+ </Import-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
Propchange: archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-providers/redback-authorization-ldap/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-providers/redback-authorization-ldap/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-providers/redback-authorization-ldap/src/main/java/org/apache/archiva/redback/authorization/ldap/LdapAuthorizer.java (from r1428909, archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-memory/src/main/java/org/apache/archiva/redback/rbac/memory/MemoryAuthorizer.java)
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-providers/redback-authorization-ldap/src/main/java/org/apache/archiva/redback/authorization/ldap/LdapAuthorizer.java?p2=archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-providers/redback-authorization-ldap/src/main/java/org/apache/archiva/redback/authorization/ldap/LdapAuthorizer.java&p1=archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-memory/src/main/java/org/apache/archiva/redback/rbac/memory/MemoryAuthorizer.java&r1=1428909&r2=1428994&rev=1428994&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-memory/src/main/java/org/apache/archiva/redback/rbac/memory/MemoryAuthorizer.java (original)
+++ archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-providers/redback-authorization-ldap/src/main/java/org/apache/archiva/redback/authorization/ldap/LdapAuthorizer.java Fri Jan 4 17:33:43 2013
@@ -1,5 +1,4 @@
-package org.apache.archiva.redback.rbac.memory;
-
+package org.apache.archiva.redback.authorization.ldap;
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -26,33 +25,21 @@ import org.apache.archiva.redback.author
import org.springframework.stereotype.Service;
/**
- * @author: Jesse McConnell <je...@codehaus.org>
- */
-@Service("authorizer#memory")
-public class MemoryAuthorizer
+ * @author Olivier Lamy
+ * @since 2.1
+ */
+@Service( "authorizer#ldap" )
+public class LdapAuthorizer
implements Authorizer
{
public String getId()
{
- return MemoryAuthorizer.class.getName();
+ return "ldap";
}
public AuthorizationResult isAuthorized( AuthorizationDataSource source )
throws AuthorizationException
{
- String principal = source.getPrincipal();
-
- String permission = source.getPermission();
-
- // TODO: Actually use a real permission!
- if ( "foo".equals( permission.toString() ) )
- {
- return new AuthorizationResult( true, principal, null );
- }
- else
- {
- return new AuthorizationResult( false, principal, null );
- }
+ return null; //To change body of implemented methods use File | Settings | File Templates.
}
}
-
Copied: archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-providers/redback-authorization-ldap/src/main/resources/META-INF/spring-context.xml (from r1428909, archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-providers/pom.xml)
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-providers/redback-authorization-ldap/src/main/resources/META-INF/spring-context.xml?p2=archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-providers/redback-authorization-ldap/src/main/resources/META-INF/spring-context.xml&p1=archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-providers/pom.xml&r1=1428909&r2=1428994&rev=1428994&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-providers/pom.xml (original)
+++ archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-providers/redback-authorization-ldap/src/main/resources/META-INF/spring-context.xml Fri Jan 4 17:33:43 2013
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0"?>
+
<!--
~ Licensed to the Apache Software Foundation (ASF) under one
~ or more contributor license agreements. See the NOTICE file
@@ -8,7 +9,7 @@
~ "License"); you may not use this file except in compliance
~ with the License. You may obtain a copy of the License at
~
- ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing,
~ software distributed under the License is distributed on an
@@ -17,17 +18,17 @@
~ specific language governing permissions and 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">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.archiva.redback</groupId>
- <artifactId>redback-authorization</artifactId>
- <version>2.1-SNAPSHOT</version>
- </parent>
- <artifactId>redback-authorization-providers</artifactId>
- <name>Redback :: Authorization Providers</name>
- <packaging>pom</packaging>
- <modules>
- <module>redback-authorization-open</module>
- </modules>
-</project>
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:context="http://www.springframework.org/schema/context"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans
+ http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+ http://www.springframework.org/schema/context
+ http://www.springframework.org/schema/context/spring-context-3.0.xsd"
+ default-lazy-init="true">
+
+ <context:annotation-config />
+ <context:component-scan
+ base-package="org.apache.archiva.redback.authorization.ldap"/>
+
+</beans>
\ No newline at end of file
Modified: archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-providers/redback-authorization-open/src/main/java/org/apache/archiva/redback/authorization/open/OpenAuthorizer.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-providers/redback-authorization-open/src/main/java/org/apache/archiva/redback/authorization/open/OpenAuthorizer.java?rev=1428994&r1=1428993&r2=1428994&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-providers/redback-authorization-open/src/main/java/org/apache/archiva/redback/authorization/open/OpenAuthorizer.java (original)
+++ archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-providers/redback-authorization-open/src/main/java/org/apache/archiva/redback/authorization/open/OpenAuthorizer.java Fri Jan 4 17:33:43 2013
@@ -29,14 +29,14 @@ import org.springframework.stereotype.Se
*
*
*/
-@Service("authorizer#rbac")
+@Service("authorizer#open")
public class OpenAuthorizer
implements Authorizer
{
public String getId()
{
- return "Open Authorizer";
+ return "open";
}
public AuthorizationResult isAuthorized( AuthorizationDataSource source )
Modified: archiva/redback/redback-core/trunk/redback-rbac/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/RbacAuthorizer.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-rbac/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/RbacAuthorizer.java?rev=1428994&r1=1428993&r2=1428994&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-rbac/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/RbacAuthorizer.java (original)
+++ archiva/redback/redback-core/trunk/redback-rbac/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/RbacAuthorizer.java Fri Jan 4 17:33:43 2013
@@ -67,7 +67,7 @@ public class RbacAuthorizer
public String getId()
{
- return "RBAC Authorizer - " + this.getClass().getName();
+ return "rbac";
}
/**
Modified: archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-memory/src/main/java/org/apache/archiva/redback/rbac/memory/MemoryAuthorizer.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-memory/src/main/java/org/apache/archiva/redback/rbac/memory/MemoryAuthorizer.java?rev=1428994&r1=1428993&r2=1428994&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-memory/src/main/java/org/apache/archiva/redback/rbac/memory/MemoryAuthorizer.java (original)
+++ archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-memory/src/main/java/org/apache/archiva/redback/rbac/memory/MemoryAuthorizer.java Fri Jan 4 17:33:43 2013
@@ -34,7 +34,7 @@ public class MemoryAuthorizer
{
public String getId()
{
- return MemoryAuthorizer.class.getName();
+ return "memory";
}
public AuthorizationResult isAuthorized( AuthorizationDataSource source )