svnno****@sourc*****
svnno****@sourc*****
2008年 4月 30日 (水) 14:09:48 JST
Revision: 899
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=899
Author: sone
Date: 2008-04-30 14:09:48 +0900 (Wed, 30 Apr 2008)
Log Message:
-----------
apply patches(Cleanup of unused import statements)
Modified Paths:
--------------
pal-portal/trunk/build.properties
Added Paths:
-----------
pal-portal/trunk/portal/patches/commons/src/java/org/apache/jetspeed/portlet/
pal-portal/trunk/portal/patches/commons/src/java/org/apache/jetspeed/portlet/PortletObjectProxy.java
pal-portal/trunk/portal/patches/components/cm/
pal-portal/trunk/portal/patches/components/cm/src/
pal-portal/trunk/portal/patches/components/cm/src/java/
pal-portal/trunk/portal/patches/components/cm/src/java/org/
pal-portal/trunk/portal/patches/components/cm/src/java/org/apache/
pal-portal/trunk/portal/patches/components/cm/src/java/org/apache/jetspeed/
pal-portal/trunk/portal/patches/components/cm/src/java/org/apache/jetspeed/cache/
pal-portal/trunk/portal/patches/components/cm/src/java/org/apache/jetspeed/cache/impl/
pal-portal/trunk/portal/patches/components/cm/src/java/org/apache/jetspeed/cache/impl/EhCacheDistributedImpl.java
pal-portal/trunk/portal/patches/components/cm/src/java/org/apache/jetspeed/cache/impl/JetspeedCacheKeyGenerator.java
pal-portal/trunk/portal/patches/components/page-manager/src/java/org/apache/jetspeed/page/document/psml/CastorFileSystemDocumentHandler.java
pal-portal/trunk/portal/patches/components/page-manager/src/test/
pal-portal/trunk/portal/patches/components/page-manager/src/test/org/
pal-portal/trunk/portal/patches/components/page-manager/src/test/org/apache/
pal-portal/trunk/portal/patches/components/page-manager/src/test/org/apache/jetspeed/
pal-portal/trunk/portal/patches/components/page-manager/src/test/org/apache/jetspeed/page/
pal-portal/trunk/portal/patches/components/page-manager/src/test/org/apache/jetspeed/page/DirectoryXMLTransform.java
pal-portal/trunk/portal/patches/components/portal/src/java/org/apache/jetspeed/capabilities/
pal-portal/trunk/portal/patches/components/portal/src/java/org/apache/jetspeed/capabilities/impl/
pal-portal/trunk/portal/patches/components/portal/src/java/org/apache/jetspeed/capabilities/impl/CapabilityCustomizerValveImpl.java
pal-portal/trunk/portal/patches/components/portal/src/java/org/apache/jetspeed/container/ContainerValve.java
pal-portal/trunk/portal/patches/components/portal/src/java/org/apache/jetspeed/decoration/
pal-portal/trunk/portal/patches/components/portal/src/java/org/apache/jetspeed/decoration/AbstractDecoratorActionsFactory.java
pal-portal/trunk/portal/patches/components/portal/src/java/org/apache/jetspeed/decoration/DecorationValve.java
pal-portal/trunk/portal/patches/components/portal/src/java/org/apache/jetspeed/engine/
pal-portal/trunk/portal/patches/components/portal/src/java/org/apache/jetspeed/engine/servlet/
pal-portal/trunk/portal/patches/components/portal/src/java/org/apache/jetspeed/engine/servlet/ServletRequestImpl.java
pal-portal/trunk/portal/patches/components/portal/src/java/org/apache/jetspeed/layout/
pal-portal/trunk/portal/patches/components/portal/src/java/org/apache/jetspeed/layout/impl/
pal-portal/trunk/portal/patches/components/portal/src/java/org/apache/jetspeed/layout/impl/BasePortletAction.java
pal-portal/trunk/portal/patches/components/portal/src/java/org/apache/jetspeed/layout/impl/BaseUserAction.java
pal-portal/trunk/portal/patches/components/portal/src/java/org/apache/jetspeed/layout/impl/GetPageAction.java
pal-portal/trunk/portal/patches/components/portal/src/java/org/apache/jetspeed/layout/impl/GetUserInformationAction.java
pal-portal/trunk/portal/patches/components/portal/src/java/org/apache/jetspeed/layout/impl/MovePortletAction.java
pal-portal/trunk/portal/patches/components/portal/src/java/org/apache/jetspeed/layout/impl/PortletPlacementContextImpl.java
pal-portal/trunk/portal/patches/components/portal/src/java/org/apache/jetspeed/tools/pamanager/VersionedPortletApplicationManager.java
pal-portal/trunk/portal/patches/jetspeed-api/src/java/org/apache/jetspeed/aggregator/
pal-portal/trunk/portal/patches/jetspeed-api/src/java/org/apache/jetspeed/aggregator/WorkerMonitor.java
-------------- next part --------------
Modified: pal-portal/trunk/build.properties
===================================================================
--- pal-portal/trunk/build.properties 2008-04-30 01:29:49 UTC (rev 898)
+++ pal-portal/trunk/build.properties 2008-04-30 05:09:48 UTC (rev 899)
@@ -163,14 +163,30 @@
components/portal/src/java/org/apache/jetspeed/container/session/PortalSessionMonitorImpl.java,\
components/portal/src/java/org/apache/jetspeed/container/session/PortalSessionsManagerImpl.java,\
components/profiler/src/java/org/apache/jetspeed/profiler/rules/impl/RuleCriterionImpl.java,\
+components/page-manager/src/test/org/apache/jetspeed/page/DirectoryXMLTransform.java,\
components/page-manager/src/java/org/apache/jetspeed/om/page/impl/PageImpl.java,\
components/page-manager/src/java/org/apache/jetspeed/page/impl/DatabasePageManager.java,\
+components/page-manager/src/java/org/apache/jetspeed/page/document/psml/CastorFileSystemDocumentHandler.java,\
+components/cm/src/java/org/apache/jetspeed/cache/impl/EhCacheDistributedImpl.java,\
+components/cm/src/java/org/apache/jetspeed/cache/impl/JetspeedCacheKeyGenerator.java,\
components/portal/src/java/org/apache/jetspeed/profiler/impl/CreateUserTemplatePagesValveImpl.java,\
+components/portal/src/java/org/apache/jetspeed/container/ContainerValve.java,\
+components/portal/src/java/org/apache/jetspeed/decoration/AbstractDecoratorActionsFactory.java,\
+components/portal/src/java/org/apache/jetspeed/decoration/DecorationValve.java,\
+components/portal/src/java/org/apache/jetspeed/capabilities/impl/CapabilityCustomizerValveImpl.java,\
+components/portal/src/java/org/apache/jetspeed/tools/pamanager/VersionedPortletApplicationManager.java,\
components/portal/src/java/org/apache/jetspeed/tools/pamanager/PortletApplicationManager.java,\
+components/portal/src/java/org/apache/jetspeed/engine/servlet/ServletRequestImpl.java,\
components/portal/src/java/org/apache/jetspeed/login/LoginErrorServlet.java,\
components/portal/src/java/org/apache/jetspeed/login/resources/LoginViewResources_ja.properties,\
components/portal/src/java/org/apache/jetspeed/login/resources/LoginViewResources.properties,\
components/portal/src/java/org/apache/jetspeed/login/resources/LoginViewResources_en.properties,\
+components/portal/src/java/org/apache/jetspeed/layout/impl/BasePortletAction.java,\
+components/portal/src/java/org/apache/jetspeed/layout/impl/GetUserInformationAction.java,\
+components/portal/src/java/org/apache/jetspeed/layout/impl/BaseUserAction.java,\
+components/portal/src/java/org/apache/jetspeed/layout/impl/PortletPlacementContextImpl.java,\
+components/portal/src/java/org/apache/jetspeed/layout/impl/GetPageAction.java,\
+components/portal/src/java/org/apache/jetspeed/layout/impl/MovePortletAction.java,\
components/rdbms/src/java/org/apache/jetspeed/components/datasource/DBCPDatasourceComponent.java,\
components/rdbms/src/java/org/apache/jetspeed/components/datasource/BoundDBCPDatasourceComponent.java,\
components/security/src/java/org/apache/jetspeed/security/impl/AuthenticationProviderProxyImpl.java,\
@@ -190,10 +206,12 @@
src/webapp/decorations/portlet/decorator.vm,\
project.properties,\
maven-plugin/plugin.jelly,\
+jetspeed-api/src/java/org/apache/jetspeed/aggregator/WorkerMonitor.java,\
jetspeed-api/src/java/org/apache/jetspeed/security/spi/UserSecurityHandler.java,\
jetspeed-api/src/java/org/apache/jetspeed/security/spi/SecurityAccess.java,\
jetspeed-api/src/java/org/apache/jetspeed/security/AuthenticationProviderProxy.java,\
commons/src/java/org/apache/jetspeed/container/resources/ContainerInfo.properties,\
+commons/src/java/org/apache/jetspeed/portlet/PortletObjectProxy.java,\
etc/sql/derby/schema/prefs-schema.sql,\
etc/sql/derby/schema/phase2-schema.sql,\
etc/schema/phase2-schema.xml,\
Added: pal-portal/trunk/portal/patches/commons/src/java/org/apache/jetspeed/portlet/PortletObjectProxy.java
===================================================================
--- pal-portal/trunk/portal/patches/commons/src/java/org/apache/jetspeed/portlet/PortletObjectProxy.java (rev 0)
+++ pal-portal/trunk/portal/patches/commons/src/java/org/apache/jetspeed/portlet/PortletObjectProxy.java 2008-04-30 05:09:48 UTC (rev 899)
@@ -0,0 +1,20 @@
+Index: commons/src/java/org/apache/jetspeed/portlet/PortletObjectProxy.java
+===================================================================
+--- commons/src/java/org/apache/jetspeed/portlet/PortletObjectProxy.java (リビジョン 648465)
++++ commons/src/java/org/apache/jetspeed/portlet/PortletObjectProxy.java (作業コピー)
+@@ -17,7 +17,6 @@
+ package org.apache.jetspeed.portlet;
+
+ import java.lang.reflect.InvocationHandler;
+-import java.lang.reflect.InvocationTargetException;
+ import java.lang.reflect.Method;
+ import java.lang.reflect.Proxy;
+ import java.lang.reflect.Modifier;
+@@ -26,7 +25,6 @@
+
+ import javax.portlet.Portlet;
+ import javax.portlet.GenericPortlet;
+-import javax.portlet.PortletConfig;
+ import javax.portlet.PortletException;
+ import javax.portlet.PortletMode;
+ import javax.portlet.WindowState;
Added: pal-portal/trunk/portal/patches/components/cm/src/java/org/apache/jetspeed/cache/impl/EhCacheDistributedImpl.java
===================================================================
--- pal-portal/trunk/portal/patches/components/cm/src/java/org/apache/jetspeed/cache/impl/EhCacheDistributedImpl.java (rev 0)
+++ pal-portal/trunk/portal/patches/components/cm/src/java/org/apache/jetspeed/cache/impl/EhCacheDistributedImpl.java 2008-04-30 05:09:48 UTC (rev 899)
@@ -0,0 +1,12 @@
+Index: components/cm/src/java/org/apache/jetspeed/cache/impl/EhCacheDistributedImpl.java
+===================================================================
+--- components/cm/src/java/org/apache/jetspeed/cache/impl/EhCacheDistributedImpl.java (リビジョン 648465)
++++ components/cm/src/java/org/apache/jetspeed/cache/impl/EhCacheDistributedImpl.java (作業コピー)
+@@ -22,7 +22,6 @@
+ import java.util.Iterator;
+ import java.util.Map;
+
+-import net.sf.ehcache.Cache;
+ import net.sf.ehcache.CacheException;
+ import net.sf.ehcache.Ehcache;
+ import net.sf.ehcache.Element;
Added: pal-portal/trunk/portal/patches/components/cm/src/java/org/apache/jetspeed/cache/impl/JetspeedCacheKeyGenerator.java
===================================================================
--- pal-portal/trunk/portal/patches/components/cm/src/java/org/apache/jetspeed/cache/impl/JetspeedCacheKeyGenerator.java (rev 0)
+++ pal-portal/trunk/portal/patches/components/cm/src/java/org/apache/jetspeed/cache/impl/JetspeedCacheKeyGenerator.java 2008-04-30 05:09:48 UTC (rev 899)
@@ -0,0 +1,12 @@
+Index: components/cm/src/java/org/apache/jetspeed/cache/impl/JetspeedCacheKeyGenerator.java
+===================================================================
+--- components/cm/src/java/org/apache/jetspeed/cache/impl/JetspeedCacheKeyGenerator.java (リビジョン 648465)
++++ components/cm/src/java/org/apache/jetspeed/cache/impl/JetspeedCacheKeyGenerator.java (作業コピー)
+@@ -17,7 +17,6 @@
+
+ package org.apache.jetspeed.cache.impl;
+
+-import java.util.Iterator;
+ import java.util.List;
+
+ import org.apache.jetspeed.cache.ContentCacheKey;
Added: pal-portal/trunk/portal/patches/components/page-manager/src/java/org/apache/jetspeed/page/document/psml/CastorFileSystemDocumentHandler.java
===================================================================
--- pal-portal/trunk/portal/patches/components/page-manager/src/java/org/apache/jetspeed/page/document/psml/CastorFileSystemDocumentHandler.java (rev 0)
+++ pal-portal/trunk/portal/patches/components/page-manager/src/java/org/apache/jetspeed/page/document/psml/CastorFileSystemDocumentHandler.java 2008-04-30 05:09:48 UTC (rev 899)
@@ -0,0 +1,12 @@
+Index: components/page-manager/src/java/org/apache/jetspeed/page/document/psml/CastorFileSystemDocumentHandler.java
+===================================================================
+--- components/page-manager/src/java/org/apache/jetspeed/page/document/psml/CastorFileSystemDocumentHandler.java (リビジョン 648465)
++++ components/page-manager/src/java/org/apache/jetspeed/page/document/psml/CastorFileSystemDocumentHandler.java (作業コピー)
+@@ -35,7 +35,6 @@
+ 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.om.common.SecurityConstraints;
+ import org.apache.jetspeed.om.folder.psml.FolderImpl;
+ import org.apache.jetspeed.om.page.Document;
+ import org.apache.jetspeed.om.page.psml.AbstractBaseElement;
Added: pal-portal/trunk/portal/patches/components/page-manager/src/test/org/apache/jetspeed/page/DirectoryXMLTransform.java
===================================================================
--- pal-portal/trunk/portal/patches/components/page-manager/src/test/org/apache/jetspeed/page/DirectoryXMLTransform.java (rev 0)
+++ pal-portal/trunk/portal/patches/components/page-manager/src/test/org/apache/jetspeed/page/DirectoryXMLTransform.java 2008-04-30 05:09:48 UTC (rev 899)
@@ -0,0 +1,12 @@
+Index: components/page-manager/src/test/org/apache/jetspeed/page/DirectoryXMLTransform.java
+===================================================================
+--- components/page-manager/src/test/org/apache/jetspeed/page/DirectoryXMLTransform.java (リビジョン 648465)
++++ components/page-manager/src/test/org/apache/jetspeed/page/DirectoryXMLTransform.java (作業コピー)
+@@ -25,7 +25,6 @@
+ import java.io.InputStream;
+ import java.io.Writer;
+ import java.nio.channels.FileChannel;
+-import java.util.Iterator;
+ import java.util.Map;
+
+ import javax.xml.parsers.SAXParserFactory;
Added: pal-portal/trunk/portal/patches/components/portal/src/java/org/apache/jetspeed/capabilities/impl/CapabilityCustomizerValveImpl.java
===================================================================
--- pal-portal/trunk/portal/patches/components/portal/src/java/org/apache/jetspeed/capabilities/impl/CapabilityCustomizerValveImpl.java (rev 0)
+++ pal-portal/trunk/portal/patches/components/portal/src/java/org/apache/jetspeed/capabilities/impl/CapabilityCustomizerValveImpl.java 2008-04-30 05:09:48 UTC (rev 899)
@@ -0,0 +1,12 @@
+Index: components/portal/src/java/org/apache/jetspeed/capabilities/impl/CapabilityCustomizerValveImpl.java
+===================================================================
+--- components/portal/src/java/org/apache/jetspeed/capabilities/impl/CapabilityCustomizerValveImpl.java (リビジョン 648465)
++++ components/portal/src/java/org/apache/jetspeed/capabilities/impl/CapabilityCustomizerValveImpl.java (作業コピー)
+@@ -18,7 +18,6 @@
+ package org.apache.jetspeed.capabilities.impl;
+
+ import java.util.Map;
+-import java.util.Iterator;
+
+ import org.apache.commons.logging.Log;
+ import org.apache.commons.logging.LogFactory;
Added: pal-portal/trunk/portal/patches/components/portal/src/java/org/apache/jetspeed/container/ContainerValve.java
===================================================================
--- pal-portal/trunk/portal/patches/components/portal/src/java/org/apache/jetspeed/container/ContainerValve.java (rev 0)
+++ pal-portal/trunk/portal/patches/components/portal/src/java/org/apache/jetspeed/container/ContainerValve.java 2008-04-30 05:09:48 UTC (rev 899)
@@ -0,0 +1,12 @@
+Index: components/portal/src/java/org/apache/jetspeed/container/ContainerValve.java
+===================================================================
+--- components/portal/src/java/org/apache/jetspeed/container/ContainerValve.java (リビジョン 648465)
++++ components/portal/src/java/org/apache/jetspeed/container/ContainerValve.java (作業コピー)
+@@ -21,7 +21,6 @@
+ import org.apache.jetspeed.request.RequestContext;
+ import org.apache.jetspeed.container.state.MutableNavigationalState;
+ import org.apache.jetspeed.om.page.Page;
+-import org.apache.jetspeed.om.common.portlet.MutablePortletEntity;
+ import org.apache.jetspeed.om.window.impl.PortletWindowImpl;
+ import org.apache.jetspeed.pipeline.PipelineException;
+ import org.apache.jetspeed.pipeline.valve.AbstractValve;
Added: pal-portal/trunk/portal/patches/components/portal/src/java/org/apache/jetspeed/decoration/AbstractDecoratorActionsFactory.java
===================================================================
--- pal-portal/trunk/portal/patches/components/portal/src/java/org/apache/jetspeed/decoration/AbstractDecoratorActionsFactory.java (rev 0)
+++ pal-portal/trunk/portal/patches/components/portal/src/java/org/apache/jetspeed/decoration/AbstractDecoratorActionsFactory.java 2008-04-30 05:09:48 UTC (rev 899)
@@ -0,0 +1,13 @@
+Index: components/portal/src/java/org/apache/jetspeed/decoration/AbstractDecoratorActionsFactory.java
+===================================================================
+--- components/portal/src/java/org/apache/jetspeed/decoration/AbstractDecoratorActionsFactory.java (リビジョン 648465)
++++ components/portal/src/java/org/apache/jetspeed/decoration/AbstractDecoratorActionsFactory.java (作業コピー)
+@@ -20,8 +20,6 @@
+ import java.util.HashMap;
+ import java.util.Iterator;
+ import java.util.List;
+-import java.util.Locale;
+-import java.util.MissingResourceException;
+ import java.util.ResourceBundle;
+
+ import javax.portlet.PortletMode;
Added: pal-portal/trunk/portal/patches/components/portal/src/java/org/apache/jetspeed/decoration/DecorationValve.java
===================================================================
--- pal-portal/trunk/portal/patches/components/portal/src/java/org/apache/jetspeed/decoration/DecorationValve.java (rev 0)
+++ pal-portal/trunk/portal/patches/components/portal/src/java/org/apache/jetspeed/decoration/DecorationValve.java 2008-04-30 05:09:48 UTC (rev 899)
@@ -0,0 +1,12 @@
+Index: components/portal/src/java/org/apache/jetspeed/decoration/DecorationValve.java
+===================================================================
+--- components/portal/src/java/org/apache/jetspeed/decoration/DecorationValve.java (リビジョン 648465)
++++ components/portal/src/java/org/apache/jetspeed/decoration/DecorationValve.java (作業コピー)
+@@ -43,7 +43,6 @@
+ import org.apache.jetspeed.om.page.ContentFragment;
+ import org.apache.jetspeed.om.page.ContentPage;
+ import org.apache.jetspeed.om.page.Fragment;
+-import org.apache.jetspeed.om.page.Page;
+ import org.apache.jetspeed.pipeline.PipelineException;
+ import org.apache.jetspeed.pipeline.valve.AbstractValve;
+ import org.apache.jetspeed.pipeline.valve.Valve;
Added: pal-portal/trunk/portal/patches/components/portal/src/java/org/apache/jetspeed/engine/servlet/ServletRequestImpl.java
===================================================================
--- pal-portal/trunk/portal/patches/components/portal/src/java/org/apache/jetspeed/engine/servlet/ServletRequestImpl.java (rev 0)
+++ pal-portal/trunk/portal/patches/components/portal/src/java/org/apache/jetspeed/engine/servlet/ServletRequestImpl.java 2008-04-30 05:09:48 UTC (rev 899)
@@ -0,0 +1,12 @@
+Index: components/portal/src/java/org/apache/jetspeed/engine/servlet/ServletRequestImpl.java
+===================================================================
+--- components/portal/src/java/org/apache/jetspeed/engine/servlet/ServletRequestImpl.java (リビジョン 648465)
++++ components/portal/src/java/org/apache/jetspeed/engine/servlet/ServletRequestImpl.java (作業コピー)
+@@ -44,7 +44,6 @@
+ import org.apache.jetspeed.container.namespace.JetspeedNamespaceMapper;
+ import org.apache.jetspeed.container.namespace.JetspeedNamespaceMapperFactory;
+ import org.apache.jetspeed.container.state.NavigationalState;
+-import org.apache.jetspeed.container.url.PortalURL;
+ import org.apache.jetspeed.om.common.GenericMetadata;
+ import org.apache.jetspeed.om.common.LocalizedField;
+ import org.apache.jetspeed.om.common.portlet.PortletDefinitionComposite;
Added: pal-portal/trunk/portal/patches/components/portal/src/java/org/apache/jetspeed/layout/impl/BasePortletAction.java
===================================================================
--- pal-portal/trunk/portal/patches/components/portal/src/java/org/apache/jetspeed/layout/impl/BasePortletAction.java (rev 0)
+++ pal-portal/trunk/portal/patches/components/portal/src/java/org/apache/jetspeed/layout/impl/BasePortletAction.java 2008-04-30 05:09:48 UTC (rev 899)
@@ -0,0 +1,12 @@
+Index: components/portal/src/java/org/apache/jetspeed/layout/impl/BasePortletAction.java
+===================================================================
+--- components/portal/src/java/org/apache/jetspeed/layout/impl/BasePortletAction.java (リビジョン 648465)
++++ components/portal/src/java/org/apache/jetspeed/layout/impl/BasePortletAction.java (作業コピー)
+@@ -17,7 +17,6 @@
+ package org.apache.jetspeed.layout.impl;
+
+ import java.util.Iterator;
+-import java.util.List;
+ import java.util.Map;
+
+ import org.apache.commons.logging.Log;
Added: pal-portal/trunk/portal/patches/components/portal/src/java/org/apache/jetspeed/layout/impl/BaseUserAction.java
===================================================================
--- pal-portal/trunk/portal/patches/components/portal/src/java/org/apache/jetspeed/layout/impl/BaseUserAction.java (rev 0)
+++ pal-portal/trunk/portal/patches/components/portal/src/java/org/apache/jetspeed/layout/impl/BaseUserAction.java 2008-04-30 05:09:48 UTC (rev 899)
@@ -0,0 +1,15 @@
+Index: components/portal/src/java/org/apache/jetspeed/layout/impl/BaseUserAction.java
+===================================================================
+--- components/portal/src/java/org/apache/jetspeed/layout/impl/BaseUserAction.java (リビジョン 648465)
++++ components/portal/src/java/org/apache/jetspeed/layout/impl/BaseUserAction.java (作業コピー)
+@@ -25,10 +25,8 @@
+ import org.apache.jetspeed.ajax.AJAXException;
+ import org.apache.jetspeed.ajax.AjaxAction;
+ import org.apache.jetspeed.ajax.AjaxBuilder;
+-import org.apache.jetspeed.layout.PortletActionSecurityBehavior;
+ import org.apache.jetspeed.om.page.Fragment;
+ import org.apache.jetspeed.om.page.Page;
+-import org.apache.jetspeed.page.PageManager;
+ import org.apache.jetspeed.request.RequestContext;
+ import org.apache.jetspeed.security.UserManager;
+
Added: pal-portal/trunk/portal/patches/components/portal/src/java/org/apache/jetspeed/layout/impl/GetPageAction.java
===================================================================
--- pal-portal/trunk/portal/patches/components/portal/src/java/org/apache/jetspeed/layout/impl/GetPageAction.java (rev 0)
+++ pal-portal/trunk/portal/patches/components/portal/src/java/org/apache/jetspeed/layout/impl/GetPageAction.java 2008-04-30 05:09:48 UTC (rev 899)
@@ -0,0 +1,15 @@
+Index: components/portal/src/java/org/apache/jetspeed/layout/impl/GetPageAction.java
+===================================================================
+--- components/portal/src/java/org/apache/jetspeed/layout/impl/GetPageAction.java (リビジョン 648465)
++++ components/portal/src/java/org/apache/jetspeed/layout/impl/GetPageAction.java (作業コピー)
+@@ -21,10 +21,6 @@
+ import java.util.List;
+ import java.util.Map;
+
+-import java.io.UnsupportedEncodingException;
+-import java.security.MessageDigest;
+-import java.security.NoSuchAlgorithmException;
+-
+ import org.apache.commons.logging.Log;
+ import org.apache.commons.logging.LogFactory;
+ import org.apache.jetspeed.JetspeedActions;
Added: pal-portal/trunk/portal/patches/components/portal/src/java/org/apache/jetspeed/layout/impl/GetUserInformationAction.java
===================================================================
--- pal-portal/trunk/portal/patches/components/portal/src/java/org/apache/jetspeed/layout/impl/GetUserInformationAction.java (rev 0)
+++ pal-portal/trunk/portal/patches/components/portal/src/java/org/apache/jetspeed/layout/impl/GetUserInformationAction.java 2008-04-30 05:09:48 UTC (rev 899)
@@ -0,0 +1,17 @@
+Index: components/portal/src/java/org/apache/jetspeed/layout/impl/GetUserInformationAction.java
+===================================================================
+--- components/portal/src/java/org/apache/jetspeed/layout/impl/GetUserInformationAction.java (リビジョン 648465)
++++ components/portal/src/java/org/apache/jetspeed/layout/impl/GetUserInformationAction.java (作業コピー)
+@@ -28,12 +28,9 @@
+
+ import org.apache.commons.logging.Log;
+ import org.apache.commons.logging.LogFactory;
+-import org.apache.jetspeed.Jetspeed;
+-import org.apache.jetspeed.administration.PortalConfiguration;
+ import org.apache.jetspeed.ajax.AJAXException;
+ import org.apache.jetspeed.ajax.AjaxAction;
+ import org.apache.jetspeed.ajax.AjaxBuilder;
+-import org.apache.jetspeed.layout.PortletActionSecurityBehavior;
+ import org.apache.jetspeed.request.RequestContext;
+ import org.apache.jetspeed.security.RolePrincipal;
+ import org.apache.jetspeed.security.User;
Added: pal-portal/trunk/portal/patches/components/portal/src/java/org/apache/jetspeed/layout/impl/MovePortletAction.java
===================================================================
--- pal-portal/trunk/portal/patches/components/portal/src/java/org/apache/jetspeed/layout/impl/MovePortletAction.java (rev 0)
+++ pal-portal/trunk/portal/patches/components/portal/src/java/org/apache/jetspeed/layout/impl/MovePortletAction.java 2008-04-30 05:09:48 UTC (rev 899)
@@ -0,0 +1,34 @@
+Index: components/portal/src/java/org/apache/jetspeed/layout/impl/MovePortletAction.java
+===================================================================
+--- components/portal/src/java/org/apache/jetspeed/layout/impl/MovePortletAction.java (リビジョン 648465)
++++ components/portal/src/java/org/apache/jetspeed/layout/impl/MovePortletAction.java (作業コピー)
+@@ -16,16 +16,12 @@
+ */
+ package org.apache.jetspeed.layout.impl;
+
+-import java.security.Principal;
+ import java.util.Map;
+ import java.util.Iterator;
+
+-import javax.security.auth.Subject;
+-
+ import org.apache.commons.logging.Log;
+ import org.apache.commons.logging.LogFactory;
+ import org.apache.jetspeed.JetspeedActions;
+-import org.apache.jetspeed.administration.PortalConfiguration;
+ import org.apache.jetspeed.ajax.AJAXException;
+ import org.apache.jetspeed.ajax.AjaxAction;
+ import org.apache.jetspeed.ajax.AjaxBuilder;
+@@ -38,12 +34,7 @@
+ import org.apache.jetspeed.om.page.Page;
+ import org.apache.jetspeed.page.PageManager;
+ import org.apache.jetspeed.page.document.NodeException;
+-import org.apache.jetspeed.portalsite.PortalSiteRequestContext;
+-import org.apache.jetspeed.profiler.impl.ProfilerValveImpl;
+ import org.apache.jetspeed.request.RequestContext;
+-import org.apache.jetspeed.security.RolePrincipal;
+-import org.apache.jetspeed.security.impl.RolePrincipalImpl;
+-import org.apache.jetspeed.Jetspeed;
+
+ /**
+ * Move Portlet portlet placement action
Added: pal-portal/trunk/portal/patches/components/portal/src/java/org/apache/jetspeed/layout/impl/PortletPlacementContextImpl.java
===================================================================
--- pal-portal/trunk/portal/patches/components/portal/src/java/org/apache/jetspeed/layout/impl/PortletPlacementContextImpl.java (rev 0)
+++ pal-portal/trunk/portal/patches/components/portal/src/java/org/apache/jetspeed/layout/impl/PortletPlacementContextImpl.java 2008-04-30 05:09:48 UTC (rev 899)
@@ -0,0 +1,15 @@
+Index: components/portal/src/java/org/apache/jetspeed/layout/impl/PortletPlacementContextImpl.java
+===================================================================
+--- components/portal/src/java/org/apache/jetspeed/layout/impl/PortletPlacementContextImpl.java (リビジョン 648465)
++++ components/portal/src/java/org/apache/jetspeed/layout/impl/PortletPlacementContextImpl.java (作業コピー)
+@@ -20,10 +20,7 @@
+ import java.util.Iterator;
+ import java.util.List;
+ import java.util.ArrayList;
+-import java.util.Set;
+ import java.util.Map;
+-import java.util.Collections;
+-import java.util.Comparator;
+
+ import org.apache.commons.logging.Log;
+ import org.apache.commons.logging.LogFactory;
Added: pal-portal/trunk/portal/patches/components/portal/src/java/org/apache/jetspeed/tools/pamanager/VersionedPortletApplicationManager.java
===================================================================
--- pal-portal/trunk/portal/patches/components/portal/src/java/org/apache/jetspeed/tools/pamanager/VersionedPortletApplicationManager.java (rev 0)
+++ pal-portal/trunk/portal/patches/components/portal/src/java/org/apache/jetspeed/tools/pamanager/VersionedPortletApplicationManager.java 2008-04-30 05:09:48 UTC (rev 899)
@@ -0,0 +1,20 @@
+Index: components/portal/src/java/org/apache/jetspeed/tools/pamanager/VersionedPortletApplicationManager.java
+===================================================================
+--- components/portal/src/java/org/apache/jetspeed/tools/pamanager/VersionedPortletApplicationManager.java (リビジョン 648465)
++++ components/portal/src/java/org/apache/jetspeed/tools/pamanager/VersionedPortletApplicationManager.java (作業コピー)
+@@ -16,7 +16,6 @@
+ */
+ package org.apache.jetspeed.tools.pamanager;
+
+-import java.io.File;
+ import java.io.IOException;
+ import java.util.Collection;
+ import java.util.Iterator;
+@@ -34,7 +33,6 @@
+ import org.apache.jetspeed.search.SearchEngine;
+ import org.apache.jetspeed.security.PermissionManager;
+ import org.apache.jetspeed.security.RoleManager;
+-import org.apache.jetspeed.util.DirectoryHelper;
+ import org.apache.jetspeed.util.FileSystemHelper;
+ import org.apache.jetspeed.util.descriptor.PortletApplicationWar;
+
Added: pal-portal/trunk/portal/patches/jetspeed-api/src/java/org/apache/jetspeed/aggregator/WorkerMonitor.java
===================================================================
--- pal-portal/trunk/portal/patches/jetspeed-api/src/java/org/apache/jetspeed/aggregator/WorkerMonitor.java (rev 0)
+++ pal-portal/trunk/portal/patches/jetspeed-api/src/java/org/apache/jetspeed/aggregator/WorkerMonitor.java 2008-04-30 05:09:48 UTC (rev 899)
@@ -0,0 +1,13 @@
+Index: jetspeed-api/src/java/org/apache/jetspeed/aggregator/WorkerMonitor.java
+===================================================================
+--- jetspeed-api/src/java/org/apache/jetspeed/aggregator/WorkerMonitor.java (リビジョン 648465)
++++ jetspeed-api/src/java/org/apache/jetspeed/aggregator/WorkerMonitor.java (作業コピー)
+@@ -18,8 +18,6 @@
+
+ import java.util.List;
+
+-import org.apache.jetspeed.util.Queue;
+-
+ /**
+ * The Worker Monitor is a thread manager and monitor for async portlet aggregation
+ * and rendering.