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 at...@apache.org on 2008/10/15 19:39:24 UTC
svn commit: r704969 [2/2] - in /portals/pluto/branches/2.0-spi-refactoring:
pluto-container-api/src/main/java/org/apache/pluto/
pluto-container-api/src/main/java/org/apache/pluto/internal/
pluto-container-api/src/main/java/org/apache/pluto/om/portlet/ ...
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/FilterManagerImpl.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/FilterManagerImpl.java?rev=704969&r1=704968&r2=704969&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/FilterManagerImpl.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/FilterManagerImpl.java Wed Oct 15 10:39:22 2008
@@ -29,7 +29,7 @@
import org.apache.pluto.om.portlet.Filter;
import org.apache.pluto.om.portlet.FilterMapping;
-import org.apache.pluto.om.portlet.PortletApp;
+import org.apache.pluto.om.portlet.PortletApplicationDefinition;
import org.apache.pluto.spi.FilterManager;
/**
@@ -40,11 +40,11 @@
*/
public class FilterManagerImpl implements FilterManager{
private FilterChainImpl filterchain;
- private PortletApp portletApp;
+ private PortletApplicationDefinition portletApp;
private String portletName;
private String lifeCycle;
- public FilterManagerImpl(PortletApp portletApp, String portletName, String lifeCycle){
+ public FilterManagerImpl(PortletApplicationDefinition portletApp, String portletName, String lifeCycle){
this.portletApp = portletApp;
this.portletName = portletName;
this.lifeCycle = lifeCycle;
@@ -52,7 +52,7 @@
initFilterChain();
}
- public static FilterManager getFilterManager(PortletApp portletApp, String portletName, String lifeCycle){
+ public static FilterManager getFilterManager(PortletApplicationDefinition portletApp, String portletName, String lifeCycle){
return new FilterManagerImpl(portletApp,portletName,lifeCycle);
}
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/PortalCallbackServiceImpl.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/PortalCallbackServiceImpl.java?rev=704969&r1=704968&r2=704969&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/PortalCallbackServiceImpl.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/PortalCallbackServiceImpl.java Wed Oct 15 10:39:22 2008
@@ -25,7 +25,7 @@
import org.apache.pluto.PortletWindow;
import org.apache.pluto.driver.AttributeKeys;
-import org.apache.pluto.om.portlet.PortletApp;
+import org.apache.pluto.om.portlet.PortletApplicationDefinition;
import org.apache.pluto.spi.EventProvider;
import org.apache.pluto.spi.FilterManager;
import org.apache.pluto.spi.PortalCallbackService;
@@ -157,7 +157,7 @@
* Returns the FilterManager, this is used to process the filter.
* @return FilterManager
*/
- public FilterManager getFilterManager(PortletApp portletAppDD, String portletName, String lifeCycle) {
+ public FilterManager getFilterManager(PortletApplicationDefinition portletAppDD, String portletName, String lifeCycle) {
return FilterManagerImpl.getFilterManager(portletAppDD,portletName,lifeCycle);
}
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=704969&r1=704968&r2=704969&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 Wed Oct 15 10:39:22 2008
@@ -27,7 +27,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.pluto.om.portlet.Listener;
-import org.apache.pluto.om.portlet.PortletApp;
+import org.apache.pluto.om.portlet.PortletApplicationDefinition;
import org.apache.pluto.spi.PortletURLListener;
public class PortletURLListenerImpl implements PortletURLListener {
@@ -40,7 +40,7 @@
}
- public synchronized void callListener(PortletApp portletApp, BaseURL baseURL, boolean isAction, boolean isResource){
+ public synchronized void callListener(PortletApplicationDefinition portletApp, BaseURL baseURL, boolean isAction, boolean isResource){
if (isAction&&isResource){
String message = "It is not allowed to set both values from isAction and isResource to true";
LOG.error(message, new IllegalArgumentException(message));
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=704969&r1=704968&r2=704969&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 Wed Oct 15 10:39:22 2008
@@ -43,7 +43,7 @@
import org.apache.pluto.driver.core.PortalServletRequest;
import org.apache.pluto.internal.impl.EventImpl;
import org.apache.pluto.om.portlet.EventDefinition;
-import org.apache.pluto.om.portlet.PortletApp;
+import org.apache.pluto.om.portlet.PortletApplicationDefinition;
import org.apache.pluto.spi.optional.PortletRegistryService;
public class PortletWindowThread extends Thread {
@@ -144,7 +144,7 @@
}
private EventDefinition getEventDefintion(QName name) throws PortletContainerException {
- PortletApp appDD = portletWindow.getPortletEntity().getPortletDefinition().getApplication();
+ PortletApplicationDefinition appDD = portletWindow.getPortletEntity().getPortletDefinition().getApplication();
for (EventDefinition def : appDD.getEventDefinitions()){
if (def.getQName() != null){
if (def.getQName().equals(name))
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=704969&r1=704968&r2=704969&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 Wed Oct 15 10:39:22 2008
@@ -34,8 +34,8 @@
import org.apache.pluto.driver.services.portal.PortletWindowConfig;
import org.apache.pluto.driver.services.portal.PropertyConfigService;
import org.apache.pluto.driver.services.portal.SupportedModesService;
-import org.apache.pluto.om.portlet.Portlet;
-import org.apache.pluto.om.portlet.PortletApp;
+import org.apache.pluto.om.portlet.PortletDefinition;
+import org.apache.pluto.om.portlet.PortletApplicationDefinition;
import org.apache.pluto.om.portlet.Supports;
import org.apache.pluto.spi.optional.PortletRegistryService;
@@ -108,10 +108,10 @@
LOG.error("Optional Portlet Registry Service not found.");
throw new PortletContainerException("Optional Portlet Registry Service not found.");
}
- PortletApp ctx = portletRegistry.getPortletApplication(applicationId);
+ PortletApplicationDefinition ctx = portletRegistry.getPortletApplication(applicationId);
Iterator i = ctx.getPortlets().iterator();
while(i.hasNext()) {
- Portlet dd = (Portlet)i.next();
+ PortletDefinition dd = (PortletDefinition)i.next();
if(portletName.equals(dd.getPortletName())) {
Iterator i2 = dd.getSupports().iterator();
while(i2.hasNext()) {
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=704969&r1=704968&r2=704969&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 Wed Oct 15 10:39:22 2008
@@ -34,7 +34,7 @@
import org.apache.pluto.driver.services.portal.PropertyConfigService;
import org.apache.pluto.driver.services.portal.SupportedWindowStateService;
import org.apache.pluto.om.portlet.CustomWindowState;
-import org.apache.pluto.om.portlet.PortletApp;
+import org.apache.pluto.om.portlet.PortletApplicationDefinition;
import org.apache.pluto.spi.optional.PortletRegistryService;
public class SupportedWindowStateServiceImpl implements
@@ -142,7 +142,7 @@
// we look to see if it is a custom window state.
String appId = PortletWindowConfig.parseContextPath(portletId);
- PortletApp portletAppDD = null;
+ PortletApplicationDefinition portletAppDD = null;
if (portletRegistry == null)
{
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver/src/main/java/org/apache/pluto/driver/PortalDriverServlet.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver/src/main/java/org/apache/pluto/driver/PortalDriverServlet.java?rev=704969&r1=704968&r2=704969&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver/src/main/java/org/apache/pluto/driver/PortalDriverServlet.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver/src/main/java/org/apache/pluto/driver/PortalDriverServlet.java Wed Oct 15 10:39:22 2008
@@ -37,7 +37,7 @@
import org.apache.pluto.driver.services.portal.PageConfig;
import org.apache.pluto.driver.services.portal.PortletWindowConfig;
import org.apache.pluto.driver.url.PortalURL;
-import org.apache.pluto.om.portlet.Portlet;
+import org.apache.pluto.om.portlet.PortletDefinition;
/**
* The controller servlet used to drive the Portal Driver. All requests mapped
@@ -210,7 +210,7 @@
private void setPublicRenderParameter(HttpServletRequest request, PortalURL portalURL, String portletID)throws ServletException, PortletContainerException {
String applicationId = PortletWindowConfig.parseContextPath(portletID);
String portletName = PortletWindowConfig.parsePortletName(portletID);
- Portlet portletDD = container.getOptionalContainerServices().getPortletRegistryService()
+ PortletDefinition portletDD = container.getOptionalContainerServices().getPortletRegistryService()
.getPortlet(applicationId, portletName);
Enumeration<String> parameterNames = request.getParameterNames();
if (parameterNames != null){
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-util/src/main/java/org/apache/pluto/util/assemble/io/WebXmlStreamingAssembly.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-util/src/main/java/org/apache/pluto/util/assemble/io/WebXmlStreamingAssembly.java?rev=704969&r1=704968&r2=704969&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-util/src/main/java/org/apache/pluto/util/assemble/io/WebXmlStreamingAssembly.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-util/src/main/java/org/apache/pluto/util/assemble/io/WebXmlStreamingAssembly.java Wed Oct 15 10:39:22 2008
@@ -21,8 +21,8 @@
import java.io.OutputStream;
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.om.portlet.PortletDefinition;
+import org.apache.pluto.om.portlet.PortletApplicationDefinition;
import org.apache.pluto.util.assemble.Assembler;
import org.apache.pluto.util.descriptors.web.PlutoWebXmlRewriter;
@@ -66,9 +66,9 @@
}
throw new IOException(e.getMessage());
}
- PortletApp portletAppDD = new PortletAppDescriptorServiceImpl().read(portletXmlIn);
+ PortletApplicationDefinition portletAppDD = new PortletAppDescriptorServiceImpl().read(portletXmlIn);
portletXmlIn.close();
- for (Portlet portlet : portletAppDD.getPortlets())
+ for (PortletDefinition portlet : portletAppDD.getPortlets())
{
webXmlRewriter.injectPortletServlet(dispatchServletClass, portlet.getPortletName());
}
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-util/src/test/java/org/apache/pluto/util/assemble/ear/ComplexEarAssemblerTest.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-util/src/test/java/org/apache/pluto/util/assemble/ear/ComplexEarAssemblerTest.java?rev=704969&r1=704968&r2=704969&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-util/src/test/java/org/apache/pluto/util/assemble/ear/ComplexEarAssemblerTest.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-util/src/test/java/org/apache/pluto/util/assemble/ear/ComplexEarAssemblerTest.java Wed Oct 15 10:39:22 2008
@@ -28,8 +28,8 @@
import org.apache.commons.io.IOUtils;
import org.apache.pluto.descriptors.services.PortletAppDescriptorService;
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.om.portlet.PortletDefinition;
+import org.apache.pluto.om.portlet.PortletApplicationDefinition;
import org.apache.pluto.util.assemble.ArchiveBasedAssemblyTest;
import org.apache.pluto.util.assemble.Assembler;
import org.apache.pluto.util.assemble.AssemblerConfig;
@@ -94,7 +94,7 @@
earFile.exists() && earFile.canRead() );
PortletAppDescriptorService portletSvc = new PortletAppDescriptorServiceImpl();
- PortletApp portletApp = null;
+ PortletApplicationDefinition portletApp = null;
PlutoWebXmlRewriter webXmlRewriter = null;
@@ -137,8 +137,8 @@
assertTrue( "WAR archive did not contain any servlet mappings", webXmlRewriter.hasServletMappings() );
assertTrue( "WAR archive did not contain any portlets", portletApp.getPortlets().size() > 0 );
- for ( Iterator<Portlet> iter = portletApp.getPortlets().iterator(); iter.hasNext(); ) {
- Portlet portlet = iter.next();
+ for ( Iterator<PortletDefinition> iter = portletApp.getPortlets().iterator(); iter.hasNext(); ) {
+ PortletDefinition portlet = iter.next();
if (! testPortlets.contains( portlet.getPortletName() ) ) {
fail( "Unexpected test portlet name encountered: [" + portlet.getPortletName() + "]" );
}
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-util/src/test/java/org/apache/pluto/util/assemble/ear/EarAssemblerTest.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-util/src/test/java/org/apache/pluto/util/assemble/ear/EarAssemblerTest.java?rev=704969&r1=704968&r2=704969&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-util/src/test/java/org/apache/pluto/util/assemble/ear/EarAssemblerTest.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-util/src/test/java/org/apache/pluto/util/assemble/ear/EarAssemblerTest.java Wed Oct 15 10:39:22 2008
@@ -26,8 +26,8 @@
import org.apache.commons.io.IOUtils;
import org.apache.pluto.descriptors.services.PortletAppDescriptorService;
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.om.portlet.PortletDefinition;
+import org.apache.pluto.om.portlet.PortletApplicationDefinition;
import org.apache.pluto.util.assemble.ArchiveBasedAssemblyTest;
import org.apache.pluto.util.assemble.Assembler;
import org.apache.pluto.util.assemble.AssemblerConfig;
@@ -85,7 +85,7 @@
earFile.exists() && earFile.canRead() );
PortletAppDescriptorService portletSvc = new PortletAppDescriptorServiceImpl();
- PortletApp portletApp = null;
+ PortletApplicationDefinition portletApp = null;
PlutoWebXmlRewriter webXmlRewriter = null;
@@ -122,7 +122,7 @@
assertTrue( "WAR archive did not contain any servlet mappings", webXmlRewriter.hasServletMappings() );
assertTrue( "WAR archive did not contain any portlets", portletApp.getPortlets().size() > 0 );
- Portlet portlet = (Portlet) portletApp.getPortlets().iterator().next();
+ PortletDefinition portlet = (PortletDefinition) portletApp.getPortlets().iterator().next();
assertEquals( "Unexpected test portlet name.", testPortletName, portlet.getPortletName() );
String servletClassName = webXmlRewriter.getServletClass( portlet.getPortletName() );
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=704969&r1=704968&r2=704969&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 Wed Oct 15 10:39:22 2008
@@ -32,8 +32,8 @@
import org.apache.commons.io.IOUtils;
import org.apache.pluto.descriptors.services.PortletAppDescriptorService;
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.om.portlet.PortletDefinition;
+import org.apache.pluto.om.portlet.PortletApplicationDefinition;
import org.apache.pluto.util.assemble.Assembler;
import org.apache.pluto.util.descriptors.web.PlutoWebXmlRewriter;
@@ -85,7 +85,7 @@
protected void verifyAssembly( InputStream webXml, InputStream portletXml ) throws Exception {
PortletAppDescriptorService portletSvc = new PortletAppDescriptorServiceImpl();
PlutoWebXmlRewriter webXmlRewriter = new PlutoWebXmlRewriter( webXml );
- PortletApp portletApp = portletSvc.read( portletXml );
+ PortletApplicationDefinition portletApp = portletSvc.read( portletXml );
assertNotNull( "Web Application Descripter was null.", webXmlRewriter );
assertNotNull( "Portlet Application Descriptor was null.", portletApp );
@@ -93,7 +93,7 @@
assertTrue( "Web Application Descriptor doesn't define any servlets.", webXmlRewriter.hasServlets() );
assertTrue( "Web Application Descriptor doesn't define any servlet mappings.", webXmlRewriter.hasServletMappings() );
- Portlet portlet = (Portlet) portletApp.getPortlets().iterator().next();
+ PortletDefinition portlet = (PortletDefinition) portletApp.getPortlets().iterator().next();
assertTrue( "Unable to retrieve test portlet named [" + testPortletName + "]", portlet.getPortletName().equals( testPortletName ) );
String servletClassName = webXmlRewriter.getServletClass( testPortletName );
@@ -107,7 +107,7 @@
int entryCount = 0;
ByteArrayOutputStream portletXmlBytes = new ByteArrayOutputStream();
ByteArrayOutputStream webXmlBytes = new ByteArrayOutputStream();
- PortletApp portletApp = null;
+ PortletApplicationDefinition portletApp = null;
JarInputStream assembledWarIn = new JarInputStream( new FileInputStream( warFile ) );
JarEntry tempEntry;
@@ -132,7 +132,7 @@
assertTrue( "Web Application Descriptor doesn't define any servlets.", webXmlRewriter.hasServlets() );
assertTrue( "Web Application Descriptor doesn't define any servlet mappings.", webXmlRewriter.hasServletMappings() );
- Portlet portlet = (Portlet) portletApp.getPortlets().iterator().next();
+ PortletDefinition portlet = (PortletDefinition) portletApp.getPortlets().iterator().next();
assertTrue( "Unable to retrieve test portlet named [" + testPortletName + "]", portlet.getPortletName().equals( testPortletName ) );
String servletClassName = webXmlRewriter.getServletClass( testPortletName );