You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by vt...@apache.org on 2005/03/08 04:25:01 UTC
svn commit: r156490 - in incubator/directory/authx/trunk: api/ core/
core/src/java/org/apache/authx/
core/src/java/org/apache/authx/authentication/
core/src/java/org/apache/authx/authentication/attribute/
core/src/java/org/apache/authx/authentication/realm/
core/src/java/org/apache/authx/authorization/ example/ impl/ jdbc/ script/
Author: vtence
Date: Mon Mar 7 19:24:59 2005
New Revision: 156490
URL: http://svn.apache.org/viewcvs?view=rev&rev=156490
Log:
Merged api and impl into core
Added:
incubator/directory/authx/trunk/core/
- copied from r156478, incubator/directory/authx/trunk/impl/
incubator/directory/authx/trunk/core/src/java/org/apache/authx/AuthXException.java
- copied unchanged from r156478, incubator/directory/authx/trunk/api/src/java/org/apache/authx/AuthXException.java
incubator/directory/authx/trunk/core/src/java/org/apache/authx/authentication/Authenticator.java
- copied unchanged from r156478, incubator/directory/authx/trunk/api/src/java/org/apache/authx/authentication/Authenticator.java
incubator/directory/authx/trunk/core/src/java/org/apache/authx/authentication/Credential.java
- copied unchanged from r156478, incubator/directory/authx/trunk/api/src/java/org/apache/authx/authentication/Credential.java
incubator/directory/authx/trunk/core/src/java/org/apache/authx/authentication/CredentialSet.java
- copied unchanged from r156478, incubator/directory/authx/trunk/api/src/java/org/apache/authx/authentication/CredentialSet.java
incubator/directory/authx/trunk/core/src/java/org/apache/authx/authentication/attribute/CyclicAssociationException.java
- copied unchanged from r156478, incubator/directory/authx/trunk/api/src/java/org/apache/authx/authentication/attribute/CyclicAssociationException.java
incubator/directory/authx/trunk/core/src/java/org/apache/authx/authentication/attribute/InformationProvider.java
- copied unchanged from r156478, incubator/directory/authx/trunk/api/src/java/org/apache/authx/authentication/attribute/InformationProvider.java
incubator/directory/authx/trunk/core/src/java/org/apache/authx/authentication/attribute/MutableInformationProvider.java
- copied unchanged from r156478, incubator/directory/authx/trunk/api/src/java/org/apache/authx/authentication/attribute/MutableInformationProvider.java
incubator/directory/authx/trunk/core/src/java/org/apache/authx/authentication/realm/IdentityInUseException.java
- copied unchanged from r156478, incubator/directory/authx/trunk/api/src/java/org/apache/authx/authentication/realm/IdentityInUseException.java
incubator/directory/authx/trunk/core/src/java/org/apache/authx/authentication/realm/MutableRealm.java
- copied unchanged from r156478, incubator/directory/authx/trunk/api/src/java/org/apache/authx/authentication/realm/MutableRealm.java
incubator/directory/authx/trunk/core/src/java/org/apache/authx/authentication/realm/Realm.java
- copied unchanged from r156478, incubator/directory/authx/trunk/api/src/java/org/apache/authx/authentication/realm/Realm.java
incubator/directory/authx/trunk/core/src/java/org/apache/authx/authentication/realm/UnsupportedCredentialsException.java
- copied unchanged from r156478, incubator/directory/authx/trunk/api/src/java/org/apache/authx/authentication/realm/UnsupportedCredentialsException.java
incubator/directory/authx/trunk/core/src/java/org/apache/authx/authorization/AuthorizationRequest.java
- copied, changed from r156478, incubator/directory/authx/trunk/api/src/java/org/apache/authx/authorization/AuthorizationRequest.java
incubator/directory/authx/trunk/core/src/java/org/apache/authx/authorization/Authorizer.java
- copied unchanged from r156478, incubator/directory/authx/trunk/api/src/java/org/apache/authx/authorization/Authorizer.java
incubator/directory/authx/trunk/core/src/java/org/apache/authx/authorization/Condition.java
- copied unchanged from r156478, incubator/directory/authx/trunk/api/src/java/org/apache/authx/authorization/Condition.java
incubator/directory/authx/trunk/core/src/java/org/apache/authx/authorization/Effect.java
- copied unchanged from r156478, incubator/directory/authx/trunk/api/src/java/org/apache/authx/authorization/Effect.java
incubator/directory/authx/trunk/core/src/java/org/apache/authx/authorization/Permission.java
- copied unchanged from r156478, incubator/directory/authx/trunk/api/src/java/org/apache/authx/authorization/Permission.java
incubator/directory/authx/trunk/core/src/java/org/apache/authx/authorization/Rule.java
- copied unchanged from r156478, incubator/directory/authx/trunk/api/src/java/org/apache/authx/authorization/Rule.java
incubator/directory/authx/trunk/core/src/java/org/apache/authx/authorization/RuleSet.java
- copied unchanged from r156478, incubator/directory/authx/trunk/api/src/java/org/apache/authx/authorization/RuleSet.java
Removed:
incubator/directory/authx/trunk/api/
incubator/directory/authx/trunk/impl/
Modified:
incubator/directory/authx/trunk/core/project.properties
incubator/directory/authx/trunk/core/project.xml
incubator/directory/authx/trunk/core/src/java/org/apache/authx/authorization/DefaultAuthorizer.java
incubator/directory/authx/trunk/example/project.xml
incubator/directory/authx/trunk/jdbc/project.xml
incubator/directory/authx/trunk/script/project.xml
Modified: incubator/directory/authx/trunk/core/project.properties
URL: http://svn.apache.org/viewcvs/incubator/directory/authx/trunk/core/project.properties?view=diff&r1=156478&r2=156490
==============================================================================
--- incubator/directory/authx/trunk/core/project.properties (original)
+++ incubator/directory/authx/trunk/core/project.properties Mon Mar 7 19:24:59 2005
@@ -1,2 +1,2 @@
-module.path=core/impl
+module.path=core
Modified: incubator/directory/authx/trunk/core/project.xml
URL: http://svn.apache.org/viewcvs/incubator/directory/authx/trunk/core/project.xml?view=diff&r1=156478&r2=156490
==============================================================================
--- incubator/directory/authx/trunk/core/project.xml (original)
+++ incubator/directory/authx/trunk/core/project.xml Mon Mar 7 19:24:59 2005
@@ -2,22 +2,17 @@
<project>
<extend>${basedir}/../project.xml</extend>
- <name>Apache Authentication and Authorization Framework Implementation</name>
- <id>authx-impl</id>
+ <name>Apache Authentication and Authorization Framework Core</name>
+ <id>authx-core</id>
<package>org.apache.authx</package>
- <shortDescription>Apache Authentication and Authorization Framework Implementation</shortDescription>
+ <shortDescription>Apache Authentication and Authorization Framework Core</shortDescription>
<description>
- Implementation of the Apache Authentication and Authorization Framework APIs
+ Apache Authentication and Authorization Framework Core
</description>
<dependencies>
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>authx-api</artifactId>
- <version>${pom.currentVersion}</version>
- </dependency>
<!-- Test dependencies -->
<dependency>
<groupId>commons-collections</groupId>
Copied: incubator/directory/authx/trunk/core/src/java/org/apache/authx/authorization/AuthorizationRequest.java (from r156478, incubator/directory/authx/trunk/api/src/java/org/apache/authx/authorization/AuthorizationRequest.java)
URL: http://svn.apache.org/viewcvs/incubator/directory/authx/trunk/core/src/java/org/apache/authx/authorization/AuthorizationRequest.java?view=diff&rev=156490&p1=incubator/directory/authx/trunk/api/src/java/org/apache/authx/authorization/AuthorizationRequest.java&r1=156478&p2=incubator/directory/authx/trunk/core/src/java/org/apache/authx/authorization/AuthorizationRequest.java&r2=156490
==============================================================================
--- incubator/directory/authx/trunk/api/src/java/org/apache/authx/authorization/AuthorizationRequest.java (original)
+++ incubator/directory/authx/trunk/core/src/java/org/apache/authx/authorization/AuthorizationRequest.java Mon Mar 7 19:24:59 2005
@@ -3,6 +3,8 @@
*/
package org.apache.authx.authorization;
+import org.apache.authx.authorization.effect.LastApplicableEffect;
+
import javax.security.auth.Subject;
public final class AuthorizationRequest
@@ -14,8 +16,7 @@
public AuthorizationRequest( Subject subject, Permission permission )
{
- m_subject = subject;
- m_permission = permission;
+ this( subject, permission, new LastApplicableEffect() );
}
public AuthorizationRequest( Subject subject, Permission permission, Effect initialEffect )
Modified: incubator/directory/authx/trunk/core/src/java/org/apache/authx/authorization/DefaultAuthorizer.java
URL: http://svn.apache.org/viewcvs/incubator/directory/authx/trunk/core/src/java/org/apache/authx/authorization/DefaultAuthorizer.java?view=diff&r1=156478&r2=156490
==============================================================================
--- incubator/directory/authx/trunk/core/src/java/org/apache/authx/authorization/DefaultAuthorizer.java (original)
+++ incubator/directory/authx/trunk/core/src/java/org/apache/authx/authorization/DefaultAuthorizer.java Mon Mar 7 19:24:59 2005
@@ -16,7 +16,6 @@
*/
package org.apache.authx.authorization;
-import org.apache.authx.authorization.effect.LastApplicableEffect;
import org.apache.authx.authorization.effect.Effects;
import javax.security.auth.Subject;
@@ -39,7 +38,7 @@
public boolean renderDecision( Subject s, Permission p )
{
- AuthorizationRequest request = new AuthorizationRequest( s, p, new LastApplicableEffect() );
+ AuthorizationRequest request = new AuthorizationRequest( s, p );
m_ruleSet.evaluate( request );
Effect outcome = request.outcome();
Modified: incubator/directory/authx/trunk/example/project.xml
URL: http://svn.apache.org/viewcvs/incubator/directory/authx/trunk/example/project.xml?view=diff&r1=156489&r2=156490
==============================================================================
--- incubator/directory/authx/trunk/example/project.xml (original)
+++ incubator/directory/authx/trunk/example/project.xml Mon Mar 7 19:24:59 2005
@@ -15,15 +15,7 @@
<dependencies>
<dependency>
<groupId>${pom.groupId}</groupId>
- <artifactId>authx-api</artifactId>
- <version>${pom.currentVersion}</version>
- <properties>
- <war.bundle>true</war.bundle>
- </properties>
- </dependency>
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>authx-impl</artifactId>
+ <artifactId>authx-core</artifactId>
<version>${pom.currentVersion}</version>
<properties>
<war.bundle>true</war.bundle>
Modified: incubator/directory/authx/trunk/jdbc/project.xml
URL: http://svn.apache.org/viewcvs/incubator/directory/authx/trunk/jdbc/project.xml?view=diff&r1=156489&r2=156490
==============================================================================
--- incubator/directory/authx/trunk/jdbc/project.xml (original)
+++ incubator/directory/authx/trunk/jdbc/project.xml Mon Mar 7 19:24:59 2005
@@ -15,12 +15,7 @@
<dependencies>
<dependency>
<groupId>${pom.groupId}</groupId>
- <artifactId>authx-api</artifactId>
- <version>${pom.currentVersion}</version>
- </dependency>
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>authx-impl</artifactId>
+ <artifactId>authx-core</artifactId>
<version>${pom.currentVersion}</version>
</dependency>
<dependency>
@@ -29,4 +24,4 @@
<version>1.7.2.2</version>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
Modified: incubator/directory/authx/trunk/script/project.xml
URL: http://svn.apache.org/viewcvs/incubator/directory/authx/trunk/script/project.xml?view=diff&r1=156489&r2=156490
==============================================================================
--- incubator/directory/authx/trunk/script/project.xml (original)
+++ incubator/directory/authx/trunk/script/project.xml Mon Mar 7 19:24:59 2005
@@ -15,12 +15,7 @@
<dependencies>
<dependency>
<groupId>${pom.groupId}</groupId>
- <artifactId>authx-api</artifactId>
- <version>${pom.currentVersion}</version>
- </dependency>
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>authx-impl</artifactId>
+ <artifactId>authx-core</artifactId>
<version>${pom.currentVersion}</version>
</dependency>