cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r330249 - in /cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal: layout/ layout/impl/ pluto/adapter/ pluto/om/
Date Wed, 02 Nov 2005 13:37:31 GMT
Author: cziegeler
Date: Wed Nov  2 05:37:21 2005
New Revision: 330249

URL: http://svn.apache.org/viewcvs?rev=330249&view=rev
Log:
Fix javadocs
Improve logging for portlets

Modified:
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/AbstractLayout.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/impl/CompositeLayoutImpl.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/impl/CopletLayout.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/impl/FrameLayout.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/impl/LinkLayout.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/adapter/PortletWindowAspect.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/om/PortletApplicationDefinitionListImpl.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/om/PortletApplicationEntityListImpl.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/om/PortletDefinitionRegistryImpl.java

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/AbstractLayout.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/AbstractLayout.java?rev=330249&r1=330248&r2=330249&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/AbstractLayout.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/AbstractLayout.java Wed
Nov  2 05:37:21 2005
@@ -68,7 +68,7 @@
      * Never create a layout object directly. Use the
      * {@link LayoutFactory} instead.
      * @param id The unique identifier of the layout object or null.
-     * @param id The name of the layout.
+     * @param name The name of the layout.
      */
     public AbstractLayout (String id, String name) {
         this.id = id;

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/impl/CompositeLayoutImpl.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/impl/CompositeLayoutImpl.java?rev=330249&r1=330248&r2=330249&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/impl/CompositeLayoutImpl.java
(original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/impl/CompositeLayoutImpl.java
Wed Nov  2 05:37:21 2005
@@ -55,7 +55,7 @@
      * Never create a layout object directly. Use the
      * {@link LayoutFactory} instead.
      * @param id The unique identifier of the layout object or null.
-     * @param id The name of the layout.
+     * @param name The name of the layout.
      */
     public CompositeLayoutImpl(String id, String name) {
         super(id, name);
@@ -146,7 +146,7 @@
     }
 
     /**
-     * @see org.apache.cocoon.portal.layout.Layout#copy(java.util.Map)
+     * @see org.apache.cocoon.portal.layout.Layout#copy()
      */
     public Layout copy() {
         CompositeLayoutImpl clone = (CompositeLayoutImpl)super.copy();

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/impl/CopletLayout.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/impl/CopletLayout.java?rev=330249&r1=330248&r2=330249&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/impl/CopletLayout.java
(original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/impl/CopletLayout.java
Wed Nov  2 05:37:21 2005
@@ -45,7 +45,7 @@
      * Never create a layout object directly. Use the
      * {@link LayoutFactory} instead.
      * @param id The unique identifier of the layout object or null.
-     * @param id The name of the layout.
+     * @param name The name of the layout.
      */
     public CopletLayout(String id, String name) {
         super(id, name);

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/impl/FrameLayout.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/impl/FrameLayout.java?rev=330249&r1=330248&r2=330249&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/impl/FrameLayout.java
(original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/impl/FrameLayout.java
Wed Nov  2 05:37:21 2005
@@ -31,7 +31,7 @@
 
     /**
      * DO NOT USE THIS CONSTRUCTOR - it's just here to keep Castor happy.
-     * Use {@link #CopletLayout(String, String)} instead.
+     * Use {@link #FrameLayout(String, String)} instead.
      */
     public FrameLayout() {
         // this constructor is just to keep Castor happy (version 0.9.9)
@@ -45,7 +45,7 @@
      * Never create a layout object directly. Use the
      * {@link LayoutFactory} instead.
      * @param id The unique identifier of the layout object or null.
-     * @param id The name of the layout.
+     * @param name The name of the layout.
      */
     public FrameLayout(String id, String name) {
         super(id, name);

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/impl/LinkLayout.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/impl/LinkLayout.java?rev=330249&r1=330248&r2=330249&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/impl/LinkLayout.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/impl/LinkLayout.java Wed
Nov  2 05:37:21 2005
@@ -32,7 +32,7 @@
 
     /**
      * DO NOT USE THIS CONSTRUCTOR - it's just here to keep Castor happy.
-     * Use {@link #CopletLayout(String, String)} instead.
+     * Use {@link #LinkLayout(String, String)} instead.
      */
     public LinkLayout() {
         // this constructor is just to keep Castor happy (version 0.9.9)
@@ -46,7 +46,7 @@
      * Never create a layout object directly. Use the
      * {@link LayoutFactory} instead.
      * @param id The unique identifier of the layout object or null.
-     * @param id The name of the layout.
+     * @param name The name of the layout.
      */
     public LinkLayout(String id, String name) {
         super(id, name);

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/adapter/PortletWindowAspect.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/adapter/PortletWindowAspect.java?rev=330249&r1=330248&r2=330249&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/adapter/PortletWindowAspect.java
(original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/adapter/PortletWindowAspect.java
Wed Nov  2 05:37:21 2005
@@ -101,7 +101,7 @@
     }
 
     /**
-     * @see org.apache.cocoon.portal.layout.renderer.RendererAspect#toSAX(org.apache.cocoon.portal.layout.renderer.RendererAspectContext,
org.apache.cocoon.portal.layout.Layout, org.apache.cocoon.portal.PortalService, org.xml.sax.ContentHandler)
+     * @see org.apache.cocoon.portal.layout.renderer.aspect.RendererAspect#toSAX(org.apache.cocoon.portal.layout.renderer.aspect.RendererAspectContext,
org.apache.cocoon.portal.layout.Layout, org.apache.cocoon.portal.PortalService, org.xml.sax.ContentHandler)
      */
     public void toSAX(RendererAspectContext context,
                       Layout layout,

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/om/PortletApplicationDefinitionListImpl.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/om/PortletApplicationDefinitionListImpl.java?rev=330249&r1=330248&r2=330249&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/om/PortletApplicationDefinitionListImpl.java
(original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/om/PortletApplicationDefinitionListImpl.java
Wed Nov  2 05:37:21 2005
@@ -30,21 +30,24 @@
 public class PortletApplicationDefinitionListImpl
 implements PortletApplicationDefinitionList {
 
-    /** The portlet application definitions */
+    /** The portlet application definitions. */
     protected Map portletApplicationDefinitions;
 
+    /**
+     * Constructor.
+     */
     public PortletApplicationDefinitionListImpl() {
         this.portletApplicationDefinitions = new HashMap();
     }
 
-    /* (non-Javadoc)
+    /**
      * @see org.apache.pluto.om.portlet.PortletApplicationDefinitionList#get(org.apache.pluto.om.common.ObjectID)
      */
     public PortletApplicationDefinition get(ObjectID objectId) {
         return (PortletApplicationDefinition)this.portletApplicationDefinitions.get(objectId);
     }
 
-    /* (non-Javadoc)
+    /**
      * @see java.util.Collection#iterator()
      */
     public Iterator iterator() {

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/om/PortletApplicationEntityListImpl.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/om/PortletApplicationEntityListImpl.java?rev=330249&r1=330248&r2=330249&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/om/PortletApplicationEntityListImpl.java
(original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/om/PortletApplicationEntityListImpl.java
Wed Nov  2 05:37:21 2005
@@ -35,25 +35,25 @@
 
     /** the portlet application entities */
     protected Map portletApplicationEntities = new HashMap();
-    
+
     /** The registry */
     protected PortletDefinitionRegistry registry;
-    
+
     /**
-     * Constructor
+     * Constructor.
      */
     public PortletApplicationEntityListImpl(PortletDefinitionRegistry pdr) {
         this.registry = pdr;
     }
-    
-    /* (non-Javadoc)
+
+    /**
      * @see org.apache.pluto.om.entity.PortletApplicationEntityList#iterator()
      */
     public Iterator iterator() {
         return this.portletApplicationEntities.values().iterator();
     }
 
-    /* (non-Javadoc)
+    /**
      * @see org.apache.pluto.om.entity.PortletApplicationEntityListCtrl#add(java.lang.String)
      */
     public PortletApplicationEntity add(String definitionId) {
@@ -64,12 +64,11 @@
         return pae;
     }
 
-    /* (non-Javadoc)
+    /**
      * @see org.apache.pluto.om.entity.PortletApplicationEntityList#get(org.apache.pluto.om.common.ObjectID)
      */
     public PortletApplicationEntity get(ObjectID objectId) {
         final PortletApplicationEntity pae = (PortletApplicationEntity) this.portletApplicationEntities.get(objectId);
         return pae;
     }
-
 }

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/om/PortletDefinitionRegistryImpl.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/om/PortletDefinitionRegistryImpl.java?rev=330249&r1=330248&r2=330249&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/om/PortletDefinitionRegistryImpl.java
(original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/om/PortletDefinitionRegistryImpl.java
Wed Nov  2 05:37:21 2005
@@ -366,7 +366,7 @@
                 portletXml.getSystemId() +
                     ", " +
                     webXml.getSystemId());
-            }
+        }
 
         Unmarshaller unmarshaller = new Unmarshaller(portletXMLMapping);
         unmarshaller.setIgnoreExtraElements(true);
@@ -378,6 +378,7 @@
         WebApplicationDefinitionImpl webApp = null;
 
         if (webXml.getByteStream() != null) {
+            this.getLogger().info("Loading web.xml...");
             unmarshaller = new Unmarshaller(webXMLMapping);
             unmarshaller.setIgnoreExtraElements(true);
             unmarshaller.setEntityResolver(this.resolver);
@@ -395,7 +396,7 @@
 
             webApp.postBuild(structure);
         } else {
-            this.getLogger().info("no web.xml...");
+            this.getLogger().info("No web.xml...");
 
             Vector structure = new Vector();
             structure.add("/" + webModule);
@@ -408,12 +409,14 @@
 
             portletApp.postBuild(structure);
 
-            this.getLogger().debug("portlet.xml loaded");
         }
+        this.getLogger().debug("portlet.xml loaded");
 
         this.registry.add(portletApp);
 
-        this.getLogger().debug("Portlet added to registry");
+        if ( this.getLogger().isInfoEnabled() ) {
+            this.getLogger().info("Portlet application '" + portletApp.getAppId() + "' added
to registry.");
+        }
 
         // fill portletsKeyObjectId
         final Iterator portlets = portletApp.getPortletDefinitionList().iterator();
@@ -426,6 +429,9 @@
             }
             ((PortletDefinitionImpl) portlet).setPortletClassLoader(Thread.currentThread()
                 .getContextClassLoader());
+            if ( this.getLogger().isInfoEnabled() ) {
+                this.getLogger().info("Adding portlet '" + portlet.getId() + "'.");
+            }
         }
     }
 
@@ -442,5 +448,4 @@
     public PortalService getPortalService() {
         return this.service;
     }
-
 }



Mime
View raw message