paulsp 2003/08/14 17:27:54
Modified: portal/src/java/org/apache/jetspeed/aggregator
PortletWindowFactory.java
portal/src/java/org/apache/jetspeed/capability
CapabilityValveImpl.java
portal/src/java/org/apache/jetspeed/engine/core
PortalControlParameter.java
portal/src/java/org/apache/jetspeed/om/collection
ManageablePreferenceSetImpl.java
portal/src/java/org/apache/jetspeed/request
RequestContext.java
portal/src/java/org/apache/jetspeed/services/entity
PortletEntityAccess.java
PortletEntityServiceImpl.java
portal/src/java/org/apache/jetspeed/services/information
InformationProviderServiceImpl.java
PortletURLProviderImpl.java
portal/src/java/org/apache/jetspeed/services/jmx
JetspeedJMXService.java
portal/src/java/org/apache/jetspeed/services/page
PageManager.java PageManagerService.java
portal/src/java/org/apache/jetspeed/services/page/impl
CastorXmlPageManagerService.java
portal/src/test/org/apache/jetspeed/services/page
TestPageXmlPersistence.java
portal/src/test/org/apache/jetspeed/tools/pamanager
TestPortletDescriptor.java
Log:
Cleanup imports
Revision Changes Path
1.6 +1 -3
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/aggregator/PortletWindowFactory.java
Index: PortletWindowFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/aggregator/PortletWindowFactory.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- PortletWindowFactory.java 11 Aug 2003 23:26:53 -0000 1.5
+++ PortletWindowFactory.java 15 Aug 2003 00:27:53 -0000 1.6
@@ -53,8 +53,6 @@
*/
package org.apache.jetspeed.aggregator;
-import java.util.Iterator;
-
import org.apache.jetspeed.Jetspeed;
import org.apache.jetspeed.om.common.entity.InitablePortletEntity;
import org.apache.jetspeed.om.common.window.PortletWindowImpl;
1.2 +1 -6
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/capability/CapabilityValveImpl.java
Index: CapabilityValveImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/capability/CapabilityValveImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CapabilityValveImpl.java 28 Jul 2003 23:47:37 -0000 1.1
+++ CapabilityValveImpl.java 15 Aug 2003 00:27:53 -0000 1.2
@@ -54,17 +54,12 @@
package org.apache.jetspeed.capability;
-import org.apache.commons.configuration.Configuration;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.jetspeed.Jetspeed;
-import org.apache.jetspeed.om.registry.MediaTypeEntry;
import org.apache.jetspeed.pipeline.PipelineException;
import org.apache.jetspeed.pipeline.valve.CapabilityValve;
import org.apache.jetspeed.pipeline.valve.ValveContext;
import org.apache.jetspeed.request.RequestContext;
-import org.apache.jetspeed.services.registry.JetspeedRegistry;
-import org.apache.jetspeed.services.registry.RegistryService;
/**
1.4 +1 -10
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/engine/core/PortalControlParameter.java
Index: PortalControlParameter.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/engine/core/PortalControlParameter.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- PortalControlParameter.java 11 Aug 2003 23:29:22 -0000 1.3
+++ PortalControlParameter.java 15 Aug 2003 00:27:53 -0000 1.4
@@ -62,20 +62,11 @@
import javax.portlet.PortletMode;
import javax.portlet.WindowState;
-import org.apache.jetspeed.Jetspeed;
import org.apache.jetspeed.aggregator.PortletWindowFactory;
import org.apache.jetspeed.exception.JetspeedException;
-import org.apache.jetspeed.om.common.window.PortletWindowImpl;
-import org.apache.jetspeed.request.RequestContext;
-import org.apache.jetspeed.services.entity.PortletEntityAccess;
import org.apache.jetspeed.services.registry.JetspeedPortletRegistry;
-import org.apache.jetspeed.util.JetspeedObjectID;
-import org.apache.pluto.om.entity.PortletEntity;
import org.apache.pluto.om.portlet.PortletDefinition;
import org.apache.pluto.om.window.PortletWindow;
-import org.apache.pluto.om.window.PortletWindowCtrl;
-import org.apache.pluto.om.window.PortletWindowList;
-import org.apache.pluto.om.window.PortletWindowListCtrl;
import org.apache.pluto.util.StringUtils;
/**
1.4 +0 -4
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/om/collection/ManageablePreferenceSetImpl.java
Index: ManageablePreferenceSetImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/om/collection/ManageablePreferenceSetImpl.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ManageablePreferenceSetImpl.java 6 Aug 2003 19:42:18 -0000 1.3
+++ ManageablePreferenceSetImpl.java 15 Aug 2003 00:27:54 -0000 1.4
@@ -53,18 +53,14 @@
*/
package org.apache.jetspeed.om.collection;
-import java.util.Collection;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Set;
-import org.apache.jetspeed.om.common.preference.PreferenceComposite;
import org.apache.jetspeed.om.common.preference.PreferenceSetImpl;
import org.apache.ojb.broker.ManageableCollection;
import org.apache.ojb.broker.PersistenceBroker;
import org.apache.ojb.broker.PersistenceBrokerException;
-
-import org.apache.pluto.om.common.Preference;
import org.apache.pluto.om.common.PreferenceSet;
import org.apache.pluto.om.common.PreferenceSetCtrl;
1.2 +1 -2
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/request/RequestContext.java
Index: RequestContext.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/request/RequestContext.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RequestContext.java 28 Jul 2003 23:47:46 -0000 1.1
+++ RequestContext.java 15 Aug 2003 00:27:54 -0000 1.2
@@ -62,7 +62,6 @@
import org.apache.jetspeed.engine.core.PortalControlParameter;
import org.apache.jetspeed.engine.core.PortalURL;
import org.apache.jetspeed.om.profile.Profile;
-import org.apache.jetspeed.util.MimeType;
import org.apache.pluto.om.window.PortletWindow;
/**
* Portal Request Context is associated with each request
1.3 +1 -2
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/services/entity/PortletEntityAccess.java
Index: PortletEntityAccess.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/services/entity/PortletEntityAccess.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PortletEntityAccess.java 6 Aug 2003 19:41:19 -0000 1.2
+++ PortletEntityAccess.java 15 Aug 2003 00:27:54 -0000 1.3
@@ -56,7 +56,6 @@
import org.apache.jetspeed.om.common.entity.InitablePortletEntity;
import org.apache.jetspeed.request.RequestContext;
import org.apache.jetspeed.util.ServiceUtil;
-import org.apache.pluto.om.entity.PortletEntity;
import org.apache.pluto.om.portlet.PortletDefinition;
/**
1.5 +1 -2
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/services/entity/PortletEntityServiceImpl.java
Index: PortletEntityServiceImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/services/entity/PortletEntityServiceImpl.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- PortletEntityServiceImpl.java 6 Aug 2003 19:41:19 -0000 1.4
+++ PortletEntityServiceImpl.java 15 Aug 2003 00:27:54 -0000 1.5
@@ -59,7 +59,6 @@
import org.apache.fulcrum.InitializationException;
import org.apache.jetspeed.om.common.entity.PortletEntityImpl;
import org.apache.jetspeed.om.common.entity.InitablePortletEntity;
-import org.apache.jetspeed.om.common.preference.PreferenceSetComposite;
import org.apache.jetspeed.request.RequestContext;
import org.apache.jetspeed.util.ArgUtil;
import org.apache.jetspeed.util.JetspeedObjectID;
1.2 +1 -2
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/services/information/InformationProviderServiceImpl.java
Index: InformationProviderServiceImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/services/information/InformationProviderServiceImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- InformationProviderServiceImpl.java 28 Jul 2003 23:47:47 -0000 1.1
+++ InformationProviderServiceImpl.java 15 Aug 2003 00:27:54 -0000 1.2
@@ -61,7 +61,6 @@
import org.apache.jetspeed.engine.core.PortletActionProviderImpl;
import org.apache.pluto.factory.Factory;
import org.apache.pluto.services.information.DynamicInformationProvider;
-import org.apache.pluto.services.information.InformationProviderService;
import org.apache.pluto.services.information.PortalContextProvider;
import org.apache.pluto.services.information.PortletActionProvider;
import org.apache.pluto.services.information.StaticInformationProvider;
1.2 +4 -5
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/services/information/PortletURLProviderImpl.java
Index: PortletURLProviderImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/services/information/PortletURLProviderImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PortletURLProviderImpl.java 28 Jul 2003 23:47:47 -0000 1.1
+++ PortletURLProviderImpl.java 15 Aug 2003 00:27:54 -0000 1.2
@@ -59,13 +59,12 @@
import javax.portlet.PortletMode;
import javax.portlet.WindowState;
-import org.apache.pluto.om.window.PortletWindow;
-import org.apache.pluto.services.information.PortletURLProvider;
-import org.apache.pluto.util.NamespaceMapperAccess;
import org.apache.jetspeed.engine.core.PortalControlParameter;
import org.apache.jetspeed.engine.core.PortalURL;
import org.apache.jetspeed.request.JetspeedRequestContext;
-import org.apache.jetspeed.services.information.*;
+import org.apache.pluto.om.window.PortletWindow;
+import org.apache.pluto.services.information.PortletURLProvider;
+import org.apache.pluto.util.NamespaceMapperAccess;
/**
* Provides access to the Portal URL manipulation
1.2 +1 -7
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/services/jmx/JetspeedJMXService.java
Index: JetspeedJMXService.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/services/jmx/JetspeedJMXService.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JetspeedJMXService.java 28 Jul 2003 23:47:48 -0000 1.1
+++ JetspeedJMXService.java 15 Aug 2003 00:27:54 -0000 1.2
@@ -57,20 +57,14 @@
import java.io.File;
import java.io.FileInputStream;
import java.io.InputStream;
-
-import java.rmi.server.ExportException;
import java.util.HashMap;
import java.util.Iterator;
import javax.management.MBeanServer;
-
import javax.management.MalformedObjectNameException;
-
import javax.management.ObjectName;
-
import javax.management.modelmbean.ModelMBean;
import javax.naming.Context;
-
import mx4j.adaptor.rmi.jrmp.JRMPAdaptorMBean;
import mx4j.tools.naming.NamingService;
1.2 +4 -4
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/services/page/PageManager.java
Index: PageManager.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/services/page/PageManager.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PageManager.java 8 Aug 2003 22:05:55 -0000 1.1
+++ PageManager.java 15 Aug 2003 00:27:54 -0000 1.2
@@ -54,12 +54,12 @@
package org.apache.jetspeed.services.page;
-import java.util.Iterator;
import java.util.List;
-import org.apache.jetspeed.om.page.Page;
+
+import org.apache.jetspeed.exception.JetspeedException;
import org.apache.jetspeed.om.page.Fragment;
+import org.apache.jetspeed.om.page.Page;
import org.apache.jetspeed.om.page.Property;
-import org.apache.jetspeed.exception.JetspeedException;
import org.apache.jetspeed.util.ServiceUtil;
/**
1.2 +5 -5
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/services/page/PageManagerService.java
Index: PageManagerService.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/services/page/PageManagerService.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PageManagerService.java 8 Aug 2003 22:05:55 -0000 1.1
+++ PageManagerService.java 15 Aug 2003 00:27:54 -0000 1.2
@@ -54,13 +54,13 @@
package org.apache.jetspeed.services.page;
-import java.util.Iterator;
import java.util.List;
-import org.apache.jetspeed.om.page.Page;
+
+import org.apache.fulcrum.Service;
+import org.apache.jetspeed.exception.JetspeedException;
import org.apache.jetspeed.om.page.Fragment;
+import org.apache.jetspeed.om.page.Page;
import org.apache.jetspeed.om.page.Property;
-import org.apache.jetspeed.exception.JetspeedException;
-import org.apache.fulcrum.Service;
/**
* This service is responsible for loading and saving Pages into
1.2 +22 -31
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/services/page/impl/CastorXmlPageManagerService.java
Index: CastorXmlPageManagerService.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/services/page/impl/CastorXmlPageManagerService.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CastorXmlPageManagerService.java 8 Aug 2003 22:05:55 -0000 1.1
+++ CastorXmlPageManagerService.java 15 Aug 2003 00:27:54 -0000 1.2
@@ -56,49 +56,40 @@
//standard java stuff
import java.io.File;
-import java.io.FilenameFilter;
-import java.io.Reader;
import java.io.FileReader;
-import java.io.Writer;
import java.io.FileWriter;
+import java.io.FilenameFilter;
import java.io.IOException;
-import java.util.Iterator;
-import java.util.List;
import java.util.ArrayList;
+import java.util.List;
-//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
-import org.apache.xml.serialize.Serializer;
-import org.apache.xml.serialize.XMLSerializer;
-import org.apache.xml.serialize.OutputFormat;
-
-import org.apache.fulcrum.BaseService;
-import org.apache.fulcrum.InitializationException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
-import org.apache.jetspeed.om.page.Page;
+import org.apache.fulcrum.BaseService;
+import org.apache.fulcrum.InitializationException;
+import org.apache.jetspeed.Jetspeed;
+import org.apache.jetspeed.cache.file.FileCache;
+import org.apache.jetspeed.cache.file.FileCacheEntry;
+import org.apache.jetspeed.cache.file.FileCacheEventListener;
+import org.apache.jetspeed.exception.JetspeedException;
import org.apache.jetspeed.om.page.Fragment;
+import org.apache.jetspeed.om.page.Page;
import org.apache.jetspeed.om.page.Property;
-import org.apache.jetspeed.om.page.psml.PageImpl;
import org.apache.jetspeed.om.page.psml.FragmentImpl;
+import org.apache.jetspeed.om.page.psml.PageImpl;
import org.apache.jetspeed.om.page.psml.PropertyImpl;
-
-import org.apache.jetspeed.Jetspeed;
-import org.apache.jetspeed.exception.JetspeedException;
-import org.apache.jetspeed.cache.file.FileCache;
-import org.apache.jetspeed.cache.file.FileCacheEventListener;
-import org.apache.jetspeed.cache.file.FileCacheEntry;
import org.apache.jetspeed.services.idgenerator.JetspeedIdGenerator;
import org.apache.jetspeed.services.page.PageManagerService;
+import org.apache.xml.serialize.OutputFormat;
+import org.apache.xml.serialize.Serializer;
+import org.apache.xml.serialize.XMLSerializer;
+import org.exolab.castor.mapping.Mapping;
+import org.exolab.castor.mapping.MappingException;
+import org.exolab.castor.xml.MarshalException;
+import org.exolab.castor.xml.Marshaller;
+import org.exolab.castor.xml.Unmarshaller;
+import org.exolab.castor.xml.ValidationException;
+import org.xml.sax.InputSource;
/**
* This service is responsible for loading and saving PSML pages
1.2 +2 -4
jakarta-jetspeed-2/portal/src/test/org/apache/jetspeed/services/page/TestPageXmlPersistence.java
Index: TestPageXmlPersistence.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/test/org/apache/jetspeed/services/page/TestPageXmlPersistence.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestPageXmlPersistence.java 8 Aug 2003 22:05:55 -0000 1.1
+++ TestPageXmlPersistence.java 15 Aug 2003 00:27:54 -0000 1.2
@@ -55,14 +55,12 @@
// Java imports
import java.util.List;
-import java.util.Map;
-import java.util.Iterator;
import junit.framework.Test;
import junit.framework.TestSuite;
-import org.apache.jetspeed.om.page.Page;
import org.apache.jetspeed.om.page.Fragment;
+import org.apache.jetspeed.om.page.Page;
import org.apache.jetspeed.om.page.Property;
import org.apache.jetspeed.test.JetspeedTest;
import org.apache.jetspeed.util.ServiceUtil;
1.3 +10 -11
jakarta-jetspeed-2/portal/src/test/org/apache/jetspeed/tools/pamanager/TestPortletDescriptor.java
Index: TestPortletDescriptor.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/test/org/apache/jetspeed/tools/pamanager/TestPortletDescriptor.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TestPortletDescriptor.java 3 Aug 2003 15:13:22 -0000 1.2
+++ TestPortletDescriptor.java 15 Aug 2003 00:27:54 -0000 1.3
@@ -54,27 +54,26 @@
package org.apache.jetspeed.tools.pamanager;
import java.util.Iterator;
-import java.util.Locale;
import junit.framework.Test;
import junit.framework.TestSuite;
import junit.textui.TestRunner;
-import org.apache.jetspeed.Jetspeed;
-import org.apache.jetspeed.test.JetspeedTest;
import org.apache.commons.configuration.Configuration;
+import org.apache.jetspeed.Jetspeed;
+import org.apache.jetspeed.om.common.MutableLanguage;
+import org.apache.jetspeed.om.common.ParameterComposite;
+import org.apache.jetspeed.om.common.portlet.ContentTypeComposite;
import org.apache.jetspeed.om.common.portlet.MutablePortletApplication;
-import org.apache.pluto.om.portlet.PortletDefinitionList;
-import org.apache.pluto.om.portlet.ContentTypeSet;
import org.apache.jetspeed.om.common.portlet.PortletDefinitionComposite;
+import org.apache.jetspeed.om.common.preference.PreferenceComposite;
+import org.apache.jetspeed.test.JetspeedTest;
import org.apache.pluto.om.common.DisplayName;
-import org.apache.pluto.om.common.ParameterSet;
import org.apache.pluto.om.common.LanguageSet;
-import org.apache.jetspeed.om.common.ParameterComposite;
-import org.apache.jetspeed.om.common.MutableLanguage;
-import org.apache.jetspeed.om.common.portlet.ContentTypeComposite;
-import org.apache.jetspeed.om.common.preference.PreferenceComposite;
+import org.apache.pluto.om.common.ParameterSet;
import org.apache.pluto.om.common.PreferenceSet;
+import org.apache.pluto.om.portlet.ContentTypeSet;
+import org.apache.pluto.om.portlet.PortletDefinitionList;
/**
* TestPortletDescriptor - tests loading the portlet.xml deployment descriptor
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
