portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rwat...@apache.org
Subject svn commit: r393298 - in /portals/jetspeed-2/trunk/maven-archetypes: application/src/archetype/META-INF/ application/src/archetype/archetype-resources/ application/src/archetype/archetype-resources/src/java/ application/src/archetype/archetype-resource...
Date Tue, 11 Apr 2006 19:31:10 GMT
Author: rwatler
Date: Tue Apr 11 12:31:05 2006
New Revision: 393298

URL: http://svn.apache.org/viewcvs?rev=393298&view=rev
Log:
Maven2 Archetypes Update

Added:
    portals/jetspeed-2/trunk/maven-archetypes/application/src/archetype/archetype-resources/src/webapp/logs/
    portals/jetspeed-2/trunk/maven-archetypes/application/src/archetype/archetype-resources/src/webapp/logs/pa.log
    portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/portal/src/webapp/WEB-INF/conf/
    portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/portal/src/webapp/WEB-INF/conf/Log4j.properties   (with props)
    portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/portal/src/webapp/WEB-INF/conf/readme.txt   (with props)
Modified:
    portals/jetspeed-2/trunk/maven-archetypes/application/src/archetype/META-INF/archetype.xml
    portals/jetspeed-2/trunk/maven-archetypes/application/src/archetype/archetype-resources/pom.xml
    portals/jetspeed-2/trunk/maven-archetypes/application/src/archetype/archetype-resources/src/java/ApplicationPortlet.java
    portals/jetspeed-2/trunk/maven-archetypes/application/src/archetype/archetype-resources/src/webapp/WEB-INF/portlet.xml
    portals/jetspeed-2/trunk/maven-archetypes/application/src/archetype/archetype-resources/src/webapp/WEB-INF/velocity/toolbox.xml
    portals/jetspeed-2/trunk/maven-archetypes/application/src/archetype/archetype-resources/src/webapp/WEB-INF/view/application-portlet-edit.vm
    portals/jetspeed-2/trunk/maven-archetypes/application/src/archetype/archetype-resources/src/webapp/WEB-INF/view/application-portlet-help.vm
    portals/jetspeed-2/trunk/maven-archetypes/application/src/archetype/archetype-resources/src/webapp/WEB-INF/view/application-portlet-view.vm
    portals/jetspeed-2/trunk/maven-archetypes/component/src/archetype/archetype-resources/pom.xml
    portals/jetspeed-2/trunk/maven-archetypes/portal-component/src/archetype/archetype-resources/pom.xml
    portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/pom.xml
    portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/portal/build.xml
    portals/jetspeed-2/trunk/maven-archetypes/shared-component/src/archetype/archetype-resources/pom.xml
    portals/jetspeed-2/trunk/maven-archetypes/shared-component/src/archetype/archetype-resources/src/java/SharedComponentImpl.java

Modified: portals/jetspeed-2/trunk/maven-archetypes/application/src/archetype/META-INF/archetype.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/maven-archetypes/application/src/archetype/META-INF/archetype.xml?rev=393298&r1=393297&r2=393298&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/maven-archetypes/application/src/archetype/META-INF/archetype.xml (original)
+++ portals/jetspeed-2/trunk/maven-archetypes/application/src/archetype/META-INF/archetype.xml Tue Apr 11 12:31:05 2006
@@ -23,6 +23,7 @@
 
     <resources>
         <resource>pom.xml</resource>
+        <resource>src/webapp/logs/pa.log</resource>
         <resource>src/webapp/WEB-INF/c-rt.tld</resource>
         <resource>src/webapp/WEB-INF/c.tld</resource>
         <resource>src/webapp/WEB-INF/jetspeed-portlet.xml</resource>

Modified: portals/jetspeed-2/trunk/maven-archetypes/application/src/archetype/archetype-resources/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/maven-archetypes/application/src/archetype/archetype-resources/pom.xml?rev=393298&r1=393297&r2=393298&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/maven-archetypes/application/src/archetype/archetype-resources/pom.xml (original)
+++ portals/jetspeed-2/trunk/maven-archetypes/application/src/archetype/archetype-resources/pom.xml Tue Apr 11 12:31:05 2006
@@ -81,6 +81,11 @@
             <scope>runtime</scope>
         </dependency>
         <dependency>
+            <groupId>commons-digester</groupId>
+            <artifactId>commons-digester</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>
             <scope>runtime</scope>

Modified: portals/jetspeed-2/trunk/maven-archetypes/application/src/archetype/archetype-resources/src/java/ApplicationPortlet.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/maven-archetypes/application/src/archetype/archetype-resources/src/java/ApplicationPortlet.java?rev=393298&r1=393297&r2=393298&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/maven-archetypes/application/src/archetype/archetype-resources/src/java/ApplicationPortlet.java (original)
+++ portals/jetspeed-2/trunk/maven-archetypes/application/src/archetype/archetype-resources/src/java/ApplicationPortlet.java Tue Apr 11 12:31:05 2006
@@ -16,25 +16,14 @@
 package ${groupId};
 
 import java.io.IOException;
-import java.net.MalformedURLException;
-import java.security.Principal;
-import java.util.Enumeration;
-import java.util.Iterator;
-import java.util.Map;
 
 import javax.portlet.ActionRequest;
 import javax.portlet.ActionResponse;
-import javax.portlet.GenericPortlet;
 import javax.portlet.PortletConfig;
 import javax.portlet.PortletException;
 import javax.portlet.PortletMode;
-import javax.portlet.PortletPreferences;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletSession;
-import javax.portlet.PortletURL;
 import javax.portlet.RenderRequest;
 import javax.portlet.RenderResponse;
-import javax.portlet.WindowState;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -156,168 +145,7 @@
         getPortletContext().log("ApplicationPortlet.processAction() invoked...");
         log.debug("ApplicationPortlet.processAction() invoked...");
 
-        // precess action from request parameters
-        Enumeration requestParametersEnum = request.getParameterNames();
-        while (requestParametersEnum.hasMoreElements())
-        {
-            String name = (String) requestParametersEnum.nextElement();
-            String [] values = request.getParameterValues(name);
-
-            // log.debug, redirect, or side effect various parameters, attributes,
-            // and preferences
-            if (name.equals("test-action") && (values.length == 1) && (values[0] != null))
-            {
-                getPortletContext().log("ApplicationPortlet.processAction() received action: "+name+" value="+values[0]);
-                log.debug("ApplicationPortlet.processAction() received action: "+name+" value="+values[0]);
-            }
-            else if (name.equals("redirect-action") && (values.length == 1) && (values[0] != null))
-            {
-                getPortletContext().log("ApplicationPortlet.processAction() received action: "+name+" url="+values[0]);
-                log.debug("ApplicationPortlet.processAction() received action: "+name+" url="+values[0]);
-                if (values[0].startsWith("http://") || values[0].startsWith("https://"))
-                {
-                    response.sendRedirect(values[0]);
-                    return ;
-                }
-            }
-            else if (name.equals("edit-context-attributes-name-action") && (values.length == 1) && (values[0] != null))
-            {
-                String [] attributeValues = request.getParameterValues("edit-context-attributes-value-action");
-                if ((attributeValues != null) && (attributeValues.length == 1) && (attributeValues[0] != null))
-                {
-                    getPortletContext().log("ApplicationPortlet.processAction() received action: "+name+", name="+values[0]+", value="+attributeValues[0]);
-                    log.debug("ApplicationPortlet.processAction() received action: "+name+", name="+values[0]+", value="+attributeValues[0]);
-                    getPortletContext().setAttribute(values[0], attributeValues[0]);
-                }
-                else
-                {
-                    getPortletContext().log("ApplicationPortlet.processAction() received action: "+name+", name="+values[0]);
-                    log.debug("ApplicationPortlet.processAction() received action: "+name+", name="+values[0]);
-                    getPortletContext().removeAttribute(values[0]);
-                }
-            }
-            else if (name.equals("edit-preferences-name-action") && (values.length == 1) && (values[0] != null))
-            {
-                PortletPreferences prefs = request.getPreferences();
-                String [] preferenceValues = request.getParameterValues("edit-preferences-value-action");
-                if ((preferenceValues != null) && (preferenceValues.length == 1))
-                {
-                    preferenceValues = splitArrayValues(preferenceValues[0]);
-                }
-                if ((preferenceValues != null) && (preferenceValues.length > 0))
-                {
-                    getPortletContext().log("ApplicationPortlet.processAction() received action: "+name+", name="+values[0]+", value="+concatArrayValues(preferenceValues));
-                    log.debug("ApplicationPortlet.processAction() received action: "+name+", name="+values[0]+", value="+concatArrayValues(preferenceValues));
-                    if (! prefs.isReadOnly(values[0]))
-                    {
-                        prefs.setValues(values[0], preferenceValues);
-                        try
-                        {
-                            prefs.store();
-                        }
-                        catch (Exception e)
-                        {
-                            getPortletContext().log("ApplicationPortlet.processAction() preferences store exception caught", e);
-                            log.debug("ApplicationPortlet.processAction() preferences store exception caught", e);
-                        }
-                    }
-                    else
-                    {
-                        getPortletContext().log("ApplicationPortlet.processAction() read only preference: "+values[0]);
-                        log.debug("ApplicationPortlet.processAction() read only preference: "+values[0]);
-                    }
-                }
-                else
-                {
-                    getPortletContext().log("ApplicationPortlet.processAction() received action: "+name+", name="+values[0]);
-                    if (! prefs.isReadOnly(values[0]))
-                    {
-                        prefs.reset(values[0]);
-                        try
-                        {
-                            prefs.store();
-                        }
-                        catch (Exception e)
-                        {
-                            getPortletContext().log("ApplicationPortlet.processAction() preferences store exception caught", e);
-                            log.debug("ApplicationPortlet.processAction() preferences store exception caught", e);
-                        }
-                    }
-                    else
-                    {
-                        getPortletContext().log("ApplicationPortlet.processAction() read only preference: "+values[0]);
-                        log.debug("ApplicationPortlet.processAction() read only preference: "+values[0]);
-                    }
-                }
-            }
-            else if (name.equals("edit-session-application-attributes-name-action") && (values.length == 1) && (values[0] != null))
-            {
-                PortletSession session = request.getPortletSession(false);
-                String [] attributeValues = request.getParameterValues("edit-session-application-attributes-value-action");
-                if ((attributeValues != null) && (attributeValues.length == 1) && (attributeValues[0] != null))
-                {
-                    getPortletContext().log("ApplicationPortlet.processAction() received action: "+name+", name="+values[0]+", value="+attributeValues[0]);
-                    log.debug("ApplicationPortlet.processAction() received action: "+name+", name="+values[0]+", value="+attributeValues[0]);
-                    session.setAttribute(values[0], attributeValues[0], PortletSession.APPLICATION_SCOPE);
-                }
-                else
-                {
-                    getPortletContext().log("ApplicationPortlet.processAction() received action: "+name+", name="+values[0]);
-                    log.debug("ApplicationPortlet.processAction() received action: "+name+", name="+values[0]);
-                    session.removeAttribute(values[0], PortletSession.APPLICATION_SCOPE);
-                }
-            }
-            else if (name.equals("edit-session-portlet-attributes-name-action") && (values.length == 1) && (values[0] != null))
-            {
-                PortletSession session = request.getPortletSession(false);
-                String [] attributeValues = request.getParameterValues("edit-session-portlet-attributes-value-action");
-                if ((attributeValues != null) && (attributeValues.length == 1) && (attributeValues[0] != null))
-                {
-                    getPortletContext().log("ApplicationPortlet.processAction() received action: "+name+", name="+values[0]+", value="+attributeValues[0]);
-                    log.debug("ApplicationPortlet.processAction() received action: "+name+", name="+values[0]+", value="+attributeValues[0]);
-                    session.setAttribute(values[0], attributeValues[0], PortletSession.PORTLET_SCOPE);
-                }
-                else
-                {
-                    getPortletContext().log("ApplicationPortlet.processAction() received action: "+name+", name="+values[0]);
-                    log.debug("ApplicationPortlet.processAction() received action: "+name+", name="+values[0]);
-                    session.removeAttribute(values[0], PortletSession.PORTLET_SCOPE);
-                }
-            }
-            else if (name.equals("edit-request-attributes-name-action") && (values.length == 1) && (values[0] != null))
-            {
-                String [] attributeValues = request.getParameterValues("edit-request-attributes-value-action");
-                if ((attributeValues != null) && (attributeValues.length == 1) && (attributeValues[0] != null))
-                {
-                    getPortletContext().log("ApplicationPortlet.processAction() received action: "+name+", name="+values[0]+", value="+attributeValues[0]);
-                    log.debug("ApplicationPortlet.processAction() received action: "+name+", name="+values[0]+", value="+attributeValues[0]);
-                    request.setAttribute(values[0], attributeValues[0]);
-                }
-                else
-                {
-                    getPortletContext().log("ApplicationPortlet.processAction() received action: "+name+", name="+values[0]);
-                    log.debug("ApplicationPortlet.processAction() received action: "+name+", name="+values[0]);
-                    request.removeAttribute(values[0]);
-                }
-            }
-            else if (name.equals("set-render-parameters-name-action") && (values.length == 1) && (values[0] != null))
-            {
-                String [] parameterValues = request.getParameterValues("set-render-parameters-value-action");
-                if ((parameterValues != null) && (parameterValues.length == 1))
-                {
-                    parameterValues = splitArrayValues(parameterValues[0]);
-                }
-                if ((parameterValues != null) && (parameterValues.length > 0))
-                {
-                    getPortletContext().log("ApplicationPortlet.processAction() received action: "+name+", name="+values[0]+", value="+concatArrayValues(parameterValues));
-                    log.debug("ApplicationPortlet.processAction() received action: "+name+", name="+values[0]+", value="+concatArrayValues(parameterValues));
-                    response.setRenderParameter(values[0], parameterValues);
-                }
-            }
-
-            // propagate action request parameters as render parameters
-            response.setRenderParameter((name.startsWith("ACTION-PARAMETER-") ? name : "ACTION-PARAMETER-"+name), values);
-        }
+        super.processAction(request, response);
     }
     
     /**
@@ -508,72 +336,5 @@
         log.debug("ApplicationPortlet.destroy() invoked...");
 
         super.destroy();
-    }
-
-    // utilities
-
-    /**
-     * Convert String to String array.
-     *
-     * @param values string to split
-     * @return split array of strings
-     */
-    public String [] splitArrayValues(String values)
-    {
-        if (values != null)
-        {
-            return values.split(",");
-        }
-        return null;
-    }
-
-    /**
-     * Concatinate String array to String.
-     *
-     * @param values array of string to concatinate
-     * @return concatinated string
-     */
-    public String concatArrayValues(String [] values)
-    {
-        if (values != null)
-        {
-            StringBuffer concat = new StringBuffer();
-            if (values.length > 0)
-            {
-                concat.append(values[0]);
-            }
-            for (int i = 1; (i < values.length); i++)
-            {
-                concat.append(',');
-                concat.append(values[i]);
-            }
-            return concat.toString();
-        }
-        return null;
-    }
-
-    /**
-     * Concatinate String Enumeration to String.
-     *
-     * @param values enumeration of strings to concatinate
-     * @return concatinated string
-     */
-    public String concatArrayValues(Enumeration values)
-    {
-        if (values != null)
-        {
-            StringBuffer concat = new StringBuffer();
-            if (values.hasMoreElements())
-            {
-                concat.append(values.nextElement());
-            }
-            while (values.hasMoreElements())
-            {
-                concat.append(',');
-                concat.append(values.nextElement());
-            }
-            return concat.toString();
-        }
-        return null;
     }
 }

Modified: portals/jetspeed-2/trunk/maven-archetypes/application/src/archetype/archetype-resources/src/webapp/WEB-INF/portlet.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/maven-archetypes/application/src/archetype/archetype-resources/src/webapp/WEB-INF/portlet.xml?rev=393298&r1=393297&r2=393298&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/maven-archetypes/application/src/archetype/archetype-resources/src/webapp/WEB-INF/portlet.xml (original)
+++ portals/jetspeed-2/trunk/maven-archetypes/application/src/archetype/archetype-resources/src/webapp/WEB-INF/portlet.xml Tue Apr 11 12:31:05 2006
@@ -26,15 +26,15 @@
 
         <init-param>
             <name>ViewPage</name>
-            <value>/WEB-INF/view/application-view.vm</value>
+            <value>/WEB-INF/view/application-portlet-view.vm</value>
         </init-param>
         <init-param>
             <name>EditPage</name>
-            <value>/WEB-INF/view/application-edit.vm</value>
+            <value>/WEB-INF/view/application-portlet-edit.vm</value>
         </init-param>
         <init-param>
             <name>HelpPage</name>
-            <value>/WEB-INF/view/application-help.vm</value>
+            <value>/WEB-INF/view/application-portlet-help.vm</value>
         </init-param>
 
         <init-param>

Modified: portals/jetspeed-2/trunk/maven-archetypes/application/src/archetype/archetype-resources/src/webapp/WEB-INF/velocity/toolbox.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/maven-archetypes/application/src/archetype/archetype-resources/src/webapp/WEB-INF/velocity/toolbox.xml?rev=393298&r1=393297&r2=393298&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/maven-archetypes/application/src/archetype/archetype-resources/src/webapp/WEB-INF/velocity/toolbox.xml (original)
+++ portals/jetspeed-2/trunk/maven-archetypes/application/src/archetype/archetype-resources/src/webapp/WEB-INF/velocity/toolbox.xml Tue Apr 11 12:31:05 2006
@@ -18,10 +18,6 @@
 
   <!-- Velocity Tools -->
   <tool>
-    <key>toolLoader</key>
-    <class>org.apache.velocity.tools.generic.ToolLoader</class>
-  </tool> 
-  <tool>
     <key>date</key>
     <scope>application</scope>
     <class>org.apache.velocity.tools.generic.DateTool</class>

Modified: portals/jetspeed-2/trunk/maven-archetypes/application/src/archetype/archetype-resources/src/webapp/WEB-INF/view/application-portlet-edit.vm
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/maven-archetypes/application/src/archetype/archetype-resources/src/webapp/WEB-INF/view/application-portlet-edit.vm?rev=393298&r1=393297&r2=393298&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/maven-archetypes/application/src/archetype/archetype-resources/src/webapp/WEB-INF/view/application-portlet-edit.vm (original)
+++ portals/jetspeed-2/trunk/maven-archetypes/application/src/archetype/archetype-resources/src/webapp/WEB-INF/view/application-portlet-edit.vm Tue Apr 11 12:31:05 2006
@@ -1,89 +1 @@
-## application portlet
-<b>EDIT: Application Portlet</b>
-<p>portlet name: $portlet.getPortletName()
-<p>portlet mode: $renderRequest.getPortletMode()
-<p>window state: $renderRequest.getWindowState()
-
-## render links to change window state/portlet modes
-<p>
-#if ($renderRequest.isWindowStateAllowed($STATE_NORMAL))
-    #set ($normalRenderURL = $renderResponse.createRenderURL())
-    $normalRenderURL.setWindowState($STATE_NORMAL)
-    <p>NORMAL render link: <a href="$normalRenderURL">$normalRenderURL</a>
-#end
-#if ($renderRequest.isWindowStateAllowed($STATE_MAX))
-    #set ($maximizedRenderURL = $renderResponse.createRenderURL())
-    $maximizedRenderURL.setWindowState($STATE_MAX)
-    <p>MAXIMIZED render link: <a href="$maximizedRenderURL">$maximizedRenderURL</a>
-#end
-#if ($renderRequest.isWindowStateAllowed($STATE_MIN))
-    #set ($minimizedRenderURL = $renderResponse.createRenderURL())
-    $minimizedRenderURL.setWindowState($STATE_MIN)
-    <p>MINIMIZED render link: <a href="$minimizedRenderURL">$minimizedRenderURL</a>
-#end
-#if ($renderRequest.isPortletModeAllowed($MODE_VIEW))
-    #set ($viewRenderURL = $renderResponse.createRenderURL())
-    $viewRenderURL.setPortletMode($MODE_VIEW)
-    <p>VIEW render link: <a href="$viewRenderURL">$viewRenderURL</a>
-#end
-#if ($renderRequest.isPortletModeAllowed($MODE_EDIT))
-    #set ($editRenderURL = $renderResponse.createRenderURL())
-    $editRenderURL.setPortletMode($MODE_EDIT)
-    <p>EDIT render link: <a href="$editRenderURL">$editRenderURL</a>
-#end
-#if ($renderRequest.isPortletModeAllowed($MODE_HELP))
-    #set ($helpRenderURL = $renderResponse.createRenderURL())
-    $helpRenderURL.setPortletMode($MODE_HELP)
-    <p>HELP render link: <a href="$helpRenderURL">$helpRenderURL</a>
-#end
-<p>
-
-## edit links/forms to change portlet state
-#set ($testActionURL = $renderResponse.createActionURL())
-$testActionURL.setParameter("test-action", "test-me-to-tears")
-#if ($renderRequest.isPortletModeAllowed($MODE_VIEW))
-    $testActionURL.setPortletMode($MODE_VIEW)
-#end
-<p>test action link: <a href="$testActionURL">$testActionURL</a>
-
-#set ($redirectActionURL = $renderResponse.createActionURL())
-#if ($renderRequest.isPortletModeAllowed($MODE_VIEW))
-    $redirectActionURL.setPortletMode($MODE_VIEW)
-#end
-<p><form method="POST" action="$redirectActionURL">redirect url: <input name="redirect-action" type="TEXT" size="64"></form>
-
-#set ($editContextAttributesActionURL = $renderResponse.createActionURL())
-#if ($renderRequest.isPortletModeAllowed($MODE_VIEW))
-    $editContextAttributesActionURL.setPortletMode($MODE_VIEW)
-#end
-<p><form method="POST" action="$editContextAttributesActionURL">edit context attributes: <input name="edit-context-attributes-name-action" type="TEXT" size="32" value="context-attr"><input name="edit-context-attributes-value-action" type="TEXT" size="32"><input type="submit"></form>
-
-#set ($editPreferencesActionURL = $renderResponse.createActionURL())
-#if ($renderRequest.isPortletModeAllowed($MODE_VIEW))
-    $editPreferencesActionURL.setPortletMode($MODE_VIEW)
-#end
-<p><form method="POST" action="$editPreferencesActionURL">edit preferences: <input name="edit-preferences-name-action" type="TEXT" size="32" value="preference"><input name="edit-preferences-value-action" type="TEXT" size="32"><input type="submit"></form>
-
-#set ($editSessionApplicationAttributesActionURL = $renderResponse.createActionURL())
-#if ($renderRequest.isPortletModeAllowed($MODE_VIEW))
-    $editSessionApplicationAttributesActionURL.setPortletMode($MODE_VIEW)
-#end
-<p><form method="POST" action="$editSessionApplicationAttributesActionURL">edit session application attributes: <input name="edit-session-application-attributes-name-action" type="TEXT" size="32" value="app-attr"><input name="edit-session-application-attributes-value-action" type="TEXT" size="32"><input type="submit"></form>
-
-#set ($editSessionPortletAttributesActionURL = $renderResponse.createActionURL())
-#if ($renderRequest.isPortletModeAllowed($MODE_VIEW))
-    $editSessionPortletAttributesActionURL.setPortletMode($MODE_VIEW)
-#end
-<p><form method="POST" action="$editSessionPortletAttributesActionURL">edit session portlet attributes: <input name="edit-session-portlet-attributes-name-action" type="TEXT" size="32" value="portlet-attr"><input name="edit-session-portlet-attributes-value-action" type="TEXT" size="32"><input type="submit"></form>
-
-#set ($editRequestAttributesActionURL = $renderResponse.createActionURL())
-#if ($renderRequest.isPortletModeAllowed($MODE_VIEW))
-    $editRequestAttributesActionURL.setPortletMode($MODE_VIEW)
-#end
-<p><form method="POST" action="$editRequestAttributesActionURL">edit request attributes: <input name="edit-request-attributes-name-action" type="TEXT" size="32" value="request-attr"><input name="edit-request-attributes-value-action" type="TEXT" size="32"><input type="submit"></form>
-
-#set ($setRenderParametersActionURL = $renderResponse.createActionURL())
-#if ($renderRequest.isPortletModeAllowed($MODE_VIEW))
-    $setRenderParametersActionURL.setPortletMode($MODE_VIEW)
-#end
-<p><form method="POST" action="$setRenderParametersActionURL">set render parameters: <input name="set-render-parameters-name-action" type="TEXT" size="32" value="render-param"><input name="set-render-parameters-value-action" type="TEXT" size="32"><input type="submit"></form>
+<b>${renderRequest.getPortletMode()}/${renderRequest.getWindowState()}: ${portlet.getPortletName()}, (edit template)</b>

Modified: portals/jetspeed-2/trunk/maven-archetypes/application/src/archetype/archetype-resources/src/webapp/WEB-INF/view/application-portlet-help.vm
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/maven-archetypes/application/src/archetype/archetype-resources/src/webapp/WEB-INF/view/application-portlet-help.vm?rev=393298&r1=393297&r2=393298&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/maven-archetypes/application/src/archetype/archetype-resources/src/webapp/WEB-INF/view/application-portlet-help.vm (original)
+++ portals/jetspeed-2/trunk/maven-archetypes/application/src/archetype/archetype-resources/src/webapp/WEB-INF/view/application-portlet-help.vm Tue Apr 11 12:31:05 2006
@@ -1,46 +1 @@
-## application portlet
-<b>HELP: Application Portlet</b>
-<p>portlet name: $portlet.getPortletName()
-<p>portlet mode: $renderRequest.getPortletMode()
-<p>window state: $renderRequest.getWindowState()
-
-## dump window state/portlet modes; render links to change
-## window state/portlet modes
-<p>
-<p>NORMAL window state allowed: $renderRequest.isWindowStateAllowed($STATE_NORMAL)
-<p>MAXIMIZED window state allowed: $renderRequest.isWindowStateAllowed($STATE_MAX)
-<p>MINIMIZED window state allowed: $renderRequest.isWindowStateAllowed($STATE_MIN)
-<p>VIEW portlet mode allowed: $renderRequest.isPortletModeAllowed($MODE_VIEW)
-<p>EDIT portlet mode allowed: $renderRequest.isPortletModeAllowed($MODE_EDIT)
-<p>HELP portlet mode allowed: $renderRequest.isPortletModeAllowed($MODE_HELP)
-#if ($renderRequest.isWindowStateAllowed($STATE_NORMAL))
-    #set ($normalRenderURL = $renderResponse.createRenderURL())
-    $normalRenderURL.setWindowState($STATE_NORMAL)
-    <p>NORMAL render link: <a href="$normalRenderURL">$normalRenderURL</a>
-#end
-#if ($renderRequest.isWindowStateAllowed($STATE_MAX))
-    #set ($maximizedRenderURL = $renderResponse.createRenderURL())
-    $maximizedRenderURL.setWindowState($STATE_MAX)
-    <p>MAXIMIZED render link: <a href="$maximizedRenderURL">$maximizedRenderURL</a>
-#end
-#if ($renderRequest.isWindowStateAllowed($STATE_MIN))
-    #set ($minimizedRenderURL = $renderResponse.createRenderURL())
-    $minimizedRenderURL.setWindowState($STATE_MIN)
-    <p>MINIMIZED render link: <a href="$minimizedRenderURL">$minimizedRenderURL</a>
-#end
-#if ($renderRequest.isPortletModeAllowed($MODE_VIEW))
-    #set ($viewRenderURL = $renderResponse.createRenderURL())
-    $viewRenderURL.setPortletMode($MODE_VIEW)
-    <p>VIEW render link: <a href="$viewRenderURL">$viewRenderURL</a>
-#end
-#if ($renderRequest.isPortletModeAllowed($MODE_EDIT))
-    #set ($editRenderURL = $renderResponse.createRenderURL())
-    $editRenderURL.setPortletMode($MODE_EDIT)
-    <p>EDIT render link: <a href="$editRenderURL">$editRenderURL</a>
-#end
-#if ($renderRequest.isPortletModeAllowed($MODE_HELP))
-    #set ($helpRenderURL = $renderResponse.createRenderURL())
-    $helpRenderURL.setPortletMode($MODE_HELP)
-    <p>HELP render link: <a href="$helpRenderURL">$helpRenderURL</a>
-#end
-<p>
+<b>${renderRequest.getPortletMode()}/${renderRequest.getWindowState()}: ${portlet.getPortletName()}, (help template)</b>

Modified: portals/jetspeed-2/trunk/maven-archetypes/application/src/archetype/archetype-resources/src/webapp/WEB-INF/view/application-portlet-view.vm
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/maven-archetypes/application/src/archetype/archetype-resources/src/webapp/WEB-INF/view/application-portlet-view.vm?rev=393298&r1=393297&r2=393298&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/maven-archetypes/application/src/archetype/archetype-resources/src/webapp/WEB-INF/view/application-portlet-view.vm (original)
+++ portals/jetspeed-2/trunk/maven-archetypes/application/src/archetype/archetype-resources/src/webapp/WEB-INF/view/application-portlet-view.vm Tue Apr 11 12:31:05 2006
@@ -1,176 +1 @@
-## application portlet
-<b>VIEW: Application Portlet</b>
-<p>portlet name: $portlet.getPortletName()
-<p>portlet mode: $renderRequest.getPortletMode()
-<p>window state: $renderRequest.getWindowState()
-
-## render links to change window state/portlet modes
-<p>
-#if ($renderRequest.isWindowStateAllowed($STATE_NORMAL))
-    #set ($normalRenderURL = $renderResponse.createRenderURL())
-    $normalRenderURL.setWindowState($STATE_NORMAL)
-    <p>NORMAL render link: <a href="$normalRenderURL">$normalRenderURL</a>
-#end
-#if ($renderRequest.isWindowStateAllowed($STATE_MAX))
-    #set ($maximizedRenderURL = $renderResponse.createRenderURL())
-    $maximizedRenderURL.setWindowState($STATE_MAX)
-    <p>MAXIMIZED render link: <a href="$maximizedRenderURL">$maximizedRenderURL</a>
-#end
-#if ($renderRequest.isWindowStateAllowed($STATE_MIN))
-    #set ($minimizedRenderURL = $renderResponse.createRenderURL())
-    $minimizedRenderURL.setWindowState($STATE_MIN)
-    <p>MINIMIZED render link: <a href="$minimizedRenderURL">$minimizedRenderURL</a>
-#end
-#if ($renderRequest.isPortletModeAllowed($MODE_VIEW))
-    #set ($viewRenderURL = $renderResponse.createRenderURL())
-    $viewRenderURL.setPortletMode($MODE_VIEW)
-    <p>VIEW render link: <a href="$viewRenderURL">$viewRenderURL</a>
-#end
-#if ($renderRequest.isPortletModeAllowed($MODE_EDIT))
-    #set ($editRenderURL = $renderResponse.createRenderURL())
-    $editRenderURL.setPortletMode($MODE_EDIT)
-    <p>EDIT render link: <a href="$editRenderURL">$editRenderURL</a>
-#end
-#if ($renderRequest.isPortletModeAllowed($MODE_HELP))
-    #set ($helpRenderURL = $renderResponse.createRenderURL())
-    $helpRenderURL.setPortletMode($MODE_HELP)
-    <p>HELP render link: <a href="$helpRenderURL">$helpRenderURL</a>
-#end
-<p>
-
-## dump all portlet state information
-<p>response is committed: $renderResponse.isCommitted()
-<p>locale: $renderRequest.getLocale()
-<p>has locale resource bundle:
-#if ($portlet.getResourceBundle($renderRequest.getLocale()))
-    true
-#else
-    false
-#end
-<p>init parameters:
-<ul>
-#foreach ($name in $portlet.getInitParameterNames())
-    <li>$name: $portlet.getInitParameter($name)</li>
-#end
-</ul>
-<p>portlet context name: getPortletContext().getPortletContextName()
-<p>context server info: getPortletContext().getServerInfo()
-<p>context major version: getPortletContext().getMajorVersion()
-<p>context minor version: getPortletContext().getMinorVersion()
-<p>context real path for "/": getPortletContext().getRealPath("/")
-
-<p>context resource paths for "/":
-<ul>
-#foreach ($path in $portlet.getPortletContext().getResourcePaths("/"))
-    <li>$path</li>
-#end
-</ul>
-<p>context resource url for "/":$portlet.getPortletContext().getResource("/")
-<p>context attributes:
-<ul>
-#foreach ($name in $portlet.getPortletContext().getAttributeNames())
-    <li>$name: $portlet.getPortletContext().getAttribute($name)</li>
-#end
-</ul>
-<p>context init parameters:
-<ul>
-#foreach ($name in $portlet.getPortletContext().getInitParameterNames())
-    <li>$name: $portlet.getPortletContext().getInitParameter($name)</li>
-#end
-</ul>
-#set ($prefs = $renderRequest.getPreferences())
-#if ($prefs)
-    <p>preferences:
-    <ul>
-    #foreach ($name in $prefs.getNames())
-        #set ($values = $prefs.getValues($name, null))
-        #if ($prefs.isReadOnly($name))
-            <li>$name: $portlet.concatArrayValues($values), (read only)</li>
-        #else
-            <li>$name: $portlet.concatArrayValues($values)</li>
-        #end
-    #end
-    </ul>
-#end
-<p>requested session id: $renderRequest.getRequestedSessionId()
-<p>requested session id is valid: $renderRequest.isRequestedSessionIdValid()
-#set ($session = $renderRequest.getPortletSession(false))
-#if ($session)
-    <p>session is new: $session.isNew()
-    <p>session id: $session.getId()
-    <p>session creation time: $session.getCreationTime()
-    <p>session last accessed time: $session.getLastAccessedTime()
-    <p>session max inactive: $session.getMaxInactiveInterval()
-    <p>session application attributes:
-    <ul>
-    #foreach ($name in $session.getAttributeNames($session.APPLICATION_SCOPE))
-        <li>$name: $session.getAttribute($name, $session.APPLICATION_SCOPE)</li>
-    #end
-    </ul>
-    <p>session portlet attributes:
-    <ul>
-    #foreach ($name in $session.getAttributeNames($session.PORTLET_SCOPE))
-        <li>$name: $session.getAttribute($name, $session.PORTLET_SCOPE)</li>
-    #end
-    </ul>
-#end
-<p>request properties:
-<ul>
-#foreach ($name in $renderRequest.getPropertyNames())
-    #set ($values = $renderRequest.getProperties($name))
-    <li>$name: $portlet.concatArrayValues($values)</li>
-#end
-</ul>
-<p>authentication type: $renderRequest.getAuthType()
-<p>context path: $renderRequest.getContextPath()
-<p>remote user: $renderRequest.getRemoteUser()
-#set ($principal = $renderRequest.getUserPrincipal())
-#if ($principal)
-    <p>principal: $principal.getName()
-    <p>principal is in user role: $renderRequest.isUserInRole("user")
-    <p>principal is in manager role: $renderRequest.isUserInRole("manager")
-    <p>principal is in admin role: $renderRequest.isUserInRole("admin")
-#end
-<p>request attributes:
-<ul>
-#foreach ($name in $renderRequest.getAttributeNames())
-    <li>$name: $renderRequest.getAttribute($name)</li>
-#end
-</ul>
-<p>request parameters:
-<ul>
-#foreach ($name in $renderRequest.getParameterNames())
-    #set ($values = $renderRequest.getParameterValues($name))
-    <li>$name: $portlet.concatArrayValues($values)</li>
-#end
-</ul>
-<p>is secure: $renderRequest.isSecure()
-
-<p>preferred content type: $renderRequest.getResponseContentType()
-<p>accepted content types:
-<ol>
-#foreach ($type in $renderRequest.getResponseContentTypes())
-    <li>$type</li>
-#end
-</ol>
-<p>preferred locale: $renderRequest.getLocale()
-<p>accepted locales:
-<ol>
-#foreach ($locale in $renderRequest.getLocales())
-    <li>$locale</li>
-#end
-</ol>
-<p>scheme: $renderRequest.getScheme()
-<p>server name: $renderRequest.getServerName()
-<p>server port: $renderRequest.getServerPort()
-<p>namespace: $renderResponse.getNamespace()
-<p>response is committed: $renderResponse.isCommitted()
-#set ($userInfo = $renderRequest.getAttribute($USER_INFO))
-#if ($userInfo)
-    <p>user info request attribute values:
-    <ul>
-    #foreach ($userInfoEntry in $userInfo.entrySet())
-        <li>$userInfoEntry.getKey(): $userInfoEntry.getValue()</li>
-    #end
-    </ul>
-#end
+<b>${renderRequest.getPortletMode()}/${renderRequest.getWindowState()}: ${portlet.getPortletName()}, (view template)</b>

Added: portals/jetspeed-2/trunk/maven-archetypes/application/src/archetype/archetype-resources/src/webapp/logs/pa.log
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/maven-archetypes/application/src/archetype/archetype-resources/src/webapp/logs/pa.log?rev=393298&view=auto
==============================================================================
    (empty)

Modified: portals/jetspeed-2/trunk/maven-archetypes/component/src/archetype/archetype-resources/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/maven-archetypes/component/src/archetype/archetype-resources/pom.xml?rev=393298&r1=393297&r2=393298&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/maven-archetypes/component/src/archetype/archetype-resources/pom.xml (original)
+++ portals/jetspeed-2/trunk/maven-archetypes/component/src/archetype/archetype-resources/pom.xml Tue Apr 11 12:31:05 2006
@@ -46,6 +46,13 @@
             <artifactId>commons-logging</artifactId>
         </dependency>
 
+        <!-- Test Dependencies -->
+        <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+            <scope>test</scope>
+        </dependency>
+
     </dependencies>
 
     <!-- Build Configuration -->

Modified: portals/jetspeed-2/trunk/maven-archetypes/portal-component/src/archetype/archetype-resources/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/maven-archetypes/portal-component/src/archetype/archetype-resources/pom.xml?rev=393298&r1=393297&r2=393298&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/maven-archetypes/portal-component/src/archetype/archetype-resources/pom.xml (original)
+++ portals/jetspeed-2/trunk/maven-archetypes/portal-component/src/archetype/archetype-resources/pom.xml Tue Apr 11 12:31:05 2006
@@ -44,6 +44,14 @@
         <dependency>
             <groupId>commons-logging</groupId>
             <artifactId>commons-logging</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <!-- Test Dependencies -->
+        <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+            <scope>test</scope>
         </dependency>
 
     </dependencies>

Modified: portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/pom.xml?rev=393298&r1=393297&r2=393298&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/pom.xml (original)
+++ portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/pom.xml Tue Apr 11 12:31:05 2006
@@ -92,6 +92,7 @@
 
         <!-- Dependency Version Properties -->
         <ant.version>1.6.5</ant.version>
+        <commons-digester.version>1.5</commons-digester.version>
         <commons-logging.version>1.0.3</commons-logging.version>
         <hsqldb.version>1.8.0.2</hsqldb.version>
         <javax.servlet.jstl.version>1.0.6</javax.servlet.jstl.version>
@@ -387,6 +388,11 @@
                 <groupId>log4j</groupId>
                 <artifactId>log4j</artifactId>
                 <version>${log4j.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>commons-digester</groupId>
+                <artifactId>commons-digester</artifactId>
+                <version>${commons-digester.version}</version>
             </dependency>
             <dependency>
                 <groupId>commons-logging</groupId>

Modified: portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/portal/build.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/portal/build.xml?rev=393298&r1=393297&r2=393298&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/portal/build.xml (original)
+++ portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/portal/build.xml Tue Apr 11 12:31:05 2006
@@ -84,6 +84,7 @@
         <copy todir="${basedir}/target/webapp" overwrite="on">
             <fileset dir="${basedir}/src/webapp">
                 <exclude name="WEB-INF/assembly/readme.txt"/>
+                <exclude name="WEB-INF/conf/readme.txt"/>
                 <exclude name="WEB-INF/pages/readme.txt"/>
                 <exclude name="WEB-INF/templates/readme.txt"/>
                 <exclude name="decorations/readme.txt"/>

Added: portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/portal/src/webapp/WEB-INF/conf/Log4j.properties
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/portal/src/webapp/WEB-INF/conf/Log4j.properties?rev=393298&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/portal/src/webapp/WEB-INF/conf/Log4j.properties (added)
+++ portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/portal/src/webapp/WEB-INF/conf/Log4j.properties Tue Apr 11 12:31:05 2006
@@ -0,0 +1,173 @@
+# Copyright 2004 The Apache Software Foundation
+#
+# Licensed 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.
+
+# ------------------------------------------------------------------------
+#
+# Logging Configuration
+#
+# $Id$
+#
+# ------------------------------------------------------------------------
+
+#
+# If we don't know the logging facility, put it into the jetspeed.log
+# 
+#
+log4j.rootLogger = INFO, jetspeed
+
+#
+# ${groupId} goes into Jetspeed Log
+#
+log4j.category.${groupId} = DEBUG, jetspeed
+log4j.additivity.${groupId} = false
+
+#
+# Jetspeed goes into Jetspeed Log
+#
+log4j.category.org.apache.jetspeed = DEBUG, jetspeed
+log4j.additivity.org.apache.jetspeed = false
+
+
+log4j.category.org.apache.jetspeed.tools = DEBUG, jetspeed
+log4j.additivity.org.apache.jetspeed.tools = false
+
+log4j.category.org.apache.commons.digester = ERROR, digester
+log4j.additivity.org.apache.commons.digester = false
+
+
+#
+# Velocity Logfile
+#
+log4j.category.velocity = INFO, velocity
+log4j.additivity.velocity = false
+
+#
+# OJB Logfile
+#
+log4j.category.org.apache.ojb= INFO, ojb
+log4j.additivity.org.apache.ojb= false
+
+#
+# Scheduler Category
+#
+log4j.category.scheduler = INFO, scheduler
+log4j.additivity.scheduler = false
+
+#
+# Pluto Category
+#
+log4j.category.org.apache.pluto = INFO, PLUTO, console
+log4j.additivity.org.apache.pluto = false
+
+#
+# Deployment Category
+#
+log4j.category.deployment = INFO, DEPLOYMENT, console
+log4j.additivity.deployment = false
+
+
+#
+# Console Category
+#
+log4j.category.console = INFO, console
+log4j.additivity.console = false
+
+#
+# Content Server
+#
+log4j.category.org.apache.jetspeed.contentserver = WARN, CONTENT_SERVER
+log4j.additivity.org.apache.struts = false
+
+########################################################################
+#
+# Logfile definitions
+#
+########################################################################
+
+#
+# jetspeed.log
+#
+log4j.appender.jetspeed = org.apache.log4j.FileAppender
+log4j.appender.jetspeed.file = ${applicationRoot}/logs/jetspeed.log
+log4j.appender.jetspeed.layout = org.apache.log4j.PatternLayout
+log4j.appender.jetspeed.layout.conversionPattern = %d [%t] %-5p %c - %m%n
+log4j.appender.jetspeed.append = false
+
+log4j.appender.digester = org.apache.log4j.FileAppender
+log4j.appender.digester.file = ${applicationRoot}/logs/digester.log
+log4j.appender.digester.layout = org.apache.log4j.PatternLayout
+log4j.appender.digester.layout.conversionPattern = %d [%t] %-5p %c - %m%n
+log4j.appender.digester.append = false
+
+#
+# pluto.log
+#
+log4j.appender.PLUTO = org.apache.log4j.FileAppender
+log4j.appender.PLUTO.file = ${applicationRoot}/logs/pluto.log
+log4j.appender.PLUTO.layout = org.apache.log4j.PatternLayout
+log4j.appender.PLUTO.layout.conversionPattern = %d [%t] %-5p %c - %m%n
+log4j.appender.PLUTO.append = false
+
+#
+# deployment.log
+#
+log4j.appender.DEPLOYMENT = org.apache.log4j.FileAppender
+log4j.appender.DEPLOYMENT.file = ${applicationRoot}/logs/deployment.log
+log4j.appender.DEPLOYMENT.layout = org.apache.log4j.PatternLayout
+log4j.appender.DEPLOYMENT.layout.conversionPattern = %d [%t] %-5p %c - %m%n
+log4j.appender.DEPLOYMENT.append = false
+
+#
+# Scheduler Output
+#
+log4j.appender.scheduler = org.apache.log4j.FileAppender
+log4j.appender.scheduler.file = ${applicationRoot}/logs/scheduler.log
+log4j.appender.scheduler.layout = org.apache.log4j.PatternLayout
+log4j.appender.scheduler.layout.conversionPattern = %d [%t] %-5p %c - %m%n
+log4j.appender.scheduler.append = false
+
+#
+# Velocity gets configured to write its output onto the velocity
+# category.
+#
+log4j.appender.velocity = org.apache.log4j.FileAppender
+log4j.appender.velocity.file = ${applicationRoot}/logs/velocity.log
+log4j.appender.velocity.layout = org.apache.log4j.PatternLayout
+log4j.appender.velocity.layout.conversionPattern = %d [%t] %-5p %c - %m%n
+log4j.appender.velocity.append = false
+
+
+log4j.appender.ojb = org.apache.log4j.FileAppender
+log4j.appender.ojb.file = ${applicationRoot}/logs/ojb.log
+log4j.appender.ojb.layout = org.apache.log4j.PatternLayout
+log4j.appender.ojb.layout.conversionPattern = %d [%t] %-5p %c - %m%n
+log4j.appender.ojb.append = false
+
+#
+# Console
+#
+log4j.appender.console=org.apache.log4j.ConsoleAppender
+log4j.appender.console.layout=org.apache.log4j.PatternLayout
+
+# Pattern to output the caller's file name and line number.
+log4j.appender.console.layout.ConversionPattern=%5p: %m%n
+
+#
+# content-server.log
+#
+log4j.appender.CONTENT_SERVER = org.apache.log4j.FileAppender
+log4j.appender.CONTENT_SERVER.file = ${applicationRoot}/logs/content-server.log
+log4j.appender.CONTENT_SERVER.layout = org.apache.log4j.PatternLayout
+log4j.appender.CONTENT_SERVER.layout.conversionPattern = %d [%t] %-5p %c - %m%n
+log4j.appender.CONTENT_SERVER.append = false

Propchange: portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/portal/src/webapp/WEB-INF/conf/Log4j.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Added: portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/portal/src/webapp/WEB-INF/conf/readme.txt
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/portal/src/webapp/WEB-INF/conf/readme.txt?rev=393298&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/portal/src/webapp/WEB-INF/conf/readme.txt (added)
+++ portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/portal/src/webapp/WEB-INF/conf/readme.txt Tue Apr 11 12:31:05 2006
@@ -0,0 +1,3 @@
+Directory: portal/src/webapp/WEB-INF/conf
+Contents: custom portal configuration files
+Usage: overrides default Jetspeed-2 configuration files

Propchange: portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/portal/src/webapp/WEB-INF/conf/readme.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/trunk/maven-archetypes/shared-component/src/archetype/archetype-resources/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/maven-archetypes/shared-component/src/archetype/archetype-resources/pom.xml?rev=393298&r1=393297&r2=393298&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/maven-archetypes/shared-component/src/archetype/archetype-resources/pom.xml (original)
+++ portals/jetspeed-2/trunk/maven-archetypes/shared-component/src/archetype/archetype-resources/pom.xml Tue Apr 11 12:31:05 2006
@@ -40,10 +40,16 @@
 
     <dependencies>
 
-        <!-- Build Dependencies -->
+        <!-- Test Dependencies -->
         <dependency>
             <groupId>commons-logging</groupId>
             <artifactId>commons-logging</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+            <scope>test</scope>
         </dependency>
 
     </dependencies>

Modified: portals/jetspeed-2/trunk/maven-archetypes/shared-component/src/archetype/archetype-resources/src/java/SharedComponentImpl.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/maven-archetypes/shared-component/src/archetype/archetype-resources/src/java/SharedComponentImpl.java?rev=393298&r1=393297&r2=393298&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/maven-archetypes/shared-component/src/archetype/archetype-resources/src/java/SharedComponentImpl.java (original)
+++ portals/jetspeed-2/trunk/maven-archetypes/shared-component/src/archetype/archetype-resources/src/java/SharedComponentImpl.java Tue Apr 11 12:31:05 2006
@@ -15,9 +15,6 @@
  */
 package ${groupId};
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
 import ${groupId}.SharedComponent;
 
 /**
@@ -28,11 +25,6 @@
  */
 public class SharedComponentImpl implements SharedComponent
 {
-    /**
-     * Class specific log instance.
-     */
-    private final static Log log = LogFactory.getLog(SharedComponentImpl.class);
-
     /**
      * SharedComponentImpl constructor.
      */



---------------------------------------------------------------------
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