portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tay...@apache.org
Subject svn commit: r1563354 - in /portals/jetspeed-2/portal/trunk: applications/jetspeed/src/main/webapp/WEB-INF/jetui/yui/ components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/page/document/psml/ components/jetspeed-portal/src/main/java/org/apa...
Date Sat, 01 Feb 2014 00:02:36 GMT
Author: taylor
Date: Sat Feb  1 00:02:35 2014
New Revision: 1563354

URL: http://svn.apache.org/r1563354
Log:
JS2-874: another checkpoint in Java Generics migration

Added:
    portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/decoration/DecoratorActionImpl.java
      - copied, changed from r1548225, portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/decoration/DecoratorAction.java
    portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/decoration/DecoratorAction.java
Removed:
    portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/decoration/DecoratorAction.java
Modified:
    portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/jetui/yui/jetui.jsp
    portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/page/document/psml/CastorFileSystemDocumentHandler.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/administration/PortalAdministrationImpl.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/decoration/AbstractDecoratorActionsFactory.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/decoration/DecorationFactoryImpl.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/decoration/DecorationValve.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/decoration/PageTheme.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/DecorationBean.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/DecoratorActionBean.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/components/portletentity/PersistenceBrokerPortletEntityAccess.java
    portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/cache/JetspeedContentCache.java
    portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/cluster/NodeInformation.java
    portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/components/portletentity/PortletEntityAccessComponent.java
    portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/container/url/PortalURL.java
    portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/decoration/Decoration.java
    portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/decoration/DecorationFactory.java
    portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/decoration/Theme.java

Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/jetui/yui/jetui.jsp
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/jetui/yui/jetui.jsp?rev=1563354&r1=1563353&r2=1563354&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/jetui/yui/jetui.jsp (original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/jetui/yui/jetui.jsp Sat Feb  1 00:02:35 2014
@@ -28,7 +28,6 @@ limitations under the License.
 <%@ page import="org.apache.jetspeed.om.page.ContentFragment" %>
 <%@ page import="org.apache.jetspeed.om.page.ContentPage" %>
 <%@ page import="org.apache.jetspeed.portlets.layout.ColumnLayout" %>
-<%@ page import="org.apache.jetspeed.decoration.DecoratorAction" %>
 <%@ page import="org.apache.jetspeed.PortalReservedParameters" %>
 <%@ page import="org.apache.jetspeed.administration.PortalConfiguration" %>
 <%@ page import="org.apache.jetspeed.administration.PortalConfigurationConstants" %>

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/page/document/psml/CastorFileSystemDocumentHandler.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/page/document/psml/CastorFileSystemDocumentHandler.java?rev=1563354&r1=1563353&r2=1563354&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/page/document/psml/CastorFileSystemDocumentHandler.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/page/document/psml/CastorFileSystemDocumentHandler.java Sat Feb  1 00:02:35 2014
@@ -16,22 +16,6 @@
  */
 package org.apache.jetspeed.page.document.psml;
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStreamWriter;
-import java.io.Writer;
-
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.parsers.SAXParser;
-import javax.xml.parsers.SAXParserFactory;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.apache.jetspeed.JetspeedActions;
 import org.apache.jetspeed.cache.file.FileCache;
 import org.apache.jetspeed.cache.file.FileCacheEntry;
@@ -63,6 +47,8 @@ import org.exolab.castor.xml.SAX2EventPr
 import org.exolab.castor.xml.Unmarshaller;
 import org.exolab.castor.xml.ValidationException;
 import org.exolab.castor.xml.XMLClassDescriptorResolver;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.xml.sax.Attributes;
 import org.xml.sax.ContentHandler;
 import org.xml.sax.InputSource;
@@ -70,6 +56,19 @@ import org.xml.sax.Locator;
 import org.xml.sax.SAXException;
 import org.xml.sax.XMLReader;
 
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.parsers.SAXParser;
+import javax.xml.parsers.SAXParserFactory;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStreamWriter;
+import java.io.Writer;
+
 /**
  * <p>
  * CastorFileSystemDocumentHandler
@@ -668,7 +667,7 @@ public class CastorFileSystemDocumentHan
      * @see org.apache.jetspeed.page.document.DocumentHandler#getDocument(java.lang.String,
      *      boolean)
      * @param name
-     * @param fromCahe
+     * @param fromCache
      *            Whether or not the Document should be pulled from the cache.
      * @return @throws
      *         DocumentNotFoundException

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/administration/PortalAdministrationImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/administration/PortalAdministrationImpl.java?rev=1563354&r1=1563353&r2=1563354&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/administration/PortalAdministrationImpl.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/administration/PortalAdministrationImpl.java Sat Feb  1 00:02:35 2014
@@ -44,7 +44,6 @@ import org.apache.velocity.VelocityConte
 import org.apache.velocity.app.VelocityEngine;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.mail.MailException;
 import org.springframework.mail.SimpleMailMessage;
 import org.springframework.mail.javamail.JavaMailSender;
 
@@ -421,9 +420,10 @@ public class PortalAdministrationImpl im
             // JS2-1256: Needs to set context classloader to null to let geronimo-javamail find provider class properly.
             Thread.currentThread().setContextClassLoader(null);
             mailSender.send(msg);
-        } catch (MailException ex) {
-            throw new AdministrationEmailException(
-                    "Failed to send forgotten password email to user with email address because " + ex.getMessage(), ex
+        } catch (Exception ex) {
+            String message = "Failed to send forgotten password email to user with email address because " + ex.getMessage();
+            log.error(message, ex);
+            throw new AdministrationEmailException(message, ex
             ); //+ user.getEmail());
         } finally {
             Thread.currentThread().setContextClassLoader(currentCL);

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/decoration/AbstractDecoratorActionsFactory.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/decoration/AbstractDecoratorActionsFactory.java?rev=1563354&r1=1563353&r2=1563354&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/decoration/AbstractDecoratorActionsFactory.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/decoration/AbstractDecoratorActionsFactory.java Sat Feb  1 00:02:35 2014
@@ -16,17 +16,6 @@
 */
 package org.apache.jetspeed.decoration;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.ResourceBundle;
-
-import javax.portlet.PortletMode;
-import javax.portlet.WindowState;
-
 import org.apache.jetspeed.JetspeedActions;
 import org.apache.jetspeed.container.PortletWindow;
 import org.apache.jetspeed.container.url.PortalURL;
@@ -37,6 +26,15 @@ import org.apache.jetspeed.request.Reque
 import org.apache.jetspeed.security.SecurityAccessController;
 import org.apache.jetspeed.util.ServletRequestThreadLocalCleanupCallback;
 
+import javax.portlet.PortletMode;
+import javax.portlet.WindowState;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.ResourceBundle;
+
 public abstract class AbstractDecoratorActionsFactory implements DecoratorActionsFactory
 {
     private static ThreadLocal<Map<String, Object>> actionResourcesMap = new ThreadLocal<Map<String, Object>>();
@@ -47,7 +45,6 @@ public abstract class AbstractDecoratorA
     /**
      * When Edit is clicked, also maximize the window state
      * 
-     * @param editMaxOption
      */
     public AbstractDecoratorActionsFactory()
     {
@@ -169,14 +166,14 @@ public abstract class AbstractDecoratorA
                 || (template.getState() != null && !template.getState().equals(
                         template.getCustomState()));
 
-        ResourceBundle bundle = DecoratorAction.getResourceBundle(rc.getLocale());
+        ResourceBundle bundle = DecoratorActionImpl.getResourceBundle(rc.getLocale());
         Map<String, Object> resourcesMap = actionResourcesMap.get();
         
         // It seems better to not use threadLocal variable or to have an abstraction, but
         // let's just check if the current cache in the thread has the same locale for now.
         if (resourcesMap != null)
         {
-            ResourceBundle cachedBundle = (ResourceBundle) resourcesMap.get(DecoratorAction.RESOURCE_BUNDLE);
+            ResourceBundle cachedBundle = (ResourceBundle) resourcesMap.get(DecoratorActionImpl.RESOURCE_BUNDLE);
             if (!bundle.getLocale().equals(cachedBundle.getLocale())) 
             {
                 resourcesMap = null;
@@ -190,8 +187,8 @@ public abstract class AbstractDecoratorA
             resourcesMap = new HashMap<String, Object>();
             actionResourcesMap.set(resourcesMap);
             new ServletRequestThreadLocalCleanupCallback(actionResourcesMap);
-            resourcesMap.put(DecoratorAction.RESOURCE_BUNDLE, bundle);
-            localizedName = DecoratorAction.getResourceString(bundle, actionName, actionName);
+            resourcesMap.put(DecoratorActionImpl.RESOURCE_BUNDLE, bundle);
+            localizedName = DecoratorActionImpl.getResourceString(bundle, actionName, actionName);
             resourcesMap.put(actionName,localizedName);
         }
         else
@@ -199,11 +196,11 @@ public abstract class AbstractDecoratorA
             localizedName = (String)resourcesMap.get(actionName);
             if (localizedName == null)
             {
-                localizedName = DecoratorAction.getResourceString(bundle, actionName, actionName);
+                localizedName = DecoratorActionImpl.getResourceString(bundle, actionName, actionName);
                 resourcesMap.put(actionName,localizedName);
             }
         }
-        return new DecoratorAction(actionName, localizedName, localizedName, linkURL, actionURL, customAction, template.getActionType());
+        return new DecoratorActionImpl(actionName, localizedName, localizedName, linkURL, actionURL, customAction, template.getActionType());
     }
     
     //added for checkin the constraints on actions

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/decoration/DecorationFactoryImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/decoration/DecorationFactoryImpl.java?rev=1563354&r1=1563353&r2=1563354&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/decoration/DecorationFactoryImpl.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/decoration/DecorationFactoryImpl.java Sat Feb  1 00:02:35 2014
@@ -16,6 +16,22 @@
  */
 package org.apache.jetspeed.decoration;
 
+import org.apache.jetspeed.cache.CacheElement;
+import org.apache.jetspeed.cache.JetspeedCache;
+import org.apache.jetspeed.components.portletregistry.PortletRegistry;
+import org.apache.jetspeed.decoration.caches.SessionPathResolverCache;
+import org.apache.jetspeed.desktop.JetspeedDesktop;
+import org.apache.jetspeed.om.page.ContentFragment;
+import org.apache.jetspeed.om.page.ContentPage;
+import org.apache.jetspeed.om.portlet.PortletApplication;
+import org.apache.jetspeed.om.portlet.PortletDefinition;
+import org.apache.jetspeed.request.RequestContext;
+import org.apache.jetspeed.util.Path;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.web.context.ServletContextAware;
+
+import javax.servlet.ServletContext;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Collections;
@@ -31,23 +47,6 @@ import java.util.Set;
 import java.util.SortedSet;
 import java.util.TreeSet;
 
-import javax.servlet.ServletContext;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.apache.jetspeed.cache.CacheElement;
-import org.apache.jetspeed.cache.JetspeedCache;
-import org.apache.jetspeed.components.portletregistry.PortletRegistry;
-import org.apache.jetspeed.decoration.caches.SessionPathResolverCache;
-import org.apache.jetspeed.om.page.ContentFragment;
-import org.apache.jetspeed.om.page.ContentPage;
-import org.apache.jetspeed.om.portlet.PortletApplication;
-import org.apache.jetspeed.om.portlet.PortletDefinition;
-import org.apache.jetspeed.request.RequestContext;
-import org.apache.jetspeed.util.Path;
-import org.apache.jetspeed.desktop.JetspeedDesktop;
-import org.springframework.web.context.ServletContextAware;
-
 /**
  *
  * @author <href a="mailto:weaver@apache.org">Scott T. Weaver</a>
@@ -423,8 +422,8 @@ public class DecorationFactoryImpl imple
      * @param page Page this fragment belongs to.
      * @return Default decorator name.
      *
-     * @see Page
-     * @see Fragment
+     * @param page
+     * @param fragment
      */
     protected String getDefaultDecorationName(ContentFragment fragment, ContentPage page)
     {
@@ -501,7 +500,7 @@ public class DecorationFactoryImpl imple
      *
      * @return A list of page decorations of type <code>Decoration</code>
      */
-    public Set getPageDecorations( RequestContext request )
+    public Set<String> getPageDecorations( RequestContext request )
     {
         Set decorations = servletContext.getResourcePaths( decorationsPath.toString() + "/layout" );
         if( ! layoutDecorationsDir.equals( decorations ) )
@@ -518,7 +517,7 @@ public class DecorationFactoryImpl imple
      * 
      * @return A list of desktop skins of type <code>String</code>
      */        
-    public Set getDesktopPageDecorations( RequestContext request )
+    public Set<String> getDesktopPageDecorations( RequestContext request )
     {
         Set decorations = servletContext.getResourcePaths( decorationsPath.toString() + "/layout" );
         if( ! desktopLayoutDecorationsDir.equals( decorations ) )
@@ -535,7 +534,7 @@ public class DecorationFactoryImpl imple
      *
      * @return A list of portlet decorations of type <code>String</code>
      */
-    public Set getPortletDecorations( RequestContext request )
+    public Set<String> getPortletDecorations( RequestContext request )
     {
         Set decorations = servletContext.getResourcePaths( decorationsPath.toString() + "/portlet" );
         if( ! portletDecorationsDir.equals( decorations ) )
@@ -552,7 +551,7 @@ public class DecorationFactoryImpl imple
      *
      * @return A list of portlet decorations of type <code>String</code>
      */
-    public Set getDesktopPortletDecorations( RequestContext request )
+    public Set<String> getDesktopPortletDecorations( RequestContext request )
     {
         Set decorations = servletContext.getResourcePaths( decorationsPath.toString() + "/portlet" );
         if( ! desktopPortletDecorationsDir.equals( decorations ) )
@@ -569,7 +568,7 @@ public class DecorationFactoryImpl imple
      *
      * @return A list of layout portlets of type <code>PortletDefinitionComposite</code>
      */
-    public List getLayouts( RequestContext request )
+    public List<LayoutInfo> getLayouts( RequestContext request )
     {
         List list = new LinkedList();
         Iterator portlets = registry.getAllDefinitions().iterator();

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/decoration/DecorationValve.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/decoration/DecorationValve.java?rev=1563354&r1=1563353&r2=1563354&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/decoration/DecorationValve.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/decoration/DecorationValve.java Sat Feb  1 00:02:35 2014
@@ -16,17 +16,6 @@
  */
 package org.apache.jetspeed.decoration;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-
-import javax.portlet.PortletMode;
-import javax.portlet.WindowState;
-
 import org.apache.jetspeed.JetspeedActions;
 import org.apache.jetspeed.PortalReservedParameters;
 import org.apache.jetspeed.cache.CacheElement;
@@ -51,6 +40,16 @@ import org.apache.jetspeed.security.Secu
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import javax.portlet.PortletMode;
+import javax.portlet.WindowState;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+
 /**
  * Assigns decorations and page actions to all of the portlet Fragments within
  * the current request. 
@@ -482,12 +481,13 @@ public class DecorationValve extends Abs
      * <code>fragment</code> excluding the portlet's current mode.
      * 
      * @param requestContext RequestContext of the current portal request.
-     * @param pageActionAccess
-     * @param mode
-     * @param content
-     * @param portletName
      * @param window
-     * @param fragment
+     * @param supports
+     * @param mode
+     * @param state
+     * @param pageActionAccess     *
+     * @param decoration
+     * @param isAjaxRequest
      * @return <code>java.util.List</code> of modes excluding the current one.
      */
     protected List getPageModes(RequestContext requestContext, PortletWindow window, List<Supports> supports, 
@@ -507,7 +507,7 @@ public class DecorationValve extends Abs
                   ? portalURL.createNavigationalEncoding(window, PortletMode.VIEW, WindowState.NORMAL)                          
                   : portalURL.createPortletURL(window, PortletMode.VIEW, WindowState.NORMAL, portalURL.isSecure()).toString() );
                 String actionName = PortletMode.VIEW.toString();
-                pageModes.add(new DecoratorAction(actionName, requestContext.getLocale(), decoration.getResource("images/" + actionName + ".gif"),action,DecoratorActionTemplate.ACTION_TYPE_MODE));
+                pageModes.add(new DecoratorActionImpl(actionName, requestContext.getLocale(), decoration.getResource("images/" + actionName + ".gif"),action,DecoratorActionTemplate.ACTION_TYPE_MODE));
             }
             else if ( pageActionAccess.isEditAllowed() )
             {
@@ -521,7 +521,7 @@ public class DecorationValve extends Abs
                 String action = requestContext.getResponse().encodeURL( (isAjaxRequest)
                     ? portalURL.createNavigationalEncoding(window, parameters, PortletMode.VIEW, WindowState.NORMAL, true)                                              
                     : portalURL.createPortletURL(window, parameters, PortletMode.VIEW, WindowState.NORMAL, true, portalURL.isSecure()).toString() );
-                pageModes.add(new DecoratorAction(targetMode, requestContext.getLocale(), decoration.getResource("images/" + targetMode + ".gif"), action,DecoratorActionTemplate.ACTION_TYPE_MODE));
+                pageModes.add(new DecoratorActionImpl(targetMode, requestContext.getLocale(), decoration.getResource("images/" + targetMode + ".gif"), action,DecoratorActionTemplate.ACTION_TYPE_MODE));
                 
                 if (supportsPortletMode(supports,PortletMode.HELP))
                 {
@@ -541,7 +541,7 @@ public class DecorationValve extends Abs
                             : portalURL.createPortletURL(window,PortletMode.HELP, WindowState.MAXIMIZED, portalURL.isSecure()).toString() );
                     }
                     String actionName = PortletMode.HELP.toString();
-                    pageModes.add(new DecoratorAction(actionName, requestContext.getLocale(), decoration.getResource("images/" + actionName + ".gif"), action,DecoratorActionTemplate.ACTION_TYPE_MODE));
+                    pageModes.add(new DecoratorActionImpl(actionName, requestContext.getLocale(), decoration.getResource("images/" + actionName + ".gif"), action,DecoratorActionTemplate.ACTION_TYPE_MODE));
                 }
             }
         }

Copied: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/decoration/DecoratorActionImpl.java (from r1548225, portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/decoration/DecoratorAction.java)
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/decoration/DecoratorActionImpl.java?p2=portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/decoration/DecoratorActionImpl.java&p1=portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/decoration/DecoratorAction.java&r1=1548225&r2=1563354&rev=1563354&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/decoration/DecoratorAction.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/decoration/DecoratorActionImpl.java Sat Feb  1 00:02:35 2014
@@ -22,13 +22,12 @@ import java.util.MissingResourceExceptio
 import java.util.ResourceBundle;
 
 /**
- * DecoratorAction
+ * DecoratorActionImpl
  *
  * @author <a href="mailto:taylor@apache.org">David Sean Taylor</a>
  * @version $Id$
  */
-public class DecoratorAction implements Serializable
-{
+public class DecoratorActionImpl implements Serializable, DecoratorAction {
     public static final String RESOURCE_BUNDLE = "org.apache.jetspeed.decoration.resources.DecoratorActions";
 
     String actionName = null;
@@ -80,7 +79,7 @@ public class DecoratorAction implements 
         return value;
     }
 
-    public DecoratorAction(String actionName, String name, String alt, Locale locale, String link, String action, boolean custom, String actionType)
+    public DecoratorActionImpl(String actionName, String name, String alt, Locale locale, String link, String action, boolean custom, String actionType)
     {
         ResourceBundle bundle = getBundle(RESOURCE_BUNDLE, locale);
         this.actionName = actionName;
@@ -92,7 +91,7 @@ public class DecoratorAction implements 
         this.custom = custom;
     }
     
-    public DecoratorAction(String actionName, String name, String alt, String link, String action, boolean custom, String actionType)
+    public DecoratorActionImpl(String actionName, String name, String alt, String link, String action, boolean custom, String actionType)
     {
         this.actionName = actionName;
         this.actionType = actionType;
@@ -103,94 +102,110 @@ public class DecoratorAction implements 
         this.custom = custom;
     }
     
-    public DecoratorAction(String name, Locale locale, String link, String action, boolean custom, String actionType)
+    public DecoratorActionImpl(String name, Locale locale, String link, String action, boolean custom, String actionType)
     {
         this(name,name,name,locale,link,action,custom,actionType);
     }
     
-    public DecoratorAction(String name, Locale locale, String link, String action, String actionType)
+    public DecoratorActionImpl(String name, Locale locale, String link, String action, String actionType)
     {
         this(name,name,name,locale,link,action,false,actionType);
     }
     
-    public DecoratorAction(String actionName, String name, String alt, String link, String actionType)
+    public DecoratorActionImpl(String actionName, String name, String alt, String link, String actionType)
     {
         this(actionName, name,alt,null,link,null,false,actionType);
     }
 
+    @Override
     public String getActionName()
     {
         return this.actionName;
     }
-    public void setActionName( String actionName )
+    @Override
+    public void setActionName(String actionName)
     {
         this.actionName = actionName;
     }
 
+    @Override
     public String getActionType()
     {
         return this.actionType;
     }
-    public void setActionType( String actionType )
+    @Override
+    public void setActionType(String actionType)
     {
         this.actionType = actionType;
     }
     
+    @Override
     public String getName()
     {
         return this.name;
     }
     
+    @Override
     public void setName(String name)
     {
         this.name = name;
     }
     
+    @Override
     public String getLink()
     {
         return this.link;
     }
     
+    @Override
     public void setLink(String link)
     {
         this.link = link;
     }
 
+    @Override
     public String getAlt()
     {
         return this.alt;
     }
     
+    @Override
     public void setAlt(String alt)
     {
         this.alt = alt;
     }
 
+    @Override
     public String getAction()
     {
         return this.action;
     }
     
+    @Override
     public void setAction(String action)
     {
         this.action = action;
     }
     
+    @Override
     public String getTarget()
     {
         return this.target;
     }
     
+    @Override
     public void setTarget(String target)
     {
         this.target = target;
     }
     
+    @Override
     public boolean isCustom()
     {
         return custom;
     }
 
+    @Override
     public void setCustom(boolean custom)
     {
         this.custom = custom;

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/decoration/PageTheme.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/decoration/PageTheme.java?rev=1563354&r1=1563353&r2=1563354&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/decoration/PageTheme.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/decoration/PageTheme.java Sat Feb  1 00:02:35 2014
@@ -16,6 +16,10 @@
  */
 package org.apache.jetspeed.decoration;
 
+import org.apache.jetspeed.om.page.ContentFragment;
+import org.apache.jetspeed.om.page.ContentPage;
+import org.apache.jetspeed.request.RequestContext;
+
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -27,10 +31,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.jetspeed.om.page.ContentPage;
-import org.apache.jetspeed.om.page.ContentFragment;
-import org.apache.jetspeed.request.RequestContext;
-
 /**
  * Default implementation of <code>org.apache.jetspeed.decoration.Theme</code>
  * 
@@ -43,10 +43,10 @@ public class PageTheme implements Theme,
     private transient ContentPage page;
     private transient DecorationFactory decorationFactory;
     private transient RequestContext requestContext;
-    private final Set styleSheets;
+    private final Set<String> styleSheets;
     private final LayoutDecoration layoutDecoration;
     private final Map fragmentDecorations;
-    private final Collection portletDecorationNames;
+    private final Collection<String> portletDecorationNames;
     private boolean invalidated = false;
         
     public PageTheme(ContentPage page, DecorationFactory decorationFactory, RequestContext requestContext)
@@ -58,30 +58,30 @@ public class PageTheme implements Theme,
         this.fragmentDecorations = new HashMap();
         
         boolean isDesktopEnabled = decorationFactory.isDesktopEnabled( requestContext );
-        HashMap portletDecorationNames = new HashMap();
-        this.layoutDecoration = (LayoutDecoration)setupFragmentDecorations( page.getRootFragment(), true, portletDecorationNames, isDesktopEnabled );
+        HashMap namesMap = new HashMap();
+        this.layoutDecoration = (LayoutDecoration)setupFragmentDecorations( page.getRootFragment(), true, namesMap, isDesktopEnabled );
         
         if ( isDesktopEnabled )
         {
             String defaultDesktopPortletDecoration = decorationFactory.getDefaultDesktopPortletDecoration();
             if ( defaultDesktopPortletDecoration != null && defaultDesktopPortletDecoration.length() > 0 )
             {
-                if ( portletDecorationNames.get( defaultDesktopPortletDecoration ) == null )
+                if ( namesMap.get( defaultDesktopPortletDecoration ) == null )
                 {
-                    portletDecorationNames.put( defaultDesktopPortletDecoration, defaultDesktopPortletDecoration );
+                    namesMap.put( defaultDesktopPortletDecoration, defaultDesktopPortletDecoration );
                 }
             }
         }
-        if (!portletDecorationNames.containsKey(this.layoutDecoration.getName()))
+        if (!namesMap.containsKey(this.layoutDecoration.getName()))
         {
-            portletDecorationNames.put(this.layoutDecoration.getName(), this.layoutDecoration.getName());
+            namesMap.put(this.layoutDecoration.getName(), this.layoutDecoration.getName());
             Decoration decoration = decorationFactory.getPortletDecoration(this.layoutDecoration.getName(), requestContext);
             if (decoration.getStyleSheet() != null)
                 this.styleSheets.add(decoration.getStyleSheet());
             if (decoration.getStyleSheetPortal() != null)
                 this.styleSheets.add(decoration.getStyleSheetPortal());            
         }
-        this.portletDecorationNames = Collections.unmodifiableCollection( new ArrayList( portletDecorationNames.keySet() ) );
+        this.portletDecorationNames = Collections.unmodifiableCollection( new ArrayList( namesMap.keySet() ) );
     }
 
     /**
@@ -146,7 +146,7 @@ public class PageTheme implements Theme,
         return decoration;
     }
 
-    public Set getStyleSheets()
+    public Set<String> getStyleSheets()
     {
         return styleSheets;
     }
@@ -156,7 +156,7 @@ public class PageTheme implements Theme,
         return (Decoration) fragmentDecorations.get( fragment.getId() );
     }
     
-    public Collection getPortletDecorationNames()
+    public Collection<String> getPortletDecorationNames()
     {
         return portletDecorationNames;    // is unmodifiable
     }

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/DecorationBean.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/DecorationBean.java?rev=1563354&r1=1563353&r2=1563354&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/DecorationBean.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/DecorationBean.java Sat Feb  1 00:02:35 2014
@@ -16,18 +16,16 @@
  */
 package org.apache.jetspeed.services.beans;
 
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
+import org.apache.jetspeed.decoration.Decoration;
+import org.apache.jetspeed.decoration.DecoratorAction;
 
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlElementWrapper;
 import javax.xml.bind.annotation.XmlElements;
 import javax.xml.bind.annotation.XmlRootElement;
-
-import org.apache.jetspeed.decoration.Decoration;
-import org.apache.jetspeed.decoration.DecoratorAction;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collection;
 
 /**
  * DecorationBean
@@ -60,7 +58,7 @@ public class DecorationBean implements S
         actionsOption = decoration.getActionsOption();
         actionBeans = new ArrayList<DecoratorActionBean>();
         
-        for (DecoratorAction action : (List<DecoratorAction>) decoration.getActions())
+        for (DecoratorAction action : decoration.getActions())
         {
             actionBeans.add(new DecoratorActionBean(action));
         }

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/DecoratorActionBean.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/DecoratorActionBean.java?rev=1563354&r1=1563353&r2=1563354&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/DecoratorActionBean.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/DecoratorActionBean.java Sat Feb  1 00:02:35 2014
@@ -16,11 +16,10 @@
  */
 package org.apache.jetspeed.services.beans;
 
-import java.io.Serializable;
+import org.apache.jetspeed.decoration.DecoratorAction;
 
 import javax.xml.bind.annotation.XmlRootElement;
-
-import org.apache.jetspeed.decoration.DecoratorAction;
+import java.io.Serializable;
 
 /**
  * DecoratorActionBean

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/components/portletentity/PersistenceBrokerPortletEntityAccess.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/components/portletentity/PersistenceBrokerPortletEntityAccess.java?rev=1563354&r1=1563353&r2=1563354&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/components/portletentity/PersistenceBrokerPortletEntityAccess.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/components/portletentity/PersistenceBrokerPortletEntityAccess.java Sat Feb  1 00:02:35 2014
@@ -16,19 +16,19 @@
  */
 package org.apache.jetspeed.components.portletentity;
 
-import java.rmi.server.UID;
-import java.util.Collection;
-import java.util.Iterator;
-
 import org.apache.jetspeed.components.portletregistry.PortletRegistry;
+import org.apache.jetspeed.container.PortletEntity;
 import org.apache.jetspeed.om.page.ContentFragment;
 import org.apache.jetspeed.om.portlet.PortletDefinition;
 import org.apache.ojb.broker.query.Criteria;
 import org.apache.ojb.broker.query.Query;
 import org.apache.ojb.broker.query.QueryFactory;
-import org.apache.jetspeed.container.PortletEntity;
 import org.springframework.orm.ojb.support.PersistenceBrokerDaoSupport;
 
+import java.rmi.server.UID;
+import java.util.Collection;
+import java.util.Iterator;
+
 /**
  * <p>
  * PersistenceStorePortletEntityAccess
@@ -77,7 +77,6 @@ public class PersistenceBrokerPortletEnt
      * generateEntityFromFragment
      * </p>
      * 
-     * @see org.apache.jetspeed.components.portletentity.PortletEntityAccessComponent#generateEntityFromFragment(org.apache.jetspeed.om.page.Fragment)
      * @param fragment
      * @return @throws
      *         PortletEntityNotGeneratedException
@@ -117,10 +116,7 @@ public class PersistenceBrokerPortletEnt
      * generateEntityKey
      * </p>
      * 
-     * @see org.apache.jetspeed.components.portletentity.PortletEntityAccessComponent#generateEntityKey(org.apache.jetspeed.om.page.Fragment,
-     *      java.lang.String)
      * @param fragment
-     * @param principal
      * @return
      */
     public String generateEntityKey( ContentFragment fragment)
@@ -134,7 +130,6 @@ public class PersistenceBrokerPortletEnt
      * getPortletEntities
      * </p>
      * 
-     * @see org.apache.jetspeed.components.portletentity.PortletEntityAccessComponent#getPortletEntities(org.apache.pluto.container.om.portlet.PortletDefinition)
      * @param portletDefinition
      * @return
      */
@@ -258,10 +253,10 @@ public class PersistenceBrokerPortletEnt
 
     public void removePortletEntities( PortletDefinition portletDefinition ) throws PortletEntityNotDeletedException
     {
-        Iterator entities = getPortletEntities(portletDefinition).iterator();
+        Iterator<PortletEntity> entities = getPortletEntities(portletDefinition).iterator();
         while (entities.hasNext())
         {
-            PortletEntity entity = (PortletEntity) entities.next();
+            PortletEntity entity =  entities.next();
             removePortletEntity(entity);
         }
 

Modified: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/cache/JetspeedContentCache.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/cache/JetspeedContentCache.java?rev=1563354&r1=1563353&r2=1563354&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/cache/JetspeedContentCache.java (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/cache/JetspeedContentCache.java Sat Feb  1 00:02:35 2014
@@ -41,7 +41,6 @@ public interface JetspeedContentCache ex
      * remove from the cache and invalidate any associated caches or session attributes
      * 
      * @param context
-     * @param key
      */
     void invalidate(RequestContext context);
 }
\ No newline at end of file

Modified: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/cluster/NodeInformation.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/cluster/NodeInformation.java?rev=1563354&r1=1563353&r2=1563354&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/cluster/NodeInformation.java (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/cluster/NodeInformation.java Sat Feb  1 00:02:35 2014
@@ -69,8 +69,7 @@ public interface NodeInformation
 	/**
 	 * setter for last deploy date 
 	 * 
-	 * @param id
-	 */	
+	 */
 	public void setLastDeployDate(Date lastDeployDate);
 	
 	public String toString ();

Modified: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/components/portletentity/PortletEntityAccessComponent.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/components/portletentity/PortletEntityAccessComponent.java?rev=1563354&r1=1563353&r2=1563354&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/components/portletentity/PortletEntityAccessComponent.java (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/components/portletentity/PortletEntityAccessComponent.java Sat Feb  1 00:02:35 2014
@@ -16,12 +16,12 @@
  */
 package org.apache.jetspeed.components.portletentity;
 
-import java.util.Collection;
-
-import org.apache.jetspeed.om.page.ContentFragment;
 import org.apache.jetspeed.container.PortletEntity;
+import org.apache.jetspeed.om.page.ContentFragment;
 import org.apache.jetspeed.om.portlet.PortletDefinition;
 
+import java.util.Collection;
+
 /**
  * <p>
  * PortletEntityAccessComponent
@@ -146,9 +146,9 @@ public interface PortletEntityAccessComp
 	 * @param portletDefinition
 	 * @return
 	 */
-	Collection getPortletEntities(PortletDefinition portletDefinition);
+	Collection<PortletEntity> getPortletEntities(PortletDefinition portletDefinition);
     
-    Collection getPortletEntities( String portletUniqueName );
+    Collection<PortletEntity> getPortletEntities( String portletUniqueName );
 	
 	/**
 	 * 

Modified: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/container/url/PortalURL.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/container/url/PortalURL.java?rev=1563354&r1=1563353&r2=1563354&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/container/url/PortalURL.java (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/container/url/PortalURL.java Sat Feb  1 00:02:35 2014
@@ -16,14 +16,13 @@
  */
 package org.apache.jetspeed.container.url;
 
-import java.util.Map;
+import org.apache.jetspeed.container.PortletWindow;
+import org.apache.jetspeed.container.state.NavigationalState;
 
 import javax.portlet.PortletMode;
 import javax.portlet.WindowState;
 import javax.servlet.http.HttpServletRequest;
-
-import org.apache.jetspeed.container.state.NavigationalState;
-import org.apache.jetspeed.container.PortletWindow;
+import java.util.Map;
 
 /**
  * <p>
@@ -215,7 +214,6 @@ public interface PortalURL
      * @param mode the new PortletMode for the PortalWindow
      * @param state the new WindowState for the PortalWindow
      * @param action indicates if an actionURL or renderURL is created
-     * @param secure indicates if a secure url is required 
      * @return a new navigational state as String
      * @deprecated
      */
@@ -230,7 +228,6 @@ public interface PortalURL
      * @param mode the new PortletMode for the PortalWindow
      * @param state the new WindowState for the PortalWindow
      * @param urlType indicates if an actionURL, Resource or renderURL is to created
-     * @param secure indicates if a secure url is required 
      * @return a new navigational state as String
      * @deprecated
      */
@@ -251,7 +248,6 @@ public interface PortalURL
      * @param mode the new PortletMode for the PortalWindow
      * @param state the new WindowState for the PortalWindow
      * @param urlType indicates if an actionURL, Resource or renderURL is to created
-     * @param secure indicates if a secure url is required 
      * @return a new navigational state as String
      */
     String createNavigationalEncoding(PortletWindow window, Map<String, String[]> parameters, String actionScopeId, boolean actionScopeRendered,
@@ -265,8 +261,6 @@ public interface PortalURL
      * @param window the PortalWindow
      * @param mode the new PortletMode for the PortalWindow
      * @param state the new WindowState for the PortalWindow
-     * @param secure
-     * @param secure indicates if a secure url is required 
      * @return a new renderURL as String
      */    
     String createNavigationalEncoding(PortletWindow window, PortletMode mode, WindowState state);

Modified: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/decoration/Decoration.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/decoration/Decoration.java?rev=1563354&r1=1563353&r2=1563354&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/decoration/Decoration.java (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/decoration/Decoration.java Sat Feb  1 00:02:35 2014
@@ -171,7 +171,7 @@ public interface Decoration
      * @return the list of <code>DecoratorAction</code>s to be displayed
      * within the portlet window.
      */
-    List getActions();
+    List<DecoratorAction> getActions();
     
     /**
      * Set the list of <code>DecoratorAction</code>s to be displayed
@@ -180,7 +180,7 @@ public interface Decoration
      * 
      * @param actions actions to displayed within this portlet window. 
      */
-    void setActions(List actions);
+    void setActions(List<DecoratorAction> actions);
     
     /**
      * Allows access to abritrary properties configured

Modified: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/decoration/DecorationFactory.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/decoration/DecorationFactory.java?rev=1563354&r1=1563353&r2=1563354&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/decoration/DecorationFactory.java (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/decoration/DecorationFactory.java Sat Feb  1 00:02:35 2014
@@ -16,13 +16,13 @@
  */
 package org.apache.jetspeed.decoration;
 
-import java.util.List;
-import java.util.Set;
-
 import org.apache.jetspeed.om.page.ContentFragment;
 import org.apache.jetspeed.om.page.ContentPage;
 import org.apache.jetspeed.request.RequestContext;
 
+import java.util.List;
+import java.util.Set;
+
 /**
  * Factory class used for locating Decorations and Themes for 
  * Fragments and pages.
@@ -97,9 +97,9 @@ public interface DecorationFactory
      * empty Decoration will be created "in memory" and a message should be logged
      * informing the admin that non-existent decoration has been requested.
      * 
-     * @see Page
-     * @see Fragment
-     * @see RequestContext
+     * @param page
+     * @param fragment
+     * @param requestContext
      */
     Decoration getDecoration(ContentPage page, ContentFragment fragment, RequestContext requestContext);
     
@@ -132,35 +132,35 @@ public interface DecorationFactory
      * 
      * @return A list of page decorations of type <code>String</code>
      */
-    Set getPageDecorations(RequestContext request);
+    Set<String> getPageDecorations(RequestContext request);
 
     /**
      * Get the portal-wide list of portlet decorations.
      * 
      * @return A list of portlet decorations of type <code>String</code>
      */    
-    Set getPortletDecorations(RequestContext request);
+    Set<String> getPortletDecorations(RequestContext request);
     
     /**
      * Get the portal-wide list of available layouts.
      * 
      * @return A list of layout portlets of type <code>LayoutInfo</code>
      */    
-    List getLayouts(RequestContext request);
+    List<LayoutInfo> getLayouts(RequestContext request);
     
     /**
      * Get the portal-wide list of available desktop page decorations.
      * 
      * @return A list of desktop skins of type <code>String</code>
      */    
-    Set getDesktopPageDecorations(RequestContext request);
+    Set<String> getDesktopPageDecorations(RequestContext request);
     
     /**
      * Get the portal-wide list of desktop portlet decorations.
      * 
      * @return A list of desktop skins of type <code>String</code>
      */
-    Set getDesktopPortletDecorations(RequestContext request);
+    Set<String> getDesktopPortletDecorations(RequestContext request);
     
     /**
      * Get the path to the layout decorations directory.

Added: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/decoration/DecoratorAction.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/decoration/DecoratorAction.java?rev=1563354&view=auto
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/decoration/DecoratorAction.java (added)
+++ portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/decoration/DecoratorAction.java Sat Feb  1 00:02:35 2014
@@ -0,0 +1,51 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * 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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jetspeed.decoration;
+
+public interface DecoratorAction {
+    String getActionName();
+
+    void setActionName(String actionName);
+
+    String getActionType();
+
+    void setActionType(String actionType);
+
+    String getName();
+
+    void setName(String name);
+
+    String getLink();
+
+    void setLink(String link);
+
+    String getAlt();
+
+    void setAlt(String alt);
+
+    String getAction();
+
+    void setAction(String action);
+
+    String getTarget();
+
+    void setTarget(String target);
+
+    boolean isCustom();
+
+    void setCustom(boolean custom);
+}

Modified: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/decoration/Theme.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/decoration/Theme.java?rev=1563354&r1=1563353&r2=1563354&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/decoration/Theme.java (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/decoration/Theme.java Sat Feb  1 00:02:35 2014
@@ -16,13 +16,13 @@
  */
 package org.apache.jetspeed.decoration;
 
-import java.util.Collection;
-import java.util.Set;
-
 import org.apache.jetspeed.om.page.ContentFragment;
 import org.apache.jetspeed.om.page.ContentPage;
 import org.apache.jetspeed.request.RequestContext;
 
+import java.util.Collection;
+import java.util.Set;
+
 /**
  * Theme provides a simple aggregation of all of the decorations
  * within the current "page."
@@ -37,7 +37,7 @@ public interface Theme 
      * @return Set of all of the stylesheets needed to properly
      * render of the decorations in this theme.
      */
-    Set getStyleSheets();
+    Set<String> getStyleSheets();
     
     /**
      * Returns a a Decoration for the requested fragment.
@@ -46,7 +46,6 @@ public interface Theme 
      * @return Decoration for this fragment.
      * 
      * @see Decoration
-     * @see Fragment
      */
     Decoration getDecoration(ContentFragment fragment);
     
@@ -57,9 +56,8 @@ public interface Theme 
      * @return unmodifiable list for portlet decoration names.
      * 
      * @see Decoration
-     * @see Fragment
      */
-    Collection getPortletDecorationNames();
+    Collection<String> getPortletDecorationNames();
     
     
     /**



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org


Mime
View raw message