Title: Message
Index: apache/jetspeed/services/security/JetspeedSecurityCache.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/security/JetspeedSecurityCache.java,v
retrieving revision 1.5
diff -u -r1.5 JetspeedSecurityCache.java
--- apache/jetspeed/services/security/JetspeedSecurityCache.java 8 Dec 2002
19:33:53 -0000 1.5
+++ apache/jetspeed/services/security/JetspeedSecurityCache.java 3 Mar 2003
14:42:05 -0000
@@ -57,10 +57,8 @@
import java.util.Iterator;
-import org.apache.turbine.services.Service;
import org.apache.turbine.services.TurbineServices;
-import org.apache.jetspeed.om.security.JetspeedUser;
import org.apache.jetspeed.om.security.Role;
import org.apache.jetspeed.om.security.Permission;
import org.apache.jetspeed.services.security.JetspeedSecurityException;
Index: apache/jetspeed/services/security/JetspeedSecurityService.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/security/JetspeedSecurityService.java,v
retrieving revision 1.9
diff -u -r1.9 JetspeedSecurityService.java
--- apache/jetspeed/services/security/JetspeedSecurityService.java 28 Jun 2002
05:37:34 -0000 1.9
+++ apache/jetspeed/services/security/JetspeedSecurityService.java 3 Mar 2003
14:42:12 -0000
@@ -58,10 +58,7 @@
import org.apache.turbine.services.Service;
import org.apache.jetspeed.om.security.JetspeedUser;
-import org.apache.jetspeed.om.profile.Profile;
-import org.apache.jetspeed.om.profile.ProfileException;
import org.apache.jetspeed.portal.Portlet;
-import org.apache.jetspeed.om.registry.RegistryEntry;
/**
* The Security Service manages Users, Groups Roles and Permissions in the
Index: apache/jetspeed/services/security/SecurityCacheImpl.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/security/SecurityCacheImpl.java,v
retrieving revision 1.5
diff -u -r1.5 SecurityCacheImpl.java
--- apache/jetspeed/services/security/SecurityCacheImpl.java 8 Dec 2002 19:33:53
-0000 1.5
+++ apache/jetspeed/services/security/SecurityCacheImpl.java 3 Mar 2003 14:42:18
-0000
@@ -58,10 +58,8 @@
import java.util.Iterator;
import java.util.Map;
import java.util.HashMap;
-import java.util.Vector;
import javax.servlet.ServletConfig;
-import org.apache.turbine.services.Service;
import org.apache.turbine.services.TurbineServices;
import org.apache.turbine.services.TurbineBaseService;
import org.apache.turbine.services.InitializationException;
@@ -69,7 +67,6 @@
import org.apache.turbine.util.Log;
import org.apache.jetspeed.services.JetspeedSecurity;
-import org.apache.jetspeed.om.security.JetspeedUser;
import org.apache.jetspeed.om.security.Role;
import org.apache.jetspeed.om.security.Permission;
import org.apache.jetspeed.services.security.JetspeedSecurityException;
Index: apache/jetspeed/services/security/SecurityCacheService.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/security/SecurityCacheService.java,v
retrieving revision 1.5
diff -u -r1.5 SecurityCacheService.java
--- apache/jetspeed/services/security/SecurityCacheService.java 8 Dec 2002 19:33:53
-0000 1.5
+++ apache/jetspeed/services/security/SecurityCacheService.java 3 Mar 2003 14:42:22
-0000
@@ -58,7 +58,6 @@
import org.apache.turbine.services.Service;
-import org.apache.jetspeed.om.security.JetspeedUser;
import org.apache.jetspeed.om.security.Role;
import org.apache.jetspeed.om.security.Permission;
import org.apache.jetspeed.services.security.JetspeedSecurityException;
Index: apache/jetspeed/services/security/TestGroupManagement.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/security/TestGroupManagement.java,v
retrieving revision 1.3
diff -u -r1.3 TestGroupManagement.java
--- apache/jetspeed/services/security/TestGroupManagement.java 15 Oct 2002 17:35:33
-0000 1.3
+++ apache/jetspeed/services/security/TestGroupManagement.java 3 Mar 2003 14:42:27
-0000
@@ -67,9 +67,6 @@
import org.apache.turbine.util.TurbineConfig;
import org.apache.turbine.util.StringUtils;
-import org.apache.torque.Torque;
-import org.apache.torque.TorqueException;
-
import org.apache.jetspeed.om.security.Group;
import org.apache.jetspeed.om.security.JetspeedGroupFactory;
Index: apache/jetspeed/services/security/TestPermissionManagement.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/security/TestPermissionManagement.java,v
retrieving revision 1.4
diff -u -r1.4 TestPermissionManagement.java
--- apache/jetspeed/services/security/TestPermissionManagement.java 15 Oct 2002
17:35:33 -0000 1.4
+++ apache/jetspeed/services/security/TestPermissionManagement.java 3 Mar 2003
14:42:35 -0000
@@ -67,9 +67,6 @@
import org.apache.turbine.util.TurbineConfig;
import org.apache.turbine.util.StringUtils;
-import org.apache.torque.Torque;
-import org.apache.torque.TorqueException;
-
import org.apache.jetspeed.om.security.Permission;
import org.apache.jetspeed.om.security.JetspeedPermissionFactory;
Index: apache/jetspeed/services/security/TestPortalAuthentication.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/security/TestPortalAuthentication.java,v
retrieving revision 1.3
diff -u -r1.3 TestPortalAuthentication.java
--- apache/jetspeed/services/security/TestPortalAuthentication.java 15 Oct 2002
17:35:33 -0000 1.3
+++ apache/jetspeed/services/security/TestPortalAuthentication.java 3 Mar 2003
14:42:39 -0000
@@ -64,9 +64,6 @@
import org.apache.turbine.util.TurbineConfig;
import org.apache.turbine.util.StringUtils;
-import org.apache.torque.Torque;
-import org.apache.torque.TorqueException;
-
import org.apache.jetspeed.om.security.JetspeedUser;
Index: apache/jetspeed/services/security/TestRoleManagement.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/security/TestRoleManagement.java,v
retrieving revision 1.4
diff -u -r1.4 TestRoleManagement.java
--- apache/jetspeed/services/security/TestRoleManagement.java 15 Oct 2002 17:35:33
-0000 1.4
+++ apache/jetspeed/services/security/TestRoleManagement.java 3 Mar 2003 14:42:45
-0000
@@ -67,13 +67,8 @@
import org.apache.turbine.util.TurbineConfig;
import org.apache.turbine.util.StringUtils;
-import org.apache.torque.Torque;
-import org.apache.torque.TorqueException;
-
import org.apache.jetspeed.om.security.Role;
import org.apache.jetspeed.om.security.JetspeedRoleFactory;
-
-import org.apache.jetspeed.services.security.JetspeedSecurityCache;
/**
* Unit test for RoleManagement interface
Index: apache/jetspeed/services/security/TestSecurityCache.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/security/TestSecurityCache.java,v
retrieving revision 1.3
diff -u -r1.3 TestSecurityCache.java
--- apache/jetspeed/services/security/TestSecurityCache.java 15 Oct 2002 17:35:33
-0000 1.3
+++ apache/jetspeed/services/security/TestSecurityCache.java 3 Mar 2003 14:42:52
-0000
@@ -54,9 +54,6 @@
package org.apache.jetspeed.services.security;
-import java.util.Iterator;
-import java.util.HashMap;
-
// Junit imports
import junit.framework.Test;
import junit.framework.TestSuite;
@@ -72,7 +69,6 @@
import org.apache.jetspeed.om.security.Role;
import org.apache.jetspeed.om.security.Permission;
import org.apache.jetspeed.om.security.JetspeedUser;
-import org.apache.jetspeed.om.security.JetspeedRoleFactory;
/**
* Unit test for SecurityCacheService
Index: apache/jetspeed/services/security/TestUserManagement.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/security/TestUserManagement.java,v
retrieving revision 1.5
diff -u -r1.5 TestUserManagement.java
--- apache/jetspeed/services/security/TestUserManagement.java 8 Dec 2002 19:33:53
-0000 1.5
+++ apache/jetspeed/services/security/TestUserManagement.java 3 Mar 2003 14:42:59
-0000
@@ -66,14 +66,10 @@
import org.apache.turbine.util.TurbineConfig;
import org.apache.turbine.util.StringUtils;
-import org.apache.torque.Torque;
-import org.apache.torque.TorqueException;
-
import org.apache.jetspeed.services.JetspeedUserManagement;
import org.apache.jetspeed.om.security.JetspeedUser;
import org.apache.jetspeed.om.security.JetspeedUserFactory;
import org.apache.jetspeed.om.security.UserNamePrincipal;
-import org.apache.jetspeed.om.security.UserIdPrincipal;
/**
* Unit test for UserManagement interface
Index: apache/jetspeed/services/security/ldap/LDAPAuthentication.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/security/ldap/LDAPAuthentication.java,v
retrieving revision 1.5
diff -u -r1.5 LDAPAuthentication.java
--- apache/jetspeed/services/security/ldap/LDAPAuthentication.java 12 Feb 2003
00:09:28 -0000 1.5
+++ apache/jetspeed/services/security/ldap/LDAPAuthentication.java 3 Mar 2003
14:43:07 -0000
@@ -54,7 +54,6 @@
package org.apache.jetspeed.services.security.ldap;
-import java.security.Principal;
import javax.naming.directory.BasicAttributes;
import javax.servlet.ServletConfig;
import org.apache.jetspeed.om.security.JetspeedUser;
@@ -70,14 +69,11 @@
import org.apache.jetspeed.services.security.LoginException;
import org.apache.jetspeed.services.security.PortalAuthentication;
import org.apache.jetspeed.services.security.UnknownUserException;
-import org.apache.turbine.om.security.User;
import org.apache.turbine.services.InitializationException;
-import org.apache.turbine.services.Service;
import org.apache.turbine.services.TurbineBaseService;
import org.apache.turbine.services.TurbineServices;
import org.apache.turbine.services.resources.ResourceService;
import org.apache.turbine.services.rundata.RunDataService;
-import org.apache.turbine.util.RunData;
/**
*
Index: apache/jetspeed/services/security/ldap/LDAPGroupManagement.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/security/ldap/LDAPGroupManagement.java,v
retrieving revision 1.5
diff -u -r1.5 LDAPGroupManagement.java
--- apache/jetspeed/services/security/ldap/LDAPGroupManagement.java 28 Jan 2003
04:49:44 -0000 1.5
+++ apache/jetspeed/services/security/ldap/LDAPGroupManagement.java 3 Mar 2003
14:43:16 -0000
@@ -54,7 +54,6 @@
package org.apache.jetspeed.services.security.ldap;
-import java.security.Principal;
import java.util.Enumeration;
import java.util.Iterator;
import java.util.StringTokenizer;
@@ -80,12 +79,10 @@
import org.apache.jetspeed.services.security.JetspeedSecurityService;
import org.apache.jetspeed.services.security.UnknownUserException;
import org.apache.turbine.services.InitializationException;
-import org.apache.turbine.services.Service;
import org.apache.turbine.services.TurbineBaseService;
import org.apache.turbine.services.TurbineServices;
import org.apache.turbine.services.resources.ResourceService;
import org.apache.turbine.services.rundata.RunDataService;
-import org.apache.turbine.util.RunData;
/**
*
Index: apache/jetspeed/services/security/ldap/LDAPPermissionManagement.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/security/ldap/LDAPPermissionManagement.java,v
retrieving revision 1.4
diff -u -r1.4 LDAPPermissionManagement.java
--- apache/jetspeed/services/security/ldap/LDAPPermissionManagement.java 28 Jan
2003 04:49:44 -0000 1.4
+++ apache/jetspeed/services/security/ldap/LDAPPermissionManagement.java 3 Mar
2003 14:43:27 -0000
@@ -60,7 +60,6 @@
import javax.naming.directory.BasicAttributes;
import javax.servlet.ServletConfig;
import org.apache.jetspeed.om.security.Permission;
-import org.apache.jetspeed.om.security.Role;
import org.apache.jetspeed.om.security.ldap.LDAPPermission;
import org.apache.jetspeed.om.security.ldap.LDAPRole;
import org.apache.jetspeed.services.JetspeedLDAP;
@@ -74,7 +73,6 @@
import org.apache.jetspeed.services.security.PermissionException;
import org.apache.jetspeed.services.security.PermissionManagement;
import org.apache.turbine.services.InitializationException;
-import org.apache.turbine.services.Service;
import org.apache.turbine.services.TurbineBaseService;
import org.apache.turbine.services.TurbineServices;
import org.apache.turbine.services.resources.ResourceService;
Index: apache/jetspeed/services/security/ldap/LDAPRoleManagement.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/security/ldap/LDAPRoleManagement.java,v
retrieving revision 1.6
diff -u -r1.6 LDAPRoleManagement.java
--- apache/jetspeed/services/security/ldap/LDAPRoleManagement.java 28 Jan 2003
04:49:44 -0000 1.6
+++ apache/jetspeed/services/security/ldap/LDAPRoleManagement.java 3 Mar 2003
14:43:36 -0000
@@ -54,7 +54,6 @@
package org.apache.jetspeed.services.security.ldap;
-import java.security.Principal;
import java.util.Enumeration;
import java.util.Iterator;
import java.util.StringTokenizer;
@@ -82,12 +81,10 @@
import org.apache.jetspeed.services.security.RoleManagement;
import org.apache.jetspeed.services.security.UnknownUserException;
import org.apache.turbine.services.InitializationException;
-import org.apache.turbine.services.Service;
import org.apache.turbine.services.TurbineBaseService;
import org.apache.turbine.services.TurbineServices;
import org.apache.turbine.services.resources.ResourceService;
import org.apache.turbine.services.rundata.RunDataService;
-import org.apache.turbine.util.RunData;
/**
*
@@ -372,7 +369,7 @@
user = (LDAPUser)JetspeedSecurity.getUser(new
UserNamePrincipal(username));
role = (LDAPRole)JetspeedSecurity.getRole(roleName);
}
- catch(JetspeedSecurityException e)
+ catch(JetspeedSecurityException e)
{
throw new RoleException("Failed to Retrieve User or Role: ", e);
}
Index: apache/jetspeed/services/security/ldap/LDAPUserManagement.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/security/ldap/LDAPUserManagement.java,v
retrieving revision 1.6
diff -u -r1.6 LDAPUserManagement.java
--- apache/jetspeed/services/security/ldap/LDAPUserManagement.java 12 Feb 2003
00:09:28 -0000 1.6
+++ apache/jetspeed/services/security/ldap/LDAPUserManagement.java 3 Mar 2003
14:43:49 -0000
@@ -55,11 +55,9 @@
package org.apache.jetspeed.services.security.ldap;
import java.security.Principal;
-import java.util.Enumeration;
import java.util.Iterator;
import java.util.List;
import java.util.Vector;
-import javax.naming.Context;
import javax.naming.NamingEnumeration;
import javax.naming.directory.Attributes;
import javax.naming.directory.BasicAttributes;
@@ -68,7 +66,6 @@
import javax.servlet.ServletConfig;
import org.apache.jetspeed.om.profile.Profile;
import org.apache.jetspeed.om.security.JetspeedUser;
-import org.apache.jetspeed.om.security.Role;
import org.apache.jetspeed.om.security.UserNamePrincipal;
import org.apache.jetspeed.om.security.ldap.LDAPUser;
import org.apache.jetspeed.services.JetspeedLDAP;
@@ -85,15 +82,12 @@
import org.apache.jetspeed.services.security.UnknownUserException;
import org.apache.jetspeed.services.security.UserException;
import org.apache.jetspeed.services.security.UserManagement;
-import org.apache.turbine.om.security.User;
import org.apache.turbine.services.InitializationException;
-import org.apache.turbine.services.Service;
import org.apache.turbine.services.TurbineBaseService;
import org.apache.turbine.services.TurbineServices;
import org.apache.turbine.services.resources.ResourceService;
import org.apache.turbine.services.rundata.RunDataService;
import org.apache.turbine.util.Log;
-import org.apache.turbine.util.RunData;
/**
*
Index: apache/jetspeed/services/security/nosecurity/NoAuthentication.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/security/nosecurity/NoAuthentication.java,v
retrieving revision 1.1
diff -u -r1.1 NoAuthentication.java
--- apache/jetspeed/services/security/nosecurity/NoAuthentication.java 6 Sep 2002
03:29:40 -0000 1.1
+++ apache/jetspeed/services/security/nosecurity/NoAuthentication.java 3 Mar 2003
14:43:57 -0000
@@ -64,7 +64,6 @@
import org.apache.jetspeed.services.JetspeedSecurity;
import org.apache.jetspeed.om.security.JetspeedUser;
-import org.apache.jetspeed.services.security.LoginException;
import org.apache.jetspeed.services.security.FailedLoginException;
import org.apache.jetspeed.services.rundata.JetspeedRunDataService;
import org.apache.jetspeed.services.rundata.JetspeedRunData;
Index: apache/jetspeed/services/security/nosecurity/NoPermissionManagement.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/security/nosecurity/NoPermissionManagement.java,v
retrieving revision 1.1
diff -u -r1.1 NoPermissionManagement.java
--- apache/jetspeed/services/security/nosecurity/NoPermissionManagement.java 6 Sep
2002 03:29:40 -0000 1.1
+++ apache/jetspeed/services/security/nosecurity/NoPermissionManagement.java 3 Mar
2003 14:44:02 -0000
@@ -62,16 +62,10 @@
import org.apache.jetspeed.om.security.Permission;
-import org.apache.jetspeed.services.JetspeedSecurity;
import org.apache.jetspeed.om.security.BaseJetspeedPermission;
// Jetspeed Security Exceptions
import org.apache.jetspeed.services.security.JetspeedSecurityException;
-
-// Rundata
-import org.apache.jetspeed.services.rundata.JetspeedRunDataService;
-import org.apache.jetspeed.services.rundata.JetspeedRunData;
-import org.apache.turbine.services.rundata.RunDataService;
// Turbine
import org.apache.turbine.services.TurbineBaseService;
Index: apache/jetspeed/services/security/nosecurity/NoSecurityAccessController.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/security/nosecurity/NoSecurityAccessController.java,v
retrieving revision 1.3
diff -u -r1.3 NoSecurityAccessController.java
--- apache/jetspeed/services/security/nosecurity/NoSecurityAccessController.java
25 Aug 2002 19:45:07 -0000 1.3
+++ apache/jetspeed/services/security/nosecurity/NoSecurityAccessController.java
3 Mar 2003 14:44:08 -0000
@@ -59,18 +59,14 @@
// Jetspeed import
import org.apache.jetspeed.om.profile.Entry;
-import org.apache.jetspeed.om.registry.Security;
import org.apache.jetspeed.om.security.JetspeedUser;
import org.apache.jetspeed.portal.Portlet;
-import org.apache.jetspeed.services.resources.JetspeedResources;
-import org.apache.jetspeed.services.JetspeedSecurity;
import org.apache.jetspeed.services.security.PortalAccessController;
import org.apache.jetspeed.services.security.PortalResource;
// Turbine imports
import org.apache.turbine.services.TurbineBaseService;
import org.apache.turbine.services.InitializationException;
-import org.apache.turbine.util.Log;
/**
* NoSecurityAccessController
Index: apache/jetspeed/services/security/registry/RegistryAccessController.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/security/registry/RegistryAccessController.java,v
retrieving revision 1.5
diff -u -r1.5 RegistryAccessController.java
--- apache/jetspeed/services/security/registry/RegistryAccessController.java 21 Jan
2003 21:50:33 -0000 1.5
+++ apache/jetspeed/services/security/registry/RegistryAccessController.java 3 Mar
2003 14:44:15 -0000
@@ -68,7 +68,6 @@
import org.apache.jetspeed.portal.Portlet;
import org.apache.jetspeed.portal.PortletController;
import org.apache.jetspeed.portal.PortletSet;
-import org.apache.jetspeed.services.resources.JetspeedResources;
import org.apache.jetspeed.services.Registry;
import org.apache.jetspeed.services.security.JetspeedRoleManagement;
import org.apache.jetspeed.services.security.PortalAccessController;
Index: apache/jetspeed/services/security/registry/TestAccessController.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/security/registry/TestAccessController.java,v
retrieving revision 1.3
diff -u -r1.3 TestAccessController.java
--- apache/jetspeed/services/security/registry/TestAccessController.java 4 Jul
2002 00:04:19 -0000 1.3
+++ apache/jetspeed/services/security/registry/TestAccessController.java 3 Mar
2003 14:44:25 -0000
@@ -66,7 +66,6 @@
import org.apache.jetspeed.om.registry.base.BaseSecurityAccess;
import org.apache.jetspeed.om.registry.base.BaseSecurityAllow;
import org.apache.jetspeed.om.registry.base.BaseSecurityEntry;
-import org.apache.jetspeed.om.registry.base.BasePortletEntry;
import org.apache.jetspeed.om.registry.RegistryEntry;
import org.apache.jetspeed.om.registry.SecurityEntry;
@@ -74,11 +73,9 @@
import org.apache.jetspeed.services.JetspeedPortalAccessController;
import org.apache.jetspeed.services.Registry;
import org.apache.jetspeed.services.resources.JetspeedResources;
-import org.apache.jetspeed.services.security.PortalResource;
import org.apache.jetspeed.services.security.JetspeedRoleManagement;
// Turbine imports
-import org.apache.turbine.services.TurbineServices;
import org.apache.turbine.util.TurbineConfig;
import org.apache.turbine.util.StringUtils;
Index: apache/jetspeed/services/security/turbine/TestAccessController.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/security/turbine/TestAccessController.java,v
retrieving revision 1.2
diff -u -r1.2 TestAccessController.java
--- apache/jetspeed/services/security/turbine/TestAccessController.java 28 Jun 2002
05:37:36 -0000 1.2
+++ apache/jetspeed/services/security/turbine/TestAccessController.java 3 Mar 2003
14:44:34 -0000
@@ -54,23 +54,10 @@
package org.apache.jetspeed.services.security.turbine;
-// Java imports
-import java.io.File;
// Jetspeed imports
-import org.apache.jetspeed.om.profile.BaseProfileLocator;
-import org.apache.jetspeed.om.profile.Control;
-import org.apache.jetspeed.om.profile.Controller;
import org.apache.jetspeed.om.profile.Entry;
-import org.apache.jetspeed.om.profile.Profile;
-import org.apache.jetspeed.om.profile.ProfileLocator;
-import org.apache.jetspeed.om.profile.Portlets;
-import org.apache.jetspeed.om.profile.PSMLDocument;
-import org.apache.jetspeed.om.profile.psml.PsmlController;
import org.apache.jetspeed.om.profile.psml.PsmlEntry;
-import org.apache.jetspeed.om.profile.psml.PsmlPortlets;
-import org.apache.jetspeed.om.profile.psml.PsmlRole;
-import org.apache.jetspeed.om.profile.psml.PsmlSkin;
import org.apache.jetspeed.om.security.JetspeedUser;
import org.apache.jetspeed.om.registry.base.BaseSecurity;
import org.apache.jetspeed.om.registry.base.BasePortletEntry;
@@ -81,12 +68,10 @@
import org.apache.jetspeed.services.JetspeedSecurity;
import org.apache.jetspeed.services.JetspeedPortalAccessController;
-import org.apache.jetspeed.services.Profiler;
import org.apache.jetspeed.services.resources.JetspeedResources;
import org.apache.jetspeed.services.security.PortalResource;
// Turbine imports
-import org.apache.turbine.services.TurbineServices;
import org.apache.turbine.util.TurbineConfig;
import org.apache.turbine.util.StringUtils;
Index: apache/jetspeed/services/security/turbine/TurbineAuthentication.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/security/turbine/TurbineAuthentication.java,v
retrieving revision 1.4
diff -u -r1.4 TurbineAuthentication.java
--- apache/jetspeed/services/security/turbine/TurbineAuthentication.java 13 Sep
2002 18:44:07 -0000 1.4
+++ apache/jetspeed/services/security/turbine/TurbineAuthentication.java 3 Mar
2003 14:44:44 -0000
@@ -70,16 +70,13 @@
import org.apache.jetspeed.services.JetspeedSecurity;
import org.apache.jetspeed.om.security.JetspeedUser;
-import org.apache.jetspeed.om.security.JetspeedUserFactory;
import org.apache.jetspeed.om.security.UserNamePrincipal;
import org.apache.jetspeed.services.JetspeedUserManagement;
import org.apache.jetspeed.services.security.JetspeedSecurityService;
-import org.apache.jetspeed.services.security.LoginException;
import org.apache.jetspeed.services.security.FailedLoginException;
import org.apache.jetspeed.services.security.CredentialExpiredException;
import org.apache.jetspeed.services.security.UnknownUserException;
-import org.apache.jetspeed.services.security.UserException;
import org.apache.jetspeed.services.security.JetspeedSecurityException;
import org.apache.jetspeed.services.security.JetspeedSecurityCache;
import org.apache.jetspeed.services.rundata.JetspeedRunDataService;
Index: apache/jetspeed/services/security/turbine/TurbineGroupManagement.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/security/turbine/TurbineGroupManagement.java,v
retrieving revision 1.5
diff -u -r1.5 TurbineGroupManagement.java
--- apache/jetspeed/services/security/turbine/TurbineGroupManagement.java 8 Nov
2002 10:05:18 -0000 1.5
+++ apache/jetspeed/services/security/turbine/TurbineGroupManagement.java 3 Mar
2003 14:44:55 -0000
@@ -65,19 +65,15 @@
import org.apache.jetspeed.services.security.GroupManagement;
import org.apache.jetspeed.om.security.JetspeedUser;
-import org.apache.jetspeed.om.security.BaseJetspeedUser;
import org.apache.jetspeed.om.security.Group;
import org.apache.jetspeed.om.security.Role;
import org.apache.jetspeed.services.JetspeedSecurity;
-import org.apache.jetspeed.services.security.UserManagement;
import org.apache.jetspeed.services.security.JetspeedSecurityService;
import org.apache.jetspeed.om.security.UserNamePrincipal;
// Jetspeed Security Exceptions
import org.apache.jetspeed.services.security.GroupException;
-import org.apache.jetspeed.services.security.UnknownUserException;
-import org.apache.jetspeed.services.security.NotUniqueUserException;
import org.apache.jetspeed.services.security.JetspeedSecurityException;
import org.apache.jetspeed.services.PsmlManager;
@@ -97,7 +93,6 @@
import org.apache.torque.util.Criteria;
import org.apache.torque.om.NumberKey;
import org.apache.torque.Torque;
-import org.apache.torque.TorqueException;
// Rundata
import org.apache.jetspeed.services.rundata.JetspeedRunDataService;
Index: apache/jetspeed/services/security/turbine/TurbinePermissionManagement.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/security/turbine/TurbinePermissionManagement.java,v
retrieving revision 1.5
diff -u -r1.5 TurbinePermissionManagement.java
--- apache/jetspeed/services/security/turbine/TurbinePermissionManagement.java 18 Oct
2002 19:16:32 -0000 1.5
+++ apache/jetspeed/services/security/turbine/TurbinePermissionManagement.java 3 Mar
2003 14:45:07 -0000
@@ -65,24 +65,17 @@
// Jetspeed Security
import org.apache.jetspeed.services.security.PermissionManagement;
import org.apache.jetspeed.services.security.JetspeedSecurityCache;
-import org.apache.jetspeed.services.security.CachedAcl;
-import org.apache.jetspeed.om.security.JetspeedUser;
-import org.apache.jetspeed.om.security.BaseJetspeedUser;
import org.apache.jetspeed.om.security.Role;
import org.apache.jetspeed.om.security.Permission;
import org.apache.jetspeed.services.JetspeedSecurity;
-import org.apache.jetspeed.services.security.UserManagement;
import org.apache.jetspeed.services.security.JetspeedSecurityService;
-import org.apache.jetspeed.om.security.UserNamePrincipal;
// Jetspeed Security Exceptions
import org.apache.jetspeed.services.security.PermissionException;
import org.apache.jetspeed.services.security.JetspeedSecurityException;
-import org.apache.jetspeed.services.PsmlManager;
-
// Jetspeed Database OM
import org.apache.jetspeed.om.security.turbine.TurbinePermission;
import org.apache.jetspeed.om.security.turbine.TurbinePermissionPeer;
@@ -93,7 +86,6 @@
import org.apache.torque.util.Criteria;
import org.apache.torque.om.NumberKey;
import org.apache.torque.Torque;
-import org.apache.torque.TorqueException;
// Rundata
import org.apache.jetspeed.services.rundata.JetspeedRunDataService;
Index: apache/jetspeed/services/security/turbine/TurbineRoleManagement.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/security/turbine/TurbineRoleManagement.java,v
retrieving revision 1.7
diff -u -r1.7 TurbineRoleManagement.java
--- apache/jetspeed/services/security/turbine/TurbineRoleManagement.java 8 Dec
2002 19:33:53 -0000 1.7
+++ apache/jetspeed/services/security/turbine/TurbineRoleManagement.java 3 Mar
2003 14:45:20 -0000
@@ -68,11 +68,9 @@
import org.apache.jetspeed.services.security.CachedAcl;
import org.apache.jetspeed.om.security.JetspeedUser;
-import org.apache.jetspeed.om.security.BaseJetspeedUser;
import org.apache.jetspeed.om.security.Role;
import org.apache.jetspeed.services.JetspeedSecurity;
-import org.apache.jetspeed.services.security.UserManagement;
import org.apache.jetspeed.services.security.JetspeedSecurityService;
import org.apache.jetspeed.om.security.UserNamePrincipal;
@@ -80,8 +78,6 @@
// Jetspeed Security Exceptions
import org.apache.jetspeed.services.security.RoleException;
-import org.apache.jetspeed.services.security.UnknownUserException;
-import org.apache.jetspeed.services.security.NotUniqueUserException;
import org.apache.jetspeed.services.security.JetspeedSecurityException;
@@ -101,7 +97,6 @@
import org.apache.torque.util.Criteria;
import org.apache.torque.om.NumberKey;
import org.apache.torque.Torque;
-import org.apache.torque.TorqueException;
// Rundata
import org.apache.jetspeed.services.rundata.JetspeedRunDataService;
Index: apache/jetspeed/services/statemanager/BaseStateManagerService.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/statemanager/BaseStateManagerService.java,v
retrieving revision 1.2
diff -u -r1.2 BaseStateManagerService.java
--- apache/jetspeed/services/statemanager/BaseStateManagerService.java 8 Aug 2002
00:05:18 -0000 1.2
+++ apache/jetspeed/services/statemanager/BaseStateManagerService.java 3 Mar 2003
14:45:33 -0000
@@ -65,7 +65,6 @@
import java.util.Map;
import java.util.Set;
import java.util.Collections;
-import java.util.Vector;
import javax.servlet.ServletConfig;
import javax.servlet.http.HttpSession;
Index: apache/jetspeed/services/statemanager/JetspeedHttpStateManagerService.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/statemanager/JetspeedHttpStateManagerService.java,v
retrieving revision 1.2
diff -u -r1.2 JetspeedHttpStateManagerService.java
--- apache/jetspeed/services/statemanager/JetspeedHttpStateManagerService.java 8 Aug
2002 00:05:18 -0000 1.2
+++ apache/jetspeed/services/statemanager/JetspeedHttpStateManagerService.java 3 Mar
2003 14:45:41 -0000
@@ -60,9 +60,7 @@
package org.apache.jetspeed.services.statemanager;
// imports
-import java.util.HashMap;
import java.util.Map;
-import java.util.Collections;
import java.util.Vector;
import java.util.Enumeration;
Index: apache/jetspeed/services/statemanager/SessionState.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/statemanager/SessionState.java,v
retrieving revision 1.3
diff -u -r1.3 SessionState.java
--- apache/jetspeed/services/statemanager/SessionState.java 14 May 2002 14:50:11
-0000 1.3
+++ apache/jetspeed/services/statemanager/SessionState.java 3 Mar 2003 14:45:47
-0000
@@ -59,9 +59,6 @@
// package
package org.apache.jetspeed.services.statemanager;
-// imports
-import java.util.Iterator;
-
/**
* <p>SessionState is an interface for objects that provide name - value information
sets
* with a unique key that can be used in the StateManager service</p>
Index: apache/jetspeed/services/template/JetspeedTemplateLocatorService.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/template/JetspeedTemplateLocatorService.java,v
retrieving revision 1.14
diff -u -r1.14 JetspeedTemplateLocatorService.java
--- apache/jetspeed/services/template/JetspeedTemplateLocatorService.java 2 Mar
2003 19:40:13 -0000 1.14
+++ apache/jetspeed/services/template/JetspeedTemplateLocatorService.java 3 Mar
2003 14:46:00 -0000
@@ -56,26 +56,22 @@
// java.io
import java.io.File;
-import java.io.IOException;
// java.util
import java.util.Iterator;
import java.util.List;
import java.util.ArrayList;
import java.util.Map;
import java.util.HashMap;
import java.util.Locale;
-import java.util.StringTokenizer;
import javax.servlet.ServletConfig;
// turbine.util
import org.apache.turbine.util.Log;
import org.apache.turbine.util.RunData;
-import org.apache.turbine.util.DynamicURI;
// turbine.services
-import org.apache.turbine.services.Service;
import org.apache.turbine.services.TurbineBaseService;
import org.apache.turbine.services.TurbineServices;
import org.apache.turbine.services.InitializationException;
@@ -87,14 +83,10 @@
// jetspeed.capability
import org.apache.jetspeed.capability.CapabilityMap;
-// jetspeed.util
-import org.apache.jetspeed.util.MimeType;
-
// jetspeed.services
import org.apache.jetspeed.services.resources.JetspeedResources;
import org.apache.jetspeed.services.rundata.JetspeedRunData;
import org.apache.jetspeed.services.Profiler;
-
/**
* <p>Implements all template location related operations.
* Template location algorithms are different from the Velocity template location,
Index: apache/jetspeed/services/template/JetspeedTemplateService.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/template/JetspeedTemplateService.java,v
retrieving revision 1.7
diff -u -r1.7 JetspeedTemplateService.java
--- apache/jetspeed/services/template/JetspeedTemplateService.java 7 Feb 2002
22:22:12 -0000 1.7
+++ apache/jetspeed/services/template/JetspeedTemplateService.java 3 Mar 2003
14:46:22 -0000
@@ -64,7 +64,6 @@
// Turbine Utility Classes
import org.apache.turbine.util.*;
import org.apache.turbine.services.*;
-import org.apache.turbine.services.template.TemplateService;
import org.apache.turbine.services.resources.TurbineResources;
import org.apache.turbine.modules.*;
Index: apache/jetspeed/services/template/TemplateLocatorService.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/template/TemplateLocatorService.java,v
retrieving revision 1.6
diff -u -r1.6 TemplateLocatorService.java
--- apache/jetspeed/services/template/TemplateLocatorService.java 24 Oct 2002
16:17:21 -0000 1.6
+++ apache/jetspeed/services/template/TemplateLocatorService.java 3 Mar 2003
14:46:37 -0000
@@ -54,16 +54,9 @@
package org.apache.jetspeed.services.template;
-import org.apache.jetspeed.om.profile.Profile;
-import org.apache.jetspeed.services.Profiler;
-import org.apache.jetspeed.capability.CapabilityMap;
-//import org.apache.jetspeed.util.MimeType;
-
import org.apache.turbine.services.Service;
import org.apache.turbine.util.RunData;
-import org.apache.turbine.util.DynamicURI;
-import java.io.IOException;
import java.util.Locale;
/**
Index: apache/jetspeed/services/threadpool/JetspeedThreadPoolService.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/threadpool/JetspeedThreadPoolService.java,v
retrieving revision 1.7
diff -u -r1.7 JetspeedThreadPoolService.java
--- apache/jetspeed/services/threadpool/JetspeedThreadPoolService.java 17 Dec 2001
15:32:28 -0000 1.7
+++ apache/jetspeed/services/threadpool/JetspeedThreadPoolService.java 3 Mar 2003
14:46:51 -0000
@@ -56,7 +56,6 @@
// Java Stuff
import java.util.*;
-import java.io.*;
import javax.servlet.ServletConfig;
// Turbine Stuff
Index: apache/jetspeed/services/urlmanager/URLFetcher.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/urlmanager/URLFetcher.java,v
retrieving revision 1.10
diff -u -r1.10 URLFetcher.java
--- apache/jetspeed/services/urlmanager/URLFetcher.java 4 Jun 2002 20:10:49 -0000
1.10
+++ apache/jetspeed/services/urlmanager/URLFetcher.java 3 Mar 2003 14:47:15 -0000
@@ -55,7 +55,6 @@
package org.apache.jetspeed.services.urlmanager;
//jetspeed stuff
-import org.apache.jetspeed.util.*;
import org.apache.jetspeed.cache.disk.*;
//turbine stuff
Index: apache/jetspeed/services/webpage/AbstractSiteSession.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/webpage/AbstractSiteSession.java,v
retrieving revision 1.1
diff -u -r1.1 AbstractSiteSession.java
--- apache/jetspeed/services/webpage/AbstractSiteSession.java 12 Feb 2003 08:12:28
-0000 1.1
+++ apache/jetspeed/services/webpage/AbstractSiteSession.java 3 Mar 2003 14:47:26
-0000
@@ -56,13 +56,10 @@
// java.io
import java.io.IOException;
-import java.io.PrintWriter;
import java.io.FileOutputStream;
import java.io.InputStream;
import java.io.ByteArrayOutputStream;
import java.io.DataOutputStream;
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
// java.util
import java.util.Iterator;
@@ -70,7 +67,6 @@
import java.util.HashMap;
// javax.servlet
-import javax.servlet.*;
import javax.servlet.http.*;
// java.net
@@ -78,7 +74,6 @@
import java.net.URLConnection;
import java.net.HttpURLConnection;
import java.net.URLEncoder;
-import sun.net.www.protocol.http.*;
import org.apache.log4j.Logger;
Index: apache/jetspeed/services/webpage/CachedResource.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/webpage/CachedResource.java,v
retrieving revision 1.1
diff -u -r1.1 CachedResource.java
--- apache/jetspeed/services/webpage/CachedResource.java 12 Feb 2003 08:12:28
-0000 1.1
+++ apache/jetspeed/services/webpage/CachedResource.java 3 Mar 2003 14:47:32
-0000
@@ -54,22 +54,6 @@
package org.apache.jetspeed.services.webpage;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.io.FileOutputStream;
-import java.io.InputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.DataOutputStream;
-import java.util.Iterator;
-import java.util.Enumeration;
-import java.util.HashMap;
-import javax.servlet.*;
-import javax.servlet.http.*;
-import java.net.URL;
-import java.net.URLConnection;
-import java.net.HttpURLConnection;
-import java.net.URLEncoder;
-
/**
* A cached resource object, stored in memory to optimize access to static resources
* such as images and style sheets.
Index: apache/jetspeed/services/webpage/JetspeedSiteSession.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/webpage/JetspeedSiteSession.java,v
retrieving revision 1.1
diff -u -r1.1 JetspeedSiteSession.java
--- apache/jetspeed/services/webpage/JetspeedSiteSession.java 12 Feb 2003 08:12:28
-0000 1.1
+++ apache/jetspeed/services/webpage/JetspeedSiteSession.java 3 Mar 2003 14:47:35
-0000
@@ -56,28 +56,12 @@
// java.io
import java.io.IOException;
-import java.io.PrintWriter;
-import java.io.FileOutputStream;
-import java.io.InputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.DataOutputStream;
-
-// java.util
-import java.util.Iterator;
-import java.util.Enumeration;
-import java.util.StringTokenizer;
-import java.util.HashMap;
// javax.servlet
-import javax.servlet.*;
import javax.servlet.http.*;
// java.net
-import java.net.URL;
import java.net.URLConnection;
-import java.net.HttpURLConnection;
-import java.net.URLEncoder;
-import sun.net.www.protocol.http.*;
import org.apache.log4j.Logger;
Index: apache/jetspeed/services/webpage/JetspeedWebPageService.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/webpage/JetspeedWebPageService.java,v
retrieving revision 1.1
diff -u -r1.1 JetspeedWebPageService.java
--- apache/jetspeed/services/webpage/JetspeedWebPageService.java 12 Feb 2003
08:12:28 -0000 1.1
+++ apache/jetspeed/services/webpage/JetspeedWebPageService.java 3 Mar 2003
14:47:51 -0000
@@ -56,20 +56,9 @@
// java.io
import java.io.IOException;
-import java.io.PrintWriter;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.BufferedReader;
-import java.io.DataInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.DataOutputStream;
// java.util
-import java.util.Enumeration;
-import java.util.StringTokenizer;
-import java.util.List;
import java.util.Collection;
-import java.util.Map;
import java.util.Iterator;
// javax.servlet
@@ -82,10 +71,8 @@
// java.net
import java.net.URL;
-import java.net.URLConnection;
import java.util.HashMap;
import java.net.MalformedURLException;
-import java.rmi.RemoteException;
import org.apache.log4j.Logger;
Index: apache/jetspeed/services/webpage/SessionMap.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/webpage/SessionMap.java,v
retrieving revision 1.1
diff -u -r1.1 SessionMap.java
--- apache/jetspeed/services/webpage/SessionMap.java 12 Feb 2003 08:12:28 -0000
1.1
+++ apache/jetspeed/services/webpage/SessionMap.java 3 Mar 2003 14:47:59 -0000
@@ -59,7 +59,6 @@
import java.util.Iterator;
// javax.servlet
-import javax.servlet.*;
import javax.servlet.http.*;
import org.apache.log4j.Logger;
Index: apache/jetspeed/services/webpage/SiteSession.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/webpage/SiteSession.java,v
retrieving revision 1.1
diff -u -r1.1 SiteSession.java
--- apache/jetspeed/services/webpage/SiteSession.java 12 Feb 2003 08:12:28 -0000
1.1
+++ apache/jetspeed/services/webpage/SiteSession.java 3 Mar 2003 14:48:02 -0000
@@ -56,27 +56,12 @@
// java.io
import java.io.IOException;
-import java.io.PrintWriter;
-import java.io.FileOutputStream;
-import java.io.InputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.DataOutputStream;
-
-// java.util
-import java.util.Iterator;
-import java.util.Enumeration;
-import java.util.StringTokenizer;
-import java.util.HashMap;
// javax.servlet
-import javax.servlet.*;
import javax.servlet.http.*;
// java.net
-import java.net.URL;
import java.net.URLConnection;
-import java.net.HttpURLConnection;
-import java.net.URLEncoder;
/**
* Standard interface for all proxied sessions.
Index: apache/jetspeed/services/webpage/WebPageCache.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/webpage/WebPageCache.java,v
retrieving revision 1.1
diff -u -r1.1 WebPageCache.java
--- apache/jetspeed/services/webpage/WebPageCache.java 12 Feb 2003 08:12:28 -0000
1.1
+++ apache/jetspeed/services/webpage/WebPageCache.java 3 Mar 2003 14:48:10 -0000
@@ -56,31 +56,20 @@
// java.io
import java.io.IOException;
-import java.io.PrintWriter;
import java.io.FileOutputStream;
import java.io.InputStream;
import java.io.ByteArrayOutputStream;
-import java.io.DataOutputStream;
// java.util
-import java.util.Iterator;
-import java.util.Enumeration;
import java.util.HashMap;
-// javax.servlet
-import javax.servlet.*;
-import javax.servlet.http.*;
-
// java.net
import java.net.URL;
import java.net.URLConnection;
import java.net.HttpURLConnection;
-import java.net.URLEncoder;
import java.net.MalformedURLException;
import org.apache.log4j.Logger;
-
-import org.apache.jetspeed.util.rewriter.HTMLRewriter;
/*
Index: apache/jetspeed/services/webpage/WebPageConsoleServlet.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/webpage/WebPageConsoleServlet.java,v
retrieving revision 1.1
diff -u -r1.1 WebPageConsoleServlet.java
--- apache/jetspeed/services/webpage/WebPageConsoleServlet.java 12 Feb 2003 08:12:28
-0000 1.1
+++ apache/jetspeed/services/webpage/WebPageConsoleServlet.java 3 Mar 2003 14:48:22
-0000
@@ -56,7 +56,6 @@
// java.util
import java.util.Properties;
-import java.util.Vector;
import java.util.Collection;
// java.io
Index: apache/jetspeed/services/webpage/WebPageHelper.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/webpage/WebPageHelper.java,v
retrieving revision 1.1
diff -u -r1.1 WebPageHelper.java
--- apache/jetspeed/services/webpage/WebPageHelper.java 12 Feb 2003 08:12:28 -0000
1.1
+++ apache/jetspeed/services/webpage/WebPageHelper.java 3 Mar 2003 14:48:31 -0000
@@ -57,13 +57,9 @@
// java.io
import java.io.IOException;
-import java.io.FileReader;
-import java.io.BufferedReader;
-import java.io.PrintWriter;
import java.io.FileOutputStream;
// java.util
-import java.util.Enumeration;
import java.util.StringTokenizer;
import java.util.Date;
import java.text.SimpleDateFormat;
@@ -73,10 +69,7 @@
import java.net.UnknownHostException;
// javax.servlet
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.Cookie;
-import javax.servlet.ServletException;
/**
Index: apache/jetspeed/services/webpage/WebPageServlet.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/webpage/WebPageServlet.java,v
retrieving revision 1.1
diff -u -r1.1 WebPageServlet.java
--- apache/jetspeed/services/webpage/WebPageServlet.java 12 Feb 2003 08:12:28
-0000 1.1
+++ apache/jetspeed/services/webpage/WebPageServlet.java 3 Mar 2003 14:48:43
-0000
@@ -57,27 +57,12 @@
// java.io
import java.io.IOException;
import java.io.PrintWriter;
-import java.io.InputStream;
-import java.io.InputStreamReader;
import java.io.BufferedReader;
-import java.io.DataInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.DataOutputStream;
import java.io.FileReader;
-import java.io.BufferedReader;
// java.util
-import java.util.Enumeration;
-import java.util.StringTokenizer;
import javax.servlet.*;
import javax.servlet.http.*;
-
-// java.text
-import java.text.SimpleDateFormat;
-
-// java.net
-import java.net.URL;
-import java.net.URLConnection;
import org.apache.log4j.Logger;
Index: apache/jetspeed/test/HeadlessBaseTest.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/test/HeadlessBaseTest.java,v
retrieving revision 1.1
diff -u -r1.1 HeadlessBaseTest.java
--- apache/jetspeed/test/HeadlessBaseTest.java 28 Jan 2003 05:57:48 -0000 1.1
+++ apache/jetspeed/test/HeadlessBaseTest.java 3 Mar 2003 14:48:53 -0000
@@ -54,9 +54,7 @@
package org.apache.jetspeed.test;
import java.io.File;
-import java.io.FileNotFoundException;
import java.io.FileReader;
-import java.io.IOException;
import junit.framework.AssertionFailedError;
import junit.framework.TestCase;
@@ -65,20 +63,12 @@
import org.apache.commons.configuration.Configuration;
import org.apache.commons.configuration.PropertiesConfiguration;
import org.apache.commons.lang.exception.NestableRuntimeException;
-import org.apache.jetspeed.om.profile.ConfigElement;
import org.apache.jetspeed.om.profile.PSMLDocument;
import org.apache.jetspeed.om.profile.Portlets;
-import org.apache.jetspeed.om.profile.ProfileLocator;
-import org.apache.jetspeed.services.Profiler;
import org.apache.jetspeed.services.PsmlManager;
import org.apache.turbine.util.StringUtils;
import org.apache.turbine.util.TurbineConfig;
import org.exolab.castor.mapping.Mapping;
-import org.exolab.castor.mapping.MappingException;
-import org.exolab.castor.xml.MarshalException;
-import org.exolab.castor.xml.Unmarshaller;
-import org.exolab.castor.xml.ValidationException;
-import org.xml.sax.InputSource;
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Scott Weaver</a>
Index: apache/jetspeed/test/TestBasicSanity.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/test/TestBasicSanity.java,v
retrieving revision 1.4
diff -u -r1.4 TestBasicSanity.java
--- apache/jetspeed/test/TestBasicSanity.java 28 Jun 2002 05:37:36 -0000 1.4
+++ apache/jetspeed/test/TestBasicSanity.java 3 Mar 2003 14:49:04 -0000
@@ -54,11 +54,6 @@
package org.apache.jetspeed.test;
-// Java imports
-
-// ECS imports
-import org.apache.ecs.ConcreteElement;
-
// Junit imports
import junit.awtui.TestRunner;
import junit.framework.Test;
@@ -75,7 +70,6 @@
import org.apache.jetspeed.om.profile.ProfileLocator;
import org.apache.jetspeed.om.profile.PSMLDocument;
import org.apache.jetspeed.services.Profiler;
-import org.apache.jetspeed.services.JetspeedSecurity;
import org.apache.jetspeed.services.rundata.JetspeedRunData;
import org.apache.jetspeed.test.TurbineTestUtilities;
Index: apache/jetspeed/test/TestBasicSecurity.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/test/TestBasicSecurity.java,v
retrieving revision 1.3
diff -u -r1.3 TestBasicSecurity.java
--- apache/jetspeed/test/TestBasicSecurity.java 8 Nov 2002 10:05:19 -0000 1.3
+++ apache/jetspeed/test/TestBasicSecurity.java 3 Mar 2003 14:49:16 -0000
@@ -56,13 +56,6 @@
// Java imports
import java.io.File;
-import java.io.FileReader;
-import java.io.Writer;
-import java.io.FileWriter;
-import java.io.IOException;
-
-// ECS imports
-import org.apache.ecs.ConcreteElement;
// Junit imports
import junit.awtui.TestRunner;
@@ -75,9 +68,6 @@
import org.apache.cactus.WebResponse;
// Jetspeed imports
-import org.apache.jetspeed.capability.CapabilityMap;
-import org.apache.jetspeed.om.profile.Control;
-import org.apache.jetspeed.om.profile.Controller;
import org.apache.jetspeed.om.profile.Profile;
import org.apache.jetspeed.om.profile.ProfileLocator;
import org.apache.jetspeed.om.profile.Portlets;
@@ -85,17 +75,11 @@
import org.apache.jetspeed.om.profile.psml.PsmlController;
import org.apache.jetspeed.om.profile.psml.PsmlEntry;
import org.apache.jetspeed.om.profile.psml.PsmlPortlets;
-import org.apache.jetspeed.om.profile.psml.PsmlRole;
import org.apache.jetspeed.om.profile.psml.PsmlSkin;
import org.apache.jetspeed.services.Profiler;
-import org.apache.jetspeed.services.JetspeedSecurity;
-import org.apache.jetspeed.services.rundata.JetspeedRunData;
import org.apache.jetspeed.test.TurbineTestUtilities;
// Turbine imports
-import org.apache.turbine.om.security.User;
-import org.apache.turbine.services.pull.TurbinePull;
-import org.apache.turbine.services.velocity.TurbineVelocity;
import org.apache.turbine.util.RunData;
import org.apache.turbine.util.RunDataFactory;
Index: apache/jetspeed/util/AutoProfile.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/util/AutoProfile.java,v
retrieving revision 1.7
diff -u -r1.7 AutoProfile.java
--- apache/jetspeed/util/AutoProfile.java 27 Sep 2002 17:02:33 -0000 1.7
+++ apache/jetspeed/util/AutoProfile.java 3 Mar 2003 14:49:23 -0000
@@ -3,14 +3,11 @@
import org.apache.jetspeed.om.profile.Portlets;
import org.apache.jetspeed.om.profile.Entry;
import org.apache.jetspeed.om.profile.Profile;
-import org.apache.jetspeed.services.Profiler;
-import org.apache.jetspeed.util.MimeType;
import org.apache.jetspeed.services.rundata.JetspeedRunData;
import org.apache.jetspeed.portal.PortletSet;
import org.apache.turbine.util.RunData;
-import javax.servlet.http.*;
import java.util.*;
/**
Index: apache/jetspeed/util/Base64.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/util/Base64.java,v
retrieving revision 1.3
diff -u -r1.3 Base64.java
--- apache/jetspeed/util/Base64.java 28 Jan 2003 04:49:44 -0000 1.3
+++ apache/jetspeed/util/Base64.java 3 Mar 2003 14:49:25 -0000
@@ -54,10 +54,8 @@
package org.apache.jetspeed.util;
import javax.mail.internet.MimeUtility;
-import java.io.BufferedReader;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
-import java.io.InputStreamReader;
import java.io.InputStream;
/**
Index: apache/jetspeed/util/DirectoryUtils.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/util/DirectoryUtils.java,v
retrieving revision 1.2
diff -u -r1.2 DirectoryUtils.java
--- apache/jetspeed/util/DirectoryUtils.java 30 Nov 2001 10:53:59 -0000 1.2
+++ apache/jetspeed/util/DirectoryUtils.java 3 Mar 2003 14:49:32 -0000
@@ -55,8 +55,6 @@
package org.apache.jetspeed.util;
import java.io.*;
-import java.net.URL;
-
import org.apache.turbine.util.Log;
/*
Index: apache/jetspeed/util/PortletSessionState.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/util/PortletSessionState.java,v
retrieving revision 1.6
diff -u -r1.6 PortletSessionState.java
--- apache/jetspeed/util/PortletSessionState.java 18 Oct 2002 17:46:37 -0000
1.6
+++ apache/jetspeed/util/PortletSessionState.java 3 Mar 2003 14:49:40 -0000
@@ -58,7 +58,6 @@
import org.apache.turbine.util.Log;
import org.apache.jetspeed.portal.portlets.VelocityPortlet;
import org.apache.jetspeed.portal.Portlet;
-import org.apache.jetspeed.portal.PortletConfig;
import org.apache.jetspeed.services.persistence.PersistenceManager;
import org.apache.jetspeed.portal.PortletInstance;
Index: apache/jetspeed/util/SimpleTransform.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/util/SimpleTransform.java,v
retrieving revision 1.19
diff -u -r1.19 SimpleTransform.java
--- apache/jetspeed/util/SimpleTransform.java 18 Jan 2002 13:14:35 -0000 1.19
+++ apache/jetspeed/util/SimpleTransform.java 3 Mar 2003 14:50:04 -0000
@@ -64,13 +64,8 @@
import javax.xml.transform.Templates;
//import javax.xml.transform.stream.StreamSource;
import javax.xml.transform.stream.StreamResult;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.TransformerConfigurationException;
-import javax.xml.transform.Source;
import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.sax.SAXSource;
-import javax.xml.transform.Result;
-import javax.xml.transform.stream.StreamResult;
import javax.xml.transform.sax.SAXTransformerFactory;
import javax.xml.transform.sax.TemplatesHandler;
import javax.xml.transform.sax.TransformerHandler;
@@ -80,8 +75,6 @@
//SAX Suport
import org.xml.sax.XMLReader;
-import org.xml.sax.ContentHandler;
-import org.xml.sax.ext.LexicalHandler;
import org.xml.sax.SAXException;
import org.xml.sax.helpers.XMLReaderFactory;
import org.xml.sax.InputSource;
Index: apache/jetspeed/util/StringUtils.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/util/StringUtils.java,v
retrieving revision 1.7
diff -u -r1.7 StringUtils.java
--- apache/jetspeed/util/StringUtils.java 30 Sep 2002 17:35:04 -0000 1.7
+++ apache/jetspeed/util/StringUtils.java 3 Mar 2003 14:50:16 -0000
@@ -54,7 +54,6 @@
package org.apache.jetspeed.util;
-import org.apache.turbine.util.Log;
import java.util.StringTokenizer;
import java.util.Map;
Index: apache/jetspeed/util/TestValidation.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/util/TestValidation.java,v
retrieving revision 1.1
diff -u -r1.1 TestValidation.java
--- apache/jetspeed/util/TestValidation.java 12 Feb 2003 05:57:48 -0000 1.1
+++ apache/jetspeed/util/TestValidation.java 3 Mar 2003 14:50:38 -0000
@@ -59,9 +59,6 @@
import junit.framework.TestSuite;
import junit.framework.TestCase;
-import org.apache.turbine.util.TurbineConfig;
-import org.apache.turbine.util.StringUtils;
-
/**
* Command Line Test Validation routines.
Index: apache/jetspeed/util/TestValidationParameterParser.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/util/TestValidationParameterParser.java,v
retrieving revision 1.2
diff -u -r1.2 TestValidationParameterParser.java
--- apache/jetspeed/util/TestValidationParameterParser.java 19 Feb 2003 14:38:42
-0000 1.2
+++ apache/jetspeed/util/TestValidationParameterParser.java 3 Mar 2003 14:50:43
-0000
@@ -53,15 +53,9 @@
*/
package org.apache.jetspeed.util;
-import java.util.List;
-
// Junit imports
import junit.framework.Test;
import junit.framework.TestSuite;
-import junit.framework.TestCase;
-
-import org.apache.turbine.util.TurbineConfig;
-import org.apache.turbine.util.StringUtils;
import org.apache.jetspeed.test.HeadlessBaseTest;
import org.apache.jetspeed.util.parser.ValidationParameterParser;
Index: apache/jetspeed/util/URILookup.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/util/URILookup.java,v
retrieving revision 1.20
diff -u -r1.20 URILookup.java
--- apache/jetspeed/util/URILookup.java 14 Jul 2002 17:20:50 -0000 1.20
+++ apache/jetspeed/util/URILookup.java 3 Mar 2003 14:51:05 -0000
@@ -66,10 +66,6 @@
import org.apache.turbine.util.*;
import org.apache.turbine.util.template.TemplateLink;
-//java imports
-import java.util.Enumeration;
-import java.util.Hashtable;
-
/**
* <p>
Index: apache/jetspeed/util/parser/ValidationParameterParser.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/util/parser/ValidationParameterParser.java,v
retrieving revision 1.1
diff -u -r1.1 ValidationParameterParser.java
--- apache/jetspeed/util/parser/ValidationParameterParser.java 19 Feb 2003 07:58:54
-0000 1.1
+++ apache/jetspeed/util/parser/ValidationParameterParser.java 3 Mar 2003 14:51:37
-0000
@@ -53,10 +53,6 @@
*/
package org.apache.jetspeed.util.parser;
-import java.io.BufferedReader;
-import java.io.Reader;
-import javax.servlet.http.HttpServletRequest;
-
import java.beans.PropertyDescriptor;
import java.beans.IndexedPropertyDescriptor;
import java.beans.Introspector;
@@ -67,13 +63,8 @@
import org.apache.torque.om.StringKey;
import java.util.Date;
-import org.apache.turbine.util.Log;
-import org.apache.turbine.util.parser.DefaultParameterParser;
import org.apache.turbine.util.ParameterParser;
-import org.apache.turbine.util.TurbineException;
import org.apache.turbine.util.pool.Recyclable;
-import org.apache.turbine.util.upload.FileItem;
-import org.apache.turbine.services.upload.TurbineUpload;
import org.apache.jetspeed.util.ValidationException;
import org.apache.jetspeed.util.ValidationHelper;
Index: apache/jetspeed/util/rewriter/FrameRewriterTest.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/util/rewriter/FrameRewriterTest.java,v
retrieving revision 1.2
diff -u -r1.2 FrameRewriterTest.java
--- apache/jetspeed/util/rewriter/FrameRewriterTest.java 29 Oct 2002 18:38:06
-0000 1.2
+++ apache/jetspeed/util/rewriter/FrameRewriterTest.java 3 Mar 2003 14:51:50
-0000
@@ -56,8 +56,6 @@
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
-import junit.framework.Assert;
-
import java.io.Reader;
import java.io.StringReader;
import java.io.FileReader;
Index: apache/jetspeed/util/rewriter/HTMLParserAdaptor.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/util/rewriter/HTMLParserAdaptor.java,v
retrieving revision 1.2
diff -u -r1.2 HTMLParserAdaptor.java
--- apache/jetspeed/util/rewriter/HTMLParserAdaptor.java 29 Oct 2002 18:38:06
-0000 1.2
+++ apache/jetspeed/util/rewriter/HTMLParserAdaptor.java 3 Mar 2003 14:51:52
-0000
@@ -55,7 +55,6 @@
package org.apache.jetspeed.util.rewriter;
import java.net.MalformedURLException;
-import java.net.URL;
import java.io.Reader;
/*
Index: apache/jetspeed/util/rewriter/HTMLRewriter.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/util/rewriter/HTMLRewriter.java,v
retrieving revision 1.3
diff -u -r1.3 HTMLRewriter.java
--- apache/jetspeed/util/rewriter/HTMLRewriter.java 29 Oct 2002 18:38:06 -0000
1.3
+++ apache/jetspeed/util/rewriter/HTMLRewriter.java 3 Mar 2003 14:52:00 -0000
@@ -55,14 +55,11 @@
package org.apache.jetspeed.util.rewriter;
// java.io
-import java.io.IOException;
-import java.io.CharArrayWriter;
import java.io.Reader;
// java.net
import java.net.MalformedURLException;
import java.net.URL;
-import java.net.URLEncoder;
// this makes it dependent on Swing...need an abstraction WTP
import javax.swing.text.html.HTML;
Index: apache/jetspeed/util/rewriter/Rewriter.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/util/rewriter/Rewriter.java,v
retrieving revision 1.3
diff -u -r1.3 Rewriter.java
--- apache/jetspeed/util/rewriter/Rewriter.java 29 Oct 2002 18:38:06 -0000 1.3
+++ apache/jetspeed/util/rewriter/Rewriter.java 3 Mar 2003 14:52:05 -0000
@@ -55,12 +55,10 @@
package org.apache.jetspeed.util.rewriter;
// java.io
-import java.io.IOException;
import java.io.Reader;
// java.net
import java.net.MalformedURLException;
-import java.net.URL;
// this makes it dependent on Swing...need an abstraction WTP
import javax.swing.text.html.HTML;
Index: apache/jetspeed/util/rewriter/SampleRewriter.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/util/rewriter/SampleRewriter.java,v
retrieving revision 1.3
diff -u -r1.3 SampleRewriter.java
--- apache/jetspeed/util/rewriter/SampleRewriter.java 29 Oct 2002 18:38:06 -0000
1.3
+++ apache/jetspeed/util/rewriter/SampleRewriter.java 3 Mar 2003 14:52:13 -0000
@@ -56,14 +56,10 @@
// java.io
-import java.io.IOException;
-import java.io.CharArrayWriter;
import java.io.Reader;
// java.net
import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLEncoder;
// this makes it dependent on Swing...need an abstraction WTP
import javax.swing.text.html.HTML;
Index: apache/jetspeed/util/rewriter/SwingParserAdaptor.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/util/rewriter/SwingParserAdaptor.java,v
retrieving revision 1.3
diff -u -r1.3 SwingParserAdaptor.java
--- apache/jetspeed/util/rewriter/SwingParserAdaptor.java 29 Oct 2002 18:38:06
-0000 1.3
+++ apache/jetspeed/util/rewriter/SwingParserAdaptor.java 3 Mar 2003 14:52:27
-0000
@@ -55,7 +55,6 @@
// javax.swing.text
import javax.swing.text.*;
-import javax.swing.text.html.parser.*;
import javax.swing.text.html.*;
import javax.swing.text.html.HTMLEditorKit;
Index: apache/jetspeed/util/rewriter/TestRewriter.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/util/rewriter/TestRewriter.java,v
retrieving revision 1.1
diff -u -r1.1 TestRewriter.java
--- apache/jetspeed/util/rewriter/TestRewriter.java 29 Oct 2002 18:38:06 -0000
1.1
+++ apache/jetspeed/util/rewriter/TestRewriter.java 3 Mar 2003 14:52:34 -0000
@@ -53,23 +53,11 @@
*/
package org.apache.jetspeed.util.rewriter;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import junit.framework.Assert;
-
import java.io.Reader;
-import java.io.StringReader;
-import java.io.FileReader;
-import java.io.BufferedReader;
import java.io.InputStreamReader;
-import java.io.IOException;
import java.net.URL;
import java.net.URLConnection;
-
-import org.apache.jetspeed.util.Streams;
-
public class TestRewriter // extends TestCase
{
Index: apache/jetspeed/util/servlet/EcsServletElement.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/util/servlet/EcsServletElement.java,v
retrieving revision 1.6
diff -u -r1.6 EcsServletElement.java
--- apache/jetspeed/util/servlet/EcsServletElement.java 2 Jul 2001 07:47:51 -0000
1.6
+++ apache/jetspeed/util/servlet/EcsServletElement.java 3 Mar 2003 14:52:41 -0000
@@ -54,17 +54,13 @@
package org.apache.jetspeed.util.servlet;
-import java.io.IOException;
import java.io.OutputStream;
-import java.io.ByteArrayOutputStream;
import java.io.PrintWriter;
-import java.io.OutputStreamWriter;
import javax.servlet.*;
import org.apache.turbine.util.RunData;
import org.apache.turbine.util.Log;
import org.apache.ecs.ConcreteElement;
-import org.apache.ecs.Element;
/**
* NOTE: The use of Ecs for aggregating portlet content is deprecated!
Index: apache/jetspeed/util/servlet/EcsServletResponse.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/util/servlet/EcsServletResponse.java,v
retrieving revision 1.6
diff -u -r1.6 EcsServletResponse.java
--- apache/jetspeed/util/servlet/EcsServletResponse.java 5 Jun 2002 23:43:55
-0000 1.6
+++ apache/jetspeed/util/servlet/EcsServletResponse.java 3 Mar 2003 14:52:51
-0000
@@ -57,7 +57,6 @@
import java.io.IOException;
import java.io.OutputStream;
import java.io.PrintWriter;
-import java.io.OutputStreamWriter;
import javax.servlet.*;
import javax.servlet.http.*;
import java.util.Locale;
Index: apache/jetspeed/util/servlet/EcsStylesheetElement.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/util/servlet/EcsStylesheetElement.java,v
retrieving revision 1.4
diff -u -r1.4 EcsStylesheetElement.java
--- apache/jetspeed/util/servlet/EcsStylesheetElement.java 13 Sep 2001 13:53:03
-0000 1.4
+++ apache/jetspeed/util/servlet/EcsStylesheetElement.java 3 Mar 2003 14:53:02
-0000
@@ -57,8 +57,6 @@
import java.io.OutputStream;
import java.io.PrintWriter;
import java.io.StringReader;
-import java.io.IOException;
-
import org.apache.turbine.util.Log;
import org.apache.ecs.ConcreteElement;
Index: apache/jetspeed/util/template/JetspeedTemplateLink.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/util/template/JetspeedTemplateLink.java,v
retrieving revision 1.12
diff -u -r1.12 JetspeedTemplateLink.java
--- apache/jetspeed/util/template/JetspeedTemplateLink.java 12 Nov 2002 00:34:57
-0000 1.12
+++ apache/jetspeed/util/template/JetspeedTemplateLink.java 3 Mar 2003 14:53:07
-0000
@@ -55,7 +55,6 @@
package org.apache.jetspeed.util.template;
import org.apache.turbine.util.RunData;
-import org.apache.turbine.util.Log;
import org.apache.turbine.util.DynamicURI;
import org.apache.turbine.util.template.TemplateLink;
import org.apache.turbine.services.pull.ApplicationTool;
@@ -68,7 +67,6 @@
import org.apache.jetspeed.om.profile.Portlets;
import org.apache.jetspeed.services.rundata.JetspeedRunData;
-import org.apache.jetspeed.util.template.JetspeedLink;
import org.apache.jetspeed.services.resources.JetspeedResources;
/**
Index: apache/jetspeed/util/template/PortletTemplateLink.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/util/template/PortletTemplateLink.java,v
retrieving revision 1.2
diff -u -r1.2 PortletTemplateLink.java
--- apache/jetspeed/util/template/PortletTemplateLink.java 5 Mar 2002 12:26:33
-0000 1.2
+++ apache/jetspeed/util/template/PortletTemplateLink.java 3 Mar 2003 14:53:19
-0000
@@ -55,10 +55,7 @@
package org.apache.jetspeed.util.template;
import org.apache.turbine.util.RunData;
-import org.apache.turbine.util.Log;
import org.apache.turbine.util.DynamicURI;
-import org.apache.turbine.util.template.TemplateLink;
-import org.apache.turbine.services.pull.ApplicationTool;
import org.apache.jetspeed.portal.Portlet;
import org.apache.jetspeed.portal.PortletController;
Index: apache/jetspeed/util/template/TestJetspeedLink.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/util/template/TestJetspeedLink.java,v
retrieving revision 1.8
diff -u -r1.8 TestJetspeedLink.java
--- apache/jetspeed/util/template/TestJetspeedLink.java 23 Nov 2002 09:56:13 -0000
1.8
+++ apache/jetspeed/util/template/TestJetspeedLink.java 3 Mar 2003 14:53:31 -0000
@@ -56,9 +56,6 @@
// Java imports
-// ECS imports
-import org.apache.ecs.ConcreteElement;
-
// Junit imports
import junit.awtui.TestRunner;
import junit.framework.Test;
@@ -67,17 +64,11 @@
// Cactus imports
import org.apache.cactus.ServletTestCase;
import org.apache.cactus.WebRequest;
-import org.apache.cactus.WebResponse;
// Jetspeed imports
-import org.apache.jetspeed.capability.CapabilityMap;
-import org.apache.jetspeed.om.profile.Profile;
import org.apache.jetspeed.om.profile.ProfileLocator;
-import org.apache.jetspeed.om.profile.PSMLDocument;
import org.apache.jetspeed.services.Profiler;
-import org.apache.jetspeed.services.JetspeedSecurity;
import org.apache.jetspeed.services.resources.JetspeedResources;
-import org.apache.jetspeed.services.rundata.JetspeedRunData;
import org.apache.jetspeed.util.template.JetspeedLink;
import org.apache.jetspeed.util.template.JetspeedLinkFactory;
import org.apache.jetspeed.test.TurbineTestUtilities;
Index: apache/jetspeed/util/template/TestJetspeedLinkFactory.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/util/template/TestJetspeedLinkFactory.java,v
retrieving revision 1.2
diff -u -r1.2 TestJetspeedLinkFactory.java
--- apache/jetspeed/util/template/TestJetspeedLinkFactory.java 14 Apr 2002 16:49:09
-0000 1.2
+++ apache/jetspeed/util/template/TestJetspeedLinkFactory.java 3 Mar 2003 14:54:01
-0000
@@ -70,7 +70,6 @@
// Turbine imports
import org.apache.turbine.services.pool.PoolService;
-import org.apache.turbine.services.pool.TurbinePool;
import org.apache.turbine.services.TurbineServices;
import org.apache.turbine.util.TurbineConfig;
import org.apache.turbine.util.StringUtils;
Index: apache/jetspeed/util/types/MetaInfo.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/util/types/MetaInfo.java,v
retrieving revision 1.2
diff -u -r1.2 MetaInfo.java
--- apache/jetspeed/util/types/MetaInfo.java 7 Mar 2001 06:50:40 -0000 1.2
+++ apache/jetspeed/util/types/MetaInfo.java 3 Mar 2003 14:54:01 -0000
@@ -55,9 +55,6 @@
package org.apache.jetspeed.util.types;
-import java.util.Vector;
-
-
/**
Autogenerated JavaBean from xjay (http://relativity.yi.org/xjay)
Index: apache/jetspeed/util/types/Parameter.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/util/types/Parameter.java,v
retrieving revision 1.2
diff -u -r1.2 Parameter.java
--- apache/jetspeed/util/types/Parameter.java 7 Mar 2001 06:50:42 -0000 1.2
+++ apache/jetspeed/util/types/Parameter.java 3 Mar 2003 14:54:01 -0000
@@ -55,9 +55,6 @@
package org.apache.jetspeed.util.types;
-import java.util.Vector;
-
-
/**
Autogenerated JavaBean from xjay (http://relativity.yi.org/xjay)
Index: apache/jetspeed/webservices/finance/stockmarket/JetspeedStockQuoteService.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/webservices/finance/stockmarket/JetspeedStockQuoteService.java,v
retrieving revision 1.5
diff -u -r1.5 JetspeedStockQuoteService.java
--- apache/jetspeed/webservices/finance/stockmarket/JetspeedStockQuoteService.java
10 Dec 2002 01:23:12 -0000 1.5
+++ apache/jetspeed/webservices/finance/stockmarket/JetspeedStockQuoteService.java
3 Mar 2003 14:54:21 -0000
@@ -66,7 +66,6 @@
import org.xml.sax.helpers.XMLFilterImpl;
import org.xml.sax.InputSource;
-import org.apache.turbine.services.Service;
import org.apache.turbine.services.TurbineBaseService;
/**
Index: apache/jetspeed/webservices/finance/stockmarket/SOAPResponseHandler.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/webservices/finance/stockmarket/SOAPResponseHandler.java,v
retrieving revision 1.1
diff -u -r1.1 SOAPResponseHandler.java
--- apache/jetspeed/webservices/finance/stockmarket/SOAPResponseHandler.java 23 Sep
2001 08:08:05 -0000 1.1
+++ apache/jetspeed/webservices/finance/stockmarket/SOAPResponseHandler.java 3 Mar
2003 14:54:29 -0000
@@ -57,7 +57,6 @@
import org.xml.sax.helpers.XMLFilterImpl;
import org.xml.sax.ContentHandler;
import org.xml.sax.*;
-import javax.xml.parsers.*;
class SOAPResponseHandler extends XMLFilterImpl
Index: apache/jetspeed/webservices/finance/stockmarket/StockQuoteArrayHandler.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/webservices/finance/stockmarket/StockQuoteArrayHandler.java,v
retrieving revision 1.1
diff -u -r1.1 StockQuoteArrayHandler.java
--- apache/jetspeed/webservices/finance/stockmarket/StockQuoteArrayHandler.java 23 Sep
2001 08:08:05 -0000 1.1
+++ apache/jetspeed/webservices/finance/stockmarket/StockQuoteArrayHandler.java 3 Mar
2003 14:54:31 -0000
@@ -57,7 +57,6 @@
import org.xml.sax.helpers.XMLFilterImpl;
import org.xml.sax.ContentHandler;
import org.xml.sax.*;
-import javax.xml.parsers.*;
/**
SAX-based XML event handler (filter). Works with org.xml.sax.XMLReader to filter
Index: apache/jetspeed/webservices/finance/stockmarket/StockQuoteHandler.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/webservices/finance/stockmarket/StockQuoteHandler.java,v
retrieving revision 1.1
diff -u -r1.1 StockQuoteHandler.java
--- apache/jetspeed/webservices/finance/stockmarket/StockQuoteHandler.java 23 Sep
2001 08:08:05 -0000 1.1
+++ apache/jetspeed/webservices/finance/stockmarket/StockQuoteHandler.java 3 Mar
2003 14:54:35 -0000
@@ -57,7 +57,6 @@
import org.xml.sax.helpers.XMLFilterImpl;
import org.xml.sax.ContentHandler;
import org.xml.sax.*;
-import javax.xml.parsers.*;
/**
SAX-based XML event handler (filter). Works with org.xml.sax.XMLReader to filter
Index: apache/jetspeed/webservices/util/SoapAccessBean.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/webservices/util/SoapAccessBean.java,v
retrieving revision 1.1
diff -u -r1.1 SoapAccessBean.java
--- apache/jetspeed/webservices/util/SoapAccessBean.java 29 Oct 2001 08:53:51
-0000 1.1
+++ apache/jetspeed/webservices/util/SoapAccessBean.java 3 Mar 2003 14:54:41
-0000
@@ -4,8 +4,6 @@
* Created on August 6, 2001, 3:59 PM
*/
package org.apache.jetspeed.webservices.util;
-// import beans packages
-import java.beans.*;
// import soap packages
import org.apache.soap.SOAPException;
import org.apache.soap.Constants;
Index: apache/jetspeed/webservices/util/UDDIAccessBean.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/webservices/util/UDDIAccessBean.java,v
retrieving revision 1.2
diff -u -r1.2 UDDIAccessBean.java
--- apache/jetspeed/webservices/util/UDDIAccessBean.java 11 Nov 2001 19:52:41
-0000 1.2
+++ apache/jetspeed/webservices/util/UDDIAccessBean.java 3 Mar 2003 14:54:48
-0000
@@ -7,14 +7,11 @@
package org.apache.jetspeed.webservices.util;
// import javabeans packages
import java.io.Serializable;
-import java.beans.*;
// import uddi packages
import org.uddi4j.UDDIException;
import org.uddi4j.transport.TransportException;
import org.uddi4j.client.UDDIProxy;
import org.uddi4j.response.*;
-// import soap packages
-import org.apache.soap.SOAPException;
// import logging framework
import org.apache.turbine.util.Log;
Index: apache/jetspeed/xml/JetspeedXMLEntityResolver.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/xml/JetspeedXMLEntityResolver.java,v
retrieving revision 1.5
diff -u -r1.5 JetspeedXMLEntityResolver.java
--- apache/jetspeed/xml/JetspeedXMLEntityResolver.java 18 Jan 2002 13:14:35 -0000
1.5
+++ apache/jetspeed/xml/JetspeedXMLEntityResolver.java 3 Mar 2003 14:54:52 -0000
@@ -58,7 +58,6 @@
//Jetspeed cache
import org.apache.jetspeed.cache.disk.*;
-import org.w3c.dom.*;
import org.xml.sax.*;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
