Title: Message
Index: apache/jetspeed/portal/controllers/AbstractPortletController.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/controllers/AbstractPortletController.java,v
retrieving revision 1.22
diff -u -r1.22 AbstractPortletController.java
--- apache/jetspeed/portal/controllers/AbstractPortletController.java 7 Nov 2002
20:22:45 -0000 1.22
+++ apache/jetspeed/portal/controllers/AbstractPortletController.java 3 Mar 2003
14:34:00 -0000
@@ -56,10 +56,8 @@
//jetspeed support
import org.apache.jetspeed.portal.*;
-import org.apache.jetspeed.portal.expire.*;
import org.apache.jetspeed.capability.CapabilityMap;
import org.apache.jetspeed.services.rundata.JetspeedRunData;
-import org.apache.jetspeed.util.*;
import org.apache.jetspeed.services.Registry;
import org.apache.jetspeed.om.registry.PortletControllerEntry;
import org.apache.jetspeed.om.registry.MediaTypeEntry;
Index: apache/jetspeed/portal/controllers/GridPortletController.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/controllers/GridPortletController.java,v
retrieving revision 1.13
diff -u -r1.13 GridPortletController.java
--- apache/jetspeed/portal/controllers/GridPortletController.java 6 Jun 2001
22:29:02 -0000 1.13
+++ apache/jetspeed/portal/controllers/GridPortletController.java 3 Mar 2003
14:34:05 -0000
@@ -62,13 +62,10 @@
import org.apache.turbine.util.RunData;
//jetspeed stuff
-import org.apache.jetspeed.util.*;
-import org.apache.turbine.util.*;
import org.apache.jetspeed.portal.*;
//standard Java stuff
import java.util.Vector;
-import java.util.Hashtable;
import java.util.StringTokenizer;
import java.util.Enumeration;
Index: apache/jetspeed/portal/controllers/VelocityPanedPortletController.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/controllers/VelocityPanedPortletController.java,v
retrieving revision 1.7
diff -u -r1.7 VelocityPanedPortletController.java
--- apache/jetspeed/portal/controllers/VelocityPanedPortletController.java 12 Nov
2002 00:34:57 -0000 1.7
+++ apache/jetspeed/portal/controllers/VelocityPanedPortletController.java 3 Mar
2003 14:34:12 -0000
@@ -62,7 +62,6 @@
// Jetspeed stuff
import org.apache.jetspeed.portal.Portlet;
import org.apache.jetspeed.portal.PanedPortletController;
-import org.apache.jetspeed.util.MetaData;
import org.apache.jetspeed.util.template.JetspeedLink;
import org.apache.jetspeed.util.template.JetspeedLinkFactory;
import org.apache.jetspeed.services.statemanager.SessionState;
Index: apache/jetspeed/portal/controllers/VelocityPortletController.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/controllers/VelocityPortletController.java,v
retrieving revision 1.8
diff -u -r1.8 VelocityPortletController.java
--- apache/jetspeed/portal/controllers/VelocityPortletController.java 14 Apr 2002
16:49:09 -0000 1.8
+++ apache/jetspeed/portal/controllers/VelocityPortletController.java 3 Mar 2003
14:34:16 -0000
@@ -62,8 +62,6 @@
import org.apache.turbine.util.RunData;
// Jetspeed stuff
-import org.apache.jetspeed.portal.Portlet;
-import org.apache.jetspeed.portal.PortletException;
import org.apache.jetspeed.services.TemplateLocator;
// Ecs stuff
Index: apache/jetspeed/portal/controls/AbstractPortletControl.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/controls/AbstractPortletControl.java,v
retrieving revision 1.17
diff -u -r1.17 AbstractPortletControl.java
--- apache/jetspeed/portal/controls/AbstractPortletControl.java 10 Sep 2002 15:12:08
-0000 1.17
+++ apache/jetspeed/portal/controls/AbstractPortletControl.java 3 Mar 2003 14:34:28
-0000
@@ -54,7 +54,6 @@
package org.apache.jetspeed.portal.controls;
-import java.util.Map;
import java.util.Enumeration;
import java.util.Iterator;
import java.util.Vector;
@@ -67,7 +66,6 @@
import org.apache.jetspeed.portal.PortletState;
import org.apache.jetspeed.portal.PortletConfig;
import org.apache.jetspeed.portal.PortletSet;
-import org.apache.jetspeed.portal.BasePortletSet;
import org.apache.jetspeed.portal.PortletControl;
import org.apache.jetspeed.portal.PortletControlConfig;
import org.apache.jetspeed.portal.PortletController;
@@ -79,7 +77,6 @@
// Turbine imports
import org.apache.turbine.util.RunData;
-import org.apache.turbine.util.Log;
// ECS imports
import org.apache.ecs.ElementContainer;
Index: apache/jetspeed/portal/controls/TitleControl.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/controls/TitleControl.java,v
retrieving revision 1.10
diff -u -r1.10 TitleControl.java
--- apache/jetspeed/portal/controls/TitleControl.java 30 Nov 2001 10:53:59 -0000
1.10
+++ apache/jetspeed/portal/controls/TitleControl.java 3 Mar 2003 14:34:36 -0000
@@ -62,7 +62,6 @@
//jetspeed support
import org.apache.jetspeed.util.*;
-import org.apache.jetspeed.portal.*;
import org.apache.jetspeed.capability.*;
import org.apache.jetspeed.services.resources.JetspeedResources;
Index: apache/jetspeed/portal/controls/VelocityPortletControl.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/controls/VelocityPortletControl.java,v
retrieving revision 1.22
diff -u -r1.22 VelocityPortletControl.java
--- apache/jetspeed/portal/controls/VelocityPortletControl.java 26 Sep 2002 21:04:59
-0000 1.22
+++ apache/jetspeed/portal/controls/VelocityPortletControl.java 3 Mar 2003 14:34:42
-0000
@@ -62,15 +62,10 @@
// Jetspeed stuff
import org.apache.jetspeed.portal.Portlet;
-import org.apache.jetspeed.portal.PortletSet;
-import org.apache.jetspeed.portal.PortletControl;
import org.apache.jetspeed.portal.PortletState;
import org.apache.jetspeed.services.TemplateLocator;
-import org.apache.jetspeed.services.PortletFactory;
import org.apache.jetspeed.services.persistence.PersistenceManager;
-import org.apache.jetspeed.services.resources.JetspeedResources;
import org.apache.jetspeed.services.rundata.JetspeedRunData;
-import org.apache.jetspeed.util.MimeType;
import org.apache.jetspeed.util.template.JetspeedTool;
import org.apache.jetspeed.util.template.JetspeedLink;
import org.apache.jetspeed.util.template.JetspeedLinkFactory;
Index: apache/jetspeed/portal/expire/FileWatchExpire.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/expire/FileWatchExpire.java,v
retrieving revision 1.6
diff -u -r1.6 FileWatchExpire.java
--- apache/jetspeed/portal/expire/FileWatchExpire.java 10 Sep 2001 22:39:50 -0000
1.6
+++ apache/jetspeed/portal/expire/FileWatchExpire.java 3 Mar 2003 14:34:48 -0000
@@ -54,17 +54,11 @@
package org.apache.jetspeed.portal.expire;
-//jetspeed stuff
-import org.apache.jetspeed.cache.disk.*;
-import org.apache.jetspeed.portal.*;
-import org.apache.jetspeed.util.*;
-
//turbine stuff
import org.apache.turbine.util.*;
//java stuff
import java.io.*;
-import java.util.*;
/**
Handles expiration mechanisms that expire when the file changes.
Index: apache/jetspeed/portal/expire/FileWatcher.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/expire/FileWatcher.java,v
retrieving revision 1.12
diff -u -r1.12 FileWatcher.java
--- apache/jetspeed/portal/expire/FileWatcher.java 27 Sep 2002 02:17:24 -0000
1.12
+++ apache/jetspeed/portal/expire/FileWatcher.java 3 Mar 2003 14:34:52 -0000
@@ -56,15 +56,12 @@
//jetspeed stuff
import org.apache.jetspeed.cache.disk.*;
-import org.apache.jetspeed.portal.*;
-import org.apache.jetspeed.util.*;
//turbine stuff
import org.apache.turbine.util.*;
//java stuff
import java.io.*;
-import java.util.*;
/**
Index: apache/jetspeed/portal/portlets/AbstractPortlet.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/portlets/AbstractPortlet.java,v
retrieving revision 1.60
diff -u -r1.60 AbstractPortlet.java
--- apache/jetspeed/portal/portlets/AbstractPortlet.java 7 Nov 2002 20:22:45
-0000 1.60
+++ apache/jetspeed/portal/portlets/AbstractPortlet.java 3 Mar 2003 14:35:04
-0000
@@ -57,7 +57,6 @@
//jetspeed
import org.apache.jetspeed.capability.CapabilityMap;
import org.apache.jetspeed.capability.CapabilityMapFactory;
-import org.apache.jetspeed.om.profile.MetaInfo;
import org.apache.jetspeed.om.registry.MediaTypeEntry;
import org.apache.jetspeed.om.registry.PortletEntry;
import org.apache.jetspeed.portal.BasePortletConfig;
@@ -67,12 +66,10 @@
import org.apache.jetspeed.portal.PortletConfig;
import org.apache.jetspeed.portal.PortletException;
import org.apache.jetspeed.portal.PortletState;
-import org.apache.jetspeed.services.rundata.JetspeedRunData;
import org.apache.jetspeed.services.persistence.PersistenceManager;
import org.apache.jetspeed.services.persistence.PortalPersistenceException;
import org.apache.jetspeed.portal.PortletInstance;
import org.apache.jetspeed.services.portletcache.Cacheable;
-import org.apache.jetspeed.services.portletcache.GlobalCache;
import org.apache.jetspeed.services.Registry;
import org.apache.jetspeed.util.JetspeedException;
import org.apache.jetspeed.util.MetaData;
@@ -89,10 +86,8 @@
import org.apache.turbine.util.RunData;
//java stuff
-import java.util.Date;
import java.util.Hashtable;
import java.util.Iterator;
-import java.io.Serializable;
/**
<p>
Should be used by most Portlets that wish to conform to default behavior
Index: apache/jetspeed/portal/portlets/AggregatePortlet.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/portlets/AggregatePortlet.java,v
retrieving revision 1.5
diff -u -r1.5 AggregatePortlet.java
--- apache/jetspeed/portal/portlets/AggregatePortlet.java 8 Nov 2002 10:05:18
-0000 1.5
+++ apache/jetspeed/portal/portlets/AggregatePortlet.java 3 Mar 2003 14:35:07
-0000
@@ -54,9 +54,6 @@
package org.apache.jetspeed.portal.portlets;
-import org.apache.jetspeed.portal.Portlet;
-import org.apache.jetspeed.portal.PortletException;
-import org.apache.jetspeed.portal.PortletConfig;
import org.apache.jetspeed.om.profile.ProfileLocator;
import org.apache.jetspeed.services.Profiler;
import org.apache.jetspeed.om.profile.Profile;
@@ -65,11 +62,6 @@
import org.apache.jetspeed.services.PortalToolkit;
import org.apache.jetspeed.portal.PortletSet;
import org.apache.jetspeed.services.rundata.JetspeedRunData;
-
-import org.apache.jetspeed.util.MimeType;
-
-import org.apache.turbine.services.cache.Refreshable;
-import org.apache.jetspeed.services.portletcache.Cacheable;
import org.apache.jetspeed.util.JetspeedClearElement;
import org.apache.ecs.ConcreteElement;
Index: apache/jetspeed/portal/portlets/ApplicationsPortlet.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/portlets/ApplicationsPortlet.java,v
retrieving revision 1.35
diff -u -r1.35 ApplicationsPortlet.java
--- apache/jetspeed/portal/portlets/ApplicationsPortlet.java 14 May 2002 06:32:59
-0000 1.35
+++ apache/jetspeed/portal/portlets/ApplicationsPortlet.java 3 Mar 2003 14:35:12
-0000
@@ -57,12 +57,9 @@
//Element Construction Set
import org.apache.ecs.html.*;
import org.apache.ecs.ConcreteElement;
-import org.apache.ecs.ElementContainer;
-import org.apache.ecs.StringElement;
//Jetspeed stuff
import org.apache.jetspeed.portal.*;
-import org.apache.jetspeed.util.*;
import org.apache.jetspeed.services.PortletFactory;
import org.apache.jetspeed.services.Registry;
@@ -72,8 +69,6 @@
import org.apache.turbine.util.*;
//standard java stuff
-import java.net.*;
-import java.io.*;
import java.util.*;
/**
Index: apache/jetspeed/portal/portlets/BogusPortlet.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/portlets/BogusPortlet.java,v
retrieving revision 1.3
diff -u -r1.3 BogusPortlet.java
--- apache/jetspeed/portal/portlets/BogusPortlet.java 27 Sep 2002 19:54:26 -0000
1.3
+++ apache/jetspeed/portal/portlets/BogusPortlet.java 3 Mar 2003 14:35:16 -0000
@@ -54,7 +54,6 @@
* <http://www.apache.org/>.
*/
-import org.apache.jetspeed.portal.PortletConfig;
import org.apache.jetspeed.services.persistence.PersistenceManager;
import org.apache.jetspeed.portal.PortletInstance;
Index: apache/jetspeed/portal/portlets/ContainerTestPortlet.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/portlets/ContainerTestPortlet.java,v
retrieving revision 1.5
diff -u -r1.5 ContainerTestPortlet.java
--- apache/jetspeed/portal/portlets/ContainerTestPortlet.java 8 Nov 2002 10:05:18
-0000 1.5
+++ apache/jetspeed/portal/portlets/ContainerTestPortlet.java 3 Mar 2003 14:35:23
-0000
@@ -62,8 +62,6 @@
import org.apache.jetspeed.om.profile.Profile;
import org.apache.jetspeed.om.profile.PSMLDocument;
import org.apache.jetspeed.om.profile.Portlets;
-import org.apache.jetspeed.services.PortalToolkit;
-import org.apache.jetspeed.portal.PortletSet;
import org.apache.jetspeed.services.rundata.JetspeedRunData;
import org.apache.jetspeed.services.persistence.PersistenceManager;
@@ -71,9 +69,6 @@
import org.apache.jetspeed.portal.PortletInstance;
import org.apache.jetspeed.util.MimeType;
-
-import org.apache.turbine.services.cache.Refreshable;
-import org.apache.jetspeed.services.portletcache.Cacheable;
import org.apache.jetspeed.util.JetspeedClearElement;
import org.apache.ecs.ConcreteElement;
Index: apache/jetspeed/portal/portlets/FileServerPortlet.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/portlets/FileServerPortlet.java,v
retrieving revision 1.25
diff -u -r1.25 FileServerPortlet.java
--- apache/jetspeed/portal/portlets/FileServerPortlet.java 27 Sep 2002 19:54:26
-0000 1.25
+++ apache/jetspeed/portal/portlets/FileServerPortlet.java 3 Mar 2003 14:35:26
-0000
@@ -54,29 +54,14 @@
package org.apache.jetspeed.portal.portlets;
-//Element Construction Set
-import org.apache.ecs.html.*;
-import org.apache.ecs.ConcreteElement;
-import org.apache.ecs.ElementContainer;
-import org.apache.ecs.StringElement;
//Jetspeed stuff
import org.apache.jetspeed.portal.*;
import org.apache.jetspeed.util.*;
import org.apache.jetspeed.cache.disk.*;
-
-//turbine
-import org.apache.turbine.util.*;
-
//standard java stuff
-import java.net.*;
import java.io.*;
-
-//ecs stuff
-import org.apache.ecs.*;
-import org.apache.ecs.html.*;
-
/**
* <p>Serve a static URL (typically a HTML fragment)</p>
Index: apache/jetspeed/portal/portlets/FileWatchPortlet.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/portlets/FileWatchPortlet.java,v
retrieving revision 1.5
diff -u -r1.5 FileWatchPortlet.java
--- apache/jetspeed/portal/portlets/FileWatchPortlet.java 24 Oct 2002 14:59:25
-0000 1.5
+++ apache/jetspeed/portal/portlets/FileWatchPortlet.java 3 Mar 2003 14:35:30
-0000
@@ -55,19 +55,11 @@
package org.apache.jetspeed.portal.portlets;
//jetspeed
-import org.apache.jetspeed.cache.disk.*;
-import org.apache.jetspeed.portal.*;
import org.apache.jetspeed.portal.expire.*;
import org.apache.jetspeed.util.*;
//turbine stuff
import org.apache.turbine.util.*;
-
-//ecs
-import org.apache.ecs.*;
-
-//java stuff
-import java.io.*;
/**
Just like AbstractPortlet except that when its URL is modified on disk it
Index: apache/jetspeed/portal/portlets/JetspeedContent.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/portlets/JetspeedContent.java,v
retrieving revision 1.22
diff -u -r1.22 JetspeedContent.java
--- apache/jetspeed/portal/portlets/JetspeedContent.java 27 Sep 2002 19:54:26
-0000 1.22
+++ apache/jetspeed/portal/portlets/JetspeedContent.java 3 Mar 2003 14:35:33
-0000
@@ -55,10 +55,7 @@
package org.apache.jetspeed.portal.portlets;
//Element Construction Set
-import org.apache.ecs.html.*;
import org.apache.ecs.ConcreteElement;
-import org.apache.ecs.ElementContainer;
-import org.apache.ecs.StringElement;
//Jetspeed stuff
import org.apache.jetspeed.portal.*;
@@ -69,10 +66,6 @@
//turbine
import org.apache.turbine.util.*;
import org.apache.jetspeed.services.resources.JetspeedResources;
-
-//ecs stuff
-import org.apache.ecs.*;
-import org.apache.ecs.html.*;
//XML stuff
import org.xml.sax.SAXException;
Index: apache/jetspeed/portal/portlets/LinkPortlet.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/portlets/LinkPortlet.java,v
retrieving revision 1.4
diff -u -r1.4 LinkPortlet.java
--- apache/jetspeed/portal/portlets/LinkPortlet.java 7 Nov 2002 20:22:45 -0000
1.4
+++ apache/jetspeed/portal/portlets/LinkPortlet.java 3 Mar 2003 14:35:36 -0000
@@ -63,10 +63,8 @@
*/
import org.apache.jetspeed.capability.CapabilityMap;
import org.apache.jetspeed.util.MimeType;
-import org.apache.jetspeed.services.resources.JetspeedResources;
import org.apache.jetspeed.services.rundata.JetspeedRunData;
import org.apache.ecs.*;
-import org.apache.turbine.util.RunData;
public class LinkPortlet extends AbstractPortlet
Index: apache/jetspeed/portal/portlets/PortletInfoPortlet.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/portlets/PortletInfoPortlet.java,v
retrieving revision 1.42
diff -u -r1.42 PortletInfoPortlet.java
--- apache/jetspeed/portal/portlets/PortletInfoPortlet.java 7 Oct 2002 17:01:30
-0000 1.42
+++ apache/jetspeed/portal/portlets/PortletInfoPortlet.java 3 Mar 2003 14:35:41
-0000
@@ -64,23 +64,18 @@
//Element Construction Set
import org.apache.ecs.html.*;
import org.apache.ecs.ConcreteElement;
-import org.apache.ecs.ElementContainer;
import org.apache.ecs.StringElement;
//Jetspeed stuff
import org.apache.jetspeed.portal.*;
import org.apache.jetspeed.services.PortletFactory;
import org.apache.jetspeed.cache.disk.*;
-import org.apache.jetspeed.capability.*;
-import org.apache.jetspeed.util.*;
import org.apache.jetspeed.services.rundata.JetspeedRunData;
import org.apache.jetspeed.util.template.JetspeedLink;
import org.apache.jetspeed.util.template.JetspeedLinkFactory;
//Turbine
import org.apache.turbine.util.*;
-import org.apache.jetspeed.om.registry.PortletEntry;
-import org.apache.turbine.services.resources.TurbineResources;
/**
<p>
Index: apache/jetspeed/portal/portlets/PreviewPortlet.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/portlets/PreviewPortlet.java,v
retrieving revision 1.2
diff -u -r1.2 PreviewPortlet.java
--- apache/jetspeed/portal/portlets/PreviewPortlet.java 27 Sep 2002 19:54:26 -0000
1.2
+++ apache/jetspeed/portal/portlets/PreviewPortlet.java 3 Mar 2003 14:35:45 -0000
@@ -74,9 +74,6 @@
import org.apache.turbine.services.velocity.TurbineVelocity;
import org.apache.velocity.context.Context;
-// java
-import java.io.StringReader;
-
/**
* Preview portlet. Displays content of potlet
* defined in parameter "previewedPortletName".
Index: apache/jetspeed/portal/portlets/RSSPortlet.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/portlets/RSSPortlet.java,v
retrieving revision 1.48
diff -u -r1.48 RSSPortlet.java
--- apache/jetspeed/portal/portlets/RSSPortlet.java 27 Sep 2002 19:54:26 -0000
1.48
+++ apache/jetspeed/portal/portlets/RSSPortlet.java 3 Mar 2003 14:35:51 -0000
@@ -59,16 +59,13 @@
import java.util.*;
//Element Construction Set
-import org.apache.ecs.html.*;
import org.apache.jetspeed.util.JetspeedClearElement;
-import org.apache.ecs.StringElement;
//standard Jetspeed stuff
import org.apache.jetspeed.util.*;
import org.apache.jetspeed.cache.disk.*;
import org.apache.jetspeed.portal.*;
import org.apache.jetspeed.xml.JetspeedXMLEntityResolver;
-import org.apache.jetspeed.capability.*;
//turbine
Index: apache/jetspeed/portal/portlets/ServletInvokerPortlet.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/portlets/ServletInvokerPortlet.java,v
retrieving revision 1.1
diff -u -r1.1 ServletInvokerPortlet.java
--- apache/jetspeed/portal/portlets/ServletInvokerPortlet.java 8 Mar 2001 17:22:24
-0000 1.1
+++ apache/jetspeed/portal/portlets/ServletInvokerPortlet.java 3 Mar 2003 14:35:54
-0000
@@ -56,11 +56,9 @@
package org.apache.jetspeed.portal.portlets;
import org.apache.ecs.ConcreteElement;
-import org.apache.ecs.ElementContainer;
import org.apache.ecs.StringElement;
import org.apache.jetspeed.portal.*;
-import org.apache.jetspeed.util.*;
import org.apache.turbine.util.*;
Index: apache/jetspeed/portal/portlets/TurbineScreenPortlet.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/portlets/TurbineScreenPortlet.java,v
retrieving revision 1.9
diff -u -r1.9 TurbineScreenPortlet.java
--- apache/jetspeed/portal/portlets/TurbineScreenPortlet.java 28 Jun 2002 05:37:32
-0000 1.9
+++ apache/jetspeed/portal/portlets/TurbineScreenPortlet.java 3 Mar 2003 14:35:58
-0000
@@ -55,25 +55,19 @@
package org.apache.jetspeed.portal.portlets;
//standard java stuff
-import java.io.*;
import java.util.*;
-import java.net.*;
//Element Construction Set
import org.apache.ecs.html.*;
-import org.apache.ecs.xml.*;
import org.apache.ecs.ConcreteElement;
import org.apache.ecs.ElementContainer;
-import org.apache.ecs.StringElement;
//standard Jetspeed stuff
import org.apache.jetspeed.portal.*;
-import org.apache.jetspeed.util.*;
//turbine stuff
import org.apache.turbine.util.*;
import org.apache.turbine.modules.*;
-import org.apache.turbine.services.resources.TurbineResources;
/**
This portlet will attempt to render the Turbine Screen within a portlet.
Index: apache/jetspeed/portal/portlets/VelocityPortlet.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/portlets/VelocityPortlet.java,v
retrieving revision 1.20
diff -u -r1.20 VelocityPortlet.java
--- apache/jetspeed/portal/portlets/VelocityPortlet.java 27 Sep 2002 19:54:26
-0000 1.20
+++ apache/jetspeed/portal/portlets/VelocityPortlet.java 3 Mar 2003 14:36:03
-0000
@@ -61,15 +61,11 @@
import org.apache.turbine.modules.ActionLoader;
// Jetspeed stuff
-import org.apache.jetspeed.portal.Portlet;
-import org.apache.jetspeed.portal.portlets.AbstractPortlet;
import org.apache.jetspeed.portal.PortletException;
import org.apache.jetspeed.portal.PortletConfig;
import org.apache.jetspeed.services.TemplateLocator;
import org.apache.jetspeed.util.template.JetspeedLink;
import org.apache.jetspeed.util.template.JetspeedTemplateLink;
-import org.apache.jetspeed.services.JetspeedSecurity;
-import org.apache.jetspeed.services.security.JetspeedSecurityService;
// Ecs stuff
Index: apache/jetspeed/portal/portlets/WMLFilePortlet.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/portlets/WMLFilePortlet.java,v
retrieving revision 1.7
diff -u -r1.7 WMLFilePortlet.java
--- apache/jetspeed/portal/portlets/WMLFilePortlet.java 27 Sep 2002 19:54:26 -0000
1.7
+++ apache/jetspeed/portal/portlets/WMLFilePortlet.java 3 Mar 2003 14:36:09 -0000
@@ -67,13 +67,10 @@
import org.apache.turbine.util.*;
//standard java stuff
-import java.net.*;
import java.io.*;
-import java.util.*;
import org.xml.sax.*;
import org.xml.sax.helpers.ParserFactory;
-
/**
* This portlet serves well-formed WML file content and strips
Index: apache/jetspeed/portal/portlets/XSLPortlet.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/portlets/XSLPortlet.java,v
retrieving revision 1.8
diff -u -r1.8 XSLPortlet.java
--- apache/jetspeed/portal/portlets/XSLPortlet.java 7 Nov 2002 20:22:45 -0000
1.8
+++ apache/jetspeed/portal/portlets/XSLPortlet.java 3 Mar 2003 14:36:13 -0000
@@ -55,7 +55,6 @@
package org.apache.jetspeed.portal.portlets;
//standard java stuff
-import java.io.*;
import java.util.*;
//Element Construction Set
@@ -64,7 +63,6 @@
//standard Jetspeed stuff
import org.apache.jetspeed.util.*;
-import org.apache.jetspeed.cache.disk.*;
import org.apache.jetspeed.portal.*;
import org.apache.jetspeed.capability.CapabilityMap;
import org.apache.jetspeed.services.rundata.JetspeedRunData;
Index: apache/jetspeed/portal/portlets/admin/BadURLManagerPortlet.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/portlets/admin/BadURLManagerPortlet.java,v
retrieving revision 1.10
diff -u -r1.10 BadURLManagerPortlet.java
--- apache/jetspeed/portal/portlets/admin/BadURLManagerPortlet.java 9 Oct 2001
09:54:30 -0000 1.10
+++ apache/jetspeed/portal/portlets/admin/BadURLManagerPortlet.java 3 Mar 2003
14:36:15 -0000
@@ -62,7 +62,6 @@
//jetspeed stuff
-import org.apache.jetspeed.portal.*;
import org.apache.jetspeed.portal.portlets.*;
import org.apache.jetspeed.services.urlmanager.*;
Index: apache/jetspeed/portal/portlets/admin/DaemonAdminPortlet.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/portlets/admin/DaemonAdminPortlet.java,v
retrieving revision 1.24
diff -u -r1.24 DaemonAdminPortlet.java
--- apache/jetspeed/portal/portlets/admin/DaemonAdminPortlet.java 27 Sep 2002
19:54:27 -0000 1.24
+++ apache/jetspeed/portal/portlets/admin/DaemonAdminPortlet.java 3 Mar 2003
14:36:21 -0000
@@ -64,7 +64,6 @@
import org.apache.jetspeed.util.*;
import org.apache.jetspeed.daemon.*;
import org.apache.jetspeed.daemon.impl.*;
-import org.apache.jetspeed.cache.disk.*;
import org.apache.jetspeed.om.security.JetspeedUser;
import org.apache.jetspeed.services.daemonfactory.DaemonFactory;
import org.apache.jetspeed.services.JetspeedSecurity;
@@ -73,8 +72,6 @@
import org.apache.turbine.util.*;
//standard java stuff
-import java.net.*;
-import java.io.*;
import java.util.*;
/**
Index: apache/jetspeed/portal/portlets/admin/GlobalAdminPortlet.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/portlets/admin/GlobalAdminPortlet.java,v
retrieving revision 1.16
diff -u -r1.16 GlobalAdminPortlet.java
--- apache/jetspeed/portal/portlets/admin/GlobalAdminPortlet.java 2 Feb 2002
05:25:01 -0000 1.16
+++ apache/jetspeed/portal/portlets/admin/GlobalAdminPortlet.java 3 Mar 2003
14:36:25 -0000
@@ -60,7 +60,6 @@
import org.apache.ecs.html.HR;
import org.apache.ecs.ConcreteElement;
import org.apache.ecs.ElementContainer;
-import org.apache.ecs.StringElement;
//Jetspeed stuff
import org.apache.jetspeed.portal.PortletException;
@@ -77,7 +76,6 @@
//turbine
import org.apache.turbine.util.RunData;
import org.apache.turbine.services.TurbineServices;
-import org.apache.turbine.services.cache.TurbineGlobalCacheService;
/**
Returns global information about Jetspeed.
Index: apache/jetspeed/portal/portlets/admin/JavaRuntimePortlet.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/portlets/admin/JavaRuntimePortlet.java,v
retrieving revision 1.15
diff -u -r1.15 JavaRuntimePortlet.java
--- apache/jetspeed/portal/portlets/admin/JavaRuntimePortlet.java 4 Jun 2001
17:47:06 -0000 1.15
+++ apache/jetspeed/portal/portlets/admin/JavaRuntimePortlet.java 3 Mar 2003
14:36:28 -0000
@@ -57,21 +57,16 @@
//Element Construction Set
import org.apache.ecs.html.*;
import org.apache.ecs.ConcreteElement;
-import org.apache.ecs.ElementContainer;
-import org.apache.ecs.StringElement;
//Jetspeed stuff
import org.apache.jetspeed.portal.portlets.*;
import org.apache.jetspeed.portal.*;
-import org.apache.jetspeed.util.*;
//turbine
import org.apache.turbine.util.RunData;
import org.apache.turbine.util.Log;
//standard java stuff
-import java.net.*;
-import java.io.*;
import java.util.*;
/**
Index: apache/jetspeed/portal/portlets/admin/JetspeedPropertiesPortlet.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/portlets/admin/JetspeedPropertiesPortlet.java,v
retrieving revision 1.19
diff -u -r1.19 JetspeedPropertiesPortlet.java
--- apache/jetspeed/portal/portlets/admin/JetspeedPropertiesPortlet.java 3 Apr
2001 00:27:06 -0000 1.19
+++ apache/jetspeed/portal/portlets/admin/JetspeedPropertiesPortlet.java 3 Mar
2003 14:36:31 -0000
@@ -56,9 +56,7 @@
//Element Construction Set
import org.apache.ecs.html.*;
-import org.apache.ecs.ConcreteElement;
import org.apache.ecs.ElementContainer;
-import org.apache.ecs.StringElement;
//Jetspeed stuff
import org.apache.jetspeed.portal.portlets.AbstractPortlet;
Index: apache/jetspeed/portal/portlets/admin/ServletContextPortlet.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/portlets/admin/ServletContextPortlet.java,v
retrieving revision 1.1
diff -u -r1.1 ServletContextPortlet.java
--- apache/jetspeed/portal/portlets/admin/ServletContextPortlet.java 19 Apr 2002
04:36:36 -0000 1.1
+++ apache/jetspeed/portal/portlets/admin/ServletContextPortlet.java 3 Mar 2003
14:36:34 -0000
@@ -57,13 +57,10 @@
//Element Construction Set
import org.apache.ecs.html.*;
import org.apache.ecs.ConcreteElement;
-import org.apache.ecs.ElementContainer;
-import org.apache.ecs.StringElement;
//Jetspeed stuff
import org.apache.jetspeed.portal.portlets.*;
import org.apache.jetspeed.portal.*;
-import org.apache.jetspeed.util.*;
//turbine
import org.apache.turbine.util.RunData;
@@ -71,8 +68,6 @@
import org.apache.turbine.services.servlet.TurbineServlet;
//standard java stuff
-import java.net.*;
-import java.io.*;
import java.util.*;
import javax.servlet.*;
Index: apache/jetspeed/portal/security/portlets/CacheablePortletWrapper.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/security/portlets/CacheablePortletWrapper.java,v
retrieving revision 1.2
diff -u -r1.2 CacheablePortletWrapper.java
--- apache/jetspeed/portal/security/portlets/CacheablePortletWrapper.java 5 Feb
2002 03:08:05 -0000 1.2
+++ apache/jetspeed/portal/security/portlets/CacheablePortletWrapper.java 3 Mar
2003 14:36:37 -0000
@@ -60,11 +60,8 @@
import org.apache.jetspeed.services.portletcache.Cacheable;
-import org.apache.jetspeed.services.JetspeedSecurity;
-
// Turbine
import org.apache.turbine.services.cache.CachedObject;
-import org.apache.turbine.util.RunData;
/**
Index: apache/jetspeed/portal/security/portlets/CacheableStatefulPortletWrapper.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/security/portlets/CacheableStatefulPortletWrapper.java,v
retrieving revision 1.2
diff -u -r1.2 CacheableStatefulPortletWrapper.java
--- apache/jetspeed/portal/security/portlets/CacheableStatefulPortletWrapper.java
5 Feb 2002 03:08:05 -0000 1.2
+++ apache/jetspeed/portal/security/portlets/CacheableStatefulPortletWrapper.java
3 Mar 2003 14:36:40 -0000
@@ -58,10 +58,8 @@
import org.apache.jetspeed.portal.Portlet;
import org.apache.jetspeed.portal.expire.Expire;
import org.apache.jetspeed.services.portletcache.Cacheable;
-import org.apache.jetspeed.services.JetspeedSecurity;
import org.apache.turbine.services.cache.CachedObject;
-import org.apache.turbine.util.RunData;
/**
Index: apache/jetspeed/services/JetspeedAuthentication.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/JetspeedAuthentication.java,v
retrieving revision 1.2
diff -u -r1.2 JetspeedAuthentication.java
--- apache/jetspeed/services/JetspeedAuthentication.java 28 Jun 2002 05:37:32
-0000 1.2
+++ apache/jetspeed/services/JetspeedAuthentication.java 3 Mar 2003 14:36:43
-0000
@@ -54,17 +54,12 @@
package org.apache.jetspeed.services;
-import java.util.Iterator;
-import java.security.Principal;
-
// Turbine
import org.apache.turbine.services.TurbineServices;
-import org.apache.turbine.services.Service;
// Jetspeed
import org.apache.jetspeed.om.security.JetspeedUser;
import org.apache.jetspeed.services.security.PortalAuthentication;
-import org.apache.jetspeed.services.security.JetspeedSecurityException;
import org.apache.jetspeed.services.security.LoginException;
Index: apache/jetspeed/services/JetspeedLDAP.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/JetspeedLDAP.java,v
retrieving revision 1.3
diff -u -r1.3 JetspeedLDAP.java
--- apache/jetspeed/services/JetspeedLDAP.java 28 Jan 2003 04:49:43 -0000 1.3
+++ apache/jetspeed/services/JetspeedLDAP.java 3 Mar 2003 14:36:46 -0000
@@ -61,7 +61,6 @@
import javax.naming.directory.DirContext;
import org.apache.jetspeed.services.ldap.LDAPService;
import org.apache.jetspeed.services.ldap.LDAPURL;
-import org.apache.turbine.services.Service;
import org.apache.turbine.services.TurbineServices;
/**
Index: apache/jetspeed/services/JetspeedSecurity.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/JetspeedSecurity.java,v
retrieving revision 1.14
diff -u -r1.14 JetspeedSecurity.java
--- apache/jetspeed/services/JetspeedSecurity.java 12 Feb 2003 04:18:33 -0000
1.14
+++ apache/jetspeed/services/JetspeedSecurity.java 3 Mar 2003 14:36:56 -0000
@@ -58,36 +58,24 @@
import java.security.Principal;
import org.apache.turbine.services.TurbineServices;
-import org.apache.turbine.util.Log;
-import org.apache.turbine.services.rundata.RunDataService;
import org.apache.jetspeed.om.security.JetspeedUser;
import org.apache.jetspeed.om.security.Group;
import org.apache.jetspeed.om.security.Role;
import org.apache.jetspeed.om.security.Permission;
-import org.apache.jetspeed.om.profile.Profile;
-import org.apache.jetspeed.om.profile.BaseProfile;
-import org.apache.jetspeed.services.Profiler;
-import org.apache.jetspeed.services.PsmlManager;
-import org.apache.jetspeed.services.rundata.JetspeedRunDataService;
import org.apache.jetspeed.services.rundata.JetspeedRunData;
import org.apache.jetspeed.portal.Portlet;
import org.apache.jetspeed.om.profile.Entry;
-import org.apache.jetspeed.om.profile.ProfileException;
import org.apache.jetspeed.om.registry.RegistryEntry;
-import org.apache.jetspeed.om.security.JetspeedUserFactory;
import org.apache.jetspeed.om.security.UserNamePrincipal;
import org.apache.jetspeed.services.JetspeedPortalAccessController;
import org.apache.jetspeed.services.JetspeedUserManagement;
import org.apache.jetspeed.services.JetspeedAuthentication;
import org.apache.jetspeed.services.security.JetspeedRoleManagement;
-import org.apache.jetspeed.services.security.RoleManagement;
import org.apache.jetspeed.services.security.JetspeedGroupManagement;
-import org.apache.jetspeed.services.security.GroupManagement;
import org.apache.jetspeed.services.security.JetspeedPermissionManagement;
-import org.apache.jetspeed.services.security.PermissionManagement;
import org.apache.jetspeed.services.security.JetspeedSecurityService;
import org.apache.jetspeed.services.security.JetspeedSecurityException;
Index: apache/jetspeed/services/JetspeedUserManagement.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/JetspeedUserManagement.java,v
retrieving revision 1.2
diff -u -r1.2 JetspeedUserManagement.java
--- apache/jetspeed/services/JetspeedUserManagement.java 28 Jun 2002 05:37:32
-0000 1.2
+++ apache/jetspeed/services/JetspeedUserManagement.java 3 Mar 2003 14:37:01
-0000
@@ -59,7 +59,6 @@
// Turbine
import org.apache.turbine.services.TurbineServices;
-import org.apache.turbine.services.Service;
// Jetspeed
import org.apache.jetspeed.om.security.JetspeedUser;
Index: apache/jetspeed/services/Profiler.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/Profiler.java,v
retrieving revision 1.19
diff -u -r1.19 Profiler.java
--- apache/jetspeed/services/Profiler.java 8 Nov 2002 23:21:51 -0000 1.19
+++ apache/jetspeed/services/Profiler.java 3 Mar 2003 14:37:05 -0000
@@ -65,7 +65,6 @@
import org.apache.turbine.util.DynamicURI;
import org.apache.jetspeed.capability.CapabilityMap;
import org.apache.jetspeed.util.MimeType;
-import java.io.IOException;
import java.util.Iterator;
/**
Index: apache/jetspeed/services/customlocalization/CustomLocalization.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/customlocalization/CustomLocalization.java,v
retrieving revision 1.1
diff -u -r1.1 CustomLocalization.java
--- apache/jetspeed/services/customlocalization/CustomLocalization.java 14 Nov 2002
20:30:24 -0000 1.1
+++ apache/jetspeed/services/customlocalization/CustomLocalization.java 3 Mar 2003
14:37:10 -0000
@@ -60,17 +60,10 @@
* jdk 1.4.1
*/
-import java.util.*;
import org.apache.turbine.services.*;
-import org.apache.turbine.util.*;
import java.util.Locale;
import java.util.ResourceBundle;
-import javax.servlet.http.HttpServletRequest;
import org.apache.turbine.util.RunData;
-
-
-import org.apache.turbine.services.localization.Localization;
-
public abstract class CustomLocalization {
Index: apache/jetspeed/services/daemonfactory/JetspeedDaemonFactoryService.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/daemonfactory/JetspeedDaemonFactoryService.java,v
retrieving revision 1.7
diff -u -r1.7 JetspeedDaemonFactoryService.java
--- apache/jetspeed/services/daemonfactory/JetspeedDaemonFactoryService.java 17 Dec
2001 15:32:27 -0000 1.7
+++ apache/jetspeed/services/daemonfactory/JetspeedDaemonFactoryService.java 3 Mar
2003 14:37:13 -0000
@@ -57,7 +57,6 @@
import java.util.*;
import javax.servlet.ServletConfig;
import org.apache.turbine.util.Log;
-import org.apache.turbine.services.InitializationException;
import org.apache.turbine.services.TurbineBaseService;
import org.apache.jetspeed.daemon.Daemon;
import org.apache.jetspeed.daemon.DaemonEntry;
@@ -67,9 +66,6 @@
import org.apache.jetspeed.daemon.DaemonNotFoundException;
import org.apache.jetspeed.daemon.DaemonThread;
import org.apache.jetspeed.services.resources.JetspeedResources;
-
-import org.apache.turbine.services.TurbineServices;
-import org.apache.jetspeed.services.urlmanager.URLManagerService;
/**
Index: apache/jetspeed/services/db/ObjectBridgeDatabaseService.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/db/ObjectBridgeDatabaseService.java,v
retrieving revision 1.1
diff -u -r1.1 ObjectBridgeDatabaseService.java
--- apache/jetspeed/services/db/ObjectBridgeDatabaseService.java 1 Apr 2002
23:16:53 -0000 1.1
+++ apache/jetspeed/services/db/ObjectBridgeDatabaseService.java 3 Mar 2003
14:37:19 -0000
@@ -63,9 +63,7 @@
// 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;
import org.apache.turbine.util.Log;
Index: apache/jetspeed/services/idgenerator/JetspeedIdGeneratorService.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/idgenerator/JetspeedIdGeneratorService.java,v
retrieving revision 1.1
diff -u -r1.1 JetspeedIdGeneratorService.java
--- apache/jetspeed/services/idgenerator/JetspeedIdGeneratorService.java 15 Mar
2002 19:01:29 -0000 1.1
+++ apache/jetspeed/services/idgenerator/JetspeedIdGeneratorService.java 3 Mar
2003 14:37:21 -0000
@@ -63,7 +63,6 @@
// Turbine
import org.apache.turbine.services.InitializationException;
import org.apache.turbine.services.resources.ResourceService;
-import org.apache.turbine.services.Service;
import org.apache.turbine.services.TurbineBaseService;
import org.apache.turbine.services.TurbineServices;
import org.apache.turbine.util.Log;
Index: apache/jetspeed/services/idgenerator/TestIdGenerator.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/idgenerator/TestIdGenerator.java,v
retrieving revision 1.2
diff -u -r1.2 TestIdGenerator.java
--- apache/jetspeed/services/idgenerator/TestIdGenerator.java 24 Mar 2002 13:58:11
-0000 1.2
+++ apache/jetspeed/services/idgenerator/TestIdGenerator.java 3 Mar 2003 14:37:26
-0000
@@ -66,8 +66,6 @@
// Jetspeed imports
import org.apache.jetspeed.services.idgenerator.JetspeedIdGenerator;
-// Turbine imports
-import org.apache.turbine.services.TurbineServices;
import org.apache.turbine.util.TurbineConfig;
import org.apache.turbine.util.StringUtils;
Index: apache/jetspeed/services/jsp/tags/EcsScreenTag.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/jsp/tags/EcsScreenTag.java,v
retrieving revision 1.8
diff -u -r1.8 EcsScreenTag.java
--- apache/jetspeed/services/jsp/tags/EcsScreenTag.java 7 Mar 2001 06:48:36 -0000
1.8
+++ apache/jetspeed/services/jsp/tags/EcsScreenTag.java 3 Mar 2003 14:37:30 -0000
@@ -54,7 +54,6 @@
* <http://www.apache.org/>.
*/
-import java.util.*;
import javax.servlet.jsp.*;
import javax.servlet.jsp.tagext.*;
Index: apache/jetspeed/services/jsp/tags/JetspeedPortletLinkTag.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/jsp/tags/JetspeedPortletLinkTag.java,v
retrieving revision 1.1
diff -u -r1.1 JetspeedPortletLinkTag.java
--- apache/jetspeed/services/jsp/tags/JetspeedPortletLinkTag.java 20 Nov 2002
17:01:46 -0000 1.1
+++ apache/jetspeed/services/jsp/tags/JetspeedPortletLinkTag.java 3 Mar 2003
14:37:35 -0000
@@ -70,7 +70,6 @@
// Jetspeed support
import org.apache.jetspeed.services.rundata.JetspeedRunData;
-import org.apache.jetspeed.om.profile.Entry;
import org.apache.jetspeed.om.profile.ProfileLocator;
import org.apache.jetspeed.om.profile.Profile;
import org.apache.jetspeed.services.Profiler;
Index: apache/jetspeed/services/jsp/tags/JetspeedPortletTag.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/jsp/tags/JetspeedPortletTag.java,v
retrieving revision 1.6
diff -u -r1.6 JetspeedPortletTag.java
--- apache/jetspeed/services/jsp/tags/JetspeedPortletTag.java 8 Nov 2002 10:05:18
-0000 1.6
+++ apache/jetspeed/services/jsp/tags/JetspeedPortletTag.java 3 Mar 2003 14:37:40
-0000
@@ -54,20 +54,16 @@
* <http://www.apache.org/>.
*/
-import java.util.*;
import javax.servlet.jsp.*;
import javax.servlet.jsp.tagext.*;
// Turbine Classes
-import org.apache.turbine.util.RunData;
import org.apache.turbine.util.Log;
import org.apache.turbine.services.jsp.JspService;
import org.apache.ecs.ConcreteElement;
-import org.apache.ecs.StringElement;
import org.apache.jetspeed.services.PortletFactory;
-import org.apache.jetspeed.services.resources.JetspeedResources;
import org.apache.jetspeed.services.rundata.JetspeedRunData;
import org.apache.jetspeed.om.profile.Entry;
import org.apache.jetspeed.om.profile.ProfileLocator;
Index: apache/jetspeed/services/jsp/tags/NavigationTag.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/jsp/tags/NavigationTag.java,v
retrieving revision 1.3
diff -u -r1.3 NavigationTag.java
--- apache/jetspeed/services/jsp/tags/NavigationTag.java 24 Nov 2001 00:44:37
-0000 1.3
+++ apache/jetspeed/services/jsp/tags/NavigationTag.java 3 Mar 2003 14:37:43
-0000
@@ -54,7 +54,6 @@
* <http://www.apache.org/>.
*/
-import java.util.*;
import javax.servlet.jsp.*;
import javax.servlet.jsp.tagext.*;
Index: apache/jetspeed/services/jsp/tags/URILookupTag.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/jsp/tags/URILookupTag.java,v
retrieving revision 1.9
diff -u -r1.9 URILookupTag.java
--- apache/jetspeed/services/jsp/tags/URILookupTag.java 29 Jul 2001 13:41:59 -0000
1.9
+++ apache/jetspeed/services/jsp/tags/URILookupTag.java 3 Mar 2003 14:37:47 -0000
@@ -64,7 +64,6 @@
// Jetsped Classes
import org.apache.jetspeed.util.URILookup;
import org.apache.jetspeed.om.registry.PortletEntry;
-import org.apache.jetspeed.om.registry.RegistryException;
import org.apache.jetspeed.services.Registry;
import org.apache.jetspeed.portal.PortletURIManager;
Index: apache/jetspeed/services/persistence/JetspeedPortalPersistenceService.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/persistence/JetspeedPortalPersistenceService.java,v
retrieving revision 1.2
diff -u -r1.2 JetspeedPortalPersistenceService.java
--- apache/jetspeed/services/persistence/JetspeedPortalPersistenceService.java 3 Oct
2002 18:21:59 -0000 1.2
+++ apache/jetspeed/services/persistence/JetspeedPortalPersistenceService.java 3 Mar
2003 14:37:51 -0000
@@ -60,16 +60,13 @@
import org.apache.jetspeed.om.profile.Entry;
import org.apache.jetspeed.om.profile.PSMLDocument;
-import org.apache.jetspeed.om.profile.Parameter;
import org.apache.jetspeed.om.profile.Portlets;
import org.apache.jetspeed.om.profile.Profile;
-import org.apache.jetspeed.om.profile.psml.PsmlParameter;
import org.apache.jetspeed.portal.*;
import org.apache.jetspeed.portal.Portlet;
import org.apache.jetspeed.portal.PortletException;
import org.apache.jetspeed.services.PortletFactory;
import org.apache.jetspeed.services.PsmlManager;
-import org.apache.jetspeed.services.portletfactory.PortletFactoryService;
import org.apache.jetspeed.services.rundata.JetspeedRunData;
import org.apache.turbine.services.InitializationException;
import org.apache.turbine.services.TurbineBaseService;
Index: apache/jetspeed/services/persistence/PersistenceManager.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/persistence/PersistenceManager.java,v
retrieving revision 1.1
diff -u -r1.1 PersistenceManager.java
--- apache/jetspeed/services/persistence/PersistenceManager.java 1 Jul 2002
04:30:24 -0000 1.1
+++ apache/jetspeed/services/persistence/PersistenceManager.java 3 Mar 2003
14:37:56 -0000
@@ -56,12 +56,10 @@
import java.util.List;
-import org.apache.jetspeed.om.profile.PSMLDocument;
import org.apache.jetspeed.om.profile.Profile;
import org.apache.jetspeed.portal.*;
import org.apache.jetspeed.portal.Portlet;
import org.apache.jetspeed.portal.PortletException;
-import org.apache.turbine.services.TurbineBaseService;
import org.apache.turbine.services.TurbineServices;
import org.apache.turbine.util.RunData;
Index: apache/jetspeed/services/persistence/PortalPersistenceService.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/persistence/PortalPersistenceService.java,v
retrieving revision 1.1
diff -u -r1.1 PortalPersistenceService.java
--- apache/jetspeed/services/persistence/PortalPersistenceService.java 1 Jul 2002
04:30:24 -0000 1.1
+++ apache/jetspeed/services/persistence/PortalPersistenceService.java 3 Mar 2003
14:37:59 -0000
@@ -54,10 +54,8 @@
package org.apache.jetspeed.services.persistence;
-import java.util.Iterator;
import java.util.List;
-import org.apache.jetspeed.om.profile.PSMLDocument;
import org.apache.jetspeed.om.profile.Profile;
import org.apache.jetspeed.portal.*;
import org.apache.jetspeed.portal.Portlet;
Index: apache/jetspeed/services/portaltoolkit/TestSkinAggregation.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/portaltoolkit/TestSkinAggregation.java,v
retrieving revision 1.1
diff -u -r1.1 TestSkinAggregation.java
--- apache/jetspeed/services/portaltoolkit/TestSkinAggregation.java 28 Jan 2003
05:57:48 -0000 1.1
+++ apache/jetspeed/services/portaltoolkit/TestSkinAggregation.java 3 Mar 2003
14:38:10 -0000
@@ -68,25 +68,15 @@
import junit.framework.TestSuite;
import org.apache.commons.lang.exception.NestableException;
-import org.apache.commons.lang.exception.NestableRuntimeException;
-import org.apache.jetspeed.om.profile.BasePSMLDocument;
-import org.apache.jetspeed.om.profile.BaseProfileLocator;
-import org.apache.jetspeed.om.profile.ConfigElement;
-import org.apache.jetspeed.om.profile.Entry;
import org.apache.jetspeed.om.profile.IdentityElement;
import org.apache.jetspeed.om.profile.PSMLDocument;
import org.apache.jetspeed.om.profile.Portlets;
-import org.apache.jetspeed.om.profile.Profile;
-import org.apache.jetspeed.om.profile.ProfileException;
-import org.apache.jetspeed.om.profile.ProfileLocator;
import org.apache.jetspeed.om.profile.Skin;
import org.apache.jetspeed.om.profile.psml.PsmlEntry;
import org.apache.jetspeed.om.profile.psml.PsmlSkin;
import org.apache.jetspeed.portal.Portlet;
import org.apache.jetspeed.portal.PortletSet;
import org.apache.jetspeed.services.PortalToolkit;
-import org.apache.jetspeed.services.Profiler;
-import org.apache.jetspeed.services.PsmlManager;
import org.apache.jetspeed.test.HeadlessBaseTest;
import org.apache.turbine.services.TurbineServices;
import org.apache.turbine.services.resources.ResourceService;
Index: apache/jetspeed/services/portletfactory/JetspeedPortletFactoryService.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/portletfactory/JetspeedPortletFactoryService.java,v
retrieving revision 1.14
diff -u -r1.14 JetspeedPortletFactoryService.java
--- apache/jetspeed/services/portletfactory/JetspeedPortletFactoryService.java 30 Jun
2002 18:55:38 -0000 1.14
+++ apache/jetspeed/services/portletfactory/JetspeedPortletFactoryService.java 3 Mar
2003 14:38:21 -0000
@@ -70,10 +70,8 @@
import org.apache.jetspeed.services.portletcache.PortletCache;
import org.apache.jetspeed.services.portletcache.Cacheable;
import org.apache.jetspeed.om.registry.PortletEntry;
-import org.apache.jetspeed.om.registry.SkinEntry;
import org.apache.jetspeed.om.profile.Profile;
import org.apache.jetspeed.util.MetaData;
-import org.apache.jetspeed.util.JetspeedException;
import org.apache.jetspeed.services.rundata.JetspeedRunDataService;
import org.apache.jetspeed.services.rundata.JetspeedRunData;
@@ -84,7 +82,6 @@
import org.apache.turbine.util.Log;
import org.apache.turbine.services.rundata.RunDataService;
-import java.util.Enumeration;
import java.util.Hashtable;
import java.util.Map;
import java.util.HashMap;
Index: apache/jetspeed/services/profiler/JetspeedProfilerService.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/profiler/JetspeedProfilerService.java,v
retrieving revision 1.44
diff -u -r1.44 JetspeedProfilerService.java
--- apache/jetspeed/services/profiler/JetspeedProfilerService.java 14 Jan 2003
19:54:41 -0000 1.44
+++ apache/jetspeed/services/profiler/JetspeedProfilerService.java 3 Mar 2003
14:38:40 -0000
@@ -55,9 +55,6 @@
package org.apache.jetspeed.services.profiler;
//java.util
-import java.util.Map;
-import java.util.HashMap;
-import java.util.Enumeration;
import java.util.Locale;
import java.util.Iterator;
import java.util.List;
@@ -101,8 +98,6 @@
import org.apache.jetspeed.om.profile.Skin;
import org.apache.jetspeed.om.profile.psml.PsmlSkin;
import org.apache.jetspeed.om.profile.BasePSMLDocument;
-import org.apache.jetspeed.om.registry.MediaTypeRegistry;
-import org.apache.jetspeed.om.registry.MediaTypeEntry;
import org.apache.jetspeed.om.profile.Entry;
// jetspeed.capability
@@ -112,7 +107,6 @@
// jetspeed.services
import org.apache.jetspeed.services.Profiler;
import org.apache.jetspeed.services.rundata.JetspeedRunData;
-import org.apache.jetspeed.services.Registry;
import org.apache.jetspeed.services.JetspeedSecurity;
import org.apache.jetspeed.services.PsmlManager;
import org.apache.jetspeed.services.idgenerator.JetspeedIdGenerator;
@@ -120,7 +114,6 @@
// jetspeed.util
import org.apache.jetspeed.util.MimeType;
-
/**
* <p>This is an implementation of the <code>Profiler</code> interface.
*
Index: apache/jetspeed/services/profiler/ProfilerService.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/profiler/ProfilerService.java,v
retrieving revision 1.16
diff -u -r1.16 ProfilerService.java
--- apache/jetspeed/services/profiler/ProfilerService.java 8 Nov 2002 23:21:52
-0000 1.16
+++ apache/jetspeed/services/profiler/ProfilerService.java 3 Mar 2003 14:38:47
-0000
@@ -55,13 +55,11 @@
package org.apache.jetspeed.services.profiler;
import org.apache.jetspeed.om.profile.*;
-import org.apache.jetspeed.services.Profiler;
import org.apache.jetspeed.capability.CapabilityMap;
import org.apache.turbine.services.Service;
import org.apache.turbine.util.RunData;
import org.apache.turbine.util.DynamicURI;
import org.apache.jetspeed.util.MimeType;
-import java.io.IOException;
import java.util.Iterator;
/**
Index: apache/jetspeed/services/profiler/TestProfilerService.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/profiler/TestProfilerService.java,v
retrieving revision 1.3
diff -u -r1.3 TestProfilerService.java
--- apache/jetspeed/services/profiler/TestProfilerService.java 8 Nov 2002 10:04:13
-0000 1.3
+++ apache/jetspeed/services/profiler/TestProfilerService.java 3 Mar 2003 14:38:52
-0000
@@ -66,7 +66,6 @@
import org.apache.jetspeed.services.Profiler;
-import org.apache.turbine.services.TurbineServices;
import org.apache.turbine.util.TurbineConfig;
import org.apache.turbine.util.StringUtils;
Index: apache/jetspeed/services/psmlmanager/CastorPsmlManagerService.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/psmlmanager/CastorPsmlManagerService.java,v
retrieving revision 1.37
diff -u -r1.37 CastorPsmlManagerService.java
--- apache/jetspeed/services/psmlmanager/CastorPsmlManagerService.java 2 Mar 2003
19:35:21 -0000 1.37
+++ apache/jetspeed/services/psmlmanager/CastorPsmlManagerService.java 3 Mar 2003
14:39:18 -0000
@@ -61,7 +61,6 @@
import org.apache.jetspeed.util.DirectoryUtils;
import org.apache.jetspeed.services.Profiler;
import org.apache.jetspeed.services.JetspeedSecurity;
-import org.apache.jetspeed.services.security.UserException;
import org.apache.jetspeed.services.resources.JetspeedResources;
//Castor defined API
@@ -82,11 +81,8 @@
import org.apache.jetspeed.om.security.JetspeedRoleFactory;
import org.apache.jetspeed.om.security.Group;
import org.apache.jetspeed.om.security.JetspeedGroupFactory;
-import org.apache.jetspeed.om.security.JetspeedUser;
import org.apache.jetspeed.om.security.JetspeedUserFactory;
-import org.apache.turbine.services.TurbineServices;
-
//castor support
import org.exolab.castor.xml.MarshalException;
import org.exolab.castor.xml.Unmarshaller;
@@ -112,13 +108,9 @@
import java.io.FileOutputStream;
import java.io.OutputStreamWriter;
import java.io.IOException;
-import java.net.URL;
-import java.util.Date;
import java.util.Iterator;
import java.util.List;
import java.util.LinkedList;
-import java.util.Map;
-import java.util.HashMap;
import javax.servlet.ServletConfig;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
Index: apache/jetspeed/services/psmlmanager/PsmlImporter.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/psmlmanager/PsmlImporter.java,v
retrieving revision 1.13
diff -u -r1.13 PsmlImporter.java
--- apache/jetspeed/services/psmlmanager/PsmlImporter.java 29 Jul 2002 02:25:27
-0000 1.13
+++ apache/jetspeed/services/psmlmanager/PsmlImporter.java 3 Mar 2003 14:39:26
-0000
@@ -58,22 +58,15 @@
import org.apache.turbine.services.TurbineServices;
-import org.apache.jetspeed.services.psmlmanager.db.DatabasePsmlManagerService;
-
// Jetspeed Security service
import org.apache.jetspeed.services.JetspeedSecurity;
import org.apache.jetspeed.services.security.JetspeedSecurityException;
import org.apache.jetspeed.services.security.UnknownUserException;
import org.apache.jetspeed.om.security.JetspeedUser;
-import org.apache.jetspeed.om.security.Role;
-import org.apache.jetspeed.om.security.Group;
// Profile and ProfileLocator interface
-import org.apache.jetspeed.om.profile.Profile;
-import org.apache.jetspeed.om.profile.ProfileLocator;
import org.apache.jetspeed.services.PsmlManager;
import org.apache.jetspeed.om.profile.QueryLocator;
-import org.apache.turbine.services.InitializationException;
import org.apache.turbine.util.TurbineConfig;
import org.apache.turbine.util.Log;
Index: apache/jetspeed/services/psmlmanager/PsmlManagerService.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/psmlmanager/PsmlManagerService.java,v
retrieving revision 1.9
diff -u -r1.9 PsmlManagerService.java
--- apache/jetspeed/services/psmlmanager/PsmlManagerService.java 28 Jun 2002
05:37:33 -0000 1.9
+++ apache/jetspeed/services/psmlmanager/PsmlManagerService.java 3 Mar 2003
14:39:33 -0000
@@ -64,7 +64,6 @@
import org.apache.jetspeed.om.security.JetspeedUser;
import org.apache.jetspeed.om.security.Role;
import org.apache.jetspeed.om.security.Group;
-import org.apache.turbine.services.InitializationException;
/**
* This service is responsible for loading and saving PSML documents.
Index: apache/jetspeed/services/psmlmanager/TestDbCriteria.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/psmlmanager/TestDbCriteria.java,v
retrieving revision 1.1
diff -u -r1.1 TestDbCriteria.java
--- apache/jetspeed/services/psmlmanager/TestDbCriteria.java 19 Nov 2002 00:14:48
-0000 1.1
+++ apache/jetspeed/services/psmlmanager/TestDbCriteria.java 3 Mar 2003 14:39:39
-0000
@@ -60,8 +60,6 @@
import junit.framework.TestCase;
-// Turbine imports
-import org.apache.turbine.services.TurbineServices;
import org.apache.turbine.util.TurbineConfig;
import org.apache.turbine.util.StringUtils;
Index: apache/jetspeed/services/psmlmanager/TestMarshalPsml.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/psmlmanager/TestMarshalPsml.java,v
retrieving revision 1.11
diff -u -r1.11 TestMarshalPsml.java
--- apache/jetspeed/services/psmlmanager/TestMarshalPsml.java 15 Oct 2002 17:35:32
-0000 1.11
+++ apache/jetspeed/services/psmlmanager/TestMarshalPsml.java 3 Mar 2003 14:39:54
-0000
@@ -57,11 +57,8 @@
// Java imports
import java.io.File;
import java.io.FileReader;
-import java.io.Writer;
import java.io.FileWriter;
-import java.io.IOException;
import java.util.Iterator;
-import java.util.Vector;
// Junit imports
import junit.framework.Test;
@@ -69,12 +66,9 @@
import junit.framework.TestCase;
//castor support
-import org.exolab.castor.xml.MarshalException;
import org.exolab.castor.xml.Unmarshaller;
import org.exolab.castor.xml.Marshaller;
-import org.exolab.castor.xml.ValidationException;
import org.exolab.castor.mapping.Mapping;
-import org.exolab.castor.mapping.MappingException;
import org.xml.sax.InputSource;
// serialization support
@@ -97,7 +91,6 @@
import org.apache.jetspeed.om.profile.Security;
// Turbine imports
-import org.apache.turbine.services.TurbineServices;
import org.apache.turbine.util.TurbineConfig;
import org.apache.turbine.util.StringUtils;
Index: apache/jetspeed/services/psmlmanager/db/DatabasePsmlManagerService.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/psmlmanager/db/DatabasePsmlManagerService.java,v
retrieving revision 1.30
diff -u -r1.30 DatabasePsmlManagerService.java
--- apache/jetspeed/services/psmlmanager/db/DatabasePsmlManagerService.java 8 Nov
2002 10:05:18 -0000 1.30
+++ apache/jetspeed/services/psmlmanager/db/DatabasePsmlManagerService.java 3 Mar
2003 14:40:23 -0000
@@ -59,7 +59,6 @@
// PSML Manager Service interface
import org.apache.jetspeed.services.psmlmanager.PsmlManagerService;
-import org.apache.jetspeed.services.psmlmanager.db.DBOperations;
// Jetspeed Security service
import org.apache.jetspeed.services.JetspeedSecurity;
@@ -86,7 +85,6 @@
// torque
import org.apache.torque.Torque;
-import org.apache.torque.TorqueException;
// jetspeed security
import org.apache.jetspeed.om.security.JetspeedUser;
@@ -100,10 +98,6 @@
//Servlet API
import javax.servlet.ServletConfig;
-//castor support
-import org.exolab.castor.xml.MarshalException;
-import org.exolab.castor.xml.ValidationException;
-
// Torque generated classes
import org.apache.jetspeed.om.dbpsml.JetspeedUserProfile;
import org.apache.jetspeed.om.dbpsml.JetspeedUserProfilePeer;
@@ -111,27 +105,19 @@
import org.apache.jetspeed.om.dbpsml.JetspeedRoleProfilePeer;
import org.apache.jetspeed.om.dbpsml.JetspeedGroupProfile;
import org.apache.jetspeed.om.dbpsml.JetspeedGroupProfilePeer;
-import org.apache.jetspeed.services.psmlmanager.PsmlImporter;
//standard java stuff
import java.lang.Thread;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.StringWriter;
-import java.io.ByteArrayInputStream;
import java.util.List;
import java.util.Iterator;
import java.util.StringTokenizer;
import java.util.ArrayList;
import java.util.Map;
-import java.util.Set;
import java.util.HashMap;
-import java.io.IOException;
import java.io.FileReader;
import java.io.File;
import org.exolab.castor.mapping.Mapping;
-import org.exolab.castor.mapping.MappingException;
import org.xml.sax.InputSource;
Index: apache/jetspeed/services/registry/DatabaseRegistryService.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/registry/DatabaseRegistryService.java,v
retrieving revision 1.2
diff -u -r1.2 DatabaseRegistryService.java
--- apache/jetspeed/services/registry/DatabaseRegistryService.java 30 Oct 2002
15:52:39 -0000 1.2
+++ apache/jetspeed/services/registry/DatabaseRegistryService.java 3 Mar 2003
14:40:36 -0000
@@ -63,7 +63,6 @@
//turbine stuff
import org.apache.turbine.util.Log;
import org.apache.turbine.services.*;
-import org.apache.turbine.services.servlet.TurbineServlet;
import org.apache.turbine.services.resources.ResourceService;
/**
Index: apache/jetspeed/services/registry/TestRegistryCategories.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/registry/TestRegistryCategories.java,v
retrieving revision 1.6
diff -u -r1.6 TestRegistryCategories.java
--- apache/jetspeed/services/registry/TestRegistryCategories.java 15 Oct 2002
17:35:32 -0000 1.6
+++ apache/jetspeed/services/registry/TestRegistryCategories.java 3 Mar 2003
14:40:51 -0000
@@ -54,15 +54,7 @@
package org.apache.jetspeed.services.registry;
-import java.io.File;
-import java.io.FileReader;
-
-import java.util.Vector;
import java.util.Iterator;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.TreeMap;
-import java.util.SortedMap;
// Junit imports
import junit.framework.Test;
@@ -71,8 +63,6 @@
import org.apache.jetspeed.om.registry.*;
-import org.apache.turbine.services.TurbineServices;
-import org.apache.jetspeed.services.idgenerator.*;
import org.apache.turbine.util.TurbineConfig;
import org.apache.turbine.util.StringUtils;
Index: apache/jetspeed/services/resources/JetspeedResourceService.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/resources/JetspeedResourceService.java,v
retrieving revision 1.2
diff -u -r1.2 JetspeedResourceService.java
--- apache/jetspeed/services/resources/JetspeedResourceService.java 15 Oct 2002
17:35:33 -0000 1.2
+++ apache/jetspeed/services/resources/JetspeedResourceService.java 3 Mar 2003
14:41:00 -0000
@@ -59,7 +59,6 @@
import org.apache.turbine.services.resources.ResourceService;
import org.apache.commons.configuration.Configuration;
-import org.apache.commons.configuration.PropertiesConfiguration;
/**
* <p>This service subclasses <code>TurbineResourceService</code> and
Index: apache/jetspeed/services/resources/JetspeedResources.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/resources/JetspeedResources.java,v
retrieving revision 1.15
diff -u -r1.15 JetspeedResources.java
--- apache/jetspeed/services/resources/JetspeedResources.java 12 Nov 2002 00:34:57
-0000 1.15
+++ apache/jetspeed/services/resources/JetspeedResources.java 3 Mar 2003 14:41:11
-0000
@@ -55,7 +55,6 @@
package org.apache.jetspeed.services.resources;
import org.apache.turbine.services.resources.TurbineResources;
-import org.apache.turbine.util.Log;
/**
* This class defines the Jetspeed properties keys.
Index: apache/jetspeed/services/resources/VariableResourcesService.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/resources/VariableResourcesService.java,v
retrieving revision 1.11
diff -u -r1.11 VariableResourcesService.java
--- apache/jetspeed/services/resources/VariableResourcesService.java 15 Oct 2002
17:35:33 -0000 1.11
+++ apache/jetspeed/services/resources/VariableResourcesService.java 3 Mar 2003
14:41:19 -0000
@@ -63,12 +63,10 @@
// Turbine stuff.
import org.apache.commons.configuration.Configuration;
-import org.apache.commons.configuration.PropertiesConfiguration;
import org.apache.turbine.services.resources.ResourceService;
import org.apache.turbine.services.resources.TurbineResourceService;
import org.apache.turbine.services.TurbineServices;
import org.apache.turbine.services.InitializationException;
-import org.apache.turbine.util.ServletUtils;
import org.apache.turbine.util.Log;
/**
Index: apache/jetspeed/services/rundata/JetspeedRunDataService.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/rundata/JetspeedRunDataService.java,v
retrieving revision 1.2
diff -u -r1.2 JetspeedRunDataService.java
--- apache/jetspeed/services/rundata/JetspeedRunDataService.java 8 Aug 2002
00:08:37 -0000 1.2
+++ apache/jetspeed/services/rundata/JetspeedRunDataService.java 3 Mar 2003
14:41:27 -0000
@@ -69,8 +69,6 @@
import javax.servlet.ServletConfig;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-
import org.apache.turbine.services.rundata.TurbineRunDataService;
import org.apache.turbine.services.InitializationException;
import org.apache.turbine.util.RunData;
Index: apache/jetspeed/services/security/AccessControl.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/security/AccessControl.java,v
retrieving revision 1.4
diff -u -r1.4 AccessControl.java
--- apache/jetspeed/services/security/AccessControl.java 5 Sep 2001 05:48:06
-0000 1.4
+++ apache/jetspeed/services/security/AccessControl.java 3 Mar 2003 14:41:31
-0000
@@ -57,7 +57,6 @@
import org.apache.turbine.util.RunData;
import org.apache.jetspeed.portal.Portlet;
import org.apache.jetspeed.om.registry.RegistryEntry;
-import org.apache.jetspeed.om.profile.Profile;
/**
* <P>Interface defines access control methods specific to Jetspeed for
Index: apache/jetspeed/services/security/CachedAcl.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/security/CachedAcl.java,v
retrieving revision 1.2
diff -u -r1.2 CachedAcl.java
--- apache/jetspeed/services/security/CachedAcl.java 16 Jul 2002 17:27:04 -0000
1.2
+++ apache/jetspeed/services/security/CachedAcl.java 3 Mar 2003 14:41:33 -0000
@@ -58,12 +58,7 @@
import java.util.HashMap;
import java.util.Iterator;
-import org.apache.turbine.util.Log;
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.services.JetspeedSecurity;
-import org.apache.jetspeed.services.security.JetspeedSecurityException;
/**
* Cached ACL - default implementation cached ACL containing role/permission.
Index: apache/jetspeed/services/security/JetspeedDBSecurityService.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/security/JetspeedDBSecurityService.java,v
retrieving revision 1.21
diff -u -r1.21 JetspeedDBSecurityService.java
--- apache/jetspeed/services/security/JetspeedDBSecurityService.java 28 Jun 2002
05:37:33 -0000 1.21
+++ apache/jetspeed/services/security/JetspeedDBSecurityService.java 3 Mar 2003
14:41:43 -0000
@@ -58,33 +58,17 @@
import javax.servlet.ServletConfig;
// Jetspeed
-import org.apache.jetspeed.om.profile.Profile;
-import org.apache.jetspeed.om.profile.ProfileLocator;
-import org.apache.jetspeed.om.profile.BaseProfile;
-import org.apache.jetspeed.om.profile.BaseProfileLocator;
-import org.apache.jetspeed.om.profile.ProfileException;
-import org.apache.jetspeed.om.registry.RegistryEntry;
-import org.apache.jetspeed.om.registry.Security;
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.portal.Portlet;
-import org.apache.jetspeed.portal.PortletController;
-import org.apache.jetspeed.portal.PortletSet;
import org.apache.jetspeed.services.JetspeedSecurity;
import org.apache.jetspeed.services.JetspeedUserManagement;
import org.apache.jetspeed.services.JetspeedPortalAccessController;
-import org.apache.jetspeed.services.Profiler;
-import org.apache.jetspeed.services.PsmlManager;
-import org.apache.jetspeed.services.Registry;
// Turbine
-import org.apache.turbine.om.security.User;
-import org.apache.turbine.om.security.Group;
-import org.apache.turbine.om.security.Role;
-
import org.apache.turbine.services.TurbineServices;
import org.apache.turbine.services.TurbineBaseService;
import org.apache.turbine.services.InitializationException;
@@ -92,7 +76,6 @@
import org.apache.turbine.util.Log;
import org.apache.jetspeed.services.rundata.JetspeedRunData;
-import org.apache.turbine.util.security.AccessControlList;
/**
Index: apache/jetspeed/services/security/JetspeedGroupManagement.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/security/JetspeedGroupManagement.java,v
retrieving revision 1.2
diff -u -r1.2 JetspeedGroupManagement.java
--- apache/jetspeed/services/security/JetspeedGroupManagement.java 28 Jun 2002
05:37:33 -0000 1.2
+++ apache/jetspeed/services/security/JetspeedGroupManagement.java 3 Mar 2003
14:41:50 -0000
@@ -56,12 +56,9 @@
import java.util.Iterator;
-import org.apache.turbine.services.Service;
-
// Turbine
import org.apache.turbine.services.TurbineServices;
-import org.apache.turbine.services.Service;
// Jetspeed
import org.apache.jetspeed.om.security.Group;
Index: apache/jetspeed/services/security/JetspeedPermissionManagement.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/security/JetspeedPermissionManagement.java,v
retrieving revision 1.2
diff -u -r1.2 JetspeedPermissionManagement.java
--- apache/jetspeed/services/security/JetspeedPermissionManagement.java 28 Jun 2002
05:37:33 -0000 1.2
+++ apache/jetspeed/services/security/JetspeedPermissionManagement.java 3 Mar 2003
14:41:56 -0000
@@ -56,12 +56,9 @@
import java.util.Iterator;
-import org.apache.turbine.services.Service;
-
// Turbine
import org.apache.turbine.services.TurbineServices;
-import org.apache.turbine.services.Service;
import org.apache.jetspeed.om.security.Permission;
Index: apache/jetspeed/services/security/JetspeedRoleManagement.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/security/JetspeedRoleManagement.java,v
retrieving revision 1.2
diff -u -r1.2 JetspeedRoleManagement.java
--- apache/jetspeed/services/security/JetspeedRoleManagement.java 28 Jun 2002
05:37:34 -0000 1.2
+++ apache/jetspeed/services/security/JetspeedRoleManagement.java 3 Mar 2003
14:42:01 -0000
@@ -56,12 +56,9 @@
import java.util.Iterator;
-import org.apache.turbine.services.Service;
-
// Turbine
import org.apache.turbine.services.TurbineServices;
-import org.apache.turbine.services.Service;
// Jetspeed
import org.apache.jetspeed.om.security.Role;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
