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 2007/03/09 09:43:50 UTC
svn commit: r516329 [1/2] - in /portals/pluto/branches/pluto-1.1.x:
pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/common/
pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/
pluto-descriptor-api/src/main/java/org/...
Author: cziegeler
Date: Fri Mar 9 00:43:46 2007
New Revision: 516329
URL: http://svn.apache.org/viewvc?view=rev&rev=516329
Log:
Removing author tags and code cleanup - no functional changes
Added:
portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/target/
Modified:
portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/common/DisplayNameDD.java
portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/common/IconDD.java
portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/common/InitParamDD.java
portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/common/SecurityRoleRefDD.java
portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/common/UserDataConstraintDD.java
portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/CustomPortletModeDD.java
portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/CustomWindowStateDD.java
portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/PortletAppDD.java
portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/PortletDD.java
portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/PortletInfoDD.java
portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/PortletPreferenceDD.java
portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/PortletPreferencesDD.java
portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/UserAttributeDD.java
portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/services/Constants.java
portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/services/PortletAppDescriptorService.java
portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/services/WebAppDescriptorService.java
portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/servlet/AuthConstraintDD.java
portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/servlet/DistributableDD.java
portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/servlet/EjbRefDD.java
portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/servlet/EnvEntryDD.java
portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/servlet/ErrorPageDD.java
portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/servlet/FilterDD.java
portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/servlet/FilterMappingDD.java
portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/servlet/FormLoginConfigDD.java
portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/servlet/ListenerDD.java
portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/servlet/LoadOnStartupDD.java
portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/servlet/LoginConfigDD.java
portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/servlet/MimeMappingDD.java
portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/servlet/ResourceRefDD.java
portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/servlet/SecurityConstraintDD.java
portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/servlet/SecurityRoleDD.java
portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/servlet/ServletDD.java
portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/servlet/ServletMappingDD.java
portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/servlet/SessionConfigDD.java
portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/servlet/TaglibDD.java
portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/servlet/WebAppDD.java
portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/servlet/WebResourceCollectionDD.java
portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/servlet/WelcomeFileListDD.java
portals/pluto/branches/pluto-1.1.x/pluto-descriptor-impl/src/main/java/org/apache/pluto/descriptors/services/castor/AbstractCastorDescriptorService.java
portals/pluto/branches/pluto-1.1.x/pluto-descriptor-impl/src/main/java/org/apache/pluto/descriptors/services/castor/EntityResolverImpl.java
portals/pluto/branches/pluto-1.1.x/pluto-descriptor-impl/src/main/java/org/apache/pluto/descriptors/services/castor/PortletAppDescriptorServiceImpl.java
portals/pluto/branches/pluto-1.1.x/pluto-descriptor-impl/src/main/java/org/apache/pluto/descriptors/services/castor/ServletVersionCastorFieldHandler.java
portals/pluto/branches/pluto-1.1.x/pluto-descriptor-impl/src/main/java/org/apache/pluto/descriptors/services/castor/WebAppDescriptorServiceImpl.java
portals/pluto/branches/pluto-1.1.x/pluto-descriptor-impl/src/test/java/org/apache/pluto/descriptors/services/castor/PortletAppDescriptorServiceImplTest.java
portals/pluto/branches/pluto-1.1.x/pluto-descriptor-impl/src/test/java/org/apache/pluto/descriptors/services/castor/Servlet23WebAppDescriptorTest.java
portals/pluto/branches/pluto-1.1.x/pluto-descriptor-impl/src/test/java/org/apache/pluto/descriptors/services/castor/Servlet24WebAppDescriptorTest.java
portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/config/impl/DriverConfigurationImpl.java
portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/ContainerServicesImpl.java
portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/PortalCallbackServiceImpl.java
portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/PortletURLProviderImpl.java
portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/impl/UserInfoAttributesServiceImpl.java
portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/impl/resource/PropertyConfigServiceImpl.java
portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/impl/resource/RenderConfigServiceImpl.java
portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/impl/resource/ResourceConfig.java
portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/impl/resource/ResourceConfigReader.java
portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/impl/resource/SupportedModesServiceImpl.java
portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/url/impl/PortalURLImpl.java
portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/url/impl/PortalURLParserImpl.java
portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/test/java/org/apache/pluto/driver/services/impl/UserInfoAttributesServicesImplTest.java
portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/test/java/org/apache/pluto/driver/services/impl/resource/MockPortletRegistryService.java
portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/test/java/org/apache/pluto/driver/services/impl/resource/MockPropertyConfigService.java
portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/test/java/org/apache/pluto/driver/services/impl/resource/SupportedWindowStateServiceTest.java
portals/pluto/branches/pluto-1.1.x/pluto-portal-driver/src/main/java/org/apache/pluto/driver/AttributeKeys.java
portals/pluto/branches/pluto-1.1.x/pluto-portal-driver/src/main/java/org/apache/pluto/driver/PortalDriverLogoutServlet.java
portals/pluto/branches/pluto-1.1.x/pluto-portal-driver/src/main/java/org/apache/pluto/driver/PortalDriverServlet.java
portals/pluto/branches/pluto-1.1.x/pluto-portal-driver/src/main/java/org/apache/pluto/driver/PortalStartupListener.java
portals/pluto/branches/pluto-1.1.x/pluto-portal-driver/src/main/java/org/apache/pluto/driver/PublishServlet.java
portals/pluto/branches/pluto-1.1.x/pluto-portal-driver/src/main/java/org/apache/pluto/driver/TCKDriverServlet.java
portals/pluto/branches/pluto-1.1.x/pluto-portal-driver/src/main/java/org/apache/pluto/driver/config/AdminConfiguration.java
portals/pluto/branches/pluto-1.1.x/pluto-portal-driver/src/main/java/org/apache/pluto/driver/config/DriverConfiguration.java
portals/pluto/branches/pluto-1.1.x/pluto-portal-driver/src/main/java/org/apache/pluto/driver/config/DriverConfigurationException.java
portals/pluto/branches/pluto-1.1.x/pluto-portal-driver/src/main/java/org/apache/pluto/driver/core/PortalRequestContext.java
portals/pluto/branches/pluto-1.1.x/pluto-portal-driver/src/main/java/org/apache/pluto/driver/core/PortletWindowIDImpl.java
portals/pluto/branches/pluto-1.1.x/pluto-portal-driver/src/main/java/org/apache/pluto/driver/core/PortletWindowImpl.java
portals/pluto/branches/pluto-1.1.x/pluto-portal-driver/src/main/java/org/apache/pluto/driver/portlets/AboutPortlet.java
portals/pluto/branches/pluto-1.1.x/pluto-portal-driver/src/main/java/org/apache/pluto/driver/services/portal/DriverConfigurationService.java
portals/pluto/branches/pluto-1.1.x/pluto-portal-driver/src/main/java/org/apache/pluto/driver/services/portal/PageConfig.java
portals/pluto/branches/pluto-1.1.x/pluto-portal-driver/src/main/java/org/apache/pluto/driver/services/portal/PortletWindowConfig.java
portals/pluto/branches/pluto-1.1.x/pluto-portal-driver/src/main/java/org/apache/pluto/driver/services/portal/PropertyConfigService.java
portals/pluto/branches/pluto-1.1.x/pluto-portal-driver/src/main/java/org/apache/pluto/driver/services/portal/RenderConfig.java
portals/pluto/branches/pluto-1.1.x/pluto-portal-driver/src/main/java/org/apache/pluto/driver/services/portal/RenderConfigService.java
portals/pluto/branches/pluto-1.1.x/pluto-portal-driver/src/main/java/org/apache/pluto/driver/services/portal/SupportedModesService.java
portals/pluto/branches/pluto-1.1.x/pluto-portal-driver/src/main/java/org/apache/pluto/driver/services/portal/SupportedWindowStateService.java
portals/pluto/branches/pluto-1.1.x/pluto-portal-driver/src/main/java/org/apache/pluto/driver/services/portal/admin/DriverAdministrationException.java
portals/pluto/branches/pluto-1.1.x/pluto-portal-driver/src/main/java/org/apache/pluto/driver/services/portal/admin/PortletRegistryAdminService.java
portals/pluto/branches/pluto-1.1.x/pluto-portal-driver/src/main/java/org/apache/pluto/driver/services/portal/admin/RenderConfigAdminService.java
portals/pluto/branches/pluto-1.1.x/pluto-portal-driver/src/main/java/org/apache/pluto/driver/tags/PortletModeAnchorTag.java
portals/pluto/branches/pluto-1.1.x/pluto-portal-driver/src/main/java/org/apache/pluto/driver/tags/PortletPortalURLTag.java
portals/pluto/branches/pluto-1.1.x/pluto-portal-driver/src/main/java/org/apache/pluto/driver/tags/PortletRenderTag.java
portals/pluto/branches/pluto-1.1.x/pluto-portal-driver/src/main/java/org/apache/pluto/driver/tags/PortletTag.java
portals/pluto/branches/pluto-1.1.x/pluto-portal-driver/src/main/java/org/apache/pluto/driver/tags/PortletTitleTag.java
portals/pluto/branches/pluto-1.1.x/pluto-portal-driver/src/main/java/org/apache/pluto/driver/tags/PortletWindowStateAnchorTag.java
portals/pluto/branches/pluto-1.1.x/pluto-portal-driver/src/main/java/org/apache/pluto/driver/tags/ToolTips.java
portals/pluto/branches/pluto-1.1.x/pluto-portal-driver/src/main/java/org/apache/pluto/driver/url/PortalURLParameter.java
portals/pluto/branches/pluto-1.1.x/pluto-portal-driver/src/test/java/org/apache/pluto/driver/services/portal/PortletWindowConfigTest.java
Modified: portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/common/DisplayNameDD.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/common/DisplayNameDD.java?view=diff&rev=516329&r1=516328&r2=516329
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/common/DisplayNameDD.java (original)
+++ portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/common/DisplayNameDD.java Fri Mar 9 00:43:46 2007
@@ -20,7 +20,6 @@
/**
*
- * @author David H. DeWolf
* @since 1.1.0
*/
public class DisplayNameDD {
Modified: portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/common/IconDD.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/common/IconDD.java?view=diff&rev=516329&r1=516328&r2=516329
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/common/IconDD.java (original)
+++ portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/common/IconDD.java Fri Mar 9 00:43:46 2007
@@ -19,7 +19,6 @@
/**
* Resource Icon configuration.
*
- * @author <a href="ddewolf@apache.org">David H. DeWolf</a>
* @version $Id: IconDD.java 157038 2005-03-11 03:44:40Z ddewolf $
* @since Feb 28, 2005
*/
Modified: portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/common/InitParamDD.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/common/InitParamDD.java?view=diff&rev=516329&r1=516328&r2=516329
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/common/InitParamDD.java (original)
+++ portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/common/InitParamDD.java Fri Mar 9 00:43:46 2007
@@ -22,7 +22,6 @@
/**
* Initialization Parameter configuration.
*
- * @author <a href="ddewolf@apache.org">David H. DeWolf</a>
* @version $Id: InitParamDD.java 157038 2005-03-11 03:44:40Z ddewolf $
* @since Feb 28, 2005
*/
Modified: portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/common/SecurityRoleRefDD.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/common/SecurityRoleRefDD.java?view=diff&rev=516329&r1=516328&r2=516329
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/common/SecurityRoleRefDD.java (original)
+++ portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/common/SecurityRoleRefDD.java Fri Mar 9 00:43:46 2007
@@ -22,7 +22,6 @@
/**
* Security Role Reference Configuration.
*
- * @author <a href="ddewolf@apache.org">David H. DeWolf</a>
* @version $Id: SecurityRoleRefDD.java 157038 2005-03-11 03:44:40Z ddewolf $
* @since Feb 28, 2005
*/
Modified: portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/common/UserDataConstraintDD.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/common/UserDataConstraintDD.java?view=diff&rev=516329&r1=516328&r2=516329
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/common/UserDataConstraintDD.java (original)
+++ portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/common/UserDataConstraintDD.java Fri Mar 9 00:43:46 2007
@@ -22,7 +22,6 @@
/**
* User Data Constraint descriptor.
*
- * @author <a href="ddewolf@apache.org">David H. DeWolf</a>
* @version $Id: UserDataConstraintDD.java 156636 2005-03-09 12:16:31Z cziegeler $
* @since Feb 28, 2005
*/
@@ -33,7 +32,7 @@
public static final String CONFIDENTIAL = "CONFIDENTIAL";
private List descriptions = new ArrayList();
-
+
private String transportGuarantee;
public UserDataConstraintDD() {
Modified: portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/CustomPortletModeDD.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/CustomPortletModeDD.java?view=diff&rev=516329&r1=516328&r2=516329
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/CustomPortletModeDD.java (original)
+++ portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/CustomPortletModeDD.java Fri Mar 9 00:43:46 2007
@@ -21,7 +21,6 @@
/**
*
- * @author <a href="ddewolf@apache.org">David H. DeWolf</a>
* @version $Id$
* @since 1.1.0
*/
Modified: portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/CustomWindowStateDD.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/CustomWindowStateDD.java?view=diff&rev=516329&r1=516328&r2=516329
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/CustomWindowStateDD.java (original)
+++ portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/CustomWindowStateDD.java Fri Mar 9 00:43:46 2007
@@ -21,7 +21,6 @@
/**
*
- * @author <a href="ddewolf@apache.org">David H. DeWolf</a>
* @version $Id$
* @since 1.1.0
*/
Modified: portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/PortletAppDD.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/PortletAppDD.java?view=diff&rev=516329&r1=516328&r2=516329
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/PortletAppDD.java (original)
+++ portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/PortletAppDD.java Fri Mar 9 00:43:46 2007
@@ -22,7 +22,6 @@
/**
* Portlet Application Configuration.
*
- * @author <a href="ddewolf@apache.org">David H. DeWolf</a>
* @version $Id: PortletAppDD.java 157475 2005-03-14 22:13:18Z ddewolf $
* @since Mar 6, 2005
*/
Modified: portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/PortletDD.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/PortletDD.java?view=diff&rev=516329&r1=516328&r2=516329
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/PortletDD.java (original)
+++ portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/PortletDD.java Fri Mar 9 00:43:46 2007
@@ -21,20 +21,18 @@
/**
* Bare bones implementation of the Portlet descriptor.
- *
+ *
* FIXME: Hmmm... What do you mean, David? --ZHENG Zhong
- *
+ *
* Eventually this should be flushed out :), but for the sake of timing I'll be lazy for now.
*
- * @author <a href="mailto:ddewolf@apache.org">David H. DeWolf</a>
- * @author <a href="mailto:zheng@apache.org">ZHENG Zhong</a>
- *
+ *
* @since Mar 6, 2005
*/
public class PortletDD {
-
+
// Private Member Variables ------------------------------------------------
-
+
/** The unique name of the portlet. */
private String portletName = null;
@@ -63,20 +61,20 @@
/** All security role references. */
private List securityRoleRefs = new ArrayList();
-
-
+
+
// Constructor -------------------------------------------------------------
-
+
/**
* Default no-arg constructor.
*/
public PortletDD() {
// Do nothing.
}
-
-
+
+
// Public Methods ----------------------------------------------------------
-
+
/**
* Retrieve the unique name of the portlet.
* @return
@@ -202,10 +200,10 @@
public void setSecurityRoleRefs(List securityRoleRefs) {
this.securityRoleRefs = securityRoleRefs;
}
-
-
+
+
// Object Methods ----------------------------------------------------------
-
+
/**
* Returns a string representation of this instance.
* FIXME: more info!
@@ -219,7 +217,7 @@
// TODO:
return buffer.toString();
}
-
+
/**
* Returns the hash code for this instance.
* @return the hash code for this instance.
@@ -227,6 +225,6 @@
public int hashCode() {
return toString().hashCode();
}
-
+
}
Modified: portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/PortletInfoDD.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/PortletInfoDD.java?view=diff&rev=516329&r1=516328&r2=516329
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/PortletInfoDD.java (original)
+++ portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/PortletInfoDD.java Fri Mar 9 00:43:46 2007
@@ -18,7 +18,6 @@
/**
* Implementation of the Portlet Info descriptor element.
- * @author <a href="ddewolf@apache.org">David H. DeWolf</a>
* @since 1.1.0
*/
public class PortletInfoDD {
Modified: portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/PortletPreferenceDD.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/PortletPreferenceDD.java?view=diff&rev=516329&r1=516328&r2=516329
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/PortletPreferenceDD.java (original)
+++ portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/PortletPreferenceDD.java Fri Mar 9 00:43:46 2007
@@ -21,27 +21,25 @@
/**
* Portlet preference definition in portlet.xml.
- *
+ *
* @see PortletPreferencesDD
- *
- * @author <a href="mailto:ddewolf@apache.org">David H. DeWolf</a>
- * @author <a href="mailto:zheng@apache.org">ZHENG Zhong</a>
+ *
* @since Jun 29, 2005
*/
public class PortletPreferenceDD {
-
+
/** The preference name. */
- private String name = null;
-
+ private String name;
+
/** The preference values. */
private List values = new ArrayList();
-
+
/** Flag indicating if this preference is marked as read-only. */
private boolean readOnly = false;
-
-
+
+
// Public Methods ----------------------------------------------------------
-
+
public String getName() {
return name;
}
@@ -53,17 +51,17 @@
public List getValues() {
return values;
}
-
+
public void setValues(List values) {
this.values = values;
}
-
+
public boolean isReadOnly() {
return readOnly;
}
-
+
public void setReadOnly(boolean readOnly) {
this.readOnly = readOnly;
}
-
+
}
Modified: portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/PortletPreferencesDD.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/PortletPreferencesDD.java?view=diff&rev=516329&r1=516328&r2=516329
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/PortletPreferencesDD.java (original)
+++ portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/PortletPreferencesDD.java Fri Mar 9 00:43:46 2007
@@ -23,16 +23,14 @@
* Portlet preferences definition in portlet.xml.
*
* @see PortletPreferenceDD
- *
- * @author <a href="mailto:ddewolf@apache.org">David H. DeWolf</a>
- * @author <a href="mailto:zheng@apache.org">ZHENG Zhong</a>
+ *
* @since Jun 29, 2005
*/
public class PortletPreferencesDD {
-
+
/** List of portlet preferences. */
private List portletPreferences = new ArrayList();
-
+
/** Portlet preferences validator class name. */
private String preferencesValidator;
Modified: portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/UserAttributeDD.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/UserAttributeDD.java?view=diff&rev=516329&r1=516328&r2=516329
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/UserAttributeDD.java (original)
+++ portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/UserAttributeDD.java Fri Mar 9 00:43:46 2007
@@ -21,7 +21,6 @@
/**
*
- * @author <a href="ddewolf@apache.org">David H. DeWolf</a>
* @version $Id$
* @since 1.1.0
*/
Modified: portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/services/Constants.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/services/Constants.java?view=diff&rev=516329&r1=516328&r2=516329
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/services/Constants.java (original)
+++ portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/services/Constants.java Fri Mar 9 00:43:46 2007
@@ -18,7 +18,6 @@
/**
*
- * @author <a href="ddewolf@apache.org">David H. DeWolf</a>
* @version $Id: Constants.java 156636 2005-03-09 12:16:31Z cziegeler $
* @since Mar 7, 2005
*/
Modified: portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/services/PortletAppDescriptorService.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/services/PortletAppDescriptorService.java?view=diff&rev=516329&r1=516328&r2=516329
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/services/PortletAppDescriptorService.java (original)
+++ portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/services/PortletAppDescriptorService.java Fri Mar 9 00:43:46 2007
@@ -28,7 +28,6 @@
* This service reads the portlet.xml and converts it to a
* 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
*/
Modified: portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/services/WebAppDescriptorService.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/services/WebAppDescriptorService.java?view=diff&rev=516329&r1=516328&r2=516329
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/services/WebAppDescriptorService.java (original)
+++ portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/services/WebAppDescriptorService.java Fri Mar 9 00:43:46 2007
@@ -26,7 +26,6 @@
* WebApplication configuration as contained
* within the web.xml Deployment Descriptor.
*
- * @author <a href="ddewolf@apache.org">David H. DeWolf</a>
* @version $Id: WebAppDescriptorService.java 157038 2005-03-11 03:44:40Z ddewolf $
* @since Feb 28, 2005
*/
@@ -37,7 +36,7 @@
* (web.xml).
* @return Object representation of the descriptor.
* @throws IOException if an IO error occurs.
- */
+ */
WebAppDD read(InputStream in) throws IOException;
/**
Modified: portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/servlet/AuthConstraintDD.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/servlet/AuthConstraintDD.java?view=diff&rev=516329&r1=516328&r2=516329
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/servlet/AuthConstraintDD.java (original)
+++ portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/servlet/AuthConstraintDD.java Fri Mar 9 00:43:46 2007
@@ -18,7 +18,6 @@
/**
* <B>TODO</B>: Document
- * @author <a href="ddewolf@apache.org">David H. DeWolf</a>
* @version $Id: AuthConstraintDD.java 156636 2005-03-09 12:16:31Z cziegeler $
* @since Feb 28, 2005
*/
Modified: portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/servlet/DistributableDD.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/servlet/DistributableDD.java?view=diff&rev=516329&r1=516328&r2=516329
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/servlet/DistributableDD.java (original)
+++ portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/servlet/DistributableDD.java Fri Mar 9 00:43:46 2007
@@ -18,16 +18,15 @@
/**
* Models the <distributable> web.xml element.
- *
- * @author Elliot Metsger (emetsger@jhu.edu)
+ *
* @since Mar 3, 2007
* @version $Id$
*/
public class DistributableDD
{
-
+
private boolean distributable = false;
-
+
public Boolean isDistributable()
{
return Boolean.valueOf(distributable);
Modified: portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/servlet/EjbRefDD.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/servlet/EjbRefDD.java?view=diff&rev=516329&r1=516328&r2=516329
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/servlet/EjbRefDD.java (original)
+++ portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/servlet/EjbRefDD.java Fri Mar 9 00:43:46 2007
@@ -18,7 +18,6 @@
/**
* <B>TODO</B>: Document
- * @author <a href="ddewolf@apache.org">David H. DeWolf</a>
* @version $Id: EjbRefDD.java 156636 2005-03-09 12:16:31Z cziegeler $
* @since Feb 28, 2005
*/
Modified: portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/servlet/EnvEntryDD.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/servlet/EnvEntryDD.java?view=diff&rev=516329&r1=516328&r2=516329
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/servlet/EnvEntryDD.java (original)
+++ portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/servlet/EnvEntryDD.java Fri Mar 9 00:43:46 2007
@@ -18,7 +18,6 @@
/**
* <B>TODO</B>: Document
- * @author <a href="ddewolf@apache.org">David H. DeWolf</a>
* @version $Id: EnvEntryDD.java 156636 2005-03-09 12:16:31Z cziegeler $
* @since Feb 28, 2005
*/
Modified: portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/servlet/ErrorPageDD.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/servlet/ErrorPageDD.java?view=diff&rev=516329&r1=516328&r2=516329
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/servlet/ErrorPageDD.java (original)
+++ portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/servlet/ErrorPageDD.java Fri Mar 9 00:43:46 2007
@@ -18,7 +18,6 @@
/**
* <B>TODO</B>: Document
- * @author <a href="ddewolf@apache.org">David H. DeWolf</a>
* @version $Id: ErrorPageDD.java 156636 2005-03-09 12:16:31Z cziegeler $
* @since Mar 4, 2005
*/
Modified: portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/servlet/FilterDD.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/servlet/FilterDD.java?view=diff&rev=516329&r1=516328&r2=516329
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/servlet/FilterDD.java (original)
+++ portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/servlet/FilterDD.java Fri Mar 9 00:43:46 2007
@@ -24,7 +24,6 @@
* Filter DD() uration as contained within the
* web.xml Deployment Descriptor.
*
- * @author <a href="ddewolf@apache.org">David H. DeWolf</a>
* @version $Id: FilterDD.java 156636 2005-03-09 12:16:31Z cziegeler $
* @since Feb 28, 2005
*/
Modified: portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/servlet/FilterMappingDD.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/servlet/FilterMappingDD.java?view=diff&rev=516329&r1=516328&r2=516329
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/servlet/FilterMappingDD.java (original)
+++ portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/servlet/FilterMappingDD.java Fri Mar 9 00:43:46 2007
@@ -21,7 +21,6 @@
/**
* FilterMapping configuration as contained within the
* web.xml Deployment Descriptor.
- * @author <a href="ddewolf@apache.org">David H. DeWolf</a>
* @version $Id: FilterMappingDD.java 157475 2005-03-14 22:13:18Z ddewolf $
* @since Feb 28, 2005
*/
Modified: portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/servlet/FormLoginConfigDD.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/servlet/FormLoginConfigDD.java?view=diff&rev=516329&r1=516328&r2=516329
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/servlet/FormLoginConfigDD.java (original)
+++ portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/servlet/FormLoginConfigDD.java Fri Mar 9 00:43:46 2007
@@ -18,7 +18,6 @@
/**
* <B>TODO</B>: Document
- * @author <a href="ddewolf@apache.org">David H. DeWolf</a>
* @version $Id: FormLoginConfigDD.java 156636 2005-03-09 12:16:31Z cziegeler $
* @since Mar 4, 2005
*/
Modified: portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/servlet/ListenerDD.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/servlet/ListenerDD.java?view=diff&rev=516329&r1=516328&r2=516329
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/servlet/ListenerDD.java (original)
+++ portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/servlet/ListenerDD.java Fri Mar 9 00:43:46 2007
@@ -18,7 +18,6 @@
/**
* <B>TODO</B>: Document
- * @author <a href="ddewolf@apache.org">David H. DeWolf</a>
* @version $Id: ListenerDD.java 156636 2005-03-09 12:16:31Z cziegeler $
* @since Feb 28, 2005
*/
Modified: portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/servlet/LoadOnStartupDD.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/servlet/LoadOnStartupDD.java?view=diff&rev=516329&r1=516328&r2=516329
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/servlet/LoadOnStartupDD.java (original)
+++ portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/servlet/LoadOnStartupDD.java Fri Mar 9 00:43:46 2007
@@ -18,7 +18,6 @@
/**
* <B>TODO</B>: Document
- * @author <a href="ddewolf@apache.org">David H. DeWolf</a>
* @version $Id: LoadOnStartupDD.java 156636 2005-03-09 12:16:31Z cziegeler $
* @since Mar 8, 2005
*/
Modified: portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/servlet/LoginConfigDD.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/servlet/LoginConfigDD.java?view=diff&rev=516329&r1=516328&r2=516329
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/servlet/LoginConfigDD.java (original)
+++ portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/servlet/LoginConfigDD.java Fri Mar 9 00:43:46 2007
@@ -17,7 +17,6 @@
package org.apache.pluto.descriptors.servlet;
/**
- * @author <a href="ddewolf@apache.org">David H. DeWolf</a>
* @version $Id: LoginConfigDD.java 156636 2005-03-09 12:16:31Z cziegeler $
* @since Feb 28, 2005
*/
Modified: portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/servlet/MimeMappingDD.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/servlet/MimeMappingDD.java?view=diff&rev=516329&r1=516328&r2=516329
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/servlet/MimeMappingDD.java (original)
+++ portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/servlet/MimeMappingDD.java Fri Mar 9 00:43:46 2007
@@ -18,7 +18,6 @@
/**
* <B>TODO</B>: Document
- * @author <a href="ddewolf@apache.org">David H. DeWolf</a>
* @version $Id:$
* @since Feb 28, 2005
*/
Modified: portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/servlet/ResourceRefDD.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/servlet/ResourceRefDD.java?view=diff&rev=516329&r1=516328&r2=516329
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/servlet/ResourceRefDD.java (original)
+++ portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/servlet/ResourceRefDD.java Fri Mar 9 00:43:46 2007
@@ -18,7 +18,6 @@
/**
* <B>TODO</B>: Document
- * @author <a href="ddewolf@apache.org">David H. DeWolf</a>
* @version $Id: ResourceRefDD.java 156636 2005-03-09 12:16:31Z cziegeler $
* @since Feb 28, 2005
*/
Modified: portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/servlet/SecurityConstraintDD.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/servlet/SecurityConstraintDD.java?view=diff&rev=516329&r1=516328&r2=516329
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/servlet/SecurityConstraintDD.java (original)
+++ portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/servlet/SecurityConstraintDD.java Fri Mar 9 00:43:46 2007
@@ -22,7 +22,6 @@
/**
* <B>TODO</B>: Document
- * @author <a href="ddewolf@apache.org">David H. DeWolf</a>
* @version $Id: SecurityConstraintDD.java 156636 2005-03-09 12:16:31Z cziegeler $
* @since Feb 28, 2005
*/
Modified: portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/servlet/SecurityRoleDD.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/servlet/SecurityRoleDD.java?view=diff&rev=516329&r1=516328&r2=516329
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/servlet/SecurityRoleDD.java (original)
+++ portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/servlet/SecurityRoleDD.java Fri Mar 9 00:43:46 2007
@@ -18,7 +18,6 @@
/**
* <B>TODO</B>: Document
- * @author <a href="ddewolf@apache.org">David H. DeWolf</a>
* @version $Id: SecurityRoleDD.java 156636 2005-03-09 12:16:31Z cziegeler $
* @since Feb 28, 2005
*/
Modified: portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/servlet/ServletDD.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/servlet/ServletDD.java?view=diff&rev=516329&r1=516328&r2=516329
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/servlet/ServletDD.java (original)
+++ portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/servlet/ServletDD.java Fri Mar 9 00:43:46 2007
@@ -25,7 +25,6 @@
* Filter DD() uration as contained within the
* web.xml Deployment Descriptor.
*
- * @author <a href="ddewolf@apache.org">David H. DeWolf</a>
* @version $Id: ServletDD.java 156743 2005-03-10 05:50:30Z ddewolf $
* @since Feb 28, 2005
*/
@@ -37,7 +36,7 @@
private String description;
private String jspFile;
private LoadOnStartupDD loadOnStartup;
-
+
private IconDD icon;
private List initParams = new ArrayList();
private List securityRoleRefs = new ArrayList();
Modified: portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/servlet/ServletMappingDD.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/servlet/ServletMappingDD.java?view=diff&rev=516329&r1=516328&r2=516329
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/servlet/ServletMappingDD.java (original)
+++ portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/servlet/ServletMappingDD.java Fri Mar 9 00:43:46 2007
@@ -19,7 +19,6 @@
/**
* ServletMapping configuration as contained within the
* web.xml Deployment Descriptor.
- * @author <a href="ddewolf@apache.org">David H. DeWolf</a>
* @version $Id: ServletMappingDD.java 156636 2005-03-09 12:16:31Z cziegeler $
* @since Feb 28, 2005
*/
Modified: portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/servlet/SessionConfigDD.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/servlet/SessionConfigDD.java?view=diff&rev=516329&r1=516328&r2=516329
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/servlet/SessionConfigDD.java (original)
+++ portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/servlet/SessionConfigDD.java Fri Mar 9 00:43:46 2007
@@ -18,7 +18,6 @@
/**
* <B>TODO</B>: Document
- * @author <a href="ddewolf@apache.org">David H. DeWolf</a>
* @version $Id: SessionConfigDD.java 156636 2005-03-09 12:16:31Z cziegeler $
* @since Feb 28, 2005
*/
Modified: portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/servlet/TaglibDD.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/servlet/TaglibDD.java?view=diff&rev=516329&r1=516328&r2=516329
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/servlet/TaglibDD.java (original)
+++ portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/servlet/TaglibDD.java Fri Mar 9 00:43:46 2007
@@ -18,7 +18,6 @@
/**
* <B>TODO</B>: Document
- * @author <a href="ddewolf@apache.org">David H. DeWolf</a>
* @version $Id: TaglibDD.java 156636 2005-03-09 12:16:31Z cziegeler $
* @since Feb 28, 2005
*/
Modified: portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/servlet/WebAppDD.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/servlet/WebAppDD.java?view=diff&rev=516329&r1=516328&r2=516329
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/servlet/WebAppDD.java (original)
+++ portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/servlet/WebAppDD.java Fri Mar 9 00:43:46 2007
@@ -26,7 +26,6 @@
* WebApplication configuration as contained
* within the web.xml Deployment Descriptor.
*
- * @author <a href="ddewolf@apache.org">David H. DeWolf</a>
* @version $Id: WebAppDD.java 157475 2005-03-14 22:13:18Z ddewolf $
* @since Feb 28, 2005
*/
@@ -56,7 +55,7 @@
// element is present with a version attribute,
// the Castor mapping will update this field.
private String servletVersion = "2.3";
- // Default to false. If a <web-app>
+ // Default to false. If a <web-app>
// contains a <distributable/> element, then
// Castor will update this field to true.
private DistributableDD distributableDD = new DistributableDD();
@@ -92,7 +91,7 @@
public boolean isDistributable() {
return distributableDD.isDistributable().booleanValue();
}
-
+
public DistributableDD getDistributable() {
return distributableDD;
}
@@ -244,7 +243,7 @@
public void setEjbRefs(List ejbRefs) {
this.ejbRefs = ejbRefs;
}
-
+
public String getServletVersion() {
return servletVersion;
Modified: portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/servlet/WebResourceCollectionDD.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/servlet/WebResourceCollectionDD.java?view=diff&rev=516329&r1=516328&r2=516329
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/servlet/WebResourceCollectionDD.java (original)
+++ portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/servlet/WebResourceCollectionDD.java Fri Mar 9 00:43:46 2007
@@ -21,8 +21,7 @@
/**
* Web Resource Collection configuration.
- *
- * @author <a href="ddewolf@apache.org">David H. DeWolf</a>
+ *
* @version $Id: WebResourceCollectionDD.java 157475 2005-03-14 22:13:18Z ddewolf $
* @since Mar 4, 2005
*/
Modified: portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/servlet/WelcomeFileListDD.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/servlet/WelcomeFileListDD.java?view=diff&rev=516329&r1=516328&r2=516329
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/servlet/WelcomeFileListDD.java (original)
+++ portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/servlet/WelcomeFileListDD.java Fri Mar 9 00:43:46 2007
@@ -20,7 +20,6 @@
/**
* <B>TODO</B>: Document
- * @author <a href="ddewolf@apache.org">David H. DeWolf</a>
* @version $Id: WelcomeFileListDD.java 156636 2005-03-09 12:16:31Z cziegeler $
* @since Feb 28, 2005
*/
Modified: portals/pluto/branches/pluto-1.1.x/pluto-descriptor-impl/src/main/java/org/apache/pluto/descriptors/services/castor/AbstractCastorDescriptorService.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-descriptor-impl/src/main/java/org/apache/pluto/descriptors/services/castor/AbstractCastorDescriptorService.java?view=diff&rev=516329&r1=516328&r2=516329
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-descriptor-impl/src/main/java/org/apache/pluto/descriptors/services/castor/AbstractCastorDescriptorService.java (original)
+++ portals/pluto/branches/pluto-1.1.x/pluto-descriptor-impl/src/main/java/org/apache/pluto/descriptors/services/castor/AbstractCastorDescriptorService.java Fri Mar 9 00:43:46 2007
@@ -33,7 +33,6 @@
* This Base class provides support for reading
* and writing deployment descriptors using Castor.
*
- * @author <a href="ddewolf@apache.org">David H. DeWolf</a>
* @version $Id: AbstractCastorDescriptorService.java 156743 2005-03-10 05:50:30Z ddewolf $
* @since Mar 5, 2005
*/
Modified: portals/pluto/branches/pluto-1.1.x/pluto-descriptor-impl/src/main/java/org/apache/pluto/descriptors/services/castor/EntityResolverImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-descriptor-impl/src/main/java/org/apache/pluto/descriptors/services/castor/EntityResolverImpl.java?view=diff&rev=516329&r1=516328&r2=516329
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-descriptor-impl/src/main/java/org/apache/pluto/descriptors/services/castor/EntityResolverImpl.java (original)
+++ portals/pluto/branches/pluto-1.1.x/pluto-descriptor-impl/src/main/java/org/apache/pluto/descriptors/services/castor/EntityResolverImpl.java Fri Mar 9 00:43:46 2007
@@ -27,7 +27,6 @@
* Entity Resolver which first looks for dtd and xls
* locally in our packaged.
*
- * @author <a href="ddewolf@apache.org">David H. DeWolf</a>
* @version 1.0
* @since 1.1
*/
Modified: portals/pluto/branches/pluto-1.1.x/pluto-descriptor-impl/src/main/java/org/apache/pluto/descriptors/services/castor/PortletAppDescriptorServiceImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-descriptor-impl/src/main/java/org/apache/pluto/descriptors/services/castor/PortletAppDescriptorServiceImpl.java?view=diff&rev=516329&r1=516328&r2=516329
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-descriptor-impl/src/main/java/org/apache/pluto/descriptors/services/castor/PortletAppDescriptorServiceImpl.java (original)
+++ portals/pluto/branches/pluto-1.1.x/pluto-descriptor-impl/src/main/java/org/apache/pluto/descriptors/services/castor/PortletAppDescriptorServiceImpl.java Fri Mar 9 00:43:46 2007
@@ -33,7 +33,6 @@
* the service; requiring only that subclasses provide the
* input streams to/from the actual descriptor.
*
- * @author <a href="ddewolf@apache.org">David H. DeWolf</a>
* @version $Id: PortletAppDescriptorServiceImpl.java 156743 2005-03-10 05:50:30Z ddewolf $
* @since Mar 5, 2005
*/
Modified: portals/pluto/branches/pluto-1.1.x/pluto-descriptor-impl/src/main/java/org/apache/pluto/descriptors/services/castor/ServletVersionCastorFieldHandler.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-descriptor-impl/src/main/java/org/apache/pluto/descriptors/services/castor/ServletVersionCastorFieldHandler.java?view=diff&rev=516329&r1=516328&r2=516329
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-descriptor-impl/src/main/java/org/apache/pluto/descriptors/services/castor/ServletVersionCastorFieldHandler.java (original)
+++ portals/pluto/branches/pluto-1.1.x/pluto-descriptor-impl/src/main/java/org/apache/pluto/descriptors/services/castor/ServletVersionCastorFieldHandler.java Fri Mar 9 00:43:46 2007
@@ -20,13 +20,12 @@
import org.exolab.castor.mapping.AbstractFieldHandler;
/**
- * This class manages the <code>version</code> attribute on the <web-app> for
+ * This class manages the <code>version</code> attribute on the <web-app> for
* Servlet 2.3 and greater deployment descriptors.
- *
- * Servlet 2.3 does not have a <code>version</code> attribute, for the <web-app>
+ *
+ * Servlet 2.3 does not have a <code>version</code> attribute, for the <web-app>
* while Servlet 2.4 and higher do.
- *
- * @author Elliot Metsger (emetsger@jhu.edu)
+ *
* @since Mar 3, 2007
* @version $Id$
*/
@@ -40,18 +39,18 @@
throw new ClassCastException( "Error: was expecting a " +
WebAppDD.class.getName() + " but received a " + webAppDD.getClass().getName() );
}
-
+
String servletVersion = ((WebAppDD)webAppDD).getServletVersion();
-
+
// if the servlet version is 2.3, we don't want to include it in the
// XML output as a version attribute. Only servlet 2.4 and higher
// have a version attribute in their <web-app> element.
-
+
if ( "2.3".equals(servletVersion) )
{
return null;
}
-
+
return servletVersion;
}
@@ -87,8 +86,8 @@
throw new ClassCastException( "Error: was expecting a " +
String.class.getName() + " but received a " + servletVersionValue.getClass().getName() );
}
-
- ((WebAppDD)webAppDD).setServletVersion((String)servletVersionValue);
+
+ ((WebAppDD)webAppDD).setServletVersion((String)servletVersionValue);
}
}
Modified: portals/pluto/branches/pluto-1.1.x/pluto-descriptor-impl/src/main/java/org/apache/pluto/descriptors/services/castor/WebAppDescriptorServiceImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-descriptor-impl/src/main/java/org/apache/pluto/descriptors/services/castor/WebAppDescriptorServiceImpl.java?view=diff&rev=516329&r1=516328&r2=516329
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-descriptor-impl/src/main/java/org/apache/pluto/descriptors/services/castor/WebAppDescriptorServiceImpl.java (original)
+++ portals/pluto/branches/pluto-1.1.x/pluto-descriptor-impl/src/main/java/org/apache/pluto/descriptors/services/castor/WebAppDescriptorServiceImpl.java Fri Mar 9 00:43:46 2007
@@ -34,7 +34,6 @@
* the service; requiring only that subclasses provide the
* input streams to/from the actual descriptor.
*
- * @author <a href="ddewolf@apache.org">David H. DeWolf</a>
* @version $Id: WebAppDescriptorServiceImpl.java 156743 2005-03-10 05:50:30Z ddewolf $
* @since Mar 5, 2005
*/
@@ -101,7 +100,7 @@
mapping.loadMapping(url);
return mapping;
}
-
+
protected void setCastorMarshallerOptions(Marshaller marshaller, Object beingMarshalled) {
String servletVersion = ((WebAppDD)beingMarshalled).getServletVersion();
if ( "2.3".equals(servletVersion) )
Modified: portals/pluto/branches/pluto-1.1.x/pluto-descriptor-impl/src/test/java/org/apache/pluto/descriptors/services/castor/PortletAppDescriptorServiceImplTest.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-descriptor-impl/src/test/java/org/apache/pluto/descriptors/services/castor/PortletAppDescriptorServiceImplTest.java?view=diff&rev=516329&r1=516328&r2=516329
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-descriptor-impl/src/test/java/org/apache/pluto/descriptors/services/castor/PortletAppDescriptorServiceImplTest.java (original)
+++ portals/pluto/branches/pluto-1.1.x/pluto-descriptor-impl/src/test/java/org/apache/pluto/descriptors/services/castor/PortletAppDescriptorServiceImplTest.java Fri Mar 9 00:43:46 2007
@@ -30,7 +30,6 @@
/**
*
- * @author <a href="ddewolf@apache.org">David H. DeWolf</a>
* @version $Id$
* @since 1.1.0
*/
Modified: portals/pluto/branches/pluto-1.1.x/pluto-descriptor-impl/src/test/java/org/apache/pluto/descriptors/services/castor/Servlet23WebAppDescriptorTest.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-descriptor-impl/src/test/java/org/apache/pluto/descriptors/services/castor/Servlet23WebAppDescriptorTest.java?view=diff&rev=516329&r1=516328&r2=516329
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-descriptor-impl/src/test/java/org/apache/pluto/descriptors/services/castor/Servlet23WebAppDescriptorTest.java (original)
+++ portals/pluto/branches/pluto-1.1.x/pluto-descriptor-impl/src/test/java/org/apache/pluto/descriptors/services/castor/Servlet23WebAppDescriptorTest.java Fri Mar 9 00:43:46 2007
@@ -30,19 +30,18 @@
/**
* This test ensures that the version attribute of a servlet 2.3 descriptor
* is being read from and written to properly by Castor.
- *
- * @author Elliot Metsger (emetsger@jhu.edu)
+ *
* @since Mar 3, 2007
* @version $Id$
* @todo JavaDoc
*/
public class Servlet23WebAppDescriptorTest extends TestCase
{
-
+
private static final String DESCRIPTOR = "/servlet-2.3-webapp-descriptor.xml";
private InputStream in = null;
private WebAppDescriptorService underTest = null;
-
+
protected void setUp() throws Exception
{
underTest = new WebAppDescriptorServiceImpl();
@@ -60,15 +59,15 @@
{
WebAppDD webappdd = underTest.read(in);
assertNotNull(webappdd);
- assertEquals("2.3", webappdd.getServletVersion());
+ assertEquals("2.3", webappdd.getServletVersion());
}
public void testWrite() throws Exception
{
File outputFile = File.createTempFile( "webapp-2.3-descriptor-test", ".xml" );
- OutputStream out = new FileOutputStream( outputFile );
+ OutputStream out = new FileOutputStream( outputFile );
WebAppDD webappdd = underTest.read(in);
- underTest.write(webappdd, out);
+ underTest.write(webappdd, out);
// now round-trip it
WebAppDD webappdd2 = underTest.read(new FileInputStream(outputFile));
assertNotNull(webappdd2);
Modified: portals/pluto/branches/pluto-1.1.x/pluto-descriptor-impl/src/test/java/org/apache/pluto/descriptors/services/castor/Servlet24WebAppDescriptorTest.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-descriptor-impl/src/test/java/org/apache/pluto/descriptors/services/castor/Servlet24WebAppDescriptorTest.java?view=diff&rev=516329&r1=516328&r2=516329
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-descriptor-impl/src/test/java/org/apache/pluto/descriptors/services/castor/Servlet24WebAppDescriptorTest.java (original)
+++ portals/pluto/branches/pluto-1.1.x/pluto-descriptor-impl/src/test/java/org/apache/pluto/descriptors/services/castor/Servlet24WebAppDescriptorTest.java Fri Mar 9 00:43:46 2007
@@ -27,16 +27,15 @@
import org.apache.pluto.descriptors.servlet.WebAppDD;
/**
- * This test ensures that the version attribute of a Servlet 2.4
+ * This test ensures that the version attribute of a Servlet 2.4
* descriptor is being read from and written to propery by Castor.
- *
- * @author Elliot Metsger (emetsger@jhu.edu)
+ *
* @since Mar 3, 2007
* @version $Id$
*/
public class Servlet24WebAppDescriptorTest extends TestCase
{
-
+
private static final String DESCRIPTOR = "/servlet-2.4-webapp-descriptor.xml";
InputStream in = null;
private WebAppDescriptorService underTest = null;
Modified: portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/config/impl/DriverConfigurationImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/config/impl/DriverConfigurationImpl.java?view=diff&rev=516329&r1=516328&r2=516329
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/config/impl/DriverConfigurationImpl.java (original)
+++ portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/config/impl/DriverConfigurationImpl.java Fri Mar 9 00:43:46 2007
@@ -33,7 +33,6 @@
/**
* Encapsulation of the Pluto Driver ResourceConfig.
*
- * @author <a href="ddewolf@apache.org">David H. DeWolf</a>
* @version 1.0
* @since Sep 23, 2004
*/
@@ -52,11 +51,11 @@
public DriverConfigurationImpl(PortalURLParser portalUrlParser,
PropertyConfigService propertyService,
- RenderConfigService renderService,
+ RenderConfigService renderService,
SupportedModesService supportedModesService,
SupportedWindowStateService supportedWindowStateService,
PortalCallbackService portalCallback) {
-
+
this.portalUrlParser = portalUrlParser;
this.propertyService = propertyService;
this.renderService = renderService;
@@ -116,15 +115,15 @@
public PageConfig getPageConfig(String pageId) {
return renderService.getPage(pageId);
}
-
+
public boolean isPortletModeSupportedByPortal(String mode) {
return supportedModesService.isPortletModeSupportedByPortal(mode);
}
-
+
public boolean isPortletModeSupportedByPortlet(String portletId, String mode) {
return supportedModesService.isPortletModeSupportedByPortlet(portletId, mode);
}
-
+
public boolean isPortletModeSupported(String portletId, String mode) {
return supportedModesService.isPortletModeSupported(portletId, mode);
}
@@ -142,10 +141,10 @@
if(renderService != null)
renderService.destroy();
-
+
if (supportedModesService != null)
supportedModesService.destroy();
-
+
if (supportedWindowStateService != null)
supportedWindowStateService.destroy();
}
@@ -160,7 +159,7 @@
public void setPortalUrlParser(PortalURLParser portalUrlParser) {
this.portalUrlParser = portalUrlParser;
- }
+ }
//
// Container Services
Modified: portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/ContainerServicesImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/ContainerServicesImpl.java?view=diff&rev=516329&r1=516328&r2=516329
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/ContainerServicesImpl.java (original)
+++ portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/ContainerServicesImpl.java Fri Mar 9 00:43:46 2007
@@ -16,26 +16,24 @@
*/
package org.apache.pluto.driver.services.container;
+import javax.portlet.PortalContext;
+
import org.apache.pluto.OptionalContainerServices;
import org.apache.pluto.RequiredContainerServices;
-import org.apache.pluto.internal.InternalPortletWindow;
import org.apache.pluto.driver.config.DriverConfiguration;
import org.apache.pluto.spi.PortalCallbackService;
-import org.apache.pluto.spi.optional.PortletPreferencesService;
+import org.apache.pluto.spi.optional.PortalAdministrationService;
import org.apache.pluto.spi.optional.PortletEnvironmentService;
+import org.apache.pluto.spi.optional.PortletInfoService;
import org.apache.pluto.spi.optional.PortletInvokerService;
+import org.apache.pluto.spi.optional.PortletPreferencesService;
import org.apache.pluto.spi.optional.PortletRegistryService;
-import org.apache.pluto.spi.optional.PortletInfoService;
-import org.apache.pluto.spi.optional.PortalAdministrationService;
import org.apache.pluto.spi.optional.UserInfoService;
-import javax.portlet.PortalContext;
-
/**
* The Portal Driver's <code>PortletContainerServices</code> implementation. The
* <code>PortletContainerServices</code> interface is the main integration point
* between the pluto container and the surrounding portal.
- * @author <a href="ddewolf@apache.org">David H. DeWolf</a>
* @version 1.0
* @since Sep 21, 2004
*/
@@ -84,7 +82,7 @@
/**
- * Returns null to use pluto's default
+ * Returns null to use pluto's default
* @return
*/
public PortletRegistryService getPortletRegistryService() {
Modified: portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/PortalCallbackServiceImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/PortalCallbackServiceImpl.java?view=diff&rev=516329&r1=516328&r2=516329
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/PortalCallbackServiceImpl.java (original)
+++ portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/PortalCallbackServiceImpl.java Fri Mar 9 00:43:46 2007
@@ -16,38 +16,35 @@
*/
package org.apache.pluto.driver.services.container;
+import java.util.Collections;
+import java.util.Map;
+
import javax.servlet.http.HttpServletRequest;
import org.apache.pluto.PortletWindow;
import org.apache.pluto.driver.AttributeKeys;
-import org.apache.pluto.driver.services.container.ResourceURLProviderImpl;
import org.apache.pluto.spi.PortalCallbackService;
import org.apache.pluto.spi.PortletURLProvider;
import org.apache.pluto.spi.ResourceURLProvider;
-import java.util.Map;
-import java.util.Collections;
-
/**
- * @author <a href="mailto:ddewolf@apache.org">David H. DeWolf</a>
- * @author <a href="mailto:zheng@apache.org">ZHENG Zhong</a>
* @version 1.0
* @since Sep 22, 2004
*/
public class PortalCallbackServiceImpl implements PortalCallbackService {
// Constructor -------------------------------------------------------------
-
+
/**
* Default no-arg constructor.
*/
public PortalCallbackServiceImpl() {
// Do nothing.
}
-
-
+
+
// PortalCallbackService Impl ----------------------------------------------
-
+
/**
* Method invoked by the container when the portlet sets its title. This
* method binds the dynamic portlet title to the servlet request for later
Modified: portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/PortletURLProviderImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/PortletURLProviderImpl.java?view=diff&rev=516329&r1=516328&r2=516329
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/PortletURLProviderImpl.java (original)
+++ portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/PortletURLProviderImpl.java Fri Mar 9 00:43:46 2007
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* 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.
@@ -30,9 +30,7 @@
import org.apache.pluto.spi.PortletURLProvider;
/**
- *
- * @author <a href="mailto:zheng@apache.org">ZHENG Zhong</a>
- * @author <a href="mailto:ddewolf@apache.org">David H. DeWolf</a>
+ *
*/
public class PortletURLProviderImpl implements PortletURLProvider {
Modified: portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/impl/UserInfoAttributesServiceImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/impl/UserInfoAttributesServiceImpl.java?view=diff&rev=516329&r1=516328&r2=516329
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/impl/UserInfoAttributesServiceImpl.java (original)
+++ portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/impl/UserInfoAttributesServiceImpl.java Fri Mar 9 00:43:46 2007
@@ -33,28 +33,27 @@
/**
* FIXME: Only include attributes that are defined in portlet.xml
- *
+ *
* This is a default implementation of that gets user information attributes
* from a properties file where the user information attribute name (as defined
- * in PLT.D of the JSR-168 spec) is prefixed by the user name (e.g. craig.user.name.given=Craig).
- *
- * @author <a href="cdoremus@apache.org">Craig Doremus</a>
+ * in PLT.D of the JSR-168 spec) is prefixed by the user name (e.g. craig.user.name.given=Craig).
+ *
*/
public class UserInfoAttributesServiceImpl implements UserInfoAttributesService {
private static UserInfoAttributesServiceImpl instance = new UserInfoAttributesServiceImpl();
-
+
private static final String USER_INFO_ATTR_FILE = "/user-info-attributes.properties";
/** Logger. */
private static final Log LOG = LogFactory.getLog(
UserInfoAttributesServiceImpl.class);
private static Properties props = new Properties();
private static Map cache = new HashMap();
-
+
private UserInfoAttributesServiceImpl(){
-
+
}
-
+
public static UserInfoAttributesServiceImpl getInstance() throws IOException {
loadProperties();
return instance;
@@ -67,10 +66,10 @@
/**
* Implementation of PLT.17.2 used to access user information attributes.
- *
+ *
* @see UserInfoAttributesService#getUserInfo(javax.portlet.PortletRequest)
* @return As per the spec, return null if the user is not authenticated or an empty Map if there are
- * no attributes in the properties file or a Map containing only those attributes found in the attribute
+ * no attributes in the properties file or a Map containing only those attributes found in the attribute
* data store (properties file).
*/
public Map getUserInfo(PortletRequest request)
@@ -91,9 +90,9 @@
for (int i = 0; i < len ; i++) {
name = new StringBuffer();
name.append(prefix);
- String attr = P3PAttributes.ATTRIBUTE_ARRAY[i];
+ String attr = P3PAttributes.ATTRIBUTE_ARRAY[i];
name.append(attr);
- String prop = props.getProperty(name.toString());
+ String prop = props.getProperty(name.toString());
//spec says that Map only attributes that have data
if ( prop != null) {
//TODO: convert user.bdate to milliseconds since January 1, 1970, 00:00:00 GMT.
@@ -115,7 +114,7 @@
if (props.isEmpty()) {
InputStream stream = UserInfoAttributesServiceImpl.class.getResourceAsStream(USER_INFO_ATTR_FILE);
if (stream == null) {
- String msg = "The properties file '" + USER_INFO_ATTR_FILE +"' cannot be found." +
+ String msg = "The properties file '" + USER_INFO_ATTR_FILE +"' cannot be found." +
" Please make sure this file exists and is in the classpath (i.e. WEB-INF/classes).";
LOG.error(msg);
throw new IOException(msg);
Modified: portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/impl/resource/PropertyConfigServiceImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/impl/resource/PropertyConfigServiceImpl.java?view=diff&rev=516329&r1=516328&r2=516329
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/impl/resource/PropertyConfigServiceImpl.java (original)
+++ portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/impl/resource/PropertyConfigServiceImpl.java Fri Mar 9 00:43:46 2007
@@ -16,21 +16,21 @@
*/
package org.apache.pluto.driver.services.impl.resource;
-import org.apache.pluto.driver.config.DriverConfigurationException;
-import org.apache.pluto.driver.services.portal.*;
-import org.apache.commons.logging.LogFactory;
-import org.apache.commons.logging.Log;
+import java.io.InputStream;
+import java.util.Set;
import javax.servlet.ServletContext;
-import java.util.Set;
-import java.io.InputStream;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.pluto.driver.config.DriverConfigurationException;
+import org.apache.pluto.driver.services.portal.PropertyConfigService;
/**
* Default implementation of all of the portal Services.
* Utilizes resource configuration from
* <code>pluto-portal-driver-config.xml</code>
*
- * @author <a href="mailto:ddewolf@apache.org">David H. DeWolf</a>
* @since Aug 10, 2005
*/
public class PropertyConfigServiceImpl implements
@@ -42,7 +42,7 @@
private ResourceConfig config;
public PropertyConfigServiceImpl() {
-
+
}
/**
Modified: portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/impl/resource/RenderConfigServiceImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/impl/resource/RenderConfigServiceImpl.java?view=diff&rev=516329&r1=516328&r2=516329
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/impl/resource/RenderConfigServiceImpl.java (original)
+++ portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/impl/resource/RenderConfigServiceImpl.java Fri Mar 9 00:43:46 2007
@@ -16,21 +16,22 @@
*/
package org.apache.pluto.driver.services.impl.resource;
-import org.apache.pluto.driver.config.DriverConfigurationException;
-import org.apache.pluto.driver.services.portal.*;
-import org.apache.pluto.driver.services.portal.admin.RenderConfigAdminService;
-
-import javax.servlet.ServletContext;
+import java.io.InputStream;
import java.util.List;
import java.util.Set;
-import java.io.InputStream;
+
+import javax.servlet.ServletContext;
+
+import org.apache.pluto.driver.config.DriverConfigurationException;
+import org.apache.pluto.driver.services.portal.PageConfig;
+import org.apache.pluto.driver.services.portal.RenderConfigService;
+import org.apache.pluto.driver.services.portal.admin.RenderConfigAdminService;
/**
* Default implementation of all of the portal Services.
* Utilizes resource configuration from
* <code>pluto-portal-driver-config.xml</code>
*
- * @author <a href="mailto:ddewolf@apache.org">David H. DeWolf</a>
* @since Aug 10, 2005
*/
public class RenderConfigServiceImpl
Modified: portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/impl/resource/ResourceConfig.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/impl/resource/ResourceConfig.java?view=diff&rev=516329&r1=516328&r2=516329
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/impl/resource/ResourceConfig.java (original)
+++ portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/impl/resource/ResourceConfig.java Fri Mar 9 00:43:46 2007
@@ -16,17 +16,17 @@
*/
package org.apache.pluto.driver.services.impl.resource;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.pluto.driver.services.portal.PortletWindowConfig;
import org.apache.pluto.driver.services.portal.RenderConfig;
-import java.util.*;
-
/**
* Encapsulation of the Pluto Driver ResourceConfig Info.
*
- * @author <a href="ddewolf@apache.org">David H. DeWolf</a>
* @version 1.0
* @since Sep 23, 2004
*/
Modified: portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/impl/resource/ResourceConfigReader.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/impl/resource/ResourceConfigReader.java?view=diff&rev=516329&r1=516328&r2=516329
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/impl/resource/ResourceConfigReader.java (original)
+++ portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/impl/resource/ResourceConfigReader.java Fri Mar 9 00:43:46 2007
@@ -16,19 +16,17 @@
*/
package org.apache.pluto.driver.services.impl.resource;
+import java.io.IOException;
+import java.io.InputStream;
+
import org.apache.commons.digester.Digester;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.pluto.driver.services.portal.PortletWindowConfig;
import org.apache.pluto.driver.services.portal.PageConfig;
import org.apache.pluto.driver.services.portal.RenderConfig;
import org.xml.sax.SAXException;
-import java.io.IOException;
-import java.io.InputStream;
-
/**
- * @author <a href="ddewolf@apache.org">David H. DeWolf</a>
* @version 1.0
* @since Sep 23, 2004
*/
Modified: portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/impl/resource/SupportedModesServiceImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/impl/resource/SupportedModesServiceImpl.java?view=diff&rev=516329&r1=516328&r2=516329
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/impl/resource/SupportedModesServiceImpl.java (original)
+++ portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/impl/resource/SupportedModesServiceImpl.java Fri Mar 9 00:43:46 2007
@@ -40,43 +40,42 @@
/**
* Allows clients to determine if a particular PortletMode is supported
* by the portal, a particular portlet, or both.
- *
+ *
* This implementation depends on {@link PropertyConfigService}.
- *
+ *
* The service implementations are injected by Spring.
- *
- * @author <a href="mailto:esm@apache.org">Elliot Metsger</a>
+ *
* @version $Id$
* @since September 9, 2006
*/
-public class SupportedModesServiceImpl implements SupportedModesService
+public class SupportedModesServiceImpl implements SupportedModesService
{
/** Logger */
private static final Log LOG = LogFactory.getLog(SupportedModesServiceImpl.class);
/** PortletMode objects supported by the portal */
private Set supportedPortletModesByPortal = new HashSet();
-
+
/** PortletRegistryService used to obtain PortletApplicationConfig objects */
- private PortletRegistryService portletRegistry = null;
+ private PortletRegistryService portletRegistry;
/** PropertyConfig Service used to obtain supported portal modes */
- private PropertyConfigService propertyService = null;
-
+ private PropertyConfigService propertyService;
+
/** The portal's servletContext **/
- private ServletContext servletContext = null;
-
+ private ServletContext servletContext;
+
/**
* Constructs a SupportedModesService with its dependencies.
- *
+ *
* @param propertyService the PropertyConfigService
*/
public SupportedModesServiceImpl(PropertyConfigService propertyService) {
this.propertyService = propertyService;
}
-
+
// SupportedModesService Implementation -----------------
-
+
public boolean isPortletModeSupported(String portletId, String mode) {
return isPortletModeSupportedByPortal(mode) &&
isPortletModeSupportedByPortlet(portletId, mode);
@@ -97,13 +96,13 @@
.getAttribute(AttributeKeys.PORTLET_CONTAINER))
.getOptionalContainerServices()
.getPortletRegistryService();
- }
-
- try {
+ }
+
+ try {
if (portletRegistry == null) {
LOG.error("Optional Portlet Registry Service not found.");
throw new PortletContainerException("Optional Portlet Registry Service not found.");
- }
+ }
PortletAppDD ctx = portletRegistry.getPortletApplicationDescriptor(applicationId);
Iterator i = ctx.getPortlets().iterator();
while(i.hasNext()) {
@@ -130,8 +129,8 @@
}
// DriverConfiguration Lifecycle Implementation ---------
-
- public void destroy() throws DriverConfigurationException
+
+ public void destroy() throws DriverConfigurationException
{
LOG.debug("Destroying Supported Modes Service...");
supportedPortletModesByPortal = null;