You are viewing a plain text version of this content. The canonical link for it is here.
Posted to pluto-scm@portals.apache.org by dd...@apache.org on 2008/04/11 13:58:19 UTC
svn commit: r647131 [2/2] - in /portals/pluto/branches/2.0-spi-refactoring:
maven-pluto-plugin/src/main/java/org/apache/pluto/maven/
pluto-ant-tasks/src/main/java/org/apache/pluto/ant/
pluto-container/src/main/java/org/apache/pluto/ pluto-container/src...
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/services/PortletAppDescriptorService.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/services/PortletAppDescriptorService.java?rev=647131&r1=647130&r2=647131&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/services/PortletAppDescriptorService.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/services/PortletAppDescriptorService.java Fri Apr 11 04:57:21 2008
@@ -16,12 +16,11 @@
package org.apache.pluto.descriptors.services;
-import org.apache.pluto.descriptors.portlet.PortletAppDD;
-import org.apache.pluto.om.portlet.PortletApp;
-
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
+
+import org.apache.pluto.om.portlet.PortletApp;
/**
* Read/Write services for Portlet Application configuration
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/services/WebAppDescriptorService.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/services/WebAppDescriptorService.java?rev=647131&r1=647130&r2=647131&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/services/WebAppDescriptorService.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/services/WebAppDescriptorService.java Fri Apr 11 04:57:21 2008
@@ -15,11 +15,11 @@
*/
package org.apache.pluto.descriptors.services;
-import org.apache.pluto.om.servlet.WebApp;
-
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
+
+import org.apache.pluto.om.servlet.WebApp;
/**
* WebApplication configuration as contained
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/servlet/FilterDD.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/servlet/FilterDD.java?rev=647131&r1=647130&r2=647131&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/servlet/FilterDD.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/servlet/FilterDD.java Fri Apr 11 04:57:21 2008
@@ -16,10 +16,10 @@
*/
package org.apache.pluto.descriptors.servlet;
+import java.util.List;
+
import org.apache.pluto.om.common.Icon;
import org.apache.pluto.om.servlet.Filter;
-
-import java.util.List;
/**
* Filter DD() uration as contained within the
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/servlet/SecurityConstraintDD.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/servlet/SecurityConstraintDD.java?rev=647131&r1=647130&r2=647131&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/servlet/SecurityConstraintDD.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/servlet/SecurityConstraintDD.java Fri Apr 11 04:57:21 2008
@@ -16,11 +16,11 @@
*/
package org.apache.pluto.descriptors.servlet;
+import java.util.List;
+
import org.apache.pluto.om.common.UserDataConstraint;
import org.apache.pluto.om.servlet.AuthConstraint;
import org.apache.pluto.om.servlet.SecurityConstraint;
-
-import java.util.List;
/**
* <B>TODO</B>: Document
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/servlet/ServletDD.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/servlet/ServletDD.java?rev=647131&r1=647130&r2=647131&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/servlet/ServletDD.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/servlet/ServletDD.java Fri Apr 11 04:57:21 2008
@@ -16,12 +16,12 @@
*/
package org.apache.pluto.descriptors.servlet;
+import java.util.ArrayList;
+import java.util.List;
+
import org.apache.pluto.om.common.Icon;
import org.apache.pluto.om.servlet.LoadOnStartup;
import org.apache.pluto.om.servlet.Servlet;
-
-import java.util.ArrayList;
-import java.util.List;
/**
* Filter DD() uration as contained within the
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/servlet/WebAppDD.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/servlet/WebAppDD.java?rev=647131&r1=647130&r2=647131&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/servlet/WebAppDD.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/servlet/WebAppDD.java Fri Apr 11 04:57:21 2008
@@ -16,6 +16,10 @@
*/
package org.apache.pluto.descriptors.servlet;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
import org.apache.pluto.om.common.Icon;
import org.apache.pluto.om.servlet.Distributable;
import org.apache.pluto.om.servlet.LoginConfig;
@@ -24,10 +28,6 @@
import org.apache.pluto.om.servlet.SessionConfig;
import org.apache.pluto.om.servlet.WebApp;
import org.apache.pluto.om.servlet.WelcomeFileList;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
/**
* WebApplication configuration as contained
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/servlet/WebResourceCollectionDD.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/servlet/WebResourceCollectionDD.java?rev=647131&r1=647130&r2=647131&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/servlet/WebResourceCollectionDD.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/servlet/WebResourceCollectionDD.java Fri Apr 11 04:57:21 2008
@@ -16,8 +16,8 @@
*/
package org.apache.pluto.descriptors.servlet;
-import java.util.List;
import java.util.ArrayList;
+import java.util.List;
import org.apache.pluto.om.servlet.WebResourceCollection;
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-impl/src/main/java/org/apache/pluto/descriptors/services/castor/DistributableCastorFieldHandler.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-impl/src/main/java/org/apache/pluto/descriptors/services/castor/DistributableCastorFieldHandler.java?rev=647131&r1=647130&r2=647131&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-impl/src/main/java/org/apache/pluto/descriptors/services/castor/DistributableCastorFieldHandler.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-impl/src/main/java/org/apache/pluto/descriptors/services/castor/DistributableCastorFieldHandler.java Fri Apr 11 04:57:21 2008
@@ -16,7 +16,6 @@
*/
package org.apache.pluto.descriptors.services.castor;
-import org.apache.pluto.descriptors.servlet.DistributableDD;
import org.apache.pluto.om.servlet.Distributable;
import org.exolab.castor.mapping.AbstractFieldHandler;
@@ -52,9 +51,9 @@
public void setValue(Object distributableDD, Object value)
throws IllegalStateException, IllegalArgumentException
{
- if (! (distributableDD instanceof DistributableDD) )
+ if (! (distributableDD instanceof Distributable) )
{
- throw new ClassCastException("Error: was expecting " + DistributableDD.class.getName() +
+ throw new ClassCastException("Error: was expecting " + Distributable.class.getName() +
" but got a " + distributableDD.getClass().getName() );
}
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-impl/src/main/java/org/apache/pluto/descriptors/services/castor/DistributableDDCastorFieldHandler.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-impl/src/main/java/org/apache/pluto/descriptors/services/castor/DistributableDDCastorFieldHandler.java?rev=647131&r1=647130&r2=647131&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-impl/src/main/java/org/apache/pluto/descriptors/services/castor/DistributableDDCastorFieldHandler.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-impl/src/main/java/org/apache/pluto/descriptors/services/castor/DistributableDDCastorFieldHandler.java Fri Apr 11 04:57:21 2008
@@ -16,8 +16,6 @@
*/
package org.apache.pluto.descriptors.services.castor;
-import org.apache.pluto.descriptors.servlet.DistributableDD;
-import org.apache.pluto.descriptors.servlet.WebAppDD;
import org.apache.pluto.om.servlet.Distributable;
import org.apache.pluto.om.servlet.WebApp;
import org.exolab.castor.mapping.AbstractFieldHandler;
@@ -27,9 +25,9 @@
public Object getValue(Object webAppDD) throws IllegalStateException
{
- if (! ( webAppDD instanceof WebAppDD ) )
+ if (! ( webAppDD instanceof WebApp ) )
{
- throw new ClassCastException("Error: was expecting a " + WebAppDD.class.getName() +
+ throw new ClassCastException("Error: was expecting a " + WebApp.class.getName() +
" but got a " + webAppDD.getClass().getName());
}
@@ -68,14 +66,14 @@
public void setValue(Object webAppDD, Object distributableDD)
throws IllegalStateException, IllegalArgumentException
{
- if (! ( webAppDD instanceof WebAppDD ) )
+ if (! ( webAppDD instanceof WebApp ) )
{
- throw new ClassCastException("Error: was expecting a " + WebAppDD.class.getName() +
+ throw new ClassCastException("Error: was expecting a " + WebApp.class.getName() +
" but got a " + webAppDD.getClass().getName());
}
- if (! ( distributableDD instanceof DistributableDD ) )
+ if (! ( distributableDD instanceof Distributable ) )
{
- throw new ClassCastException("Error: was expecting a " + DistributableDD.class.getName() +
+ throw new ClassCastException("Error: was expecting a " + Distributable.class.getName() +
" but got a " + distributableDD.getClass().getName());
}
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-impl/src/main/java/org/apache/pluto/descriptors/services/castor/EntityResolverImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-impl/src/main/java/org/apache/pluto/descriptors/services/castor/EntityResolverImpl.java?rev=647131&r1=647130&r2=647131&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-impl/src/main/java/org/apache/pluto/descriptors/services/castor/EntityResolverImpl.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-impl/src/main/java/org/apache/pluto/descriptors/services/castor/EntityResolverImpl.java Fri Apr 11 04:57:21 2008
@@ -16,12 +16,12 @@
*/
package org.apache.pluto.descriptors.services.castor;
+import java.io.IOException;
+import java.io.InputStream;
+
import org.xml.sax.EntityResolver;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
-
-import java.io.IOException;
-import java.io.InputStream;
/**
* Entity Resolver which first looks for dtd and xls
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-impl/src/main/java/org/apache/pluto/descriptors/services/castor/PortletAppDescriptorServiceImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-impl/src/main/java/org/apache/pluto/descriptors/services/castor/PortletAppDescriptorServiceImpl.java?rev=647131&r1=647130&r2=647131&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-impl/src/main/java/org/apache/pluto/descriptors/services/castor/PortletAppDescriptorServiceImpl.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-impl/src/main/java/org/apache/pluto/descriptors/services/castor/PortletAppDescriptorServiceImpl.java Fri Apr 11 04:57:21 2008
@@ -16,18 +16,17 @@
*/
package org.apache.pluto.descriptors.services.castor;
-import org.apache.pluto.descriptors.portlet.PortletAppDD;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.URL;
+
import org.apache.pluto.descriptors.services.Constants;
import org.apache.pluto.descriptors.services.PortletAppDescriptorService;
import org.apache.pluto.om.portlet.PortletApp;
import org.exolab.castor.mapping.Mapping;
import org.exolab.castor.mapping.MappingException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.URL;
-
/**
* Abstract Implementation of the Web Application Deployment
* Descriptor service. Provides default implementation of
@@ -50,9 +49,9 @@
* @return WebAppDD instance representing the descriptor.
* @throws java.io.IOException
*/
- public PortletAppDD read(InputStream in) throws IOException {
- PortletAppDD portlet =
- (PortletAppDD) readInternal(in);
+ public PortletApp read(InputStream in) throws IOException {
+ PortletApp portlet =
+ (PortletApp) readInternal(in);
return portlet;
}
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-impl/src/main/java/org/apache/pluto/descriptors/services/castor/ServletVersionCastorFieldHandler.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-impl/src/main/java/org/apache/pluto/descriptors/services/castor/ServletVersionCastorFieldHandler.java?rev=647131&r1=647130&r2=647131&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-impl/src/main/java/org/apache/pluto/descriptors/services/castor/ServletVersionCastorFieldHandler.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-impl/src/main/java/org/apache/pluto/descriptors/services/castor/ServletVersionCastorFieldHandler.java Fri Apr 11 04:57:21 2008
@@ -16,7 +16,6 @@
*/
package org.apache.pluto.descriptors.services.castor;
-import org.apache.pluto.descriptors.servlet.WebAppDD;
import org.apache.pluto.om.servlet.WebApp;
import org.exolab.castor.mapping.AbstractFieldHandler;
@@ -35,10 +34,10 @@
public Object getValue(Object webAppDD) throws IllegalStateException
{
- if (! ( webAppDD instanceof WebAppDD ) )
+ if (! ( webAppDD instanceof WebApp ) )
{
throw new ClassCastException( "Error: was expecting a " +
- WebAppDD.class.getName() + " but received a " + webAppDD.getClass().getName() );
+ WebApp.class.getName() + " but received a " + webAppDD.getClass().getName() );
}
String servletVersion = ((WebApp)webAppDD).getServletVersion();
@@ -77,10 +76,10 @@
public void setValue(Object webAppDD, Object servletVersionValue)
throws IllegalStateException, IllegalArgumentException
{
- if (! ( webAppDD instanceof WebAppDD ) )
+ if (! ( webAppDD instanceof WebApp ) )
{
throw new ClassCastException( "Error: was expecting a " +
- WebAppDD.class.getName() + " but received a " + webAppDD.getClass().getName() );
+ WebApp.class.getName() + " but received a " + webAppDD.getClass().getName() );
}
if (! ( servletVersionValue instanceof String) )
{
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-impl/src/main/java/org/apache/pluto/descriptors/services/castor/WebAppDescriptorServiceImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-impl/src/main/java/org/apache/pluto/descriptors/services/castor/WebAppDescriptorServiceImpl.java?rev=647131&r1=647130&r2=647131&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-impl/src/main/java/org/apache/pluto/descriptors/services/castor/WebAppDescriptorServiceImpl.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-impl/src/main/java/org/apache/pluto/descriptors/services/castor/WebAppDescriptorServiceImpl.java Fri Apr 11 04:57:21 2008
@@ -16,17 +16,17 @@
*/
package org.apache.pluto.descriptors.services.castor;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.URL;
+
import org.apache.pluto.descriptors.services.Constants;
import org.apache.pluto.descriptors.services.WebAppDescriptorService;
import org.apache.pluto.om.servlet.WebApp;
import org.exolab.castor.mapping.Mapping;
import org.exolab.castor.mapping.MappingException;
import org.exolab.castor.xml.Marshaller;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.URL;
/**
* Abstract Implementation of the Web Application Deployment
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-impl/src/main/java/org/apache/pluto/descriptors/services/jaxb/PortletAppDescriptorServiceImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-impl/src/main/java/org/apache/pluto/descriptors/services/jaxb/PortletAppDescriptorServiceImpl.java?rev=647131&r1=647130&r2=647131&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-impl/src/main/java/org/apache/pluto/descriptors/services/jaxb/PortletAppDescriptorServiceImpl.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-impl/src/main/java/org/apache/pluto/descriptors/services/jaxb/PortletAppDescriptorServiceImpl.java Fri Apr 11 04:57:21 2008
@@ -9,7 +9,6 @@
import javax.xml.bind.JAXBException;
import javax.xml.bind.Unmarshaller;
-import org.apache.pluto.descriptors.portlet.PortletAppDD;
import org.apache.pluto.descriptors.services.PortletAppDescriptorService;
import org.apache.pluto.om.portlet.PortletApp;
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-impl/src/test/java/org/apache/pluto/descriptors/services/castor/WebAppDescriptorServiceImplTest.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-impl/src/test/java/org/apache/pluto/descriptors/services/castor/WebAppDescriptorServiceImplTest.java?rev=647131&r1=647130&r2=647131&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-impl/src/test/java/org/apache/pluto/descriptors/services/castor/WebAppDescriptorServiceImplTest.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-impl/src/test/java/org/apache/pluto/descriptors/services/castor/WebAppDescriptorServiceImplTest.java Fri Apr 11 04:57:21 2008
@@ -15,12 +15,12 @@
*/
package org.apache.pluto.descriptors.services.castor;
-import junit.framework.TestCase;
-import junit.framework.Assert;
-
import java.io.ByteArrayInputStream;
-import java.io.InputStream;
import java.io.IOException;
+import java.io.InputStream;
+
+import junit.framework.Assert;
+import junit.framework.TestCase;
import org.apache.pluto.om.servlet.WebApp;
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/config/impl/AdminConfigurationImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/config/impl/AdminConfigurationImpl.java?rev=647131&r1=647130&r2=647131&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/config/impl/AdminConfigurationImpl.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/config/impl/AdminConfigurationImpl.java Fri Apr 11 04:57:21 2008
@@ -16,11 +16,11 @@
*/
package org.apache.pluto.driver.config.impl;
-import org.apache.pluto.driver.services.portal.admin.RenderConfigAdminService;
-import org.apache.pluto.driver.services.portal.admin.PortletRegistryAdminService;
-import org.apache.pluto.driver.config.AdminConfiguration;
-
import javax.servlet.ServletContext;
+
+import org.apache.pluto.driver.config.AdminConfiguration;
+import org.apache.pluto.driver.services.portal.admin.PortletRegistryAdminService;
+import org.apache.pluto.driver.services.portal.admin.RenderConfigAdminService;
/**
*
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/ContainerServicesImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/ContainerServicesImpl.java?rev=647131&r1=647130&r2=647131&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/ContainerServicesImpl.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/ContainerServicesImpl.java Fri Apr 11 04:57:21 2008
@@ -24,11 +24,11 @@
import org.apache.pluto.spi.CCPPProfileService;
import org.apache.pluto.spi.PortalCallbackService;
import org.apache.pluto.spi.optional.PortalAdministrationService;
+import org.apache.pluto.spi.optional.PortletEnvironmentService;
import org.apache.pluto.spi.optional.PortletInfoService;
+import org.apache.pluto.spi.optional.PortletInvokerService;
import org.apache.pluto.spi.optional.PortletPreferencesService;
-import org.apache.pluto.spi.optional.PortletEnvironmentService;
import org.apache.pluto.spi.optional.PortletRegistryService;
-import org.apache.pluto.spi.optional.PortletInvokerService;
import org.apache.pluto.spi.optional.UserInfoService;
/**
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/EventProviderImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/EventProviderImpl.java?rev=647131&r1=647130&r2=647131&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/EventProviderImpl.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/EventProviderImpl.java Fri Apr 11 04:57:21 2008
@@ -47,7 +47,6 @@
import org.apache.pluto.PortletContainerException;
import org.apache.pluto.PortletWindow;
import org.apache.pluto.core.PortletContainerImpl;
-import org.apache.pluto.descriptors.portlet.PortletDD;
import org.apache.pluto.driver.AttributeKeys;
import org.apache.pluto.driver.config.DriverConfiguration;
import org.apache.pluto.driver.core.PortalRequestContext;
@@ -269,7 +268,7 @@
try {
portletAppDD = container
.getPortletApplicationDescriptor(contextPath);
- List<PortletDD> portletDDs = portletAppDD.getPortlets();
+ List<Portlet> portletDDs = portletAppDD.getPortlets();
List<QName> aliases = getAllAliases(eventName, portletAppDD);
for (Portlet portletDD : portletDDs) {
List<QName> processingEvents = portletDD
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/FilterConfigImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/FilterConfigImpl.java?rev=647131&r1=647130&r2=647131&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/FilterConfigImpl.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/FilterConfigImpl.java Fri Apr 11 04:57:21 2008
@@ -23,7 +23,6 @@
import javax.portlet.PortletContext;
import javax.portlet.filter.FilterConfig;
-import org.apache.pluto.descriptors.common.InitParamDD;
import org.apache.pluto.om.common.InitParam;
/**
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/PortletURLListenerImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/PortletURLListenerImpl.java?rev=647131&r1=647130&r2=647131&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/PortletURLListenerImpl.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/PortletURLListenerImpl.java Fri Apr 11 04:57:21 2008
@@ -26,7 +26,6 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.pluto.internal.InternalPortletWindow;
import org.apache.pluto.om.portlet.Listener;
import org.apache.pluto.om.portlet.PortletApp;
import org.apache.pluto.spi.PortletURLListener;
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/PortletURLProviderImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/PortletURLProviderImpl.java?rev=647131&r1=647130&r2=647131&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/PortletURLProviderImpl.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/PortletURLProviderImpl.java Fri Apr 11 04:57:21 2008
@@ -16,22 +16,18 @@
*/
package org.apache.pluto.driver.services.container;
-import java.util.Collection;
import java.util.Iterator;
import java.util.Map;
import javax.portlet.PortletMode;
-import javax.portlet.WindowState;
import javax.portlet.PortletSecurityException;
+import javax.portlet.WindowState;
import javax.servlet.http.HttpServletRequest;
import org.apache.pluto.PortletWindow;
-import org.apache.pluto.driver.url.PortalURLParameter;
-import org.apache.pluto.driver.url.PortalURL;
import org.apache.pluto.driver.core.PortalRequestContext;
import org.apache.pluto.driver.url.PortalURL;
import org.apache.pluto.driver.url.PortalURLParameter;
-import org.apache.pluto.driver.url.impl.PortalURLParserImpl;
import org.apache.pluto.spi.PortletURLProvider;
/**
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/PortletWindowThread.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/PortletWindowThread.java?rev=647131&r1=647130&r2=647131&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/PortletWindowThread.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/PortletWindowThread.java Fri Apr 11 04:57:21 2008
@@ -45,7 +45,6 @@
import org.apache.pluto.driver.AttributeKeys;
import org.apache.pluto.driver.core.PortalRequestContext;
import org.apache.pluto.driver.core.PortalServletRequest;
-import org.apache.pluto.internal.impl.ActionResponseImpl;
import org.apache.pluto.internal.impl.EventImpl;
import org.apache.pluto.om.portlet.EventDefinition;
import org.apache.pluto.om.portlet.PortletApp;
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/ResourceURLProviderImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/ResourceURLProviderImpl.java?rev=647131&r1=647130&r2=647131&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/ResourceURLProviderImpl.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/ResourceURLProviderImpl.java Fri Apr 11 04:57:21 2008
@@ -16,15 +16,9 @@
*/
package org.apache.pluto.driver.services.container;
-import java.net.MalformedURLException;
-import java.net.URL;
-
import javax.servlet.http.HttpServletRequest;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.pluto.PortletWindow;
-import org.apache.pluto.driver.core.PortalRequestContext;
import org.apache.pluto.spi.ResourceURLProvider;
public class ResourceURLProviderImpl implements ResourceURLProvider {
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/impl/resource/PropertyConfigServiceImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/impl/resource/PropertyConfigServiceImpl.java?rev=647131&r1=647130&r2=647131&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/impl/resource/PropertyConfigServiceImpl.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/impl/resource/PropertyConfigServiceImpl.java Fri Apr 11 04:57:21 2008
@@ -16,14 +16,15 @@
*/
package org.apache.pluto.driver.services.impl.resource;
+import java.io.InputStream;
+import java.util.Set;
+
+import javax.servlet.ServletContext;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.pluto.driver.config.DriverConfigurationException;
-import org.apache.pluto.driver.services.portal.*;
-
-import javax.servlet.ServletContext;
-import java.util.Set;
-import java.io.InputStream;
+import org.apache.pluto.driver.services.portal.PropertyConfigService;
/**
* Default implementation of all of the portal Services.
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/impl/resource/RenderConfigServiceImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/impl/resource/RenderConfigServiceImpl.java?rev=647131&r1=647130&r2=647131&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/impl/resource/RenderConfigServiceImpl.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/impl/resource/RenderConfigServiceImpl.java Fri Apr 11 04:57:21 2008
@@ -16,15 +16,16 @@
*/
package org.apache.pluto.driver.services.impl.resource;
+import java.io.InputStream;
+import java.util.List;
+import java.util.Set;
+
+import javax.servlet.ServletContext;
+
import org.apache.pluto.driver.config.DriverConfigurationException;
import org.apache.pluto.driver.services.portal.PageConfig;
import org.apache.pluto.driver.services.portal.RenderConfigService;
import org.apache.pluto.driver.services.portal.admin.RenderConfigAdminService;
-
-import javax.servlet.ServletContext;
-import java.util.List;
-import java.util.Set;
-import java.io.InputStream;
/**
* Default implementation of all of the portal Services.
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/impl/resource/ResourceConfigReader.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/impl/resource/ResourceConfigReader.java?rev=647131&r1=647130&r2=647131&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/impl/resource/ResourceConfigReader.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/impl/resource/ResourceConfigReader.java Fri Apr 11 04:57:21 2008
@@ -16,15 +16,15 @@
*/
package org.apache.pluto.driver.services.impl.resource;
+import java.io.IOException;
+import java.io.InputStream;
+
import org.apache.commons.digester.Digester;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.pluto.driver.services.portal.PageConfig;
import org.apache.pluto.driver.services.portal.RenderConfig;
import org.xml.sax.SAXException;
-
-import java.io.IOException;
-import java.io.InputStream;
/**
* @version 1.0
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/impl/resource/SupportedModesServiceImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/impl/resource/SupportedModesServiceImpl.java?rev=647131&r1=647130&r2=647131&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/impl/resource/SupportedModesServiceImpl.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/impl/resource/SupportedModesServiceImpl.java Fri Apr 11 04:57:21 2008
@@ -31,7 +31,6 @@
import org.apache.pluto.PortletContainerException;
import org.apache.pluto.driver.AttributeKeys;
import org.apache.pluto.driver.config.DriverConfigurationException;
-import org.apache.pluto.driver.services.container.FilterManagerImpl;
import org.apache.pluto.driver.services.portal.PortletApplicationConfig;
import org.apache.pluto.driver.services.portal.PortletWindowConfig;
import org.apache.pluto.driver.services.portal.PropertyConfigService;
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/impl/resource/SupportedWindowStateServiceImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/impl/resource/SupportedWindowStateServiceImpl.java?rev=647131&r1=647130&r2=647131&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/impl/resource/SupportedWindowStateServiceImpl.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/impl/resource/SupportedWindowStateServiceImpl.java Fri Apr 11 04:57:21 2008
@@ -29,7 +29,6 @@
import org.apache.pluto.PortletContainer;
import org.apache.pluto.PortletContainerException;
import org.apache.pluto.driver.AttributeKeys;
-import org.apache.pluto.driver.config.DriverConfiguration;
import org.apache.pluto.driver.config.DriverConfigurationException;
import org.apache.pluto.driver.services.portal.PortletWindowConfig;
import org.apache.pluto.driver.services.portal.PropertyConfigService;
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/url/impl/PortalURLImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/url/impl/PortalURLImpl.java?rev=647131&r1=647130&r2=647131&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/url/impl/PortalURLImpl.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/url/impl/PortalURLImpl.java Fri Apr 11 04:57:21 2008
@@ -16,29 +16,23 @@
*/
package org.apache.pluto.driver.url.impl;
-import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
import java.util.Map;
import javax.portlet.PortletMode;
import javax.portlet.WindowState;
import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.pluto.driver.AttributeKeys;
import org.apache.pluto.driver.config.DriverConfiguration;
-import org.apache.pluto.driver.services.container.EventProviderImpl;
import org.apache.pluto.driver.services.portal.PageConfig;
import org.apache.pluto.driver.url.PortalURL;
import org.apache.pluto.driver.url.PortalURLParameter;
-import org.apache.pluto.driver.url.PortalURLParser;
import org.apache.pluto.util.StringUtils;
/**
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver/src/main/java/org/apache/pluto/driver/PortalDriverFilter.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver/src/main/java/org/apache/pluto/driver/PortalDriverFilter.java?rev=647131&r1=647130&r2=647131&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver/src/main/java/org/apache/pluto/driver/PortalDriverFilter.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver/src/main/java/org/apache/pluto/driver/PortalDriverFilter.java Fri Apr 11 04:57:21 2008
@@ -16,14 +16,7 @@
*/
package org.apache.pluto.driver;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.pluto.PortletContainer;
-import org.apache.pluto.PortletContainerException;
-import org.apache.pluto.driver.core.PortalRequestContext;
-import org.apache.pluto.driver.core.PortletWindowImpl;
-import org.apache.pluto.driver.services.portal.PortletWindowConfig;
-import org.apache.pluto.driver.url.PortalURL;
+import java.io.IOException;
import javax.portlet.PortletException;
import javax.servlet.Filter;
@@ -35,7 +28,15 @@
import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.pluto.PortletContainer;
+import org.apache.pluto.PortletContainerException;
+import org.apache.pluto.driver.core.PortalRequestContext;
+import org.apache.pluto.driver.core.PortletWindowImpl;
+import org.apache.pluto.driver.services.portal.PortletWindowConfig;
+import org.apache.pluto.driver.url.PortalURL;
/**
* The controller filter used to drive static portlet pages.
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver/src/main/java/org/apache/pluto/driver/PublishServlet.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver/src/main/java/org/apache/pluto/driver/PublishServlet.java?rev=647131&r1=647130&r2=647131&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver/src/main/java/org/apache/pluto/driver/PublishServlet.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver/src/main/java/org/apache/pluto/driver/PublishServlet.java Fri Apr 11 04:57:21 2008
@@ -16,15 +16,16 @@
*/
package org.apache.pluto.driver;
-import org.apache.pluto.driver.services.portal.admin.DriverAdministrationException;
-import org.apache.pluto.driver.services.portal.admin.PortletRegistryAdminService;
-import org.apache.pluto.driver.config.AdminConfiguration;
+import java.io.IOException;
+import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import javax.servlet.ServletException;
-import java.io.IOException;
+
+import org.apache.pluto.driver.config.AdminConfiguration;
+import org.apache.pluto.driver.services.portal.admin.DriverAdministrationException;
+import org.apache.pluto.driver.services.portal.admin.PortletRegistryAdminService;
/**
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver/src/main/java/org/apache/pluto/driver/TCKDriverServlet.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver/src/main/java/org/apache/pluto/driver/TCKDriverServlet.java?rev=647131&r1=647130&r2=647131&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver/src/main/java/org/apache/pluto/driver/TCKDriverServlet.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver/src/main/java/org/apache/pluto/driver/TCKDriverServlet.java Fri Apr 11 04:57:21 2008
@@ -16,18 +16,19 @@
*/
package org.apache.pluto.driver;
-import org.apache.pluto.PortletContainer;
-import org.apache.pluto.driver.services.portal.PageConfig;
-import org.apache.pluto.driver.config.AdminConfiguration;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import java.io.IOException;
+import java.text.DecimalFormat;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
import javax.servlet.ServletContext;
import javax.servlet.ServletException;
-import java.io.IOException;
-import java.text.DecimalFormat;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.pluto.PortletContainer;
+import org.apache.pluto.driver.config.AdminConfiguration;
+import org.apache.pluto.driver.services.portal.PageConfig;
/**
* TCK Driver Servlet.
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver/src/main/java/org/apache/pluto/driver/config/AdminConfiguration.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver/src/main/java/org/apache/pluto/driver/config/AdminConfiguration.java?rev=647131&r1=647130&r2=647131&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver/src/main/java/org/apache/pluto/driver/config/AdminConfiguration.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver/src/main/java/org/apache/pluto/driver/config/AdminConfiguration.java Fri Apr 11 04:57:21 2008
@@ -16,10 +16,10 @@
*/
package org.apache.pluto.driver.config;
+import javax.servlet.ServletContext;
+
import org.apache.pluto.driver.services.portal.admin.PortletRegistryAdminService;
import org.apache.pluto.driver.services.portal.admin.RenderConfigAdminService;
-
-import javax.servlet.ServletContext;
/**
* Interface defining a means for obtaining administrative
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver/src/main/java/org/apache/pluto/driver/config/DriverConfiguration.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver/src/main/java/org/apache/pluto/driver/config/DriverConfiguration.java?rev=647131&r1=647130&r2=647131&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver/src/main/java/org/apache/pluto/driver/config/DriverConfiguration.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver/src/main/java/org/apache/pluto/driver/config/DriverConfiguration.java Fri Apr 11 04:57:21 2008
@@ -15,15 +15,15 @@
*/
package org.apache.pluto.driver.config;
-import org.apache.pluto.driver.services.portal.PortletWindowConfig;
+import java.util.Collection;
+
+import javax.servlet.ServletContext;
+
import org.apache.pluto.driver.services.portal.PageConfig;
import org.apache.pluto.driver.services.portal.RenderConfigService;
import org.apache.pluto.driver.url.PortalURLParser;
import org.apache.pluto.spi.PortalCallbackService;
import org.apache.pluto.spi.optional.PortletPreferencesService;
-
-import javax.servlet.ServletContext;
-import java.util.Collection;
/**
* Interface defining a means for retrieving driver services
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver/src/main/java/org/apache/pluto/driver/core/PortalRequestContext.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver/src/main/java/org/apache/pluto/driver/core/PortalRequestContext.java?rev=647131&r1=647130&r2=647131&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver/src/main/java/org/apache/pluto/driver/core/PortalRequestContext.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver/src/main/java/org/apache/pluto/driver/core/PortalRequestContext.java Fri Apr 11 04:57:21 2008
@@ -16,14 +16,14 @@
*/
package org.apache.pluto.driver.core;
+import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import javax.servlet.ServletContext;
-import org.apache.pluto.driver.url.PortalURL;
-import org.apache.pluto.driver.url.PortalURLParser;
import org.apache.pluto.driver.AttributeKeys;
import org.apache.pluto.driver.config.DriverConfiguration;
+import org.apache.pluto.driver.url.PortalURL;
+import org.apache.pluto.driver.url.PortalURLParser;
/**
* Defines the context of the currentl portal request.
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver/src/main/java/org/apache/pluto/driver/core/PortalServletRequest.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver/src/main/java/org/apache/pluto/driver/core/PortalServletRequest.java?rev=647131&r1=647130&r2=647131&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver/src/main/java/org/apache/pluto/driver/core/PortalServletRequest.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver/src/main/java/org/apache/pluto/driver/core/PortalServletRequest.java Fri Apr 11 04:57:21 2008
@@ -25,11 +25,11 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletRequestWrapper;
-import org.apache.pluto.PortletWindow;
-import org.apache.pluto.driver.url.PortalURLParameter;
-import org.apache.pluto.driver.url.PortalURL;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.pluto.PortletWindow;
+import org.apache.pluto.driver.url.PortalURL;
+import org.apache.pluto.driver.url.PortalURLParameter;
public class PortalServletRequest extends HttpServletRequestWrapper {
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver/src/main/java/org/apache/pluto/driver/portlets/GenericPlutoPortlet.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver/src/main/java/org/apache/pluto/driver/portlets/GenericPlutoPortlet.java?rev=647131&r1=647130&r2=647131&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver/src/main/java/org/apache/pluto/driver/portlets/GenericPlutoPortlet.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver/src/main/java/org/apache/pluto/driver/portlets/GenericPlutoPortlet.java Fri Apr 11 04:57:21 2008
@@ -16,13 +16,14 @@
*/
package org.apache.pluto.driver.portlets;
+import java.io.IOException;
+
import javax.portlet.GenericPortlet;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
-import javax.portlet.PortletException;
import javax.portlet.PortletContext;
+import javax.portlet.PortletException;
import javax.portlet.PortletRequestDispatcher;
-import java.io.IOException;
+import javax.portlet.RenderRequest;
+import javax.portlet.RenderResponse;
public abstract class GenericPlutoPortlet extends GenericPortlet {
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver/src/main/java/org/apache/pluto/driver/portlets/PageAdminPortlet.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver/src/main/java/org/apache/pluto/driver/portlets/PageAdminPortlet.java?rev=647131&r1=647130&r2=647131&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver/src/main/java/org/apache/pluto/driver/portlets/PageAdminPortlet.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver/src/main/java/org/apache/pluto/driver/portlets/PageAdminPortlet.java Fri Apr 11 04:57:21 2008
@@ -16,6 +16,18 @@
*/
package org.apache.pluto.driver.portlets;
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+
+import javax.portlet.ActionRequest;
+import javax.portlet.ActionResponse;
+import javax.portlet.PortletException;
+import javax.portlet.RenderRequest;
+import javax.portlet.RenderResponse;
+
import org.apache.commons.io.FileUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -25,18 +37,6 @@
import org.apache.pluto.driver.services.portal.PageConfig;
import org.apache.pluto.driver.services.portal.PortletWindowConfig;
import org.apache.pluto.driver.services.portal.RenderConfigService;
-
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
public class PageAdminPortlet extends GenericPlutoPortlet {
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver/src/main/java/org/apache/pluto/driver/services/portal/DriverConfigurationService.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver/src/main/java/org/apache/pluto/driver/services/portal/DriverConfigurationService.java?rev=647131&r1=647130&r2=647131&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver/src/main/java/org/apache/pluto/driver/services/portal/DriverConfigurationService.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver/src/main/java/org/apache/pluto/driver/services/portal/DriverConfigurationService.java Fri Apr 11 04:57:21 2008
@@ -16,9 +16,9 @@
*/
package org.apache.pluto.driver.services.portal;
-import org.apache.pluto.driver.config.DriverConfigurationException;
-
import javax.servlet.ServletContext;
+
+import org.apache.pluto.driver.config.DriverConfigurationException;
/**
* Abstract interface defining lifecycle methods for
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver/src/main/java/org/apache/pluto/driver/services/portal/RenderConfig.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver/src/main/java/org/apache/pluto/driver/services/portal/RenderConfig.java?rev=647131&r1=647130&r2=647131&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver/src/main/java/org/apache/pluto/driver/services/portal/RenderConfig.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver/src/main/java/org/apache/pluto/driver/services/portal/RenderConfig.java Fri Apr 11 04:57:21 2008
@@ -25,8 +25,6 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import java.util.*;
-
/**
*/
public class RenderConfig {
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver/src/main/java/org/apache/pluto/driver/services/portal/SupportedModesService.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver/src/main/java/org/apache/pluto/driver/services/portal/SupportedModesService.java?rev=647131&r1=647130&r2=647131&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver/src/main/java/org/apache/pluto/driver/services/portal/SupportedModesService.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver/src/main/java/org/apache/pluto/driver/services/portal/SupportedModesService.java Fri Apr 11 04:57:21 2008
@@ -16,6 +16,8 @@
*/
package org.apache.pluto.driver.services.portal;
+import javax.portlet.PortletMode;
+
/**
* Allows clients to determine if a particular PortletMode is supported
* by the portal, a particular portlet, or both.
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver/src/main/java/org/apache/pluto/driver/services/portal/admin/RenderConfigAdminService.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver/src/main/java/org/apache/pluto/driver/services/portal/admin/RenderConfigAdminService.java?rev=647131&r1=647130&r2=647131&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver/src/main/java/org/apache/pluto/driver/services/portal/admin/RenderConfigAdminService.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver/src/main/java/org/apache/pluto/driver/services/portal/admin/RenderConfigAdminService.java Fri Apr 11 04:57:21 2008
@@ -15,8 +15,8 @@
*/
package org.apache.pluto.driver.services.portal.admin;
-import org.apache.pluto.driver.services.portal.PageConfig;
import org.apache.pluto.driver.config.DriverConfigurationException;
+import org.apache.pluto.driver.services.portal.PageConfig;
/**
*
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver/src/main/java/org/apache/pluto/driver/tags/IsMaximizedTag.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver/src/main/java/org/apache/pluto/driver/tags/IsMaximizedTag.java?rev=647131&r1=647130&r2=647131&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver/src/main/java/org/apache/pluto/driver/tags/IsMaximizedTag.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver/src/main/java/org/apache/pluto/driver/tags/IsMaximizedTag.java Fri Apr 11 04:57:21 2008
@@ -16,15 +16,16 @@
*/
package org.apache.pluto.driver.tags;
-import org.apache.pluto.driver.core.PortalRequestContext;
-import org.apache.pluto.driver.url.PortalURL;
-
-import javax.servlet.jsp.tagext.TagSupport;
-import javax.servlet.jsp.JspException;
-import javax.servlet.http.HttpServletRequest;
-import javax.portlet.WindowState;
import java.util.Iterator;
import java.util.Map;
+
+import javax.portlet.WindowState;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.tagext.TagSupport;
+
+import org.apache.pluto.driver.core.PortalRequestContext;
+import org.apache.pluto.driver.url.PortalURL;
/**
* Determine whether the one of the portlets
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver/src/main/java/org/apache/pluto/driver/tags/PortletModeAnchorTag.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver/src/main/java/org/apache/pluto/driver/tags/PortletModeAnchorTag.java?rev=647131&r1=647130&r2=647131&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver/src/main/java/org/apache/pluto/driver/tags/PortletModeAnchorTag.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver/src/main/java/org/apache/pluto/driver/tags/PortletModeAnchorTag.java Fri Apr 11 04:57:21 2008
@@ -31,7 +31,6 @@
import org.apache.pluto.driver.AttributeKeys;
import org.apache.pluto.driver.config.DriverConfiguration;
import org.apache.pluto.driver.core.PortalRequestContext;
-//import org.apache.pluto.driver.services.portal.PortletWindowConfig;
import org.apache.pluto.driver.url.PortalURL;
import org.apache.taglibs.standard.lang.support.ExpressionEvaluatorManager;
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver/src/main/java/org/apache/pluto/driver/tags/PortletPortalURLTag.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver/src/main/java/org/apache/pluto/driver/tags/PortletPortalURLTag.java?rev=647131&r1=647130&r2=647131&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver/src/main/java/org/apache/pluto/driver/tags/PortletPortalURLTag.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver/src/main/java/org/apache/pluto/driver/tags/PortletPortalURLTag.java Fri Apr 11 04:57:21 2008
@@ -26,8 +26,8 @@
import javax.servlet.jsp.tagext.BodyTagSupport;
import javax.servlet.jsp.tagext.TagSupport;
-import org.apache.pluto.driver.url.PortalURL;
import org.apache.pluto.driver.core.PortalRequestContext;
+import org.apache.pluto.driver.url.PortalURL;
/**
* The portlet URL tag is used to generate portal URL pointing to the current
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver/src/main/java/org/apache/pluto/driver/tags/PortletTag.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver/src/main/java/org/apache/pluto/driver/tags/PortletTag.java?rev=647131&r1=647130&r2=647131&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver/src/main/java/org/apache/pluto/driver/tags/PortletTag.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver/src/main/java/org/apache/pluto/driver/tags/PortletTag.java Fri Apr 11 04:57:21 2008
@@ -30,15 +30,14 @@
import org.apache.commons.logging.LogFactory;
import org.apache.pluto.PortletContainer;
import org.apache.pluto.PortletWindow;
-import org.apache.pluto.tags.el.ExpressionEvaluatorProxy;
import org.apache.pluto.driver.AttributeKeys;
-import org.apache.pluto.driver.services.portal.PortletWindowConfig;
-import org.apache.pluto.driver.url.PortalURL;
import org.apache.pluto.driver.core.PortalRequestContext;
import org.apache.pluto.driver.core.PortalServletRequest;
import org.apache.pluto.driver.core.PortalServletResponse;
import org.apache.pluto.driver.core.PortletWindowImpl;
-import org.apache.taglibs.standard.lang.support.ExpressionEvaluatorManager;
+import org.apache.pluto.driver.services.portal.PortletWindowConfig;
+import org.apache.pluto.driver.url.PortalURL;
+import org.apache.pluto.tags.el.ExpressionEvaluatorProxy;
/**
* The portlet tag is used to render a portlet specified by the portlet ID.
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver/src/main/java/org/apache/pluto/driver/tags/PortletTitleTag.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver/src/main/java/org/apache/pluto/driver/tags/PortletTitleTag.java?rev=647131&r1=647130&r2=647131&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver/src/main/java/org/apache/pluto/driver/tags/PortletTitleTag.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver/src/main/java/org/apache/pluto/driver/tags/PortletTitleTag.java Fri Apr 11 04:57:21 2008
@@ -17,9 +17,11 @@
import java.io.IOException;
+import javax.servlet.http.HttpServletRequest;
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.tagext.TagSupport;
+import org.apache.pluto.PortletWindow;
import org.apache.pluto.driver.AttributeKeys;
/**
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver/src/main/java/org/apache/pluto/driver/url/PortalURL.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver/src/main/java/org/apache/pluto/driver/url/PortalURL.java?rev=647131&r1=647130&r2=647131&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver/src/main/java/org/apache/pluto/driver/url/PortalURL.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver/src/main/java/org/apache/pluto/driver/url/PortalURL.java Fri Apr 11 04:57:21 2008
@@ -24,7 +24,6 @@
import javax.portlet.PortletMode;
import javax.portlet.WindowState;
import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
import org.apache.pluto.driver.services.portal.PageConfig;
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-taglib/src/main/java/org/apache/pluto/tags/BaseURLTag.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-taglib/src/main/java/org/apache/pluto/tags/BaseURLTag.java?rev=647131&r1=647130&r2=647131&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-taglib/src/main/java/org/apache/pluto/tags/BaseURLTag.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-taglib/src/main/java/org/apache/pluto/tags/BaseURLTag.java Fri Apr 11 04:57:21 2008
@@ -23,17 +23,16 @@
import java.util.Map;
import java.util.Set;
+import javax.portlet.BaseURL;
+import javax.portlet.PortletSecurityException;
import javax.servlet.http.HttpServletResponse;
+import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.JspWriter;
+import javax.servlet.jsp.PageContext;
import javax.servlet.jsp.tagext.TagData;
import javax.servlet.jsp.tagext.TagExtraInfo;
import javax.servlet.jsp.tagext.TagSupport;
import javax.servlet.jsp.tagext.VariableInfo;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.JspWriter;
-import javax.servlet.jsp.PageContext;
-
-import javax.portlet.BaseURL;
-import javax.portlet.PortletSecurityException;
/**
* Abstract supporting class for actionURL tag, renderURL tag
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-taglib/src/main/java/org/apache/pluto/tags/DefineObjectsTag286.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-taglib/src/main/java/org/apache/pluto/tags/DefineObjectsTag286.java?rev=647131&r1=647130&r2=647131&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-taglib/src/main/java/org/apache/pluto/tags/DefineObjectsTag286.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-taglib/src/main/java/org/apache/pluto/tags/DefineObjectsTag286.java Fri Apr 11 04:57:21 2008
@@ -19,7 +19,19 @@
import java.util.HashMap;
import java.util.Map;
-import javax.portlet.*;
+import javax.portlet.ActionRequest;
+import javax.portlet.ActionResponse;
+import javax.portlet.EventRequest;
+import javax.portlet.EventResponse;
+import javax.portlet.PortletConfig;
+import javax.portlet.PortletPreferences;
+import javax.portlet.PortletRequest;
+import javax.portlet.PortletResponse;
+import javax.portlet.PortletSession;
+import javax.portlet.RenderRequest;
+import javax.portlet.RenderResponse;
+import javax.portlet.ResourceRequest;
+import javax.portlet.ResourceResponse;
import javax.servlet.ServletRequest;
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.PageContext;
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-taglib/src/main/java/org/apache/pluto/tags/NamespaceTag.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-taglib/src/main/java/org/apache/pluto/tags/NamespaceTag.java?rev=647131&r1=647130&r2=647131&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-taglib/src/main/java/org/apache/pluto/tags/NamespaceTag.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-taglib/src/main/java/org/apache/pluto/tags/NamespaceTag.java Fri Apr 11 04:57:21 2008
@@ -16,11 +16,12 @@
*/
package org.apache.pluto.tags;
+import java.io.IOException;
+
import javax.portlet.PortletResponse;
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.JspWriter;
import javax.servlet.jsp.tagext.TagSupport;
-import java.io.IOException;
/**
* This tag produces a unique value for the current portlet.
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-taglib/src/main/java/org/apache/pluto/tags/el/ApacheTaglibStandardExpressionEvaluatorProxy.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-taglib/src/main/java/org/apache/pluto/tags/el/ApacheTaglibStandardExpressionEvaluatorProxy.java?rev=647131&r1=647130&r2=647131&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-taglib/src/main/java/org/apache/pluto/tags/el/ApacheTaglibStandardExpressionEvaluatorProxy.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-taglib/src/main/java/org/apache/pluto/tags/el/ApacheTaglibStandardExpressionEvaluatorProxy.java Fri Apr 11 04:57:21 2008
@@ -16,10 +16,11 @@
*/
package org.apache.pluto.tags.el;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.PageContext;
-import java.lang.reflect.Method;
-import java.lang.reflect.InvocationTargetException;
class ApacheTaglibStandardExpressionEvaluatorProxy extends ExpressionEvaluatorProxy {
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-taglib/src/main/java/org/apache/pluto/tags/el/JSP20ExpressionEvaluatorProxy.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-taglib/src/main/java/org/apache/pluto/tags/el/JSP20ExpressionEvaluatorProxy.java?rev=647131&r1=647130&r2=647131&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-taglib/src/main/java/org/apache/pluto/tags/el/JSP20ExpressionEvaluatorProxy.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-taglib/src/main/java/org/apache/pluto/tags/el/JSP20ExpressionEvaluatorProxy.java Fri Apr 11 04:57:21 2008
@@ -16,10 +16,11 @@
*/
package org.apache.pluto.tags.el;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.PageContext;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
+
+import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.PageContext;
class JSP20ExpressionEvaluatorProxy extends ExpressionEvaluatorProxy {
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-taglib/src/main/java/org/apache/pluto/tags/el/JSP21ExpressionEvaluatorProxy.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-taglib/src/main/java/org/apache/pluto/tags/el/JSP21ExpressionEvaluatorProxy.java?rev=647131&r1=647130&r2=647131&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-taglib/src/main/java/org/apache/pluto/tags/el/JSP21ExpressionEvaluatorProxy.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-taglib/src/main/java/org/apache/pluto/tags/el/JSP21ExpressionEvaluatorProxy.java Fri Apr 11 04:57:21 2008
@@ -16,11 +16,12 @@
*/
package org.apache.pluto.tags.el;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.PageContext;
-import javax.servlet.ServletContext;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
+
+import javax.servlet.ServletContext;
+import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.PageContext;
class JSP21ExpressionEvaluatorProxy extends ExpressionEvaluatorProxy {
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/NoOpTest.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/NoOpTest.java?rev=647131&r1=647130&r2=647131&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/NoOpTest.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/NoOpTest.java Fri Apr 11 04:57:21 2008
@@ -16,15 +16,15 @@
*/
package org.apache.pluto.testsuite;
+import java.util.HashMap;
+import java.util.Map;
+
import javax.portlet.PortletConfig;
import javax.portlet.PortletContext;
import javax.portlet.PortletRequest;
import javax.portlet.PortletResponse;
import javax.portlet.RenderRequest;
import javax.portlet.RenderResponse;
-
-import java.util.HashMap;
-import java.util.Map;
/**
* @version 1.0
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/test/jsr286/PublicRenderParameterTest.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/test/jsr286/PublicRenderParameterTest.java?rev=647131&r1=647130&r2=647131&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/test/jsr286/PublicRenderParameterTest.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/test/jsr286/PublicRenderParameterTest.java Fri Apr 11 04:57:21 2008
@@ -1,15 +1,11 @@
package org.apache.pluto.testsuite.test.jsr286;
-import java.util.HashMap;
import java.util.Map;
-import javax.portlet.ActionRequest;
import javax.portlet.PortletRequest;
import javax.portlet.PortletResponse;
import org.apache.pluto.testsuite.TestResult;
-import org.apache.pluto.testsuite.TestUtils;
-import org.apache.pluto.testsuite.annotations.DefaultTestPhase;
import org.apache.pluto.testsuite.test.AbstractReflectivePortletTest;
/**
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/validator/PreferencesValidatorImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/validator/PreferencesValidatorImpl.java?rev=647131&r1=647130&r2=647131&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/validator/PreferencesValidatorImpl.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/validator/PreferencesValidatorImpl.java Fri Apr 11 04:57:21 2008
@@ -16,18 +16,18 @@
*/
package org.apache.pluto.testsuite.validator;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Map;
+
import javax.portlet.PortletPreferences;
import javax.portlet.PreferencesValidator;
import javax.portlet.ValidatorException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Map;
/**
* Implementation of the portlet preferences validator.
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-util/src/main/java/org/apache/pluto/util/assemble/WebXmlRewritingAssembler.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-util/src/main/java/org/apache/pluto/util/assemble/WebXmlRewritingAssembler.java?rev=647131&r1=647130&r2=647131&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-util/src/main/java/org/apache/pluto/util/assemble/WebXmlRewritingAssembler.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-util/src/main/java/org/apache/pluto/util/assemble/WebXmlRewritingAssembler.java Fri Apr 11 04:57:21 2008
@@ -20,7 +20,6 @@
import java.io.InputStream;
import java.io.OutputStream;
-import org.apache.pluto.util.assemble.io.JarStreamingAssembly;
import org.apache.pluto.util.assemble.io.WebXmlStreamingAssembly;
/**
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-util/src/main/java/org/apache/pluto/util/assemble/file/FileAssemblerAnt.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-util/src/main/java/org/apache/pluto/util/assemble/file/FileAssemblerAnt.java?rev=647131&r1=647130&r2=647131&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-util/src/main/java/org/apache/pluto/util/assemble/file/FileAssemblerAnt.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-util/src/main/java/org/apache/pluto/util/assemble/file/FileAssemblerAnt.java Fri Apr 11 04:57:21 2008
@@ -15,32 +15,40 @@
*/
package org.apache.pluto.util.assemble.file;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Properties;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.transform.OutputKeys;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerConfigurationException;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
+
+import org.apache.pluto.descriptors.services.PortletAppDescriptorService;
+import org.apache.pluto.descriptors.services.castor.EntityResolverImpl;
+import org.apache.pluto.descriptors.services.jaxb.PortletAppDescriptorServiceImpl;
import org.apache.pluto.om.portlet.Portlet;
import org.apache.pluto.om.portlet.PortletApp;
+import org.apache.pluto.util.UtilityException;
import org.apache.pluto.util.assemble.Assembler;
import org.apache.pluto.util.assemble.AssemblerConfig;
-import org.apache.pluto.util.UtilityException;
-import org.apache.pluto.descriptors.services.PortletAppDescriptorService;
-import org.apache.pluto.descriptors.services.castor.EntityResolverImpl;
-import org.apache.pluto.descriptors.services.jaxb.PortletAppDescriptorServiceImpl;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
import org.xml.sax.SAXException;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.*;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.util.*;
/**
*
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-util/src/main/java/org/apache/pluto/util/cli/AssemblerCLI.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-util/src/main/java/org/apache/pluto/util/cli/AssemblerCLI.java?rev=647131&r1=647130&r2=647131&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-util/src/main/java/org/apache/pluto/util/cli/AssemblerCLI.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-util/src/main/java/org/apache/pluto/util/cli/AssemblerCLI.java Fri Apr 11 04:57:21 2008
@@ -18,17 +18,17 @@
import java.io.File;
import java.io.IOException;
-import org.apache.commons.cli.Options;
-import org.apache.commons.cli.Option;
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.CommandLineParser;
-import org.apache.commons.cli.PosixParser;
-import org.apache.commons.cli.ParseException;
import org.apache.commons.cli.HelpFormatter;
+import org.apache.commons.cli.Option;
+import org.apache.commons.cli.Options;
+import org.apache.commons.cli.ParseException;
+import org.apache.commons.cli.PosixParser;
+import org.apache.pluto.util.UtilityException;
import org.apache.pluto.util.assemble.Assembler;
-import org.apache.pluto.util.assemble.AssemblerFactory;
import org.apache.pluto.util.assemble.AssemblerConfig;
-import org.apache.pluto.util.UtilityException;
+import org.apache.pluto.util.assemble.AssemblerFactory;
/**
* Command Line Interface to the Pluto Assembler.
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-util/src/main/java/org/apache/pluto/util/install/InstallationConfig.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-util/src/main/java/org/apache/pluto/util/install/InstallationConfig.java?rev=647131&r1=647130&r2=647131&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-util/src/main/java/org/apache/pluto/util/install/InstallationConfig.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-util/src/main/java/org/apache/pluto/util/install/InstallationConfig.java Fri Apr 11 04:57:21 2008
@@ -16,11 +16,9 @@
*/
package org.apache.pluto.util.install;
-import org.apache.pluto.util.install.ServerConfig;
-
+import java.io.File;
import java.util.List;
import java.util.Map;
-import java.io.File;
/**
* The installation configuration used to install Pluto to servlet container.
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-util/src/main/java/org/apache/pluto/util/install/PortalInstaller.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-util/src/main/java/org/apache/pluto/util/install/PortalInstaller.java?rev=647131&r1=647130&r2=647131&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-util/src/main/java/org/apache/pluto/util/install/PortalInstaller.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-util/src/main/java/org/apache/pluto/util/install/PortalInstaller.java Fri Apr 11 04:57:21 2008
@@ -16,9 +16,9 @@
*/
package org.apache.pluto.util.install;
-import org.apache.pluto.util.UtilityException;
-
import java.io.File;
+
+import org.apache.pluto.util.UtilityException;
public interface PortalInstaller {
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-util/src/main/java/org/apache/pluto/util/install/file/tomcat5/Tomcat5FileSystemInstaller.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-util/src/main/java/org/apache/pluto/util/install/file/tomcat5/Tomcat5FileSystemInstaller.java?rev=647131&r1=647130&r2=647131&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-util/src/main/java/org/apache/pluto/util/install/file/tomcat5/Tomcat5FileSystemInstaller.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-util/src/main/java/org/apache/pluto/util/install/file/tomcat5/Tomcat5FileSystemInstaller.java Fri Apr 11 04:57:21 2008
@@ -20,7 +20,6 @@
import java.io.FileWriter;
import java.io.IOException;
import java.util.Iterator;
-import java.util.List;
import java.util.Map;
import org.apache.pluto.util.install.InstallationConfig;
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-util/src/test/java/org/apache/pluto/util/assemble/ResourceEntityResolver.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-util/src/test/java/org/apache/pluto/util/assemble/ResourceEntityResolver.java?rev=647131&r1=647130&r2=647131&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-util/src/test/java/org/apache/pluto/util/assemble/ResourceEntityResolver.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-util/src/test/java/org/apache/pluto/util/assemble/ResourceEntityResolver.java Fri Apr 11 04:57:21 2008
@@ -16,12 +16,12 @@
*/
package org.apache.pluto.util.assemble;
+import java.io.IOException;
+import java.io.InputStream;
+
import org.xml.sax.EntityResolver;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
-
-import java.io.IOException;
-import java.io.InputStream;
/**
* Resolves entities by parsing the path from the System ID and resolving
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-util/src/test/java/org/apache/pluto/util/assemble/file/FileAssemblerTest.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-util/src/test/java/org/apache/pluto/util/assemble/file/FileAssemblerTest.java?rev=647131&r1=647130&r2=647131&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-util/src/test/java/org/apache/pluto/util/assemble/file/FileAssemblerTest.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-util/src/test/java/org/apache/pluto/util/assemble/file/FileAssemblerTest.java Fri Apr 11 04:57:21 2008
@@ -16,15 +16,15 @@
*/
package org.apache.pluto.util.assemble.file;
+import java.io.File;
+import java.io.FileReader;
+import java.net.URL;
+
import org.apache.commons.io.FileUtils;
import org.apache.pluto.util.assemble.AssemblerConfig;
import org.apache.pluto.util.assemble.ResourceEntityResolver;
import org.custommonkey.xmlunit.XMLTestCase;
import org.custommonkey.xmlunit.XMLUnit;
-
-import java.io.File;
-import java.io.FileReader;
-import java.net.URL;
/**
* @version $Revision$
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-util/src/test/java/org/apache/pluto/util/assemble/io/AssemblyStreamTest.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-util/src/test/java/org/apache/pluto/util/assemble/io/AssemblyStreamTest.java?rev=647131&r1=647130&r2=647131&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-util/src/test/java/org/apache/pluto/util/assemble/io/AssemblyStreamTest.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-util/src/test/java/org/apache/pluto/util/assemble/io/AssemblyStreamTest.java Fri Apr 11 04:57:21 2008
@@ -30,7 +30,6 @@
import junit.framework.TestCase;
import org.apache.commons.io.IOUtils;
-import org.apache.pluto.descriptors.portlet.PortletAppDD;
import org.apache.pluto.descriptors.services.PortletAppDescriptorService;
import org.apache.pluto.descriptors.services.WebAppDescriptorService;
import org.apache.pluto.descriptors.services.castor.WebAppDescriptorServiceImpl;
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-util/src/test/java/org/apache/pluto/util/assemble/war/WarAssemblerTest.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-util/src/test/java/org/apache/pluto/util/assemble/war/WarAssemblerTest.java?rev=647131&r1=647130&r2=647131&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-util/src/test/java/org/apache/pluto/util/assemble/war/WarAssemblerTest.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-util/src/test/java/org/apache/pluto/util/assemble/war/WarAssemblerTest.java Fri Apr 11 04:57:21 2008
@@ -21,9 +21,9 @@
import java.net.URL;
import org.apache.commons.io.FileUtils;
+import org.apache.pluto.util.assemble.ArchiveBasedAssemblyTest;
import org.apache.pluto.util.assemble.Assembler;
import org.apache.pluto.util.assemble.AssemblerConfig;
-import org.apache.pluto.util.assemble.ArchiveBasedAssemblyTest;
/**
* @version $Revision$