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 [1/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/ ...
Author: ate
Date: Wed Oct 15 10:39:22 2008
New Revision: 704969
URL: http://svn.apache.org/viewvc?rev=704969&view=rev
Log:
Renaming a few pluto.om.portlet interfaces to prevent name clashes with the Portlet API interfaces themselves and to be more backwards compatible with Pluto version 1.0.1 usages
Added:
portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/PortletApplicationDefinition.java
- copied, changed from r704743, portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/PortletApp.java
portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/PortletDefinition.java
- copied, changed from r704963, portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/Portlet.java
portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/Preference.java
- copied, changed from r704743, portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/PortletPreference.java
portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/Preferences.java
- copied, changed from r704743, portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/PortletPreferences.java
Removed:
portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/Portlet.java
portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/PortletApp.java
portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/PortletPreference.java
portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/PortletPreferences.java
Modified:
portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/PortletEntity.java
portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/PortletWindow.java
portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/internal/InternalPortletConfig.java
portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/internal/InternalPortletContext.java
portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/spi/PortalCallbackService.java
portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/spi/PortletURLListener.java
portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/spi/optional/PortletRegistryEvent.java
portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/spi/optional/PortletRegistryService.java
portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/core/DefaultPortletPreferencesService.java
portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/core/PortletContextManager.java
portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/core/PortletDescriptorRegistry.java
portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/core/PortletServlet.java
portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/core/PreferencesValidatorRegistry.java
portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/BaseURLImpl.java
portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/MimeResponseImpl.java
portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletConfigImpl.java
portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletContextImpl.java
portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletEntityImpl.java
portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletPreferencesImpl.java
portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletRequestImpl.java
portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/ResourceBundleFactory.java
portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/StateAwareResponseImpl.java
portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/test/java/org/apache/pluto/internal/impl/ResourceBundleFactoryTest.java
portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet10/PortletAppType.java
portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet10/PortletPreferencesType.java
portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet10/PortletType.java
portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet10/PreferenceType.java
portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet20/PortletAppType.java
portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet20/PortletPreferencesType.java
portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet20/PortletType.java
portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet20/PreferenceType.java
portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/services/PortletAppDescriptorService.java
portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-impl/src/main/java/org/apache/pluto/descriptors/services/jaxb/PortletAppDescriptorServiceImpl.java
portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-impl/src/test/java/org/apache/pluto/descriptors/services/jaxb/JaxBDescriptorServiceImplTest.java
portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/EventProviderImpl.java
portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/FilterManagerImpl.java
portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/PortalCallbackServiceImpl.java
portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/PortletURLListenerImpl.java
portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/PortletWindowThread.java
portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/impl/resource/SupportedModesServiceImpl.java
portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/impl/resource/SupportedWindowStateServiceImpl.java
portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver/src/main/java/org/apache/pluto/driver/PortalDriverServlet.java
portals/pluto/branches/2.0-spi-refactoring/pluto-util/src/main/java/org/apache/pluto/util/assemble/io/WebXmlStreamingAssembly.java
portals/pluto/branches/2.0-spi-refactoring/pluto-util/src/test/java/org/apache/pluto/util/assemble/ear/ComplexEarAssemblerTest.java
portals/pluto/branches/2.0-spi-refactoring/pluto-util/src/test/java/org/apache/pluto/util/assemble/ear/EarAssemblerTest.java
portals/pluto/branches/2.0-spi-refactoring/pluto-util/src/test/java/org/apache/pluto/util/assemble/io/AssemblyStreamTest.java
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/PortletEntity.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/PortletEntity.java?rev=704969&r1=704968&r2=704969&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/PortletEntity.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/PortletEntity.java Wed Oct 15 10:39:22 2008
@@ -16,7 +16,7 @@
*/
package org.apache.pluto;
-import org.apache.pluto.om.portlet.Portlet;
+import org.apache.pluto.om.portlet.PortletDefinition;
/**
* The PortletEntity encapsulates all data pertaining to a single portlet
@@ -31,7 +31,7 @@
* Returns the portlet description. The return value cannot be NULL.
* @return the portlet description.
*/
- public Portlet getPortletDefinition();
+ public PortletDefinition getPortletDefinition();
}
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/PortletWindow.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/PortletWindow.java?rev=704969&r1=704968&r2=704969&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/PortletWindow.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/PortletWindow.java Wed Oct 15 10:39:22 2008
@@ -25,7 +25,7 @@
* request should be processed. The PortletWindow is used internally
* to map the request to the configured Portlet Application and Portlet.
*
- * @see org.apache.pluto.om.portlet.Portlet
+ * @see org.apache.pluto.om.portlet.PortletDefinition
*
* @version 1.0
* @since Sep 22, 2004
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/internal/InternalPortletConfig.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/internal/InternalPortletConfig.java?rev=704969&r1=704968&r2=704969&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/internal/InternalPortletConfig.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/internal/InternalPortletConfig.java Wed Oct 15 10:39:22 2008
@@ -19,13 +19,13 @@
import javax.portlet.PortletConfig;
import javax.servlet.ServletConfig;
-import org.apache.pluto.om.portlet.Portlet;
+import org.apache.pluto.om.portlet.PortletDefinition;
public interface InternalPortletConfig extends PortletConfig {
public ServletConfig getServletConfig();
- public Portlet getPortletDefinition();
+ public PortletDefinition getPortletDefinition();
}
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/internal/InternalPortletContext.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/internal/InternalPortletContext.java?rev=704969&r1=704968&r2=704969&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/internal/InternalPortletContext.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/internal/InternalPortletContext.java Wed Oct 15 10:39:22 2008
@@ -19,7 +19,7 @@
import javax.portlet.PortletContext;
import javax.servlet.ServletContext;
-import org.apache.pluto.om.portlet.PortletApp;
+import org.apache.pluto.om.portlet.PortletApplicationDefinition;
public interface InternalPortletContext extends PortletContext {
@@ -39,7 +39,7 @@
*
* @return application config
*/
- public PortletApp getPortletApplicationDefinition();
+ public PortletApplicationDefinition getPortletApplicationDefinition();
}
Copied: portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/PortletApplicationDefinition.java (from r704743, portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/PortletApp.java)
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/PortletApplicationDefinition.java?p2=portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/PortletApplicationDefinition.java&p1=portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/PortletApp.java&r1=704743&r2=704969&rev=704969&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/PortletApp.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/PortletApplicationDefinition.java Wed Oct 15 10:39:22 2008
@@ -18,7 +18,7 @@
import org.apache.pluto.om.ElementFactoryList;
-public interface PortletApp {
+public interface PortletApplicationDefinition {
/**
* The name of the Portlet Application
@@ -54,7 +54,7 @@
* Retrieve the portlets which exist within this application.
* @return
*/
- ElementFactoryList<Portlet> getPortlets();
+ ElementFactoryList<PortletDefinition> getPortlets();
/**
* @return Returns the events.
Copied: portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/PortletDefinition.java (from r704963, portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/Portlet.java)
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/PortletDefinition.java?p2=portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/PortletDefinition.java&p1=portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/Portlet.java&r1=704963&r2=704969&rev=704969&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/Portlet.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/PortletDefinition.java Wed Oct 15 10:39:22 2008
@@ -19,7 +19,7 @@
import org.apache.pluto.om.ElementFactoryList;
-public interface Portlet {
+public interface PortletDefinition {
/**
* Returns a string representation of this instance.
@@ -38,7 +38,7 @@
void setId(String id);
- PortletApp getApplication();
+ PortletApplicationDefinition getApplication();
ElementFactoryList<InitParam> getInitParams();
@@ -54,9 +54,9 @@
void setPortletName(String portletName);
- PortletPreferences getPortletPreferences();
+ Preferences getPortletPreferences();
- PortletPreferences getPortletPreferences(boolean create);
+ Preferences getPortletPreferences(boolean create);
ElementFactoryList<EventDefinitionReference> getSupportedProcessingEvents();
Copied: portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/Preference.java (from r704743, portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/PortletPreference.java)
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/Preference.java?p2=portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/Preference.java&p1=portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/PortletPreference.java&r1=704743&r2=704969&rev=704969&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/PortletPreference.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/Preference.java Wed Oct 15 10:39:22 2008
@@ -17,7 +17,7 @@
import java.util.List;
-public interface PortletPreference {
+public interface Preference {
String getName();
Copied: portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/Preferences.java (from r704743, portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/PortletPreferences.java)
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/Preferences.java?p2=portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/Preferences.java&p1=portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/PortletPreferences.java&r1=704743&r2=704969&rev=704969&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/PortletPreferences.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/Preferences.java Wed Oct 15 10:39:22 2008
@@ -17,9 +17,9 @@
import org.apache.pluto.om.ElementFactoryList;
-public interface PortletPreferences {
+public interface Preferences {
- ElementFactoryList<PortletPreference> getPortletPreferences();
+ ElementFactoryList<Preference> getPortletPreferences();
String getPreferencesValidator();
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/spi/PortalCallbackService.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/spi/PortalCallbackService.java?rev=704969&r1=704968&r2=704969&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/spi/PortalCallbackService.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/spi/PortalCallbackService.java Wed Oct 15 10:39:22 2008
@@ -22,7 +22,7 @@
import javax.servlet.http.HttpServletRequest;
import org.apache.pluto.PortletWindow;
-import org.apache.pluto.om.portlet.PortletApp;
+import org.apache.pluto.om.portlet.PortletApplicationDefinition;
import org.w3c.dom.Element;
/**
@@ -96,7 +96,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);
/**
* Returns the PortletURLListener which calls the Filter for the URL.
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/spi/PortletURLListener.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/spi/PortletURLListener.java?rev=704969&r1=704968&r2=704969&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/spi/PortletURLListener.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/spi/PortletURLListener.java Wed Oct 15 10:39:22 2008
@@ -18,8 +18,8 @@
import javax.portlet.BaseURL;
-import org.apache.pluto.om.portlet.PortletApp;
+import org.apache.pluto.om.portlet.PortletApplicationDefinition;
public interface PortletURLListener {
- public void callListener(PortletApp portletAppDD, BaseURL baseURL, boolean isAction, boolean isResource);
+ public void callListener(PortletApplicationDefinition portletAppDD, BaseURL baseURL, boolean isAction, boolean isResource);
}
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/spi/optional/PortletRegistryEvent.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/spi/optional/PortletRegistryEvent.java?rev=704969&r1=704968&r2=704969&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/spi/optional/PortletRegistryEvent.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/spi/optional/PortletRegistryEvent.java Wed Oct 15 10:39:22 2008
@@ -17,7 +17,7 @@
*/
package org.apache.pluto.spi.optional;
-import org.apache.pluto.om.portlet.PortletApp;
+import org.apache.pluto.om.portlet.PortletApplicationDefinition;
/**
* Encapsulation of event information.
@@ -27,7 +27,7 @@
public class PortletRegistryEvent {
private String applicationId;
- private PortletApp portletApplication;
+ private PortletApplicationDefinition portletApplication;
public String getApplicationId() {
@@ -38,11 +38,11 @@
this.applicationId = applicationId;
}
- public PortletApp getPortletApplication() {
+ public PortletApplicationDefinition getPortletApplication() {
return portletApplication;
}
- public void setPortletApplication(PortletApp portletApplication) {
+ public void setPortletApplication(PortletApplicationDefinition portletApplication) {
this.portletApplication = portletApplication;
}
}
\ No newline at end of file
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/spi/optional/PortletRegistryService.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/spi/optional/PortletRegistryService.java?rev=704969&r1=704968&r2=704969&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/spi/optional/PortletRegistryService.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/spi/optional/PortletRegistryService.java Wed Oct 15 10:39:22 2008
@@ -22,8 +22,8 @@
import org.apache.pluto.PortletContainerException;
import org.apache.pluto.internal.InternalPortletConfig;
import org.apache.pluto.internal.InternalPortletContext;
-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;
/**
* Interface defining the services used by the container
@@ -66,7 +66,7 @@
* @throws PortletContainerException if the portlet application
* isn't registered.
*/
- PortletApp getPortletApplication(String applicationId)
+ PortletApplicationDefinition getPortletApplication(String applicationId)
throws PortletContainerException;
/**
@@ -86,7 +86,7 @@
* @return portlet
* @throws PortletContainerException if portlet or application unknown
*/
- Portlet getPortlet(String applicationId, String portletName)
+ PortletDefinition getPortlet(String applicationId, String portletName)
throws PortletContainerException;
/**
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/core/DefaultPortletPreferencesService.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/core/DefaultPortletPreferencesService.java?rev=704969&r1=704968&r2=704969&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/core/DefaultPortletPreferencesService.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/core/DefaultPortletPreferencesService.java Wed Oct 15 10:39:22 2008
@@ -28,9 +28,9 @@
import org.apache.pluto.PortletWindow;
import org.apache.pluto.internal.InternalPortletPreference;
import org.apache.pluto.internal.impl.PortletPreferenceImpl;
-import org.apache.pluto.om.portlet.Portlet;
-import org.apache.pluto.om.portlet.PortletPreference;
-import org.apache.pluto.om.portlet.PortletPreferences;
+import org.apache.pluto.om.portlet.PortletDefinition;
+import org.apache.pluto.om.portlet.Preference;
+import org.apache.pluto.om.portlet.Preferences;
import org.apache.pluto.spi.optional.PortletPreferencesService;
/**
@@ -97,11 +97,11 @@
PortletRequest request )
throws PortletContainerException {
Map<String,InternalPortletPreference> preferences = null;
- Portlet portlet = portletWindow.getPortletEntity().getPortletDefinition();
- PortletPreferences prefs = portlet.getPortletPreferences();
+ PortletDefinition portlet = portletWindow.getPortletEntity().getPortletDefinition();
+ Preferences prefs = portlet.getPortletPreferences();
if (prefs != null && prefs.getPortletPreferences() != null) {
preferences = new HashMap<String,InternalPortletPreference>(prefs.getPortletPreferences().size());
- for (PortletPreference pref : prefs.getPortletPreferences()) {
+ for (Preference pref : prefs.getPortletPreferences()) {
String[] values = null;
if (pref.getValues() != null && pref.getValues().size() > 0) {
values = pref.getValues().toArray(new String[pref.getValues().size()]);
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/core/PortletContextManager.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/core/PortletContextManager.java?rev=704969&r1=704968&r2=704969&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/core/PortletContextManager.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/core/PortletContextManager.java Wed Oct 15 10:39:22 2008
@@ -36,8 +36,8 @@
import org.apache.pluto.internal.impl.Configuration;
import org.apache.pluto.internal.impl.PortletConfigImpl;
import org.apache.pluto.internal.impl.PortletContextImpl;
-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.spi.optional.PortletRegistryEvent;
import org.apache.pluto.spi.optional.PortletRegistryListener;
import org.apache.pluto.spi.optional.PortletRegistryService;
@@ -127,7 +127,7 @@
if (!portletContexts.containsKey(applicationId)) {
PortletDescriptorRegistry portletRegistry = PortletDescriptorRegistry.getRegistry();
- PortletApp portletApp = portletRegistry.getPortletAppDD(servletContext);
+ PortletApplicationDefinition portletApp = portletRegistry.getPortletAppDD(servletContext);
portletApp.setId(applicationId);
portletApp.setName(applicationId.substring(1));
@@ -146,7 +146,7 @@
LOG.info("Registering "+portletApp.getPortlets().size()+" portlets for context "+portletContext.getApplicationId());
classLoaders.put(portletApp.getId(), Thread.currentThread().getContextClassLoader());
- for (Portlet portlet: portletApp.getPortlets()) {
+ for (PortletDefinition portlet: portletApp.getPortlets()) {
portletConfigs.put(
portletContext.getApplicationId() + "/" + portlet.getPortletName(),
new PortletConfigImpl(config, portletContext, portlet, portletApp)
@@ -200,7 +200,7 @@
throw new PortletContainerException(msg);
}
- public Portlet getPortlet(String applicationId, String portletName) throws PortletContainerException {
+ public PortletDefinition getPortlet(String applicationId, String portletName) throws PortletContainerException {
InternalPortletConfig ipc = portletConfigs.get(applicationId + "/" + portletName);
if (ipc != null) {
return ipc.getPortletDefinition();
@@ -210,7 +210,7 @@
throw new PortletContainerException(msg);
}
- public PortletApp getPortletApplication(String applicationId) throws PortletContainerException {
+ public PortletApplicationDefinition getPortletApplication(String applicationId) throws PortletContainerException {
InternalPortletContext ipc = portletContexts.get(applicationId);
if (ipc != null) {
return ipc.getPortletApplicationDefinition();
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/core/PortletDescriptorRegistry.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/core/PortletDescriptorRegistry.java?rev=704969&r1=704968&r2=704969&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/core/PortletDescriptorRegistry.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/core/PortletDescriptorRegistry.java Wed Oct 15 10:39:22 2008
@@ -26,7 +26,7 @@
import org.apache.pluto.PlutoConfigurationException;
import org.apache.pluto.PortletContainerException;
import org.apache.pluto.descriptors.services.PortletAppDescriptorService;
-import org.apache.pluto.om.portlet.PortletApp;
+import org.apache.pluto.om.portlet.PortletApplicationDefinition;
import org.apache.pluto.util.StringManager;
/**
@@ -116,9 +116,9 @@
* @return The portlet application deployment descriptor.
* @throws PortletContainerException if the descriptor can not be found or parsed
*/
- public PortletApp getPortletAppDD(ServletContext servletContext)
+ public PortletApplicationDefinition getPortletAppDD(ServletContext servletContext)
throws PortletContainerException {
- PortletApp portletApp = (PortletApp) cache.get(servletContext);
+ PortletApplicationDefinition portletApp = (PortletApplicationDefinition) cache.get(servletContext);
if (portletApp == null) {
portletApp = createDefinition(servletContext);
cache.put(servletContext, portletApp);
@@ -136,9 +136,9 @@
* @return the Portlet Application Deployment Descriptor.
* @throws PortletContainerException
*/
- private PortletApp createDefinition(ServletContext servletContext)
+ private PortletApplicationDefinition createDefinition(ServletContext servletContext)
throws PortletContainerException {
- PortletApp portletApp = null;
+ PortletApplicationDefinition portletApp = null;
try {
InputStream in = servletContext.getResourceAsStream(PORTLET_XML);
portletApp = portletDDService.read(in);
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/core/PortletServlet.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/core/PortletServlet.java?rev=704969&r1=704968&r2=704969&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/core/PortletServlet.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/core/PortletServlet.java Wed Oct 15 10:39:22 2008
@@ -129,7 +129,7 @@
throw new ServletException(ex);
}
- org.apache.pluto.om.portlet.Portlet portletDD = portletConfig.getPortletDefinition();
+ org.apache.pluto.om.portlet.PortletDefinition portletDD = portletConfig.getPortletDefinition();
// Create and initialize the portlet wrapped in the servlet.
try {
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/core/PreferencesValidatorRegistry.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/core/PreferencesValidatorRegistry.java?rev=704969&r1=704968&r2=704969&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/core/PreferencesValidatorRegistry.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/core/PreferencesValidatorRegistry.java Wed Oct 15 10:39:22 2008
@@ -24,8 +24,8 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.pluto.om.portlet.Portlet;
-import org.apache.pluto.om.portlet.PortletPreferences;
+import org.apache.pluto.om.portlet.PortletDefinition;
+import org.apache.pluto.om.portlet.Preferences;
/**
* The portlet preferences validator registry. This class caches the portlet
@@ -79,7 +79,7 @@
* @return the preferences validator if defined for the portlet definition.
* @throw ValidatorException if fail to instantiate validator instance.
*/
- public PreferencesValidator getPreferencesValidator(Portlet portletDD)
+ public PreferencesValidator getPreferencesValidator(PortletDefinition portletDD)
throws ValidatorException {
// Try to retrieve the validator from cache.
@@ -90,7 +90,7 @@
}
// Try to construct the validator instance for the portlet definition.
- PortletPreferences portletPreferencesDD = portletDD.getPortletPreferences();
+ Preferences portletPreferencesDD = portletDD.getPortletPreferences();
if (portletPreferencesDD != null) {
String className = portletPreferencesDD.getPreferencesValidator();
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/BaseURLImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/BaseURLImpl.java?rev=704969&r1=704968&r2=704969&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/BaseURLImpl.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/BaseURLImpl.java Wed Oct 15 10:39:22 2008
@@ -38,8 +38,8 @@
import org.apache.pluto.PortletContainer;
import org.apache.pluto.PortletContainerException;
import org.apache.pluto.PortletWindow;
-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.PortletURLListener;
import org.apache.pluto.spi.PortletURLProvider;
@@ -211,7 +211,7 @@
else if (isResourceServing){
urlProvider.setResourceServing(true);
}
- PortletApp portletAppDD = portletWindow.getPortletEntity().getPortletDefinition().getApplication();
+ PortletApplicationDefinition portletAppDD = portletWindow.getPortletEntity().getPortletDefinition().getApplication();
// container.getOptionalContainerServices().getPortletRegistryService().getRegisteredPortletApplications()
// PortletAppDD portletAppDD = container.getPortletApplicationDescriptor( );
portletURLFilterListener.callListener(portletAppDD,this,isAction,isResourceServing);
@@ -276,7 +276,7 @@
return true;
}
- Portlet dd = portletWindow.getPortletEntity()
+ PortletDefinition dd = portletWindow.getPortletEntity()
.getPortletDefinition();
Iterator supports = dd.getSupports().iterator();
while(supports.hasNext()) {
@@ -345,7 +345,7 @@
else if (isResourceServing){
urlProvider.setResourceServing(true);
}
- PortletApp portletAppDD = portletWindow.getPortletEntity().getPortletDefinition().getApplication();
+ PortletApplicationDefinition portletAppDD = portletWindow.getPortletEntity().getPortletDefinition().getApplication();
// container.getOptionalContainerServices().getPortletRegistryService().getRegisteredPortletApplications()
// PortletAppDD portletAppDD = container.getPortletApplicationDescriptor( );
portletURLFilterListener.callListener(portletAppDD,this,isAction,isResourceServing);
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/MimeResponseImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/MimeResponseImpl.java?rev=704969&r1=704968&r2=704969&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/MimeResponseImpl.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/MimeResponseImpl.java Wed Oct 15 10:39:22 2008
@@ -34,7 +34,7 @@
import org.apache.pluto.PortletContainer;
import org.apache.pluto.PortletEntity;
import org.apache.pluto.PortletWindow;
-import org.apache.pluto.om.portlet.Portlet;
+import org.apache.pluto.om.portlet.PortletDefinition;
import org.apache.pluto.om.portlet.Supports;
import org.apache.pluto.util.StringManager;
@@ -112,7 +112,7 @@
servletResponse);
this.cacheControl = new CacheControlImpl();
PortletEntity portletEntity = portletWindow.getPortletEntity();
- Portlet portletDefinition = portletEntity.getPortletDefinition();
+ PortletDefinition portletDefinition = portletEntity.getPortletDefinition();
this.setProperty(EXPIRATION_CACHE, String.valueOf(portletDefinition.getExpirationCache()));
this.setProperty(CACHE_SCOPE, portletDefinition.getCacheScope());
}
@@ -354,7 +354,7 @@
protected boolean isValidContentType(String contentType) {
boolean valid = false;
- Portlet portletDD = getPortletWindow().getPortletEntity()
+ PortletDefinition portletDD = getPortletWindow().getPortletEntity()
.getPortletDefinition();
for (Iterator it = portletDD.getSupports().iterator();
!valid && it.hasNext(); ) {
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletConfigImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletConfigImpl.java?rev=704969&r1=704968&r2=704969&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletConfigImpl.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletConfigImpl.java Wed Oct 15 10:39:22 2008
@@ -38,8 +38,8 @@
import org.apache.pluto.om.portlet.ContainerRuntimeOption;
import org.apache.pluto.om.portlet.EventDefinitionReference;
import org.apache.pluto.om.portlet.InitParam;
-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;
public class PortletConfigImpl implements PortletConfig, InternalPortletConfig {
@@ -58,19 +58,19 @@
/**
* The portlet descriptor.
*/
- protected Portlet portletDD;
+ protected PortletDefinition portletDD;
/**
* The portlet application descriptor.
*/
- private PortletApp portletAppDD;
+ private PortletApplicationDefinition portletAppDD;
private ResourceBundleFactory bundles;
public PortletConfigImpl(ServletConfig servletConfig,
PortletContext portletContext,
- Portlet portletDD,
- PortletApp portletAppDD) {
+ PortletDefinition portletDD,
+ PortletApplicationDefinition portletAppDD) {
this.servletConfig = servletConfig;
this.portletContext = portletContext;
this.portletDD = portletDD;
@@ -133,7 +133,7 @@
return servletConfig;
}
- public Portlet getPortletDefinition() {
+ public PortletDefinition getPortletDefinition() {
return portletDD;
}
// --------------------------------------------------------------------------------------------
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletContextImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletContextImpl.java?rev=704969&r1=704968&r2=704969&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletContextImpl.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletContextImpl.java Wed Oct 15 10:39:22 2008
@@ -31,8 +31,8 @@
import org.apache.commons.logging.LogFactory;
import org.apache.pluto.internal.InternalPortletContext;
import org.apache.pluto.om.portlet.ContainerRuntimeOption;
-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;
/**
* Pluto's Portlet Context Implementation. This class implements the
@@ -54,11 +54,11 @@
/** Portlet */
- private Portlet portlet = null;
+ private PortletDefinition portlet = null;
private String applicationName;
- private final PortletApp portletApp;
+ private final PortletApplicationDefinition portletApp;
private final ServletContext servletContext;
private ClassLoader contextClassLoader;
@@ -71,7 +71,7 @@
* @param portletAppDD the portlet application descriptor.
*/
public PortletContextImpl(ServletContext servletContext,
- PortletApp portletApp) {
+ PortletApplicationDefinition portletApp) {
this.servletContext = servletContext;
this.portletApp = portletApp;
this.applicationName = servletContext.getServletContextName();
@@ -268,7 +268,7 @@
return servletContext;
}
- public PortletApp getPortletApplicationDefinition() {
+ public PortletApplicationDefinition getPortletApplicationDefinition() {
return portletApp;
}
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletEntityImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletEntityImpl.java?rev=704969&r1=704968&r2=704969&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletEntityImpl.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletEntityImpl.java Wed Oct 15 10:39:22 2008
@@ -21,7 +21,7 @@
import org.apache.pluto.PortletEntity;
import org.apache.pluto.core.PreferencesValidatorRegistry;
-import org.apache.pluto.om.portlet.Portlet;
+import org.apache.pluto.om.portlet.PortletDefinition;
/**
* The PortletEntity encapsulates all data pertaining to a single portlet
@@ -36,11 +36,11 @@
// Private Member Variables ------------------------------------------------
/** The cached PortletDD retrieved from the portlet descriptor registry. */
- private Portlet portletDefinition;
+ private PortletDefinition portletDefinition;
// Constructor -------------------------------------------------------------
- public PortletEntityImpl(Portlet portletDefinition) {
+ public PortletEntityImpl(PortletDefinition portletDefinition) {
this.portletDefinition = portletDefinition;
}
@@ -51,7 +51,7 @@
* Returns the portlet description. The return value cannot be NULL.
* @return the portlet description.
*/
- public Portlet getPortletDefinition() {
+ public PortletDefinition getPortletDefinition() {
return portletDefinition;
}
}
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletPreferencesImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletPreferencesImpl.java?rev=704969&r1=704968&r2=704969&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletPreferencesImpl.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletPreferencesImpl.java Wed Oct 15 10:39:22 2008
@@ -37,7 +37,7 @@
import org.apache.pluto.core.PreferencesValidatorRegistry;
import org.apache.pluto.internal.InternalPortletPreference;
import org.apache.pluto.internal.InternalPortletRequest;
-import org.apache.pluto.om.portlet.Portlet;
+import org.apache.pluto.om.portlet.PortletDefinition;
import org.apache.pluto.spi.optional.PortletPreferencesService;
import org.apache.pluto.util.StringManager;
@@ -275,7 +275,7 @@
// Validate the preferences before storing, if a validator is defined.
// If the preferences cannot pass the validation,
// an ValidatorException will be thrown out.
- Portlet portletD = window.getPortletEntity().getPortletDefinition();
+ PortletDefinition portletD = window.getPortletEntity().getPortletDefinition();
PreferencesValidator validator = PreferencesValidatorRegistry.getRegistry()
.getPreferencesValidator(portletD);
if (validator != null) {
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletRequestImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletRequestImpl.java?rev=704969&r1=704968&r2=704969&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletRequestImpl.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletRequestImpl.java Wed Oct 15 10:39:22 2008
@@ -59,7 +59,7 @@
import org.apache.pluto.PortletEntity;
import org.apache.pluto.PortletWindow;
import org.apache.pluto.internal.InternalPortletRequest;
-import org.apache.pluto.om.portlet.Portlet;
+import org.apache.pluto.om.portlet.PortletDefinition;
import org.apache.pluto.om.portlet.SecurityRoleRef;
import org.apache.pluto.om.portlet.Supports;
import org.apache.pluto.spi.PortletURLProvider;
@@ -394,7 +394,7 @@
*/
public boolean isUserInRole(String roleName) {
PortletEntity entity = portletWindow.getPortletEntity();
- Portlet def = entity.getPortletDefinition();
+ PortletDefinition def = entity.getPortletDefinition();
SecurityRoleRef ref = null;
Iterator refs = def.getSecurityRoleRefs().iterator();
@@ -538,7 +538,7 @@
public Enumeration getResponseContentTypes() {
if (contentTypes == null) {
contentTypes = new Vector();
- Portlet dd = portletWindow.getPortletEntity().getPortletDefinition();
+ PortletDefinition dd = portletWindow.getPortletEntity().getPortletDefinition();
Iterator supports = dd.getSupports().iterator();
while (supports.hasNext()) {
Supports sup = (Supports) supports.next();
@@ -667,7 +667,7 @@
return true;
}
- Portlet dd = portletWindow.getPortletEntity()
+ PortletDefinition dd = portletWindow.getPortletEntity()
.getPortletDefinition();
Iterator mimes = dd.getSupports().iterator();
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/ResourceBundleFactory.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/ResourceBundleFactory.java?rev=704969&r1=704968&r2=704969&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/ResourceBundleFactory.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/ResourceBundleFactory.java Wed Oct 15 10:39:22 2008
@@ -26,7 +26,7 @@
import org.apache.commons.logging.LogFactory;
import org.apache.pluto.PortletWindow;
import org.apache.pluto.core.ContainerInvocation;
-import org.apache.pluto.om.portlet.Portlet;
+import org.apache.pluto.om.portlet.PortletDefinition;
import org.apache.pluto.om.portlet.PortletInfo;
import org.apache.pluto.spi.optional.PortletInfoService;
import org.apache.pluto.util.StringManager;
@@ -60,7 +60,7 @@
*/
private String bundleName;
- public ResourceBundleFactory(Portlet dd) {
+ public ResourceBundleFactory(PortletDefinition dd) {
bundleName = dd.getResourceBundle();
if(LOG.isDebugEnabled()) {
LOG.debug("Resource Bundle Created: "+bundleName);
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/StateAwareResponseImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/StateAwareResponseImpl.java?rev=704969&r1=704968&r2=704969&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/StateAwareResponseImpl.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/StateAwareResponseImpl.java Wed Oct 15 10:39:22 2008
@@ -43,7 +43,7 @@
import org.apache.commons.logging.LogFactory;
import org.apache.pluto.PortletContainer;
import org.apache.pluto.PortletWindow;
-import org.apache.pluto.om.portlet.Portlet;
+import org.apache.pluto.om.portlet.PortletDefinition;
import org.apache.pluto.om.portlet.Supports;
import org.apache.pluto.spi.EventProvider;
import org.apache.pluto.spi.PortalCallbackService;
@@ -314,7 +314,7 @@
}
protected boolean isPortletModeAllowedByPortlet(PortletMode mode) {
- Portlet dd = getPortletWindow().getPortletEntity()
+ PortletDefinition dd = getPortletWindow().getPortletEntity()
.getPortletDefinition();
Iterator supports = dd.getSupports().iterator();
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/test/java/org/apache/pluto/internal/impl/ResourceBundleFactoryTest.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/test/java/org/apache/pluto/internal/impl/ResourceBundleFactoryTest.java?rev=704969&r1=704968&r2=704969&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/test/java/org/apache/pluto/internal/impl/ResourceBundleFactoryTest.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/test/java/org/apache/pluto/internal/impl/ResourceBundleFactoryTest.java Wed Oct 15 10:39:22 2008
@@ -24,7 +24,7 @@
import org.apache.pluto.descriptors.portlet20.PortletType;
import org.apache.pluto.descriptors.portlet20.PortletInfoType;
-import org.apache.pluto.om.portlet.Portlet;
+import org.apache.pluto.om.portlet.PortletDefinition;
import org.apache.pluto.om.portlet.PortletInfo;
import org.apache.pluto.util.PlutoTestCase;
@@ -34,7 +34,7 @@
*/
public class ResourceBundleFactoryTest extends PlutoTestCase {
- private Portlet validDD;
+ private PortletDefinition validDD;
public void setUp() throws Exception {
super.setUp();
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet10/PortletAppType.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet10/PortletAppType.java?rev=704969&r1=704968&r2=704969&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet10/PortletAppType.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet10/PortletAppType.java Wed Oct 15 10:39:22 2008
@@ -34,8 +34,8 @@
import org.apache.pluto.om.portlet.Filter;
import org.apache.pluto.om.portlet.FilterMapping;
import org.apache.pluto.om.portlet.Listener;
-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.PublicRenderParameter;
import org.apache.pluto.om.portlet.SecurityConstraint;
import org.apache.pluto.om.portlet.UserAttribute;
@@ -68,10 +68,10 @@
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "portlet-appType", propOrder = { "portlet", "customPortletMode", "customWindowState", "userAttribute",
"securityConstraint" })
-public class PortletAppType implements PortletApp
+public class PortletAppType implements PortletApplicationDefinition
{
@XmlElement(name = "portlet", type = PortletType.class)
- protected List<Portlet> portlet;
+ protected List<PortletDefinition> portlet;
@XmlElement(name = "custom-portlet-mode", type = CustomPortletModeType.class)
protected List<CustomPortletMode> customPortletMode;
@XmlElement(name = "custom-window-state", type = CustomWindowStateType.class)
@@ -97,18 +97,18 @@
this.name = name;
}
- public ElementFactoryList<Portlet> getPortlets()
+ public ElementFactoryList<PortletDefinition> getPortlets()
{
if (portlet == null || !(portlet instanceof ElementFactoryList))
{
- ElementFactoryList<Portlet> lf = new ElementFactoryList<Portlet>(new ElementFactoryList.Factory<Portlet>()
+ ElementFactoryList<PortletDefinition> lf = new ElementFactoryList<PortletDefinition>(new ElementFactoryList.Factory<PortletDefinition>()
{
- public Class<? extends Portlet> getElementClass()
+ public Class<? extends PortletDefinition> getElementClass()
{
return PortletType.class;
}
- public Portlet newElement()
+ public PortletDefinition newElement()
{
return new PortletType();
}
@@ -119,7 +119,7 @@
}
portlet = lf;
}
- return (ElementFactoryList<Portlet>) portlet;
+ return (ElementFactoryList<PortletDefinition>) portlet;
}
public ElementFactoryList<CustomPortletMode> getCustomPortletModes()
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet10/PortletPreferencesType.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet10/PortletPreferencesType.java?rev=704969&r1=704968&r2=704969&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet10/PortletPreferencesType.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet10/PortletPreferencesType.java Wed Oct 15 10:39:22 2008
@@ -25,8 +25,8 @@
import javax.xml.bind.annotation.XmlType;
import org.apache.pluto.om.ElementFactoryList;
-import org.apache.pluto.om.portlet.PortletPreference;
-import org.apache.pluto.om.portlet.PortletPreferences;
+import org.apache.pluto.om.portlet.Preference;
+import org.apache.pluto.om.portlet.Preferences;
/**
* Portlet persistent preference store. Used in: portlet <p>Java class for portlet-preferencesType complex type. <p>The
@@ -50,28 +50,28 @@
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "portlet-preferencesType", propOrder = { "preference", "preferencesValidator" })
-public class PortletPreferencesType implements PortletPreferences
+public class PortletPreferencesType implements Preferences
{
@XmlElement(name = "preference", type=PreferenceType.class)
- protected List<PortletPreference> preference;
+ protected List<Preference> preference;
@XmlElement(name = "preferences-validator")
protected String preferencesValidator;
@XmlAttribute
protected String id;
- public ElementFactoryList<PortletPreference> getPortletPreferences()
+ public ElementFactoryList<Preference> getPortletPreferences()
{
if (preference == null || !(preference instanceof ElementFactoryList))
{
- ElementFactoryList<PortletPreference> lf =
- new ElementFactoryList<PortletPreference>( new ElementFactoryList.Factory<PortletPreference>()
+ ElementFactoryList<Preference> lf =
+ new ElementFactoryList<Preference>( new ElementFactoryList.Factory<Preference>()
{
- public Class<? extends PortletPreference> getElementClass()
+ public Class<? extends Preference> getElementClass()
{
return PreferenceType.class;
}
- public PortletPreference newElement()
+ public Preference newElement()
{
return new PreferenceType();
}
@@ -82,7 +82,7 @@
}
preference = lf;
}
- return (ElementFactoryList<PortletPreference>)preference;
+ return (ElementFactoryList<Preference>)preference;
}
public String getPreferencesValidator()
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet10/PortletType.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet10/PortletType.java?rev=704969&r1=704968&r2=704969&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet10/PortletType.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet10/PortletType.java Wed Oct 15 10:39:22 2008
@@ -35,10 +35,10 @@
import org.apache.pluto.om.portlet.DisplayName;
import org.apache.pluto.om.portlet.EventDefinitionReference;
import org.apache.pluto.om.portlet.InitParam;
-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.PortletInfo;
-import org.apache.pluto.om.portlet.PortletPreferences;
+import org.apache.pluto.om.portlet.Preferences;
import org.apache.pluto.om.portlet.SecurityRoleRef;
import org.apache.pluto.om.portlet.Supports;
@@ -81,7 +81,7 @@
@XmlType(name = "portletType", propOrder = { "description", "portletName", "displayName", "portletClass", "initParam",
"expirationCache", "supports", "supportedLocale", "resourceBundle",
"portletInfo", "portletPreferences", "securityRoleRef" })
-public class PortletType implements Portlet
+public class PortletType implements PortletDefinition
{
@XmlElement(name = "description", type = DescriptionType.class)
protected List<Description> description;
@@ -114,18 +114,18 @@
@XmlAttribute
protected String id;
@XmlTransient
- private PortletApp application;
+ private PortletApplicationDefinition application;
public PortletType()
{
}
- public PortletType(PortletApp application)
+ public PortletType(PortletApplicationDefinition application)
{
this.application = application;
}
- public PortletApp getApplication()
+ public PortletApplicationDefinition getApplication()
{
return application;
}
@@ -303,12 +303,12 @@
return portletInfo;
}
- public PortletPreferences getPortletPreferences()
+ public Preferences getPortletPreferences()
{
return getPortletPreferences(false);
}
- public PortletPreferences getPortletPreferences(boolean create)
+ public Preferences getPortletPreferences(boolean create)
{
if (create && portletPreferences == null)
{
@@ -385,6 +385,6 @@
public void afterUnmarshal(Unmarshaller u, Object parent)
{
- application = (PortletApp) parent;
+ application = (PortletApplicationDefinition) parent;
}
}
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet10/PreferenceType.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet10/PreferenceType.java?rev=704969&r1=704968&r2=704969&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet10/PreferenceType.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet10/PreferenceType.java Wed Oct 15 10:39:22 2008
@@ -27,7 +27,7 @@
import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.apache.pluto.om.portlet.PortletPreference;
+import org.apache.pluto.om.portlet.Preference;
/**
* Persistent preference values that may be used for customization and personalization by the portlet. Used in:
@@ -53,7 +53,7 @@
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "preferenceType", propOrder = { "name", "value", "readOnly" })
-public class PreferenceType implements PortletPreference
+public class PreferenceType implements Preference
{
@XmlElement(required = true)
@XmlJavaTypeAdapter(value=CollapsedStringAdapter.class)
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet20/PortletAppType.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet20/PortletAppType.java?rev=704969&r1=704968&r2=704969&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet20/PortletAppType.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet20/PortletAppType.java Wed Oct 15 10:39:22 2008
@@ -38,8 +38,8 @@
import org.apache.pluto.om.portlet.Filter;
import org.apache.pluto.om.portlet.FilterMapping;
import org.apache.pluto.om.portlet.Listener;
-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.PublicRenderParameter;
import org.apache.pluto.om.portlet.SecurityConstraint;
import org.apache.pluto.om.portlet.UserAttribute;
@@ -82,10 +82,10 @@
"securityConstraint", "resourceBundle", "filter", "filterMapping",
"defaultNamespace", "eventDefinition", "publicRenderParameter",
"listener", "containerRuntimeOption" })
-public class PortletAppType implements PortletApp
+public class PortletAppType implements PortletApplicationDefinition
{
@XmlElement(name = "portlet", type=PortletType.class)
- protected List<Portlet> portlet;
+ protected List<PortletDefinition> portlet;
@XmlElement(name = "custom-portlet-mode", type=CustomPortletModeType.class)
protected List<CustomPortletMode> customPortletMode;
@XmlElement(name = "custom-window-state", type=CustomWindowStateType.class)
@@ -130,19 +130,19 @@
this.name = name;
}
- public ElementFactoryList<Portlet> getPortlets()
+ public ElementFactoryList<PortletDefinition> getPortlets()
{
if (portlet == null || !(portlet instanceof ElementFactoryList))
{
- ElementFactoryList<Portlet> lf =
- new ElementFactoryList<Portlet>( new ElementFactoryList.Factory<Portlet>()
+ ElementFactoryList<PortletDefinition> lf =
+ new ElementFactoryList<PortletDefinition>( new ElementFactoryList.Factory<PortletDefinition>()
{
- public Class<? extends Portlet> getElementClass()
+ public Class<? extends PortletDefinition> getElementClass()
{
return PortletType.class;
}
- public Portlet newElement()
+ public PortletDefinition newElement()
{
return new PortletType();
}
@@ -153,7 +153,7 @@
}
portlet = lf;
}
- return (ElementFactoryList<Portlet>)portlet;
+ return (ElementFactoryList<PortletDefinition>)portlet;
}
public ElementFactoryList<CustomPortletMode> getCustomPortletModes()
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet20/PortletPreferencesType.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet20/PortletPreferencesType.java?rev=704969&r1=704968&r2=704969&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet20/PortletPreferencesType.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet20/PortletPreferencesType.java Wed Oct 15 10:39:22 2008
@@ -25,8 +25,8 @@
import javax.xml.bind.annotation.XmlType;
import org.apache.pluto.om.ElementFactoryList;
-import org.apache.pluto.om.portlet.PortletPreference;
-import org.apache.pluto.om.portlet.PortletPreferences;
+import org.apache.pluto.om.portlet.Preference;
+import org.apache.pluto.om.portlet.Preferences;
/**
* Portlet persistent preference store. Used in: portlet <p>Java class for portlet-preferencesType complex type. <p>The
@@ -50,28 +50,28 @@
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "portlet-preferencesType", propOrder = { "preference", "preferencesValidator" })
-public class PortletPreferencesType implements PortletPreferences
+public class PortletPreferencesType implements Preferences
{
@XmlElement(name = "preference", type=PreferenceType.class)
- protected List<PortletPreference> preference;
+ protected List<Preference> preference;
@XmlElement(name = "preferences-validator")
protected String preferencesValidator;
@XmlAttribute
protected String id;
- public ElementFactoryList<PortletPreference> getPortletPreferences()
+ public ElementFactoryList<Preference> getPortletPreferences()
{
if (preference == null || !(preference instanceof ElementFactoryList))
{
- ElementFactoryList<PortletPreference> lf =
- new ElementFactoryList<PortletPreference>( new ElementFactoryList.Factory<PortletPreference>()
+ ElementFactoryList<Preference> lf =
+ new ElementFactoryList<Preference>( new ElementFactoryList.Factory<Preference>()
{
- public Class<? extends PortletPreference> getElementClass()
+ public Class<? extends Preference> getElementClass()
{
return PreferenceType.class;
}
- public PortletPreference newElement()
+ public Preference newElement()
{
return new PreferenceType();
}
@@ -82,7 +82,7 @@
}
preference = lf;
}
- return (ElementFactoryList<PortletPreference>)preference;
+ return (ElementFactoryList<Preference>)preference;
}
public String getPreferencesValidator()
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet20/PortletType.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet20/PortletType.java?rev=704969&r1=704968&r2=704969&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet20/PortletType.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet20/PortletType.java Wed Oct 15 10:39:22 2008
@@ -35,10 +35,10 @@
import org.apache.pluto.om.portlet.DisplayName;
import org.apache.pluto.om.portlet.EventDefinitionReference;
import org.apache.pluto.om.portlet.InitParam;
-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.PortletInfo;
-import org.apache.pluto.om.portlet.PortletPreferences;
+import org.apache.pluto.om.portlet.Preferences;
import org.apache.pluto.om.portlet.SecurityRoleRef;
import org.apache.pluto.om.portlet.Supports;
@@ -83,7 +83,7 @@
"resourceBundle", "portletInfo", "portletPreferences", "securityRoleRef",
"supportedProcessingEvent", "supportedPublishingEvent",
"supportedPublicRenderParameter", "containerRuntimeOption" })
-public class PortletType implements Portlet
+public class PortletType implements PortletDefinition
{
@XmlElement(name = "description", type=DescriptionType.class)
protected List<Description> description;
@@ -128,18 +128,18 @@
protected String id;
@XmlTransient
- private PortletApp application;
+ private PortletApplicationDefinition application;
public PortletType()
{
}
- public PortletType(PortletApp application)
+ public PortletType(PortletApplicationDefinition application)
{
this.application = application;
}
- public PortletApp getApplication()
+ public PortletApplicationDefinition getApplication()
{
return application;
}
@@ -325,12 +325,12 @@
return portletInfo;
}
- public PortletPreferences getPortletPreferences()
+ public Preferences getPortletPreferences()
{
return getPortletPreferences(false);
}
- public PortletPreferences getPortletPreferences(boolean create)
+ public Preferences getPortletPreferences(boolean create)
{
if (create && portletPreferences == null)
{
@@ -473,6 +473,6 @@
}
public void afterUnmarshal(Unmarshaller u, Object parent) {
- application = (PortletApp)parent;
+ application = (PortletApplicationDefinition)parent;
}
}
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet20/PreferenceType.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet20/PreferenceType.java?rev=704969&r1=704968&r2=704969&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet20/PreferenceType.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet20/PreferenceType.java Wed Oct 15 10:39:22 2008
@@ -27,7 +27,7 @@
import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.apache.pluto.om.portlet.PortletPreference;
+import org.apache.pluto.om.portlet.Preference;
/**
* Persistent preference values that may be used for customization and personalization by the portlet. Used in:
@@ -53,7 +53,7 @@
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "preferenceType", propOrder = { "name", "value", "readOnly" })
-public class PreferenceType implements PortletPreference
+public class PreferenceType implements Preference
{
@XmlElement(required = true)
@XmlJavaTypeAdapter(value=CollapsedStringAdapter.class)
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=704969&r1=704968&r2=704969&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 Wed Oct 15 10:39:22 2008
@@ -20,7 +20,7 @@
import java.io.InputStream;
import java.io.OutputStream;
-import org.apache.pluto.om.portlet.PortletApp;
+import org.apache.pluto.om.portlet.PortletApplicationDefinition;
/**
* Read/Write services for Portlet Application configuration
@@ -39,7 +39,7 @@
* @return Object representation of the descriptor.
* @throws IOException if an IO error occurs.
*/
- PortletApp read(InputStream in) throws IOException;
+ PortletApplicationDefinition read(InputStream in) throws IOException;
/**
* Write the PortletApp deployment descriptor
@@ -48,5 +48,5 @@
* @param out
* @throws IOException if an IO error occurs.
*/
- void write(PortletApp portletDescriptor, OutputStream out) throws IOException;
+ void write(PortletApplicationDefinition portletDescriptor, OutputStream out) throws IOException;
}
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=704969&r1=704968&r2=704969&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 Wed Oct 15 10:39:22 2008
@@ -11,7 +11,7 @@
import javax.xml.bind.Unmarshaller;
import org.apache.pluto.descriptors.services.PortletAppDescriptorService;
-import org.apache.pluto.om.portlet.PortletApp;
+import org.apache.pluto.om.portlet.PortletApplicationDefinition;
/**
* JAXB implementation of the xml2java binding
@@ -28,8 +28,8 @@
*/
@SuppressWarnings("unchecked")
- public PortletApp read(InputStream in) throws IOException {
- JAXBElement<PortletApp> portletApp = null;
+ public PortletApplicationDefinition read(InputStream in) throws IOException {
+ JAXBElement<PortletApplicationDefinition> portletApp = null;
try {
JAXBContext jc = JAXBContext.newInstance(
"org.apache.pluto.descriptors.portlet10" + ":" +
@@ -38,7 +38,7 @@
Unmarshaller u = jc.createUnmarshaller();
u.setEventHandler(new javax.xml.bind.helpers.DefaultValidationEventHandler());
- portletApp = (JAXBElement<PortletApp>) u.unmarshal(in);
+ portletApp = (JAXBElement<PortletApplicationDefinition>) u.unmarshal(in);
}catch (JAXBException jaxbEx){
jaxbEx.printStackTrace();
throw new IOException(jaxbEx.getMessage());
@@ -55,7 +55,7 @@
* @param portlet
* @throws java.io.IOException
*/
- public void write(PortletApp portlet, OutputStream out) throws IOException {
+ public void write(PortletApplicationDefinition portlet, OutputStream out) throws IOException {
try {
JAXBContext jc = null;
if (portlet.getVersion().equals("1.0"))
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-impl/src/test/java/org/apache/pluto/descriptors/services/jaxb/JaxBDescriptorServiceImplTest.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/jaxb/JaxBDescriptorServiceImplTest.java?rev=704969&r1=704968&r2=704969&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-impl/src/test/java/org/apache/pluto/descriptors/services/jaxb/JaxBDescriptorServiceImplTest.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-impl/src/test/java/org/apache/pluto/descriptors/services/jaxb/JaxBDescriptorServiceImplTest.java Wed Oct 15 10:39:22 2008
@@ -24,8 +24,8 @@
import junit.framework.Assert;
import junit.framework.TestCase;
-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.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -308,15 +308,15 @@
InputStream in = new ByteArrayInputStream(xml286.toString().getBytes());
- PortletApp portletApp286 = jaxb.read(in);
+ PortletApplicationDefinition portletApp286 = jaxb.read(in);
in = new ByteArrayInputStream(xml168.toString().getBytes());
- PortletApp portletApp168 = jaxb.read(in);
+ PortletApplicationDefinition portletApp168 = jaxb.read(in);
// test if portlet has the right params:
// test jsr168 compliant portlets
- Portlet portlet168 = (Portlet)portletApp168.getPortlets().get(0);
+ PortletDefinition portlet168 = (PortletDefinition)portletApp168.getPortlets().get(0);
assertTrue(portlet168.getExpirationCache()==50);
assertEquals(portlet168.getPortletName(),"portlet168");
assertEquals(portlet168.getInitParams().get(0).getParamValue(),"value");
@@ -332,7 +332,7 @@
jaxb.write(portletApp168, System.out);
// portlet id
- Portlet portlet286 = (Portlet)portletApp286.getPortlets().get(0);
+ PortletDefinition portlet286 = (PortletDefinition)portletApp286.getPortlets().get(0);
// assertTrue(portlet1.getId().equals("id2"));
// portlet class
@@ -392,23 +392,23 @@
public void testParseNoExpirationCache168() throws IOException {
InputStream inputStream = new ByteArrayInputStream(portlet168NoCache.toString().getBytes());
- PortletApp portletDD = jaxb.read( inputStream );
+ PortletApplicationDefinition portletDD = jaxb.read( inputStream );
assertEquals( "1.0", portletDD.getVersion() );
assertEquals( 1, portletDD.getPortlets().size() );
- Portlet pd = (Portlet) portletDD.getPortlets().get( 0 );
+ PortletDefinition pd = (PortletDefinition) portletDD.getPortlets().get( 0 );
assertEquals( pd.getExpirationCache(), 0 );
}
public void testParseNoExpirationCache286() throws IOException {
InputStream inputStream = new ByteArrayInputStream(portlet286NoCache.toString().getBytes());
- PortletApp portletDD = jaxb.read( inputStream );
+ PortletApplicationDefinition portletDD = jaxb.read( inputStream );
assertEquals( "2.0", portletDD.getVersion() );
assertEquals( 1, portletDD.getPortlets().size() );
- Portlet pd = (Portlet) portletDD.getPortlets().get( 0 );
+ PortletDefinition pd = (PortletDefinition) portletDD.getPortlets().get( 0 );
assertEquals( pd.getExpirationCache(), 0 );
}
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=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/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 Wed Oct 15 10:39:22 2008
@@ -56,8 +56,8 @@
import org.apache.pluto.internal.impl.EventImpl;
import org.apache.pluto.om.portlet.EventDefinition;
import org.apache.pluto.om.portlet.EventDefinitionReference;
-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.spi.EventProvider;
import org.apache.pluto.spi.optional.PortletRegistryService;
@@ -266,12 +266,12 @@
for (PortletWindowConfig portlet : portlets) {
String contextPath = portlet.getContextPath();
- PortletApp portletAppDD = null;
+ PortletApplicationDefinition portletAppDD = null;
try {
portletAppDD = portletRegistry.getPortletApplication(contextPath);
- List<Portlet> portletDDs = portletAppDD.getPortlets();
+ List<PortletDefinition> portletDDs = portletAppDD.getPortlets();
List<QName> aliases = getAllAliases(eventName, portletAppDD);
- for (Portlet portletDD : portletDDs) {
+ for (PortletDefinition portletDD : portletDDs) {
List<EventDefinitionReference> processingEvents = portletDD.getSupportedProcessingEvents();
if (isEventSupported(processingEvents, eventName, portletAppDD.getDefaultNamespace())) {
if (portletDD.getPortletName().equals(portlet.getPortletName())) {
@@ -342,7 +342,7 @@
return false;
}
- private List<QName> getAllAliases(QName eventName, PortletApp portletAppDD) {
+ private List<QName> getAllAliases(QName eventName, PortletApplicationDefinition portletAppDD) {
if (portletAppDD.getEventDefinitions() != null) {
for (EventDefinition def : portletAppDD.getEventDefinitions()){
@@ -537,7 +537,7 @@
private boolean isValueInstanceOfDefinedClass(QName qname,
Serializable value) {
- PortletApp app = portletWindow.getPortletEntity().getPortletDefinition().getApplication();
+ PortletApplicationDefinition app = portletWindow.getPortletEntity().getPortletDefinition().getApplication();
List<EventDefinition> events = app.getEventDefinitions();
if (events != null) {