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 cz...@apache.org on 2009/04/08 12:10:40 UTC
svn commit: r763164 - in /portals/pluto/trunk:
pluto-container-api/src/main/java/org/apache/pluto/container/
pluto-container/src/main/java/org/apache/pluto/container/impl/
pluto-container/src/main/java/org/apache/pluto/container/util/
Author: cziegeler
Date: Wed Apr 8 10:10:39 2009
New Revision: 763164
URL: http://svn.apache.org/viewvc?rev=763164&view=rev
Log:
Cosmetic changes to source, clean up javadocs etc.
Modified:
portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/CCPPProfileService.java
portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/ContainerInfo.java
portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/ContainerServices.java
portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/EventCoordinationService.java
portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/EventProvider.java
portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/FilterManager.java
portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/FilterManagerService.java
portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/NamespaceMapper.java
portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/P3PAttributes.java
portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletActionResponseContext.java
portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletAppDescriptorService.java
portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletContainer.java
portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletContainerException.java
portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletEntity.java
portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletInvokerService.java
portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletPreference.java
portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletPreferencesService.java
portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletWindow.java
portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/RequestDispatcherPathInfoProvider.java
portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/ResourceURLProvider.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/RequestDispatcherPathInfoProviderImpl.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/ServletPortletSessionProxy.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/util/ClasspathScanner.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/util/NamespacedNamesEnumeration.java
Modified: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/CCPPProfileService.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/CCPPProfileService.java?rev=763164&r1=763163&r2=763164&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/CCPPProfileService.java (original)
+++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/CCPPProfileService.java Wed Apr 8 10:10:39 2009
@@ -24,7 +24,7 @@
*
*/
public interface CCPPProfileService {
-
- public Profile getCCPPProfile(HttpServletRequest httpServletRequest);
+
+ Profile getCCPPProfile(HttpServletRequest httpServletRequest);
}
Modified: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/ContainerInfo.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/ContainerInfo.java?rev=763164&r1=763163&r2=763164&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/ContainerInfo.java (original)
+++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/ContainerInfo.java Wed Apr 8 10:10:39 2009
@@ -17,11 +17,10 @@
package org.apache.pluto.container;
/**
- * @version $Id$
- *
+ * Information about the container.
*/
-public interface ContainerInfo
-{
+public interface ContainerInfo {
+
String getServerInfo();
String getPortletContainerName();
String getPortletContainerVersion();
Modified: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/ContainerServices.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/ContainerServices.java?rev=763164&r1=763163&r2=763164&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/ContainerServices.java (original)
+++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/ContainerServices.java Wed Apr 8 10:10:39 2009
@@ -42,8 +42,8 @@
/**
* Returns the FilterManagerService
*/
- FilterManagerService getFilterManagerService();
-
+ FilterManagerService getFilterManagerService();
+
/**
* Returns the PortletURLListenerService
*/
@@ -79,7 +79,7 @@
* @return user info service
*/
UserInfoService getUserInfoService();
-
+
/**
* Returns the NamespaceMapper used to retrieve the Portal
* specific PortletWindow namespace and encoding/decoding
Modified: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/EventCoordinationService.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/EventCoordinationService.java?rev=763164&r1=763163&r2=763164&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/EventCoordinationService.java (original)
+++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/EventCoordinationService.java Wed Apr 8 10:10:39 2009
@@ -25,7 +25,6 @@
/**
* @author <a href="mailto:ate@douma.nu">Ate Douma</a>
- * @version $Id$
*/
public interface EventCoordinationService
{
Modified: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/EventProvider.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/EventProvider.java?rev=763164&r1=763163&r2=763164&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/EventProvider.java (original)
+++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/EventProvider.java Wed Apr 8 10:10:39 2009
@@ -21,15 +21,14 @@
import javax.portlet.Event;
import javax.xml.namespace.QName;
- /**
- *
- * @author <a href="mailto:ferdy@informatik.uni-jena.de">Fred Thiele</a>
- * @author <a href="mailto:chrisra@cs.uni-jena.de">Christian Raschka</a>
- *
- */
-
+/**
+ *
+ * @author <a href="mailto:ferdy@informatik.uni-jena.de">Fred Thiele</a>
+ * @author <a href="mailto:chrisra@cs.uni-jena.de">Christian Raschka</a>
+ *
+ */
public interface EventProvider {
- public Event createEvent(QName name, Serializable value)
- throws IllegalArgumentException;
+ Event createEvent(QName name, Serializable value)
+ throws IllegalArgumentException;
}
Modified: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/FilterManager.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/FilterManager.java?rev=763164&r1=763163&r2=763164&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/FilterManager.java (original)
+++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/FilterManager.java Wed Apr 8 10:10:39 2009
@@ -25,6 +25,7 @@
import javax.portlet.PortletRequest;
import javax.portlet.PortletResponse;
import javax.portlet.ResourceServingPortlet;
+
/**
* Manage the initialization and doFilter for the filter which are
* declareted in the deployment descriptor.
@@ -32,7 +33,8 @@
* @version 2.0
*/
public interface FilterManager {
- public void processFilter(PortletRequest req, PortletResponse res, ClassLoader loader, Portlet portlet, PortletContext portletContext) throws PortletException, IOException;
- public void processFilter(PortletRequest req, PortletResponse res, ClassLoader loader, ResourceServingPortlet resourceServingPortlet, PortletContext portletContext)throws PortletException, IOException;
- public void processFilter(PortletRequest req, PortletResponse res, ClassLoader loader, EventPortlet eventPortlet, PortletContext portletContext)throws PortletException, IOException;
+
+ void processFilter(PortletRequest req, PortletResponse res, ClassLoader loader, Portlet portlet, PortletContext portletContext) throws PortletException, IOException;
+ void processFilter(PortletRequest req, PortletResponse res, ClassLoader loader, ResourceServingPortlet resourceServingPortlet, PortletContext portletContext)throws PortletException, IOException;
+ void processFilter(PortletRequest req, PortletResponse res, ClassLoader loader, EventPortlet eventPortlet, PortletContext portletContext)throws PortletException, IOException;
}
Modified: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/FilterManagerService.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/FilterManagerService.java?rev=763164&r1=763163&r2=763164&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/FilterManagerService.java (original)
+++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/FilterManagerService.java Wed Apr 8 10:10:39 2009
@@ -20,14 +20,12 @@
/**
* Service to retrieve a FilterManager for a specific Portlet in a lifecycle
- * @version $Id$
- *
*/
-public interface FilterManagerService
-{
+public interface FilterManagerService {
+
/**
* Returns the FilterManager, this is used to process the filter.
* @return FilterManager
*/
- public FilterManager getFilterManager(PortletApplicationDefinition portletAppDD, String portletName, String lifeCycle);
+ FilterManager getFilterManager(PortletApplicationDefinition portletAppDD, String portletName, String lifeCycle);
}
Modified: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/NamespaceMapper.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/NamespaceMapper.java?rev=763164&r1=763163&r2=763164&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/NamespaceMapper.java (original)
+++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/NamespaceMapper.java Wed Apr 8 10:10:39 2009
@@ -20,6 +20,7 @@
/**
**/
public interface NamespaceMapper {
- public String encode(PortletWindowID namespace, String name);
- public String decode(PortletWindowID ns, String name);
+
+ String encode(PortletWindowID namespace, String name);
+ String decode(PortletWindowID ns, String name);
}
Modified: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/P3PAttributes.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/P3PAttributes.java?rev=763164&r1=763163&r2=763164&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/P3PAttributes.java (original)
+++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/P3PAttributes.java Wed Apr 8 10:10:39 2009
@@ -27,147 +27,147 @@
*/
public interface P3PAttributes {
- /* NOTE: The user.bdate must consist of a string that represents the time in milliseconds
+ /* NOTE: The user.bdate must consist of a string that represents the time in milliseconds
since January 1, 1970, 00:00:00 GMT. */
- public static final String USER_BDATE = "user.bdate";
- public static final String USER_GENDER = "user.gender";
- public static final String USER_EMPLOYER = "user.employer";
- public static final String USER_DEPARTMENT = "user.department";
- public static final String USER_JOBTITLE = "user.jobtitle";
- public static final String USER_NAME_PREFIX = "user.name.prefix";
- public static final String USER_NAME_GIVEN = "user.name.given";
- public static final String USER_NAME_FAMILY = "user.name.family";
- public static final String USER_NAME_MIDDLE = "user.name.middle";
- public static final String USER_NAME_SUFFIX = "user.name.suffix";
- public static final String USER_NAME_NICKNAME = "user.name.nickName";
- public static final String USER_HOME_INFO_POSTAL_NAME = "user.home-info.postal.name";
- public static final String USER_HOME_INFO_POSTAL_STREET = "user.home-info.postal.street";
- public static final String USER_HOME_INFO_POSTAL_CITY = "user.home-info.postal.city";
- public static final String USER_HOME_INFO_POSTAL_STATEPROV = "user.home-info.postal.stateprov";
- public static final String USER_HOME_INFO_POSTAL_POSTALCODE = "user.home-info.postal.postalcode";
- public static final String USER_HOME_INFO_POSTAL_COUNTRY = "user.home-info.postal.country";
- public static final String USER_HOME_INFO_POSTAL_ORGANIZATION= "user.home-info.postal.organization";
- public static final String USER_HOME_INFO_TELECOM_TELEPHONE_INTCODE = "user.home-info.telecom.telephone.intcode";
- public static final String USER_HOME_INFO_TELECOM_TELEPHONE_LOCCODE = "user.home-info.telecom.telephone.loccode";
- public static final String USER_HOME_INFO_TELECOM_TELEPHONE_NUMBER = "user.home-info.telecom.telephone.number";
- public static final String USER_HOME_INFO_TELECOM_TELEPHONE_EXT = "user.home-info.telecom.telephone.ext";
- public static final String USER_HOME_INFO_TELECOM_TELEPHONE_COMMENT = "user.home-info.telecom.telephone.comment";
- public static final String USER_HOME_INFO_TELECOM_FAX_INTCODE = "user.home-info.telecom.fax.intcode";
- public static final String USER_HOME_INFO_TELECOM_FAX_LOCCODE = "user.home-info.telecom.fax.loccode";
- public static final String USER_HOME_INFO_TELECOM_FAX_NUMBER = "user.home-info.telecom.fax.number";
- public static final String USER_HOME_INFO_TELECOM_FAX_EXT = "user.home-info.telecom.fax.ext";
- public static final String USER_HOME_INFO_TELECOM_FAX_COMMENT = "user.home-info.telecom.fax.comment";
- public static final String USER_HOME_INFO_TELECOM_MOBILE_INTCODE = "user.home-info.telecom.mobile.intcode";
- public static final String USER_HOME_INFO_TELECOM_MOBILE_LOCCODE = "user.home-info.telecom.mobile.loccode";
- public static final String USER_HOME_INFO_TELECOM_MOBILE_NUMBER = "user.home-info.telecom.mobile.number";
- public static final String USER_HOME_INFO_TELECOM_MOBILE_EXT = "user.home-info.telecom.mobile.ext";
- public static final String USER_HOME_INFO_TELECOM_MOBILE_COMMENT = "user.home-info.telecom.mobile.comment";
- public static final String USER_HOME_INFO_TELECOM_PAGER_INTCODE = "user.home-info.telecom.pager.intcode";
- public static final String USER_HOME_INFO_TELECOM_PAGER_LOCCODE = "user.home-info.telecom.pager.loccode";
- public static final String USER_HOME_INFO_TELECOM_PAGER_NUMBER = "user.home-info.telecom.pager.number";
- public static final String USER_HOME_INFO_TELECOM_PAGER_EXT = "user.home-info.telecom.pager.ext";
- public static final String USER_HOME_INFO_TELECOM_PAGER_COMMENT = "user.home-info.telecom.pager.comment";
- public static final String USER_HOME_INFO_ONLINE_EMAIL = "user.home-info.online.email";
- public static final String USER_HOME_INFO_ONLINE_URI = "user.home-info.online.uri";
- public static final String USER_BUSINESS_INFO_POSTAL_NAME = "user.business-info.postal.name";
- public static final String USER_BUSINESS_INFO_POSTAL_STREET = "user.business-info.postal.street";
- public static final String USER_BUSINESS_INFO_POSTAL_CITY = "user.business-info.postal.city";
- public static final String USER_BUSINESS_INFO_POSTAL_STATEPROV = "user.business-info.postal.stateprov";
- public static final String USER_BUSINESS_INFO_POSTAL_POSTALCODE = "user.business-info.postal.postalcode";
- public static final String USER_BUSINESS_INFO_POSTAL_COUNTRY = "user.business-info.postal.country";
- public static final String USER_BUSINESS_INFO_POSTAL_ORGANIZATION = "user.business-info.postal.organization";
- public static final String USER_BUSINESS_INFO_TELECOM_TELEPHONE_INTCODE = "user.business-info.telecom.telephone.intcode";
- public static final String USER_BUSINESS_INFO_TELECOM_TELEPHONE_LOCCODE= "user.business-info.telecom.telephone.loccode";
- public static final String USER_BUSINESS_INFO_TELECOM_TELEPHONE_NUMBER = "user.business-info.telecom.telephone.number";
- public static final String USER_BUSINESS_INFO_TELECOM_TELEPHONE_EXT = "user.business-info.telecom.telephone.ext";
- public static final String USER_BUSINESS_INFO_TELECOM_TELEPHONE_COMMENT = "user.business-info.telecom.telephone.comment";
- public static final String USER_BUSINESS_INFO_TELECOM_FAX_INTCODE = "user.business-info.telecom.fax.intcode";
- public static final String USER_BUSINESS_INFO_TELECOM_FAX_LOCCODE = "user.business-info.telecom.fax.loccode";
- public static final String USER_BUSINESS_INFO_TELECOM_FAX_NUMBER = "user.business-info.telecom.fax.number";
- public static final String USER_BUSINESS_INFO_TELECOM_FAX_EXT = "user.business-info.telecom.fax.ext";
- public static final String USER_BUSINESS_INFO_TELECOM_FAX_COMMENT = "user.business-info.telecom.fax.comment";
- public static final String USER_BUSINESS_INFO_TELECOM_MOBILE_INTCODE = "user.business-info.telecom.mobile.intcode";
- public static final String USER_BUSINESS_INFO_TELECOM_MOBILE_LOCCODE = "user.business-info.telecom.mobile.loccode";
- public static final String USER_BUSINESS_INFO_TELECOM_MOBILE_NUMBER = "user.business-info.telecom.mobile.number";
- public static final String USER_BUSINESS_INFO_TELECOM_MOBILE_EXT = "user.business-info.telecom.mobile.ext";
- public static final String USER_BUSINESS_INFO_TELECOM_MOBILE_COMMENT = "user.business-info.telecom.mobile.comment";
- public static final String USER_BUSINESS_INFO_TELECOM_PAGER_INTCODE = "user.business-info.telecom.pager.intcode";
- public static final String USER_BUSINESS_INFO_TELECOM_PAGER_LOCCODE = "user.business-info.telecom.pager.loccode";
- public static final String USER_BUSINESS_INFO_TELECOM_PAGER_NUMBER = "user.business-info.telecom.pager.number";
- public static final String USER_BUSINESS_INFO_TELECOM_PAGER_EXT = "user.business-info.telecom.pager.ext";
- public static final String USER_BUSINESS_INFO_TELECOM_PAGER_COMMENT = "user.business-info.telecom.pager.comment";
- public static final String USER_BUSINESS_INFO_ONLINE_EMAIL = "user.business-info.online.email";
- public static final String USER_BUSINESS_INFO_ONLINE_URI = "user.business-info.online.uri";
+ String USER_BDATE = "user.bdate";
+ String USER_GENDER = "user.gender";
+ String USER_EMPLOYER = "user.employer";
+ String USER_DEPARTMENT = "user.department";
+ String USER_JOBTITLE = "user.jobtitle";
+ String USER_NAME_PREFIX = "user.name.prefix";
+ String USER_NAME_GIVEN = "user.name.given";
+ String USER_NAME_FAMILY = "user.name.family";
+ String USER_NAME_MIDDLE = "user.name.middle";
+ String USER_NAME_SUFFIX = "user.name.suffix";
+ String USER_NAME_NICKNAME = "user.name.nickName";
+ String USER_HOME_INFO_POSTAL_NAME = "user.home-info.postal.name";
+ String USER_HOME_INFO_POSTAL_STREET = "user.home-info.postal.street";
+ String USER_HOME_INFO_POSTAL_CITY = "user.home-info.postal.city";
+ String USER_HOME_INFO_POSTAL_STATEPROV = "user.home-info.postal.stateprov";
+ String USER_HOME_INFO_POSTAL_POSTALCODE = "user.home-info.postal.postalcode";
+ String USER_HOME_INFO_POSTAL_COUNTRY = "user.home-info.postal.country";
+ String USER_HOME_INFO_POSTAL_ORGANIZATION= "user.home-info.postal.organization";
+ String USER_HOME_INFO_TELECOM_TELEPHONE_INTCODE = "user.home-info.telecom.telephone.intcode";
+ String USER_HOME_INFO_TELECOM_TELEPHONE_LOCCODE = "user.home-info.telecom.telephone.loccode";
+ String USER_HOME_INFO_TELECOM_TELEPHONE_NUMBER = "user.home-info.telecom.telephone.number";
+ String USER_HOME_INFO_TELECOM_TELEPHONE_EXT = "user.home-info.telecom.telephone.ext";
+ String USER_HOME_INFO_TELECOM_TELEPHONE_COMMENT = "user.home-info.telecom.telephone.comment";
+ String USER_HOME_INFO_TELECOM_FAX_INTCODE = "user.home-info.telecom.fax.intcode";
+ String USER_HOME_INFO_TELECOM_FAX_LOCCODE = "user.home-info.telecom.fax.loccode";
+ String USER_HOME_INFO_TELECOM_FAX_NUMBER = "user.home-info.telecom.fax.number";
+ String USER_HOME_INFO_TELECOM_FAX_EXT = "user.home-info.telecom.fax.ext";
+ String USER_HOME_INFO_TELECOM_FAX_COMMENT = "user.home-info.telecom.fax.comment";
+ String USER_HOME_INFO_TELECOM_MOBILE_INTCODE = "user.home-info.telecom.mobile.intcode";
+ String USER_HOME_INFO_TELECOM_MOBILE_LOCCODE = "user.home-info.telecom.mobile.loccode";
+ String USER_HOME_INFO_TELECOM_MOBILE_NUMBER = "user.home-info.telecom.mobile.number";
+ String USER_HOME_INFO_TELECOM_MOBILE_EXT = "user.home-info.telecom.mobile.ext";
+ String USER_HOME_INFO_TELECOM_MOBILE_COMMENT = "user.home-info.telecom.mobile.comment";
+ String USER_HOME_INFO_TELECOM_PAGER_INTCODE = "user.home-info.telecom.pager.intcode";
+ String USER_HOME_INFO_TELECOM_PAGER_LOCCODE = "user.home-info.telecom.pager.loccode";
+ String USER_HOME_INFO_TELECOM_PAGER_NUMBER = "user.home-info.telecom.pager.number";
+ String USER_HOME_INFO_TELECOM_PAGER_EXT = "user.home-info.telecom.pager.ext";
+ String USER_HOME_INFO_TELECOM_PAGER_COMMENT = "user.home-info.telecom.pager.comment";
+ String USER_HOME_INFO_ONLINE_EMAIL = "user.home-info.online.email";
+ String USER_HOME_INFO_ONLINE_URI = "user.home-info.online.uri";
+ String USER_BUSINESS_INFO_POSTAL_NAME = "user.business-info.postal.name";
+ String USER_BUSINESS_INFO_POSTAL_STREET = "user.business-info.postal.street";
+ String USER_BUSINESS_INFO_POSTAL_CITY = "user.business-info.postal.city";
+ String USER_BUSINESS_INFO_POSTAL_STATEPROV = "user.business-info.postal.stateprov";
+ String USER_BUSINESS_INFO_POSTAL_POSTALCODE = "user.business-info.postal.postalcode";
+ String USER_BUSINESS_INFO_POSTAL_COUNTRY = "user.business-info.postal.country";
+ String USER_BUSINESS_INFO_POSTAL_ORGANIZATION = "user.business-info.postal.organization";
+ String USER_BUSINESS_INFO_TELECOM_TELEPHONE_INTCODE = "user.business-info.telecom.telephone.intcode";
+ String USER_BUSINESS_INFO_TELECOM_TELEPHONE_LOCCODE= "user.business-info.telecom.telephone.loccode";
+ String USER_BUSINESS_INFO_TELECOM_TELEPHONE_NUMBER = "user.business-info.telecom.telephone.number";
+ String USER_BUSINESS_INFO_TELECOM_TELEPHONE_EXT = "user.business-info.telecom.telephone.ext";
+ String USER_BUSINESS_INFO_TELECOM_TELEPHONE_COMMENT = "user.business-info.telecom.telephone.comment";
+ String USER_BUSINESS_INFO_TELECOM_FAX_INTCODE = "user.business-info.telecom.fax.intcode";
+ String USER_BUSINESS_INFO_TELECOM_FAX_LOCCODE = "user.business-info.telecom.fax.loccode";
+ String USER_BUSINESS_INFO_TELECOM_FAX_NUMBER = "user.business-info.telecom.fax.number";
+ String USER_BUSINESS_INFO_TELECOM_FAX_EXT = "user.business-info.telecom.fax.ext";
+ String USER_BUSINESS_INFO_TELECOM_FAX_COMMENT = "user.business-info.telecom.fax.comment";
+ String USER_BUSINESS_INFO_TELECOM_MOBILE_INTCODE = "user.business-info.telecom.mobile.intcode";
+ String USER_BUSINESS_INFO_TELECOM_MOBILE_LOCCODE = "user.business-info.telecom.mobile.loccode";
+ String USER_BUSINESS_INFO_TELECOM_MOBILE_NUMBER = "user.business-info.telecom.mobile.number";
+ String USER_BUSINESS_INFO_TELECOM_MOBILE_EXT = "user.business-info.telecom.mobile.ext";
+ String USER_BUSINESS_INFO_TELECOM_MOBILE_COMMENT = "user.business-info.telecom.mobile.comment";
+ String USER_BUSINESS_INFO_TELECOM_PAGER_INTCODE = "user.business-info.telecom.pager.intcode";
+ String USER_BUSINESS_INFO_TELECOM_PAGER_LOCCODE = "user.business-info.telecom.pager.loccode";
+ String USER_BUSINESS_INFO_TELECOM_PAGER_NUMBER = "user.business-info.telecom.pager.number";
+ String USER_BUSINESS_INFO_TELECOM_PAGER_EXT = "user.business-info.telecom.pager.ext";
+ String USER_BUSINESS_INFO_TELECOM_PAGER_COMMENT = "user.business-info.telecom.pager.comment";
+ String USER_BUSINESS_INFO_ONLINE_EMAIL = "user.business-info.online.email";
+ String USER_BUSINESS_INFO_ONLINE_URI = "user.business-info.online.uri";
- public static final String[] ATTRIBUTE_ARRAY = {
- "user.bdate",
- "user.gender",
- "user.employer",
- "user.department",
- "user.jobtitle",
- "user.name.prefix",
- "user.name.given",
- "user.name.family",
- "user.name.middle",
- "user.name.suffix",
- "user.name.nickName",
- "user.home-info.postal.name",
- "user.home-info.postal.street",
- "user.home-info.postal.city",
- "user.home-info.postal.stateprov",
- "user.home-info.postal.postalcode",
- "user.home-info.postal.country",
- "user.home-info.postal.organization",
- "user.home-info.telecom.telephone.intcode",
- "user.home-info.telecom.telephone.loccode",
- "user.home-info.telecom.telephone.number",
- "user.home-info.telecom.telephone.ext",
- "user.home-info.telecom.telephone.comment",
- "user.home-info.telecom.fax.intcode",
- "user.home-info.telecom.fax.loccode",
- "user.home-info.telecom.fax.number",
- "user.home-info.telecom.fax.ext",
- "user.home-info.telecom.fax.comment",
- "user.home-info.telecom.mobile.intcode",
- "user.home-info.telecom.mobile.loccode",
- "user.home-info.telecom.mobile.number",
- "user.home-info.telecom.mobile.ext",
- "user.home-info.telecom.mobile.comment",
- "user.home-info.telecom.pager.intcode",
- "user.home-info.telecom.pager.loccode",
- "user.home-info.telecom.pager.number",
- "user.home-info.telecom.pager.ext",
- "user.home-info.telecom.pager.comment",
- "user.home-info.online.email",
- "user.home-info.online.uri",
- "user.business-info.postal.name",
- "user.business-info.postal.street",
- "user.business-info.postal.city",
- "user.business-info.postal.stateprov",
- "user.business-info.postal.postalcode",
- "user.business-info.postal.country",
- "user.business-info.postal.organization",
- "user.business-info.telecom.telephone.intcode",
- "user.business-info.telecom.telephone.loccode",
- "user.business-info.telecom.telephone.number",
- "user.business-info.telecom.telephone.ext",
- "user.business-info.telecom.telephone.comment",
- "user.business-info.telecom.fax.intcode",
- "user.business-info.telecom.fax.loccode",
- "user.business-info.telecom.fax.number",
- "user.business-info.telecom.fax.ext",
- "user.business-info.telecom.fax.comment",
- "user.business-info.telecom.mobile.intcode",
- "user.business-info.telecom.mobile.loccode",
- "user.business-info.telecom.mobile.number",
- "user.business-info.telecom.mobile.ext",
- "user.business-info.telecom.mobile.comment",
- "user.business-info.telecom.pager.intcode",
- "user.business-info.telecom.pager.loccode",
- "user.business-info.telecom.pager.number",
- "user.business-info.telecom.pager.ext",
- "user.business-info.telecom.pager.comment",
- "user.business-info.online.email",
- "user.business-info.online.uri"
- };
+ String[] ATTRIBUTE_ARRAY = {
+ "user.bdate",
+ "user.gender",
+ "user.employer",
+ "user.department",
+ "user.jobtitle",
+ "user.name.prefix",
+ "user.name.given",
+ "user.name.family",
+ "user.name.middle",
+ "user.name.suffix",
+ "user.name.nickName",
+ "user.home-info.postal.name",
+ "user.home-info.postal.street",
+ "user.home-info.postal.city",
+ "user.home-info.postal.stateprov",
+ "user.home-info.postal.postalcode",
+ "user.home-info.postal.country",
+ "user.home-info.postal.organization",
+ "user.home-info.telecom.telephone.intcode",
+ "user.home-info.telecom.telephone.loccode",
+ "user.home-info.telecom.telephone.number",
+ "user.home-info.telecom.telephone.ext",
+ "user.home-info.telecom.telephone.comment",
+ "user.home-info.telecom.fax.intcode",
+ "user.home-info.telecom.fax.loccode",
+ "user.home-info.telecom.fax.number",
+ "user.home-info.telecom.fax.ext",
+ "user.home-info.telecom.fax.comment",
+ "user.home-info.telecom.mobile.intcode",
+ "user.home-info.telecom.mobile.loccode",
+ "user.home-info.telecom.mobile.number",
+ "user.home-info.telecom.mobile.ext",
+ "user.home-info.telecom.mobile.comment",
+ "user.home-info.telecom.pager.intcode",
+ "user.home-info.telecom.pager.loccode",
+ "user.home-info.telecom.pager.number",
+ "user.home-info.telecom.pager.ext",
+ "user.home-info.telecom.pager.comment",
+ "user.home-info.online.email",
+ "user.home-info.online.uri",
+ "user.business-info.postal.name",
+ "user.business-info.postal.street",
+ "user.business-info.postal.city",
+ "user.business-info.postal.stateprov",
+ "user.business-info.postal.postalcode",
+ "user.business-info.postal.country",
+ "user.business-info.postal.organization",
+ "user.business-info.telecom.telephone.intcode",
+ "user.business-info.telecom.telephone.loccode",
+ "user.business-info.telecom.telephone.number",
+ "user.business-info.telecom.telephone.ext",
+ "user.business-info.telecom.telephone.comment",
+ "user.business-info.telecom.fax.intcode",
+ "user.business-info.telecom.fax.loccode",
+ "user.business-info.telecom.fax.number",
+ "user.business-info.telecom.fax.ext",
+ "user.business-info.telecom.fax.comment",
+ "user.business-info.telecom.mobile.intcode",
+ "user.business-info.telecom.mobile.loccode",
+ "user.business-info.telecom.mobile.number",
+ "user.business-info.telecom.mobile.ext",
+ "user.business-info.telecom.mobile.comment",
+ "user.business-info.telecom.pager.intcode",
+ "user.business-info.telecom.pager.loccode",
+ "user.business-info.telecom.pager.number",
+ "user.business-info.telecom.pager.ext",
+ "user.business-info.telecom.pager.comment",
+ "user.business-info.online.email",
+ "user.business-info.online.uri"
+ };
}
Modified: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletActionResponseContext.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletActionResponseContext.java?rev=763164&r1=763163&r2=763164&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletActionResponseContext.java (original)
+++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletActionResponseContext.java Wed Apr 8 10:10:39 2009
@@ -18,7 +18,6 @@
/**
* @author <a href="mailto:ate@douma.nu">Ate Douma</a>
- * @version $Id$
*/
public interface PortletActionResponseContext extends PortletStateAwareResponseContext
{
Modified: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletAppDescriptorService.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletAppDescriptorService.java?rev=763164&r1=763163&r2=763164&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletAppDescriptorService.java (original)
+++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletAppDescriptorService.java Wed Apr 8 10:10:39 2009
@@ -28,13 +28,12 @@
* standard bean model.
*
* @author <a href="ddewolf@apache.org">David H. DeWolf</a>
- * @version $Id: PortletAppDescriptorService.java 157038 2005-03-11 03:44:40Z ddewolf $
* @since Mar 6, 2005
*/
public interface PortletAppDescriptorService {
PortletApplicationDefinition createPortletApplicationDefinition();
-
+
/**
* Retrieve the PortletApp deployment descriptor
* (portlet.xml).
@@ -52,7 +51,7 @@
* @throws IOException
*/
void mergeWebDescriptor(PortletApplicationDefinition pa, InputStream webDescriptor) throws Exception;
-
+
/**
* Write the PortletApp deployment descriptor
* (portlet.xml).
Modified: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletContainer.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletContainer.java?rev=763164&r1=763163&r2=763164&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletContainer.java (original)
+++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletContainer.java Wed Apr 8 10:10:39 2009
@@ -34,18 +34,17 @@
* lifecycle.</TD></TR>
* <p/>
* <TR><TD>{@link #doAction(PortletWindow,
- * javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)}</TD>
+ * javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)}</TD>
* <TD>Perform the action for the targeted portlet</TD> <TD>Optionally performed
* for a single portlet per request</TD></TR>
* <p/>
* <TR><TD>{@link #doRender(PortletWindow,
- * javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)}</TD>
+ * javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)}</TD>
* <TD>Render the portlet</TD> <TD>Performed once for each portlet per
* request.</TD></TR>
* <p/>
* <TR><TD>{@link #destroy()}</TD> <TD>Destroy and remove container from
* service.</TD> <TD>Performed only once per container lifecylce</TD></TR>
- * @version $Id: PortletContainer.java 36010 2004-07-30 14:16:06Z ddewolf $
*/
public interface PortletContainer {
@@ -75,9 +74,9 @@
* has trouble fulfilling the request
*/
void doRender(PortletWindow portletWindow,
- HttpServletRequest request,
- HttpServletResponse response)
- throws PortletException, IOException, PortletContainerException;
+ HttpServletRequest request,
+ HttpServletResponse response)
+ throws PortletException, IOException, PortletContainerException;
/**
* Indicates that a portlet resource Serving occured in the current request and calls
@@ -91,9 +90,9 @@
* has trouble fulfilling the request
*/
void doServeResource(PortletWindow portletWindow,
- HttpServletRequest request,
- HttpServletResponse response)
- throws PortletException, IOException, PortletContainerException;
+ HttpServletRequest request,
+ HttpServletResponse response)
+ throws PortletException, IOException, PortletContainerException;
/**
* Indicates that a portlet action occured in the current request and calls
@@ -107,9 +106,9 @@
* has trouble fulfilling the request
*/
void doAction(PortletWindow portletWindow,
- HttpServletRequest request,
- HttpServletResponse response)
- throws PortletException, IOException, PortletContainerException;
+ HttpServletRequest request,
+ HttpServletResponse response)
+ throws PortletException, IOException, PortletContainerException;
/**
* Indicates that the portlet must be initialized
@@ -122,9 +121,9 @@
* has trouble fulfilling the request
*/
void doLoad(PortletWindow portletWindow,
- HttpServletRequest servletRequest,
- HttpServletResponse servletResponse)
- throws PortletException, IOException, PortletContainerException;
+ HttpServletRequest servletRequest,
+ HttpServletResponse servletResponse)
+ throws PortletException, IOException, PortletContainerException;
/**
* Indicates that the portal needs to perform administrative
@@ -140,8 +139,8 @@
* has trouble fulfilling the request
*/
void doAdmin(PortletWindow portletWindow,
- HttpServletRequest servletRequest,
- HttpServletResponse servletResponse)
+ HttpServletRequest servletRequest,
+ HttpServletResponse servletResponse)
throws PortletException, IOException, PortletContainerException;
/**
@@ -156,10 +155,10 @@
* @throws PortletContainerException if the portlet container implementation
* has trouble fulfilling the request
*/
- public void doEvent(PortletWindow portletWindow,
- HttpServletRequest request,
- HttpServletResponse response,
- Event event)
+ public void doEvent(PortletWindow portletWindow,
+ HttpServletRequest request,
+ HttpServletResponse response,
+ Event event)
throws PortletException, IOException, PortletContainerException;
/**
Modified: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletContainerException.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletContainerException.java?rev=763164&r1=763163&r2=763164&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletContainerException.java (original)
+++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletContainerException.java Wed Apr 8 10:10:39 2009
@@ -70,6 +70,6 @@
* @return the <CODE>Throwable</CODE> that caused this portlet exception.
*/
public Throwable getRootCause() {
- return (cause);
+ return cause;
}
}
Modified: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletEntity.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletEntity.java?rev=763164&r1=763163&r2=763164&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletEntity.java (original)
+++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletEntity.java Wed Apr 8 10:10:39 2009
@@ -22,16 +22,16 @@
* The PortletEntity encapsulates all data pertaining to a single portlet
* instance. This instance may appear zero or more times per user. The
* PortletEntity consists of two primary peices of information, the Portlet
- * Definition as defined by the {@link org.apache.pluto.container.om.portlet.impl.PortletType} and the Wrapping Servlet
- * information as defined by the{@link ServletDD}
+ * Definition as defined by the {@link org.apache.pluto.container.om.portlet.impl.PortletType}.
*
*/
public interface PortletEntity {
+
/**
* Returns the portlet description. The return value cannot be NULL.
* @return the portlet description.
*/
- public PortletDefinition getPortletDefinition();
+ PortletDefinition getPortletDefinition();
}
Modified: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletInvokerService.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletInvokerService.java?rev=763164&r1=763163&r2=763164&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletInvokerService.java (original)
+++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletInvokerService.java Wed Apr 8 10:10:39 2009
@@ -35,96 +35,108 @@
* Service used to invoke portlets.
*/
public interface PortletInvokerService {
-
+
/**
* The key used to bind the <code>PortletRequest</code> to the underlying
* <code>HttpServletRequest</code>.
*/
- public final static String PORTLET_REQUEST = "javax.portlet.request";
+ String PORTLET_REQUEST = "javax.portlet.request";
+
/**
* The key used to bind the <code>PortletResponse</code> to the underlying
* <code>HttpServletRequest</code>.
*/
- public final static String PORTLET_RESPONSE = "javax.portlet.response";
+ String PORTLET_RESPONSE = "javax.portlet.response";
+
/**
* The key used to bind the <code>PortletConfig</code> to the underlying
* PortletConfig.
*/
- public final static String PORTLET_CONFIG = "javax.portlet.config";
+ String PORTLET_CONFIG = "javax.portlet.config";
+
/**
* The request attribute key used to retrieve the <code>PortletRequestContext</code> instance
*/
- public final static String REQUEST_CONTEXT = PortletRequestContext.class.getName();
+ String REQUEST_CONTEXT = PortletRequestContext.class.getName();
+
/**
* The request attribute key used to retrieve the <code>PortletRequestContext</code> instance
*/
- public final static String RESPONSE_CONTEXT = PortletResponseContext.class.getName();
+ String RESPONSE_CONTEXT = PortletResponseContext.class.getName();
+
/**
* The key used to bind the method of processing being requested by the
* container to the underlying <code>PortletRquest</code>.
*/
- public final static String METHOD_ID = "org.apache.pluto.core.method";
+ String METHOD_ID = "org.apache.pluto.core.method";
+
/**
* The unique method identifier for render requests. Render requests are
* requested through a call to the {@link PortletContainer#doRender(org.apache.pluto.container.PortletWindow,
- * javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)}
+ * javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)}
* method.
*/
- public final static Integer METHOD_RENDER = new Integer(1);
+ Integer METHOD_RENDER = new Integer(1);
+
/**
* The unique method identifier for render requests. Render requests are
* requested through a call to the {@link PortletContainer#doAction(org.apache.pluto.container.PortletWindow,
- * javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)}
+ * javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)}
* method.
*/
- public final static Integer METHOD_ACTION = new Integer(3);
+ Integer METHOD_ACTION = new Integer(3);
+
/**
* The unique method identifier for noop (load) requests. Load requests are
* requested through a call to the {@link PortletContainer#doLoad(org.apache.pluto.container.PortletWindow,
- * javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)}
+ * javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)}
* method.
*/
- public final static Integer METHOD_NOOP = new Integer(5);
+ Integer METHOD_NOOP = new Integer(5);
+
/**
* The unique method identifier for resource Serving requests. Resource requests are
* requested through a call to the {@link PortletContainer#doServeResource(PortletWindow,
* javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)}
* method.
*/
- public final static Integer METHOD_RESOURCE = new Integer(7);
+ Integer METHOD_RESOURCE = new Integer(7);
+
/**
* The unique method identifier for render requests. Render requests are
* requested through a call to the {@link PortletContainer#doEvent(org.apache.pluto.container.PortletWindow,
* javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse, javax.portlet.Event)}
* method.
*/
- public final static Integer METHOD_EVENT = new Integer(9);
+ Integer METHOD_EVENT = new Integer(9);
+
/**
* The unique method identifier for admin requests. Admin requests
* are requested through a call to the {@link PortletContainer#doAdmin(PortletWindow, javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)}
* method.
*/
- public final static Integer METHOD_ADMIN = new Integer(11);
+ Integer METHOD_ADMIN = new Integer(11);
+
/**
* The public key, to store the FilterManager in the request.
*/
- public static final String FILTER_MANAGER = "FilterManager";
+ String FILTER_MANAGER = "FilterManager";
+
+ void action(PortletRequestContext ctx, ActionRequest req, ActionResponse res, FilterManager filterManager)
+ throws IOException, PortletException, PortletContainerException;
+
+ void event(PortletRequestContext ctx, EventRequest request, EventResponse response, FilterManager filterManager)
+ throws IOException, PortletException, PortletContainerException;
+
+ void render(PortletRequestContext ctx, RenderRequest req, RenderResponse res, FilterManager filterManager)
+ throws IOException, PortletException, PortletContainerException;
+
+ void serveResource(PortletRequestContext ctx, ResourceRequest req, ResourceResponse res, FilterManager filterManager)
+ throws IOException, PortletException, PortletContainerException;
+
+ void load(PortletRequestContext ctx, PortletRequest req, PortletResponse res)
+ throws IOException, PortletException, PortletContainerException;
- public void action(PortletRequestContext ctx, ActionRequest req, ActionResponse res, FilterManager filterManager)
- throws IOException, PortletException, PortletContainerException;
-
- public void event(PortletRequestContext ctx, EventRequest request, EventResponse response, FilterManager filterManager)
- throws IOException, PortletException, PortletContainerException;
-
- public void render(PortletRequestContext ctx, RenderRequest req, RenderResponse res, FilterManager filterManager)
- throws IOException, PortletException, PortletContainerException;
-
- public void serveResource(PortletRequestContext ctx, ResourceRequest req, ResourceResponse res, FilterManager filterManager)
- throws IOException, PortletException, PortletContainerException;
-
- public void load(PortletRequestContext ctx, PortletRequest req, PortletResponse res)
- throws IOException, PortletException, PortletContainerException;
-
- public void admin(PortletRequestContext ctx, PortletRequest req, PortletResponse res)
- throws IOException, PortletException, PortletContainerException;
+ void admin(PortletRequestContext ctx, PortletRequest req, PortletResponse res)
+ throws IOException, PortletException, PortletContainerException;
}
Modified: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletPreference.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletPreference.java?rev=763164&r1=763163&r2=763164&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletPreference.java (original)
+++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletPreference.java Wed Apr 8 10:10:39 2009
@@ -22,34 +22,34 @@
*/
public interface PortletPreference {
- /**
- * Returns the name of this portlet preference.
- * @return the name of this portlet preference.
- */
- public String getName();
+ /**
+ * Returns the name of this portlet preference.
+ * @return the name of this portlet preference.
+ */
+ String getName();
/**
* Returns the values of this portlet preference, which is a string array.
* @return the values of this portlet preference as a string array.
*/
- public String[] getValues();
+ String[] getValues();
/**
* Sets values of this portlet preference.
* @param values values of this portlet preference to set.
*/
- public void setValues(String[] values);
+ void setValues(String[] values);
/**
* Returns true if this portlet preference is marked as read-only.
* @return true if this portlet preference is marked as read-only.
*/
- public boolean isReadOnly();
+ boolean isReadOnly();
/**
* Clone a copy of itself.
* @return a copy of itself.
*/
- public PortletPreference clone();
+ PortletPreference clone();
}
Modified: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletPreferencesService.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletPreferencesService.java?rev=763164&r1=763163&r2=763164&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletPreferencesService.java (original)
+++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletPreferencesService.java Wed Apr 8 10:10:39 2009
@@ -38,22 +38,22 @@
* @return the default portlet preferences.
* @throws PortletContainerException if fail to get default preferences.
*/
- public Map<String, PortletPreference> getDefaultPreferences(
+ Map<String, PortletPreference> getDefaultPreferences(
PortletWindow portletWindow,
PortletRequest request)
- throws PortletContainerException;
+ throws PortletContainerException;
- /**
- * Returns the stored portlet preferences.
- * @param portletWindow the portlet window.
- * @param request the portlet request.
- * @return the stored portlet preferences.
- * @throws PortletContainerException if fail to get stored preferences.
- */
- public Map<String, PortletPreference> getStoredPreferences(
- PortletWindow portletWindow,
- PortletRequest request)
- throws PortletContainerException;
+ /**
+ * Returns the stored portlet preferences.
+ * @param portletWindow the portlet window.
+ * @param request the portlet request.
+ * @return the stored portlet preferences.
+ * @throws PortletContainerException if fail to get stored preferences.
+ */
+ Map<String, PortletPreference> getStoredPreferences(
+ PortletWindow portletWindow,
+ PortletRequest request)
+ throws PortletContainerException;
/**
* Stores the portlet references to the persistent storage.
@@ -62,9 +62,9 @@
* @param preferences the portlet preferences to store.
* @throws PortletContainerException if fail to store preferences.
*/
- public void store(PortletWindow portletWindow,
- PortletRequest request,
- Map<String, PortletPreference> preferences)
+ void store(PortletWindow portletWindow,
+ PortletRequest request,
+ Map<String, PortletPreference> preferences)
throws PortletContainerException;
/**
@@ -76,8 +76,8 @@
* @param portletDefinition the portlet definition.
* @return the preferences validator if defined for the portlet definition.
* @throw ValidatorException if fail to instantiate validator instance.
- */
- public PreferencesValidator getPreferencesValidator(PortletDefinition portletDefinition)
+ */
+ PreferencesValidator getPreferencesValidator(PortletDefinition portletDefinition)
throws ValidatorException;
-
+
}
Modified: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletWindow.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletWindow.java?rev=763164&r1=763163&r2=763164&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletWindow.java (original)
+++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletWindow.java Wed Apr 8 10:10:39 2009
@@ -37,23 +37,23 @@
* used to communicate back to the referencing portal.
* @return unique id.
*/
- public PortletWindowID getId();
+ PortletWindowID getId();
/**
* Retrieve the current window state for this window.
* @return the current window state.
*/
- public WindowState getWindowState();
+ WindowState getWindowState();
/**
* Retrieve the current portlet mode for this window.
* @return the current portlet mode.
*/
- public PortletMode getPortletMode();
+ PortletMode getPortletMode();
/**
* Returns the portlet entity. The return value cannot be NULL.
* @return the portlet entity
*/
- public PortletEntity getPortletEntity();
+ PortletEntity getPortletEntity();
}
Modified: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/RequestDispatcherPathInfoProvider.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/RequestDispatcherPathInfoProvider.java?rev=763164&r1=763163&r2=763164&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/RequestDispatcherPathInfoProvider.java (original)
+++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/RequestDispatcherPathInfoProvider.java Wed Apr 8 10:10:39 2009
@@ -22,11 +22,6 @@
*/
public interface RequestDispatcherPathInfoProvider
{
- /**
- * PortletContext attribute key for storing and retrieving this provider.
- */
- String CONTEXT_KEY = RequestDispatcherPathInfoProvider.class.getName();
-
RequestDispatcherPathInfo getPathInfo(String contextPath, String path);
RequestDispatcherPathInfo getNamedRequestDispatcherPathInfo();
}
Modified: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/ResourceURLProvider.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/ResourceURLProvider.java?rev=763164&r1=763163&r2=763164&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/ResourceURLProvider.java (original)
+++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/ResourceURLProvider.java Wed Apr 8 10:10:39 2009
@@ -27,20 +27,20 @@
* http://host/wps/portal/hello.gif
* @param path the new absolute url
*/
- public void setAbsoluteURL(String path);
+ void setAbsoluteURL(String path);
/**
* Sets a full path URI including the context root. E.g.
* /wps/portal/hello.gif
* @param path the new absolute url
*/
- public void setFullPath(String path);
+ void setFullPath(String path);
/**
* Returns a url to a resource as absolute URL starting with protocol so
* that it can be accessed by a browser.
* @return the URL as string
*/
- public String toString();
+ String toString();
}
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/RequestDispatcherPathInfoProviderImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/RequestDispatcherPathInfoProviderImpl.java?rev=763164&r1=763163&r2=763164&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/RequestDispatcherPathInfoProviderImpl.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/RequestDispatcherPathInfoProviderImpl.java Wed Apr 8 10:10:39 2009
@@ -32,14 +32,19 @@
*/
public class RequestDispatcherPathInfoProviderImpl implements RequestDispatcherPathInfoProvider
{
+ /**
+ * PortletContext attribute key for storing and retrieving this provider.
+ */
+ private static final String CONTEXT_KEY = RequestDispatcherPathInfoProvider.class.getName();
+
protected List<String> exactServletMappingURLPatterns = new ArrayList<String>();
protected List<String> pathServletMappingURLPatterns = new ArrayList<String>();
protected boolean defaultServletMapping = false;
-
+
private RequestDispatcherPathInfoProviderImpl(Set<String> servletMappingURLPatterns)
{
for (String pat : servletMappingURLPatterns)
- {
+ {
if (pat.startsWith("/"))
{
if (pat.equals("/") || pat.equals("/*"))
@@ -56,7 +61,7 @@
}
}
else if (pat.startsWith("*."))
- {
+ {
// ignore, will always fallback on full path servlet mapping
}
else
@@ -65,7 +70,7 @@
}
}
}
-
+
public static RequestDispatcherPathInfoProvider getProvider(PortletContext portletContext, PortletApplicationDefinition app)
{
RequestDispatcherPathInfoProvider provider = (RequestDispatcherPathInfoProvider)portletContext.getAttribute(CONTEXT_KEY);
@@ -76,7 +81,7 @@
}
return provider;
}
-
+
public RequestDispatcherPathInfo getNamedRequestDispatcherPathInfo()
{
return new RequestDispatcherPathInfoImpl();
@@ -87,14 +92,14 @@
String servletPath = null;
String pathInfo = null;
String queryString = null;
-
+
int index = path.indexOf('?');
if (index != -1)
{
queryString = path.substring(index+1, path.length());
path = path.substring(0, index);
}
-
+
if (exactServletMappingURLPatterns.contains(path))
{
servletPath = path;
@@ -126,9 +131,9 @@
// which is already the default / catch-all solution
if (servletPath == null)
{
- servletPath = path;
+ servletPath = path;
}
-
+
return new RequestDispatcherPathInfoImpl(contextPath,servletPath,pathInfo,queryString);
}
}
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/ServletPortletSessionProxy.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/ServletPortletSessionProxy.java?rev=763164&r1=763163&r2=763164&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/ServletPortletSessionProxy.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/ServletPortletSessionProxy.java Wed Apr 8 10:10:39 2009
@@ -9,9 +9,9 @@
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS"
- * BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
+ * distributed under the License is distributed on an "AS IS"
+ * BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.pluto.container.impl;
@@ -23,6 +23,7 @@
import java.util.ArrayList;
import java.util.Enumeration;
import java.util.HashSet;
+import java.util.List;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
@@ -48,14 +49,15 @@
public static HttpSession createProxy(HttpServletRequest request, String portletWindowId)
{
HttpSession servletSession = request.getSession();
- HashSet interfaces = new HashSet();
+ HashSet<Class<? extends Object>> interfaces = new HashSet<Class<? extends Object>>();
interfaces.add(HttpSession.class);
- Class current = servletSession.getClass();
+ Class<? extends Object> current = servletSession.getClass();
while (current != null)
{
try
{
- Class[] currentInterfaces = current.getInterfaces();
+ @SuppressWarnings("unchecked")
+ Class<? extends Object>[] currentInterfaces = current.getInterfaces();
for (int i = 0; i < currentInterfaces.length; i++)
{
interfaces.add(currentInterfaces[i]);
@@ -67,8 +69,8 @@
current = null;
}
}
- Object proxy = Proxy.newProxyInstance(servletSession.getClass().getClassLoader(),
- (Class[])interfaces.toArray(new Class[interfaces.size()]),
+ Object proxy = Proxy.newProxyInstance(servletSession.getClass().getClassLoader(),
+ interfaces.toArray(new Class[interfaces.size()]),
new ServletPortletSessionProxy(request.getSession(), portletWindowId));
return (HttpSession)proxy;
}
@@ -86,6 +88,7 @@
* @see java.lang.reflect.InvocationHandler#invoke(java.lang.Object,
* java.lang.reflect.Method, java.lang.Object[])
*/
+ @SuppressWarnings("unchecked")
public Object invoke(Object proxy, Method m, Object[] args) throws Throwable
{
Object retval = null;
@@ -107,8 +110,8 @@
}
else if ("getValueNames".equals(m.getName()) && args == null)
{
- ArrayList list = new ArrayList();
- Enumeration e = new NamespacedNamesEnumeration(servletSession.getAttributeNames(), this.portletScopeAttrNamePrefix);
+ final List<String> list = new ArrayList<String>();
+ Enumeration<String> e = new NamespacedNamesEnumeration(servletSession.getAttributeNames(), this.portletScopeAttrNamePrefix);
while (e.hasMoreElements())
{
list.add(e.nextElement());
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/util/ClasspathScanner.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/util/ClasspathScanner.java?rev=763164&r1=763163&r2=763164&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/util/ClasspathScanner.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/util/ClasspathScanner.java Wed Apr 8 10:10:39 2009
@@ -37,7 +37,6 @@
* path.
*
* @param path
- * @return
* @throws IOException
*/
public static List<URL> scan(String path) throws IOException {
@@ -58,7 +57,6 @@
*
* @param path
* @param loader
- * @return
* @throws IOException
*/
public static List<URL> scan(String path, ClassLoader loader) throws IOException {
@@ -88,7 +86,7 @@
*/
@SuppressWarnings("unchecked")
public static List findConfiguredImplementations(Class implemented)
- throws IOException {
+ throws IOException {
List classes = new ArrayList();
List resources = scan("/META-INF/pluto.properties");
Iterator i = resources.iterator();
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/util/NamespacedNamesEnumeration.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/util/NamespacedNamesEnumeration.java?rev=763164&r1=763163&r2=763164&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/util/NamespacedNamesEnumeration.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/util/NamespacedNamesEnumeration.java Wed Apr 8 10:10:39 2009
@@ -24,21 +24,21 @@
* @author <a href="mailto:ate@douma.nu">Ate Douma</a>
* @version $Id$
*/
-public class NamespacedNamesEnumeration implements Enumeration
+public class NamespacedNamesEnumeration implements Enumeration<String>
{
- private Enumeration namesEnumeration;
+ private Enumeration<String> namesEnumeration;
private String namespace;
-
+
private String nextName;
private boolean done;
-
- public NamespacedNamesEnumeration(Enumeration namesEnumeration, String namespace)
+
+ public NamespacedNamesEnumeration(Enumeration<String> namesEnumeration, String namespace)
{
this.namesEnumeration = namesEnumeration;
this.namespace = namespace;
hasMoreElements();
}
-
+
public boolean hasMoreElements()
{
if (!done)
@@ -47,7 +47,7 @@
{
while (namesEnumeration.hasMoreElements())
{
- String name = (String)namesEnumeration.nextElement();
+ String name = namesEnumeration.nextElement();
if ( name.startsWith(namespace))
{
nextName = name.substring(namespace.length());
@@ -60,7 +60,7 @@
return !done;
}
- public Object nextElement()
+ public String nextElement()
{
if (done)
{