Align with trunk reducing coupling with maven-user

git-svn-id: https://svn.apache.org/repos/asf/maven/continuum/branches/continuum-acegi@471829 13f79535-47bb-0310-9956-ffa450edef68
apache · Nov 6, 2006 · dac0fdd · dac0fdd
1 parent a63f6aa
commit dac0fdd
Show file tree

Hide file tree

Showing 16 changed files with 388 additions and 831 deletions.
diff --git a/continuum-api/src/main/java/org/apache/maven/continuum/Continuum.java b/continuum-api/src/main/java/org/apache/maven/continuum/Continuum.java
@@ -348,54 +348,99 @@ void reloadConfiguration()
     // Security
     // ----------------------------------------------------------------------
 
+    /**
+     * @deprecated use Security framework instead
+     */
     ContinuumSecurity getSecurity();
 
     // ----------------------------------------------------------------------
     // User
     // ----------------------------------------------------------------------
 
+    /**
+     * @deprecated use Security framework instead
+     */
     void addUser( ContinuumUser user )
         throws ContinuumException;
 
+    /**
+     * @deprecated use Security framework instead
+     */
     void addUser( Map configuration )
         throws ContinuumException;
 
+    /**
+     * @deprecated use Security framework instead
+     */
     void updateUser( ContinuumUser user )
         throws ContinuumException;
 
+    /**
+     * @deprecated use Security framework instead
+     */
     void updateUser( int userId, Map configuration )
         throws ContinuumException;
 
+    /**
+     * @deprecated use Security framework instead
+     */
     List getUsers()
         throws ContinuumException;
 
+    /**
+     * @deprecated use Security framework instead
+     */
     ContinuumUser getUser( int userId )
         throws ContinuumException;
 
+    /**
+     * @deprecated use Security framework instead
+     */
     void removeUser( int userId )
         throws ContinuumException;
 
     // ----------------------------------------------------------------------
     // User Group
     // ----------------------------------------------------------------------
 
+    /**
+     * @deprecated use Security framework instead
+     */
     void addUserGroup( UserGroup userGroup );
 
+    /**
+     * @deprecated use Security framework instead
+     */
     void addUserGroup( Map configuration )
         throws ContinuumException;
 
+    /**
+     * @deprecated use Security framework instead
+     */
     void updateUserGroup( UserGroup userGroup )
         throws ContinuumException;
 
+    /**
+     * @deprecated use Security framework instead
+     */
     void updateUserGroup( int userGroupId, Map configuration )
         throws ContinuumException;
 
+    /**
+     * @deprecated use Security framework instead
+     */
     List getUserGroups()
         throws ContinuumException;
 
+    /**
+     * @deprecated use Security framework instead
+     */
     UserGroup getUserGroup( int userGroupId )
         throws ContinuumException;
 
+    /**
+     * @deprecated use Security framework instead
+     */
     void removeUserGroup( int userGroupId )
         throws ContinuumException;
 

diff --git a/continuum-api/src/main/java/org/apache/maven/continuum/security/ContinuumSecurity.java b/continuum-api/src/main/java/org/apache/maven/continuum/security/ContinuumSecurity.java
@@ -22,6 +22,8 @@
 import java.util.List;
 
 /**
+ * @deprecated use Security framework instead
+ * 
  * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
  * @version $Id$
  */