From 6f47dab728a06b157c73727c92a47f4dd10674d0 Mon Sep 17 00:00:00 2001
From: Jason van Zyl <jvanzyl@apache.org>
Date: Tue, 28 Jul 2009 22:01:48 +0000
Subject: [PATCH] o going to work on the security manager on a branch

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@798717 13f79535-47bb-0310-9956-ffa450edef68
---
 maven-compat/pom.xml                          |  7 +++---
 ...efaultRepositorySystemSecurityManager.java | 25 -------------------
 .../RepositorySystemSecurityManager.java      | 11 --------
 pom.xml                                       |  4 ++-
 4 files changed, 6 insertions(+), 41 deletions(-)
 delete mode 100644 maven-compat/src/main/java/org/apache/maven/repository/security/DefaultRepositorySystemSecurityManager.java
 delete mode 100644 maven-compat/src/main/java/org/apache/maven/repository/security/RepositorySystemSecurityManager.java

diff --git a/maven-compat/pom.xml b/maven-compat/pom.xml
index 2499336af7..f87f49eb00 100644
--- a/maven-compat/pom.xml
+++ b/maven-compat/pom.xml
@@ -57,14 +57,13 @@
       <version>1.2_Java1.3</version>
       <scope>test</scope>
     </dependency>
-    
-    
+    <!--    
     <dependency>
       <groupId>org.jsecurity</groupId>
       <artifactId>jsecurity</artifactId>
-    </dependency>    
+    </dependency>    
    -->
   </dependencies>
-
+   
   <build>
     <plugins>
       <plugin>
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/security/DefaultRepositorySystemSecurityManager.java b/maven-compat/src/main/java/org/apache/maven/repository/security/DefaultRepositorySystemSecurityManager.java
deleted file mode 100644
index 7409e34037..0000000000
--- a/maven-compat/src/main/java/org/apache/maven/repository/security/DefaultRepositorySystemSecurityManager.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package org.apache.maven.repository.security;
-
-import org.codehaus.plexus.component.annotations.Component;
-import org.codehaus.plexus.component.annotations.Requirement;
-import org.jsecurity.authc.AuthenticationException;
-import org.jsecurity.authc.AuthenticationInfo;
-import org.jsecurity.authc.AuthenticationToken;
-import org.jsecurity.authc.Authenticator;
-
-@Component(role=RepositorySystemSecurityManager.class)
-public class DefaultRepositorySystemSecurityManager
-    implements RepositorySystemSecurityManager
-{
-    @Requirement
-    private Authenticator authenticator;
-    
-    public AuthenticationInfo authenticate( AuthenticationToken token )
-        throws AuthenticationException
-    {
-        AuthenticationInfo authenticationInfo = authenticator.authenticate( token );
-                        
-        return authenticationInfo;
-    }
-
-}
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/security/RepositorySystemSecurityManager.java b/maven-compat/src/main/java/org/apache/maven/repository/security/RepositorySystemSecurityManager.java
deleted file mode 100644
index b6e68781d5..0000000000
--- a/maven-compat/src/main/java/org/apache/maven/repository/security/RepositorySystemSecurityManager.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package org.apache.maven.repository.security;
-
-import org.jsecurity.authc.AuthenticationException;
-import org.jsecurity.authc.AuthenticationInfo;
-import org.jsecurity.authc.AuthenticationToken;
-
-public interface RepositorySystemSecurityManager
-{
-    public AuthenticationInfo authenticate( AuthenticationToken token )
-        throws AuthenticationException;
-}
diff --git a/pom.xml b/pom.xml
index e09c9309d8..022ad151b9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
   <version>3.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
-  <name>Apache Maven</name>
+  <name>Apache Maven 3.x</name>
   <description>Maven is a project development management and
     comprehension tool. Based on the concept of a project object model:
     builds, dependency management, documentation creation, site
@@ -289,11 +289,13 @@
         <artifactId>plexus-plugin-manager</artifactId>
         <version>${plexusPluginManagerVersion}</version>
       </dependency>
+      <!--
       <dependency>
         <groupId>org.jsecurity</groupId>
     	<artifactId>jsecurity</artifactId>
     	<version>0.9.0-RC2</version>
       </dependency>      
+      -->
       <!--bootstrap-start-comment-->
       <dependency>
         <groupId>easymock</groupId>