jford       2004/03/25 13:39:56

  Modified:    components/security/src/java/org/apache/jetspeed/security/om/impl
                        JetspeedGroupPrincipalImpl.java
                        JetspeedUserPrincipalImpl.java
                        JetspeedRolePrincipalImpl.java
               components/security/src/java/org/apache/jetspeed/security
                        GroupManager.java PortletPermission.java
                        RoleManager.java
               components/security/src/java/org/apache/jetspeed/security/om
                        JetspeedGroupPrincipal.java JetspeedCredential.java
                        JetspeedUserPrincipal.java
                        JetspeedRolePrincipal.java
               components/security/src/java/org/apache/jetspeed/security/impl
                        GroupManagerImpl.java UserManagerImpl.java
                        GroupImpl.java RdbmsLoginModule.java
                        RoleManagerImpl.java
               components/security/src/test/org/apache/jetspeed/security
                        TestRoleManager.java TestLoginModule.java
                        TestRdbmsPolicy.java TestUserManager.java
                        TestGroupManager.java
               cps/src/java/org/apache/jetspeed/cps/jndi JNDIService.java
               content-server/src/java/org/apache/jetspeed/contentserver
                        ContentFilter.java
               
components/registry/src/test/org/apache/jetspeed/components/portletentity
                        TestPortletEntityAccessComponent.java
  Log:
  Removed unused imports
  
  Revision  Changes    Path
  1.2       +0 -1      
jakarta-jetspeed-2/components/security/src/java/org/apache/jetspeed/security/om/impl/JetspeedGroupPrincipalImpl.java
  
  Index: JetspeedGroupPrincipalImpl.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-jetspeed-2/components/security/src/java/org/apache/jetspeed/security/om/impl/JetspeedGroupPrincipalImpl.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- JetspeedGroupPrincipalImpl.java   10 Mar 2004 06:07:13 -0000      1.1
  +++ JetspeedGroupPrincipalImpl.java   25 Mar 2004 21:39:55 -0000      1.2
  @@ -14,7 +14,6 @@
    */
   package org.apache.jetspeed.security.om.impl;
   
  -import java.sql.Timestamp;
   import java.util.Collection;
   
   import org.apache.jetspeed.security.om.JetspeedGroupPrincipal;
  
  
  
  1.2       +0 -1      
jakarta-jetspeed-2/components/security/src/java/org/apache/jetspeed/security/om/impl/JetspeedUserPrincipalImpl.java
  
  Index: JetspeedUserPrincipalImpl.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-jetspeed-2/components/security/src/java/org/apache/jetspeed/security/om/impl/JetspeedUserPrincipalImpl.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- JetspeedUserPrincipalImpl.java    10 Mar 2004 06:07:13 -0000      1.1
  +++ JetspeedUserPrincipalImpl.java    25 Mar 2004 21:39:55 -0000      1.2
  @@ -14,7 +14,6 @@
    */
   package org.apache.jetspeed.security.om.impl;
   
  -import java.sql.Timestamp;
   import java.util.Collection;
   
   import org.apache.jetspeed.security.om.JetspeedUserPrincipal;
  
  
  
  1.2       +0 -1      
jakarta-jetspeed-2/components/security/src/java/org/apache/jetspeed/security/om/impl/JetspeedRolePrincipalImpl.java
  
  Index: JetspeedRolePrincipalImpl.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-jetspeed-2/components/security/src/java/org/apache/jetspeed/security/om/impl/JetspeedRolePrincipalImpl.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- JetspeedRolePrincipalImpl.java    10 Mar 2004 06:07:13 -0000      1.1
  +++ JetspeedRolePrincipalImpl.java    25 Mar 2004 21:39:55 -0000      1.2
  @@ -14,7 +14,6 @@
    */
   package org.apache.jetspeed.security.om.impl;
   
  -import java.sql.Timestamp;
   import java.util.Collection;
   
   import org.apache.jetspeed.security.om.JetspeedRolePrincipal;
  
  
  
  1.2       +0 -1      
jakarta-jetspeed-2/components/security/src/java/org/apache/jetspeed/security/GroupManager.java
  
  Index: GroupManager.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-jetspeed-2/components/security/src/java/org/apache/jetspeed/security/GroupManager.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- GroupManager.java 10 Mar 2004 06:08:50 -0000      1.1
  +++ GroupManager.java 25 Mar 2004 21:39:55 -0000      1.2
  @@ -15,7 +15,6 @@
   package org.apache.jetspeed.security;
   
   import java.util.Collection;
  -import java.util.prefs.Preferences;
   
   /**
    * <p>Describes the service interface for managing groups.</p>
  
  
  
  1.2       +0 -1      
jakarta-jetspeed-2/components/security/src/java/org/apache/jetspeed/security/PortletPermission.java
  
  Index: PortletPermission.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-jetspeed-2/components/security/src/java/org/apache/jetspeed/security/PortletPermission.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- PortletPermission.java    10 Mar 2004 06:08:50 -0000      1.1
  +++ PortletPermission.java    25 Mar 2004 21:39:55 -0000      1.2
  @@ -18,7 +18,6 @@
   import java.security.AccessControlContext;
   import java.security.Permission;
   import java.security.PermissionCollection;
  -import java.security.SecurityPermission;
   import java.util.StringTokenizer;
   
   import javax.security.auth.Subject;
  
  
  
  1.2       +0 -1      
jakarta-jetspeed-2/components/security/src/java/org/apache/jetspeed/security/RoleManager.java
  
  Index: RoleManager.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-jetspeed-2/components/security/src/java/org/apache/jetspeed/security/RoleManager.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- RoleManager.java  10 Mar 2004 06:08:50 -0000      1.1
  +++ RoleManager.java  25 Mar 2004 21:39:55 -0000      1.2
  @@ -15,7 +15,6 @@
   package org.apache.jetspeed.security;
   
   import java.util.Collection;
  -import java.util.prefs.Preferences;
   
   /**
    * <p>Describes the service interface for managing roles.</p>
  
  
  
  1.2       +0 -2      
jakarta-jetspeed-2/components/security/src/java/org/apache/jetspeed/security/om/JetspeedGroupPrincipal.java
  
  Index: JetspeedGroupPrincipal.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-jetspeed-2/components/security/src/java/org/apache/jetspeed/security/om/JetspeedGroupPrincipal.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- JetspeedGroupPrincipal.java       10 Mar 2004 06:07:13 -0000      1.1
  +++ JetspeedGroupPrincipal.java       25 Mar 2004 21:39:55 -0000      1.2
  @@ -14,8 +14,6 @@
    */
   package org.apache.jetspeed.security.om;
   
  -import java.io.Serializable;
  -import java.sql.Timestamp;
   import java.util.Collection;
   
   /**
  
  
  
  1.2       +0 -1      
jakarta-jetspeed-2/components/security/src/java/org/apache/jetspeed/security/om/JetspeedCredential.java
  
  Index: JetspeedCredential.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-jetspeed-2/components/security/src/java/org/apache/jetspeed/security/om/JetspeedCredential.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- JetspeedCredential.java   10 Mar 2004 06:07:13 -0000      1.1
  +++ JetspeedCredential.java   25 Mar 2004 21:39:55 -0000      1.2
  @@ -15,7 +15,6 @@
   package org.apache.jetspeed.security.om;
   
   import java.io.Serializable;
  -import java.util.Collection;
   import java.sql.Timestamp;
   
   /**
  
  
  
  1.2       +0 -2      
jakarta-jetspeed-2/components/security/src/java/org/apache/jetspeed/security/om/JetspeedUserPrincipal.java
  
  Index: JetspeedUserPrincipal.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-jetspeed-2/components/security/src/java/org/apache/jetspeed/security/om/JetspeedUserPrincipal.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- JetspeedUserPrincipal.java        10 Mar 2004 06:07:13 -0000      1.1
  +++ JetspeedUserPrincipal.java        25 Mar 2004 21:39:55 -0000      1.2
  @@ -14,8 +14,6 @@
    */
   package org.apache.jetspeed.security.om;
   
  -import java.io.Serializable;
  -import java.sql.Timestamp;
   import java.util.Collection;
   
   /**
  
  
  
  1.2       +0 -2      
jakarta-jetspeed-2/components/security/src/java/org/apache/jetspeed/security/om/JetspeedRolePrincipal.java
  
  Index: JetspeedRolePrincipal.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-jetspeed-2/components/security/src/java/org/apache/jetspeed/security/om/JetspeedRolePrincipal.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- JetspeedRolePrincipal.java        10 Mar 2004 06:07:13 -0000      1.1
  +++ JetspeedRolePrincipal.java        25 Mar 2004 21:39:55 -0000      1.2
  @@ -14,9 +14,7 @@
    */
   package org.apache.jetspeed.security.om;
   
  -import java.io.Serializable;
   import java.util.Collection;
  -import java.sql.Timestamp;
   
   /**
    * <p>Interface representing Jetspeed security role principal object model.</p>
  
  
  
  1.3       +0 -5      
jakarta-jetspeed-2/components/security/src/java/org/apache/jetspeed/security/impl/GroupManagerImpl.java
  
  Index: GroupManagerImpl.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-jetspeed-2/components/security/src/java/org/apache/jetspeed/security/impl/GroupManagerImpl.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- GroupManagerImpl.java     12 Mar 2004 14:37:50 -0000      1.2
  +++ GroupManagerImpl.java     25 Mar 2004 21:39:55 -0000      1.3
  @@ -30,15 +30,10 @@
   import org.apache.jetspeed.security.Group;
   import org.apache.jetspeed.security.GroupManager;
   import org.apache.jetspeed.security.GroupPrincipal;
  -import org.apache.jetspeed.security.UserPrincipal;
  -import org.apache.jetspeed.security.RolePrincipal;
   import org.apache.jetspeed.security.SecurityException;
   import org.apache.jetspeed.security.om.JetspeedGroupPrincipal;
   import org.apache.jetspeed.security.om.impl.JetspeedGroupPrincipalImpl;
  -import org.apache.jetspeed.security.om.JetspeedRolePrincipal;
  -import org.apache.jetspeed.security.om.impl.JetspeedRolePrincipalImpl;
   import org.apache.jetspeed.security.om.JetspeedUserPrincipal;
  -import org.apache.jetspeed.security.om.impl.JetspeedUserPrincipalImpl;
   import org.apache.jetspeed.util.ArgUtil;
   
   /**
  
  
  
  1.3       +0 -6      
jakarta-jetspeed-2/components/security/src/java/org/apache/jetspeed/security/impl/UserManagerImpl.java
  
  Index: UserManagerImpl.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-jetspeed-2/components/security/src/java/org/apache/jetspeed/security/impl/UserManagerImpl.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- UserManagerImpl.java      14 Mar 2004 16:29:16 -0000      1.2
  +++ UserManagerImpl.java      25 Mar 2004 21:39:55 -0000      1.3
  @@ -18,26 +18,20 @@
   import java.util.ArrayList;
   import java.util.Collection;
   import java.util.Iterator;
  -import java.util.HashSet;
  -import java.util.Set;
   import java.util.prefs.BackingStoreException;
   import java.util.prefs.Preferences;
   
  -import javax.security.auth.Subject;
   
   import org.apache.commons.logging.Log;
   import org.apache.commons.logging.LogFactory;
   
   import org.apache.jetspeed.components.persistence.store.PersistenceStore;
   import org.apache.jetspeed.components.persistence.store.PersistenceStoreContainer;
  -import org.apache.jetspeed.security.PermissionManager;
   import org.apache.jetspeed.security.SecurityException;
   import org.apache.jetspeed.security.User;
   import org.apache.jetspeed.security.UserManager;
   import org.apache.jetspeed.security.UserPrincipal;
   import org.apache.jetspeed.security.om.JetspeedCredential;
  -import org.apache.jetspeed.security.om.JetspeedGroupPrincipal;
  -import org.apache.jetspeed.security.om.JetspeedRolePrincipal;
   import org.apache.jetspeed.security.om.JetspeedUserPrincipal;
   import org.apache.jetspeed.security.om.impl.JetspeedUserPrincipalImpl;
   import org.apache.jetspeed.security.om.impl.JetspeedCredentialImpl;
  
  
  
  1.2       +0 -1      
jakarta-jetspeed-2/components/security/src/java/org/apache/jetspeed/security/impl/GroupImpl.java
  
  Index: GroupImpl.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-jetspeed-2/components/security/src/java/org/apache/jetspeed/security/impl/GroupImpl.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- GroupImpl.java    10 Mar 2004 06:07:47 -0000      1.1
  +++ GroupImpl.java    25 Mar 2004 21:39:55 -0000      1.2
  @@ -18,7 +18,6 @@
   
   import org.apache.jetspeed.security.Group;
   import org.apache.jetspeed.security.GroupPrincipal;
  -import org.apache.jetspeed.security.RolePrincipal;
   
   /**
    * <p>A group made of a [EMAIL PROTECTED] GroupPrincipal} and the user [EMAIL 
PROTECTED] Preferences}.</p>
  
  
  
  1.2       +0 -9      
jakarta-jetspeed-2/components/security/src/java/org/apache/jetspeed/security/impl/RdbmsLoginModule.java
  
  Index: RdbmsLoginModule.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-jetspeed-2/components/security/src/java/org/apache/jetspeed/security/impl/RdbmsLoginModule.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- RdbmsLoginModule.java     10 Mar 2004 06:07:47 -0000      1.1
  +++ RdbmsLoginModule.java     25 Mar 2004 21:39:55 -0000      1.2
  @@ -14,10 +14,7 @@
    */
   package org.apache.jetspeed.security.impl;
   
  -import java.security.Principal;
  -import java.util.Iterator;
   import java.util.Map;
  -import java.util.Vector;
   
   import javax.security.auth.Subject;
   import javax.security.auth.callback.Callback;
  @@ -27,14 +24,8 @@
   import javax.security.auth.login.LoginException;
   import javax.security.auth.spi.LoginModule;
   
  -import org.apache.commons.logging.Log;
  -import org.apache.commons.logging.LogFactory;
  -
   import org.apache.jetspeed.security.SecurityProvider;
   import org.apache.jetspeed.security.UserManager;
  -import org.apache.jetspeed.security.impl.UserPrincipalImpl;
  -import org.apache.jetspeed.security.om.JetspeedUserPrincipal;
  -import org.apache.jetspeed.security.om.impl.JetspeedUserPrincipalImpl;
   
   /**
    * <p>LoginModule implementation that authenticates a user
  
  
  
  1.2       +0 -5      
jakarta-jetspeed-2/components/security/src/java/org/apache/jetspeed/security/impl/RoleManagerImpl.java
  
  Index: RoleManagerImpl.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-jetspeed-2/components/security/src/java/org/apache/jetspeed/security/impl/RoleManagerImpl.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- RoleManagerImpl.java      10 Mar 2004 06:07:47 -0000      1.1
  +++ RoleManagerImpl.java      25 Mar 2004 21:39:55 -0000      1.2
  @@ -27,19 +27,14 @@
   import org.apache.jetspeed.components.persistence.store.PersistenceStore;
   import org.apache.jetspeed.components.persistence.store.PersistenceStoreContainer;
   import org.apache.jetspeed.components.persistence.store.Filter;
  -import org.apache.jetspeed.security.PermissionManager;
   import org.apache.jetspeed.security.Role;
   import org.apache.jetspeed.security.RoleManager;
  -import org.apache.jetspeed.security.GroupPrincipal;
   import org.apache.jetspeed.security.RolePrincipal;
  -import org.apache.jetspeed.security.UserPrincipal;
   import org.apache.jetspeed.security.SecurityException;
   import org.apache.jetspeed.security.om.JetspeedGroupPrincipal;
  -import org.apache.jetspeed.security.om.impl.JetspeedGroupPrincipalImpl;
   import org.apache.jetspeed.security.om.JetspeedRolePrincipal;
   import org.apache.jetspeed.security.om.impl.JetspeedRolePrincipalImpl;
   import org.apache.jetspeed.security.om.JetspeedUserPrincipal;
  -import org.apache.jetspeed.security.om.impl.JetspeedUserPrincipalImpl;
   import org.apache.jetspeed.util.ArgUtil;
   
   /**
  
  
  
  1.2       +0 -4      
jakarta-jetspeed-2/components/security/src/test/org/apache/jetspeed/security/TestRoleManager.java
  
  Index: TestRoleManager.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-jetspeed-2/components/security/src/test/org/apache/jetspeed/security/TestRoleManager.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- TestRoleManager.java      10 Mar 2004 06:09:25 -0000      1.1
  +++ TestRoleManager.java      25 Mar 2004 21:39:55 -0000      1.2
  @@ -15,12 +15,8 @@
   package org.apache.jetspeed.security;
   
   import java.security.Principal;
  -import java.util.ArrayList;
   import java.util.Collection;
   import java.util.HashSet;
  -import java.util.Iterator;
  -import java.util.Map;
  -import java.util.prefs.BackingStoreException;
   import java.util.prefs.Preferences;
   
   import javax.security.auth.Subject;
  
  
  
  1.3       +0 -2      
jakarta-jetspeed-2/components/security/src/test/org/apache/jetspeed/security/TestLoginModule.java
  
  Index: TestLoginModule.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-jetspeed-2/components/security/src/test/org/apache/jetspeed/security/TestLoginModule.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- TestLoginModule.java      11 Mar 2004 03:32:02 -0000      1.2
  +++ TestLoginModule.java      25 Mar 2004 21:39:55 -0000      1.3
  @@ -15,8 +15,6 @@
   package org.apache.jetspeed.security;
   
   import java.security.Principal;
  -import java.util.HashSet;
  -import java.util.Set;
   
   import javax.security.auth.login.LoginContext;
   import javax.security.auth.login.LoginException;
  
  
  
  1.3       +0 -6      
jakarta-jetspeed-2/components/security/src/test/org/apache/jetspeed/security/TestRdbmsPolicy.java
  
  Index: TestRdbmsPolicy.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-jetspeed-2/components/security/src/test/org/apache/jetspeed/security/TestRdbmsPolicy.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- TestRdbmsPolicy.java      11 Mar 2004 05:04:15 -0000      1.2
  +++ TestRdbmsPolicy.java      25 Mar 2004 21:39:55 -0000      1.3
  @@ -16,11 +16,7 @@
   
   import java.security.AccessController;
   import java.security.AccessControlException;
  -import java.security.Principal;
   import java.security.PrivilegedAction;
  -import java.security.Policy;
  -import java.util.HashSet;
  -import java.util.Set;
   
   import javax.security.auth.Subject;
   import javax.security.auth.login.LoginContext;
  @@ -30,10 +26,8 @@
   
   import org.apache.jetspeed.components.AbstractComponentAwareTestCase;
   import org.apache.jetspeed.components.ComponentAwareTestSuite;
  -import org.apache.jetspeed.security.SecurityHelper;
   import org.apache.jetspeed.security.UserPrincipal;
   import org.apache.jetspeed.security.impl.PassiveCallbackHandler;
  -import org.apache.jetspeed.security.impl.RdbmsPolicy;
   import org.apache.jetspeed.security.impl.UserPrincipalImpl;
   
   import org.picocontainer.MutablePicoContainer;
  
  
  
  1.5       +0 -7      
jakarta-jetspeed-2/components/security/src/test/org/apache/jetspeed/security/TestUserManager.java
  
  Index: TestUserManager.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-jetspeed-2/components/security/src/test/org/apache/jetspeed/security/TestUserManager.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- TestUserManager.java      14 Mar 2004 16:31:19 -0000      1.4
  +++ TestUserManager.java      25 Mar 2004 21:39:55 -0000      1.5
  @@ -15,12 +15,6 @@
   package org.apache.jetspeed.security;
   
   import java.security.Principal;
  -import java.util.Collection;
  -import java.util.HashMap;
  -import java.util.Iterator;
  -import java.util.Map;
  -import java.util.ArrayList;
  -import java.util.prefs.BackingStoreException;
   import java.util.prefs.Preferences;
   
   import javax.security.auth.Subject;
  @@ -31,7 +25,6 @@
   
   import org.apache.jetspeed.components.AbstractComponentAwareTestCase;
   import org.apache.jetspeed.components.ComponentAwareTestSuite;
  -import org.apache.jetspeed.prefs.PreferencesProvider;
   import org.apache.jetspeed.security.impl.PassiveCallbackHandler;
   
   import org.picocontainer.MutablePicoContainer;
  
  
  
  1.2       +0 -4      
jakarta-jetspeed-2/components/security/src/test/org/apache/jetspeed/security/TestGroupManager.java
  
  Index: TestGroupManager.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-jetspeed-2/components/security/src/test/org/apache/jetspeed/security/TestGroupManager.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- TestGroupManager.java     10 Mar 2004 06:09:25 -0000      1.1
  +++ TestGroupManager.java     25 Mar 2004 21:39:55 -0000      1.2
  @@ -15,12 +15,8 @@
   package org.apache.jetspeed.security;
   
   import java.security.Principal;
  -import java.util.ArrayList;
   import java.util.Collection;
   import java.util.HashSet;
  -import java.util.Iterator;
  -import java.util.Map;
  -import java.util.prefs.BackingStoreException;
   import java.util.prefs.Preferences;
   
   import javax.security.auth.Subject;
  
  
  
  1.5       +1 -4      
jakarta-jetspeed-2/cps/src/java/org/apache/jetspeed/cps/jndi/JNDIService.java
  
  Index: JNDIService.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-jetspeed-2/cps/src/java/org/apache/jetspeed/cps/jndi/JNDIService.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- JNDIService.java  8 Mar 2004 00:18:23 -0000       1.4
  +++ JNDIService.java  25 Mar 2004 21:39:56 -0000      1.5
  @@ -15,9 +15,6 @@
    */
   package org.apache.jetspeed.cps.jndi;
   
  -import javax.naming.Context;
  -import javax.naming.NamingException;
  -
   import org.apache.jetspeed.cps.CommonService;
   import org.apache.jetspeed.components.jndi.*;
   
  
  
  
  1.7       +1 -3      
jakarta-jetspeed-2/content-server/src/java/org/apache/jetspeed/contentserver/ContentFilter.java
  
  Index: ContentFilter.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-jetspeed-2/content-server/src/java/org/apache/jetspeed/contentserver/ContentFilter.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- ContentFilter.java        13 Mar 2004 23:57:41 -0000      1.6
  +++ ContentFilter.java        25 Mar 2004 21:39:56 -0000      1.7
  @@ -3,9 +3,7 @@
   import java.io.File;
   import java.io.IOException;
   import java.util.ArrayList;
  -import java.util.HashMap;
   import java.util.List;
  -import java.util.Map;
   
   import javax.servlet.Filter;
   import javax.servlet.FilterChain;
  
  
  
  1.2       +1 -2      
jakarta-jetspeed-2/components/registry/src/test/org/apache/jetspeed/components/portletentity/TestPortletEntityAccessComponent.java
  
  Index: TestPortletEntityAccessComponent.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-jetspeed-2/components/registry/src/test/org/apache/jetspeed/components/portletentity/TestPortletEntityAccessComponent.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- TestPortletEntityAccessComponent.java     15 Mar 2004 19:34:29 -0000      1.1
  +++ TestPortletEntityAccessComponent.java     25 Mar 2004 21:39:56 -0000      1.2
  @@ -29,7 +29,6 @@
   import org.apache.jetspeed.om.portlet.impl.PortletDefinitionImpl;
   import org.apache.jetspeed.om.servlet.impl.WebApplicationDefinitionImpl;
   import org.apache.jetspeed.util.JetspeedObjectID;
  -import org.apache.pluto.om.entity.PortletEntity;
   import org.apache.pluto.om.portlet.PortletApplicationDefinition;
   import org.apache.pluto.om.portlet.PortletDefinition;
   import org.apache.pluto.om.portlet.PortletDefinitionList;
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to