Index: admin.xreg
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed/webapp/WEB-INF/conf/admin.xreg,v
retrieving revision 1.36
diff -u -r1.36 admin.xreg
--- admin.xreg	17 Apr 2003 16:08:53 -0000	1.36
+++ admin.xreg	2 May 2003 03:25:20 -0000
@@ -121,7 +121,7 @@
   <portlet-entry type="instance" name="ControllerBrowser" hidden="false">    
     <security-ref parent="admin-only"/>
     <classname>org.apache.jetspeed.portal.portlets.VelocityPortlet</classname>
-    <parameter name="template" value="browser-portlet" hidden="true"/>
+    <parameter name="template" value="browser-controller" hidden="true"/>
     <parameter name="registry" value="PortletController"/>
     <parameter name="page-size" value="10"/>
     <parameter name="action" value="portlets.RegistryBrowseAction" hidden="true"/>
@@ -432,7 +432,7 @@
     parent="CustomizerVelocity" application="false">
     <security-ref parent="admin-only"/>
     <meta-info>
-      <title>Portlet</title>
+      <title>Skin</title>
       <description>Security Skin Maintenance for Jetspeed</description>
     </meta-info>
       <classname>org.apache.jetspeed.portal.portlets.CustomizerVelocityPortlet</classname>
@@ -483,6 +483,38 @@
         <parameter name="template" value="client-form" hidden="true"
             cachedOnName="true" cachedOnValue="true"/>
         <parameter name="action" value="portlets.ClientUpdateAction"
+            hidden="true" cachedOnName="true" cachedOnValue="true"/>
+        <media-type ref="html"/>
+        <url cachedOnURL="true"/>
+        <category group="Jetspeed">admin</category>
+    </portlet-entry>
+    <portlet-entry name="MediaForm" hidden="true" type="ref"
+        parent="CustomizerVelocity" application="false">
+        <security-ref parent="admin-only"/>
+        <meta-info>
+            <title>Media</title>
+            <description>Security Media Maintenance for Jetspeed</description>
+        </meta-info>
+        <classname>org.apache.jetspeed.portal.portlets.CustomizerVelocityPortlet</classname>
+        <parameter name="template" value="media-form" hidden="true"
+            cachedOnName="true" cachedOnValue="true"/>
+        <parameter name="action" value="portlets.MediaUpdateAction"
+            hidden="true" cachedOnName="true" cachedOnValue="true"/>
+        <media-type ref="html"/>
+        <url cachedOnURL="true"/>
+        <category group="Jetspeed">admin</category>
+    </portlet-entry>
+    <portlet-entry name="ControllerForm" hidden="true" type="ref"
+        parent="CustomizerVelocity" application="false">
+        <security-ref parent="admin-only"/>
+        <meta-info>
+            <title>Controller</title>
+            <description>Security Controller Maintenance for Jetspeed</description>
+        </meta-info>
+        <classname>org.apache.jetspeed.portal.portlets.CustomizerVelocityPortlet</classname>
+        <parameter name="template" value="controller-form" hidden="true"
+            cachedOnName="true" cachedOnValue="true"/>
+        <parameter name="action" value="portlets.ControllerUpdateAction"
             hidden="true" cachedOnName="true" cachedOnValue="true"/>
         <media-type ref="html"/>
         <url cachedOnURL="true"/>

Index: default.psml
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed/webapp/WEB-INF/psml/user/admin/html/default.psml,v
retrieving revision 1.22
diff -u -r1.22 default.psml
--- default.psml	15 Apr 2003 20:43:02 -0000	1.22
+++ default.psml	2 May 2003 03:26:09 -0000
@@ -89,5 +89,11 @@
         <entry id='351' parent="ClientForm">
             <parameter name="_menustate" value="closed"/>
         </entry>
+        <entry id="352" parent="MediaForm">
+			<parameter name="_menustate" value="closed"/>
+		</entry>
+		<entry id="353" parent="ControllerForm">
+			<parameter name="_menustate" value="closed"/>
+		</entry>
     </portlets>
 </portlets>

Index: browser-controller.vm
===================================================================
RCS file: browser-controller.vm
diff -N browser-controller.vm
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ browser-controller.vm	2 May 2003 03:26:27 -0000
@@ -0,0 +1,54 @@
+<table width="100%" cellpadding="0" cellspacing="0">
+  <tr>
+    <th>Name</th>
+    <th>Title</th>
+    <th>Description</th>
+    <th>Media Types</th>
+    <th colspan="2">Actions</th>
+  </tr>
+#foreach ( $entry in $registry )
+#set ( $old = "" )
+  <tr>
+    <td>$entry.Name</td>
+    <td>$!entry.Title</td>
+    <td>$!entry.Description</td>
+    <td>
+#foreach ( $type in $entry.listMediaTypes() )
+      #if ($old != "") , #end $!type
+      #set ( $old = $type )
+#end
+    </td>
+    <td>
+      <a style="font-size:10" href="$jslink.setPaneByName("ControllerForm").addQueryData("mode","update").addQueryData("controller_name", $!entry.Name)">Edit</a>&nbsp;
+    </td>
+    <td>
+      <a style="font-size:10" href="$jslink.setPaneByName("ControllerForm").addQueryData("mode","delete").addQueryData("controller_name", $!entry.Name)">Delete</a>&nbsp;
+    </td>
+  </tr>
+#end
+</table>
+<table width="100%" cellpadding="0" cellspacing="0">
+  <tr>
+    <td align="right" width="50%">
+#if ($prev)
+<form action="$jlink" method="post">
+       <input type="submit" value="&lt; &lt; Previous">
+      <input type="hidden" name="start" value="$prev">
+</form>
+#end
+    </td>
+    <td align="left" width="50%">
+#if ($next)
+<form action="$jlink" method="post">
+       <input type="submit" value="Next &gt; &gt;">
+      <input type="hidden" name="start" value="$next">
+</form>
+#end
+   </td>
+  </tr>
+  <tr>
+    <td colspan=6 align="left">
+     <a style="font-size:10" href="$jslink.setPaneByName("ControllerForm").addQueryData("mode","insert")">Add Controller</a>&nbsp;
+    </td>
+  </tr>
+</table>

Index: controller-form.vm
===================================================================
RCS file: controller-form.vm
diff -N controller-form.vm
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ controller-form.vm	2 May 2003 03:26:40 -0000
@@ -0,0 +1,213 @@
+<table bgcolor="#ffffff" cellpadding="5">
+      #if ($msg)
+      <tr>
+        <td colspan="2">
+          <table bgcolor="#ffffff">
+            <tr>
+              <td>
+                $msg
+              </td>
+            </tr>
+          </table>
+        </td>
+      </tr>
+      #end
+      #if($reason)
+      <tr>
+        <td colspan="2">
+          <table bgcolor="#ffffff">
+            <tr>
+              <td>
+                $reason
+              </td>
+            </tr>
+          </table>
+        </td>
+      </tr>
+      #end
+</table>
+
+      #if (($mode == "delete"))
+      	<form name="ControllerForm" method="post" action="$jslink.getPaneByName("ControllerBrowser").setAction("portlets.ControllerUpdateAction")">
+      <table>
+          <tr>
+              <td colspan="2">Are you sure you want do delete this controller?</td>
+          </tr>
+        <tr>
+            #formReadOnlyCell ("Name" "controller_name" $!entry.Name)
+        </tr>
+      </table>
+      <table border="0"  cellspacing="0" cellpadding="5" width="30%">
+      <tr>
+        <td>
+          <input type="submit" name="eventSubmit_doDelete" value="Delete Controller"/>
+        </td>
+      </tr>
+      </table>
+      </form>
+      #elseif ($mode == "insert")
+      <form name="ControllerForm" method="post" action="$jslink.getPaneByName("ControllerForm").setAction("portlets.ControllerUpdateAction")">
+	<table>
+		<input type="hidden" name="mode" value="update"/>
+		<tr>
+		  <td bgcolor="$!{skin.TitleBackgroundColor}">
+		    <b><font face="$ui.sansSerifFonts">Name</font></b>
+		  </td>
+		  <td bgcolor="$!{skin.TitleBackgroundColor}">
+		    <font face="$ui.sansSerifFonts">
+		      <input type="text" size="30" name="controller_name" value="$!data.user.getTemp("controller_name")"/>
+		    </font>
+		  </td>
+		</tr>
+		<tr>
+		  <td bgcolor="$!{skin.TitleBackgroundColor}">
+		    <b><font face="$ui.sansSerifFonts">Class Name</font></b>
+		  </td>
+		  <td bgcolor="$!{skin.TitleBackgroundColor}">
+		    <font face="$ui.sansSerifFonts">
+		      <input type="text" size="50" name="class_name" value="$!data.user.getTemp("class_name")"/>
+		    </font>
+		  </td>
+		</tr>
+		<tr>
+		  <td bgcolor="$!{skin.TitleBackgroundColor}">
+		    <b><font face="$ui.sansSerifFonts">Title</font></b>
+		  </td>
+		  <td bgcolor="$!{skin.TitleBackgroundColor}">
+		    <font face="$ui.sansSerifFonts">
+		      <input type="text" size="30" name="title" value="$!data.user.getTemp("title")"/>
+		    </font>
+		  </td>
+		</tr>
+		#*
+		<tr>
+		  <td bgcolor="$!{skin.TitleBackgroundColor}">
+		    <b><font face="$ui.sansSerifFonts">Hidden</font></b>
+		  </td>
+		  <td bgcolor="$!{skin.TitleBackgroundColor}">
+		    <font face="$ui.sansSerifFonts">
+		      <input type="checkbox" size="30" name="hidden" #if($!data.user.getTemp("hidden") == "on") checked="true"#end"/>
+		    </font>
+		  </td>
+		</tr>
+		*#
+	</table>
+	<table border="0"  cellspacing="0" cellpadding="5" width="30%">
+	  <tr>
+	    <td>
+	      <input type="submit" name="eventSubmit_doInsert" value="Insert Controller"/>
+	    </td>
+	  </tr>
+	</table>
+      </form>
+      #elseif($mode == "update")
+      <form name="ControllerForm method="post" action="$jslink.getPaneByName("ControllerForm").setAction("portlets.ControllerUpdateAction")">
+      	<table>
+		<input type="hidden" name="mode" value="update"/>
+		#formReadOnlyCell("Name" "controller_name" $!entry.name)
+		<tr>
+		  <td bgcolor="$!{skin.TitleBackgroundColor}">
+		    <b><font face="$ui.sansSerifFonts">Class Name</font></b>
+		  </td>
+		  <td bgcolor="$!{skin.TitleBackgroundColor}">
+		    <font face="$ui.sansSerifFonts">
+		      <input type="text" size="50" name="class_name" value="$!entry.classname"/>
+		    </font>
+		  </td>
+		</tr>
+		<tr>
+		  <td bgcolor="$!{skin.TitleBackgroundColor}">
+		    <b><font face="$ui.sansSerifFonts">Title</font></b>
+		  </td>
+		  <td bgcolor="$!{skin.TitleBackgroundColor}">
+		    <font face="$ui.sansSerifFonts">
+		      <input type="text" size="30" name="title" value="$!entry.title"/>
+		    </font>
+		  </td>
+		</tr>
+		#*
+		<tr>
+		  <td bgcolor="$!{skin.TitleBackgroundColor}">
+		    <b><font face="$ui.sansSerifFonts">Hidden</font></b>
+		  </td>
+		  <td bgcolor="$!{skin.TitleBackgroundColor}">
+		    <font face="$ui.sansSerifFonts">
+		      <input type="checkbox" size="30" name="hidden" #if($!entry.hidden) checked="true"#end/>
+		    </font>
+		  </td>
+		</tr>
+		*#
+		<tr>
+        	  <td align="center"><input type="submit" name="eventSubmit_doUpdate" value="Update Controller"/></td>
+    		</tr>
+	</table>
+      </form>
+      <hr />
+      <table bgcolor="#ffffff" cellpadding="5">
+<tr>
+  <td align="center" bgcolor="$!{skin.TitleBackgroundColor}">   
+        #if($entry.getParameterNames().hasNext())
+        <form name="UpdateRemoveParameterForm" method="post" action="$jslink.getPaneByName("ControllerForm").setAction("portlets.ControllerUpdateAction")">
+    <input type="hidden" name="mode" value="update"/>
+    <input type="hidden" name="controller_name" value="$!entry.Name"/>
+    <input type="hidden" name="tab" value="parameters"/>
+          <table bgcolor="#ffffff" cellpadding="5">
+              <th>Select</th>
+              <th>Name</th>
+              <th>Value</th>
+              #foreach($paramName in $entry.getParameterNames())
+                  #set($parameter = $entry.getParameter($paramName))
+                  <tr>
+                      <td bgcolor="$!{skin.TitleBackgroundColor}" width="5%">
+                          <input type="checkbox" name="parameter_name" value="$!parameter.name"/>
+                      </td>
+                      <td bgcolor="$!{skin.TitleBackgroundColor}">$!parameter.name</td>
+                      <input type="hidden" name="update_parameter_name" value="$!parameter.name"/>
+                      <td bgcolor="$!{skin.TitleBackgroundColor}"><input type="text" name="$!{parameter.name}.parameter_value" value="$!parameter.value"/></td>
+                  </tr>
+              #end
+          </table>
+          
+          <input type="submit" name="eventSubmit_doRemoveparameters" value="Remove Parameters"/>
+          <input type="submit" name="eventSubmit_doUpdateparametervalues" value="Update Parameters"/>
+          </form>
+
+          #end
+</td>
+ </tr>
+
+ <tr>
+   <td align="center" bgcolor="$!{skin.TitleBackgroundColor}">
+          <form name="AddParameterForm" method="post" action="$jslink.getPaneByName("ControllerForm").setAction("portlets.ControllerUpdateAction")">
+    <input type="hidden" name="mode" value="update"/>
+    <input type="hidden" name="controller_name" value="$!entry.Name"/>
+    <input type="hidden" name="tab" value="parameters"/>
+          <table bgcolor="#ffffff" cellpadding="5">
+              <tr>
+                  <td bgcolor="$!{skin.TitleBackgroundColor}"><b><font face="$ui.sansSerifFonts">Parameter Name</font></b></td>
+                  <td bgcolor="$!{skin.TitleBackgroundColor}"><input type="text" name="parameter_name"/></td>
+              </tr>
+              <tr>
+                  <td bgcolor="$!{skin.TitleBackgroundColor}"><b><font face="$ui.sansSerifFonts">Parameter Value</font></b></td>
+                  <td bgcolor="$!{skin.TitleBackgroundColor}"><input type="text" name="parameter_value"/></td>
+              </tr>
+              <tr>
+                  <td align="center" colspan="2" bgcolor="$!{skin.TitleBackgroundColor}"><input type="submit" name="eventSubmit_doAddparameter" value="Add Parameter"/></td>
+              </tr>
+              </table>
+          </form>
+  </td>
+</tr>
+</table>
+      
+      
+      #end
+<table>
+  <tr>
+    <td>
+      <form name="CancelForm" method="post" action="$jslink.getPaneByName("ControllerBrowser").setAction("portlets.ControllerUpdateAction")">
+        <input type="submit" name="eventSubmit_doCancel" value="Back to Browser"/>
+      </form>
+    </td>
+  </tr>
+</table>

Index: ControllerUpdateAction.java
===================================================================
RCS file: ControllerUpdateAction.java
diff -N ControllerUpdateAction.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ ControllerUpdateAction.java	2 May 2003 03:27:38 -0000
@@ -0,0 +1,158 @@
+/* ====================================================================
+ * The Apache Software License, Version 1.1
+ *
+ * Copyright (c) 2000-2003 The Apache Software Foundation.  All rights
+ * reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. The end-user documentation included with the redistribution,
+ *    if any, must include the following acknowledgment:
+ *       "This product includes software developed by the
+ *        Apache Software Foundation (http://www.apache.org/)."
+ *    Alternately, this acknowledgment may appear in the software itself,
+ *    if and wherever such third-party acknowledgments normally appear.
+ *
+ * 4. The names "Apache" and "Apache Software Foundation" and
+ *     "Apache Jetspeed" must not be used to endorse or promote products
+ *    derived from this software without prior written permission. For
+ *    written permission, please contact apache@apache.org.
+ *
+ * 5. Products derived from this software may not be called "Apache" or
+ *    "Apache Jetspeed", nor may "Apache" appear in their name, without
+ *    prior written permission of the Apache Software Foundation.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation.  For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ */
+package org.apache.jetspeed.modules.actions.portlets;
+
+import org.apache.jetspeed.modules.actions.portlets.security.SecurityConstants;
+import org.apache.jetspeed.om.registry.PortletControllerEntry;
+import org.apache.jetspeed.om.registry.RegistryEntry;
+import org.apache.jetspeed.portal.portlets.VelocityPortlet;
+import org.apache.jetspeed.services.Registry;
+import org.apache.turbine.util.Log;
+import org.apache.turbine.util.RunData;
+import org.apache.velocity.context.Context;
+
+/**
+ * This action enables to update the controller entries
+ *
+ * @author <a href="mailto:caius1440@hotmail.com">Jeremy Ford</a>
+ * @version $Id: SkinUpdateAction.java,v 1.3 2003/04/25 17:14:01 morciuch Exp $
+ */
+public class ControllerUpdateAction extends RegistryUpdateAction
+{
+    private static final String CONTROLLER_UPDATE_PANE = "ControllerForm";
+
+    public ControllerUpdateAction()
+    {
+        registryEntryName = "controller_name";
+        registry = Registry.PORTLET_CONTROLLER;
+        pane = CONTROLLER_UPDATE_PANE;
+    }
+
+    /**
+     * @see org.apache.jetspeed.modules.actions.portlets.VelocityPortletAction#buildNormalContext(org.apache.jetspeed.portal.portlets.VelocityPortlet, org.apache.velocity.context.Context, org.apache.turbine.util.RunData)
+     */
+    protected void buildNormalContext(
+        VelocityPortlet portlet,
+        Context context,
+        RunData rundata)
+        throws Exception
+    {
+        super.buildNormalContext(portlet, context, rundata);
+
+        String mode =
+            rundata.getParameters().getString(SecurityConstants.PARAM_MODE);
+
+        if (mode != null
+            && (mode.equals(SecurityConstants.PARAM_MODE_DELETE)
+                || mode.equals(SecurityConstants.PARAM_MODE_UPDATE)))
+        {
+            String controllerName =
+                rundata.getParameters().getString(registryEntryName);
+            PortletControllerEntry controllerEntry =
+                (PortletControllerEntry) Registry.getEntry(
+                    registry,
+                    controllerName);
+            context.put("entry", controllerEntry);
+        }
+    }
+
+    protected void updateRegistryEntry(
+        RunData rundata,
+        RegistryEntry registryEntry)
+        throws Exception
+    {
+        super.updateRegistryEntry(rundata, registryEntry);
+
+        PortletControllerEntry controllerEntry =
+            (PortletControllerEntry) registryEntry;
+        String className = rundata.getParameters().getString("class_name");
+        if (hasChanged(controllerEntry.getClassname(), className))
+        {
+            controllerEntry.setClassname(className);
+        }
+    }
+
+    /**
+     * @param rundata
+     */
+    protected void clearUserData(RunData rundata)
+    {
+        try
+        {
+            super.clearUserData(rundata);
+
+            rundata.getUser().removeTemp("media_type_ref");
+        }
+        catch (Exception e)
+        {
+            if (Log.getLogger().isDebugEnabled())
+            {
+                Log.debug("ControllerUpdateAction: Failed to clear user data");
+            }
+        }
+
+    }
+
+    /**
+     * @param rundata
+     */
+    protected void resetForm(RunData rundata)
+    {
+        super.resetForm(rundata);
+        String mediaTypeRef =
+            rundata.getParameters().getString("media_type_ref");
+
+        rundata.getUser().setTemp("media_type_ref", mediaTypeRef);
+    }
+}