Index: EndCustomize.java
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/controls/EndCustomize.java,v
retrieving revision 1.1
diff -u -r1.1 EndCustomize.java
--- EndCustomize.java	8 Nov 2002 23:13:44 -0000	1.1
+++ EndCustomize.java	4 Mar 2003 03:05:21 -0000
@@ -56,6 +56,7 @@
 
 // Turbine stuff
 import org.apache.turbine.modules.Action;
+import org.apache.turbine.util.DynamicURI;
 import org.apache.turbine.util.RunData;
 import org.apache.turbine.util.Log;
 
@@ -79,29 +80,40 @@
      */
     public void doPerform( RunData data ) throws Exception
     {
-        JetspeedLink jsLink = null;
         ((JetspeedRunData) data).cleanupFromCustomization();
 
         // bring logged on user to homepage via HTTP redirect
+        
         try
         {
-            jsLink = JetspeedLinkFactory.getInstance(data);
+        	JetspeedLink jsLink = JetspeedLinkFactory.getInstance(data);
+            DynamicURI duri = jsLink.getLink(JetspeedLink.CURRENT,null,null,JetspeedLink.CURRENT,null);
             String mtype = data.getParameters().getString("mtype");
             if (mtype != null)
             {
                 jsLink.setMediaType(mtype);
-                jsLink.addQueryData("mtype", mtype);
+                duri = jsLink.addQueryData("mtype", mtype);
+                duri = duri.addPathInfo("media-type", mtype);
+                String language = data.getParameters().getString("language");
+                if(language != null)
+                {
+                	duri = duri.addQueryData("language",language);
+                	String country = data.getParameters().getString("country");
+                	if(country != null)
+                	{
+                		duri = duri.addQueryData("country", country);
+                	}
+                }
             }
-
+            
+            data.setRedirectURI(duri.toString());
+            JetspeedLinkFactory.putInstance(jsLink);
+	        jsLink = null;
         }
         catch (Exception e)
         {
             Log.error(e);
-        }
-
-        data.setRedirectURI(jsLink.toString());
-        JetspeedLinkFactory.putInstance(jsLink);
-        jsLink = null;
+        }       
     }
 }
 
Index: GlobalMacros.vm
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed/webapp/WEB-INF/templates/vm/GlobalMacros.vm,v
retrieving revision 1.8
diff -u -r1.8 GlobalMacros.vm
--- GlobalMacros.vm	28 Jan 2003 06:30:20 -0000	1.8
+++ GlobalMacros.vm	4 Mar 2003 03:06:23 -0000
@@ -123,6 +123,8 @@
   </td>
 #end
 
+#macro(psmlLink $baseLink)#set ($theLink = $baseLink)#set ($mtype = $!data.Parameters.getString("mtype"))#set ($language = $!data.Parameters.getString("language"))#set ($country = $!data.Parameters.getString("country"))#if($!mtype)#set ($theLink = $theLink.addQueryData("mtype", $mtype))#if($!language)#set ($theLink = $theLink.addQueryData("language", $language))#if($!country)#set ($theLink = $theLink.addQueryData("country", $country))#end#end#end$theLink#end
+
 #* ------------------------------------------------------------------
 #
 # Macros that are used for portal page construction.

Index: customizer-portletset-layout.vm
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed/webapp/WEB-INF/templates/vm/portlets/html/customizer-portletset-layout.vm,v
retrieving revision 1.12
diff -u -r1.12 customizer-portletset-layout.vm
--- customizer-portletset-layout.vm	15 Nov 2002 17:27:18 -0000	1.12
+++ customizer-portletset-layout.vm	4 Mar 2003 03:10:23 -0000
@@ -9,12 +9,7 @@
         $l10n.CUSTOMIZER_LAYOUT :
       </td>
       <td valign="middle">
-          #set ($mtype = $!data.Parameters.getString("mtype"))
-          #if ($!mtype) 
-            <form name="controllers" action="$jslink.Template.addQueryData('mtype', $mtype)" method="post">
-          #else
-            <form name="controllers" action="$jslink.Template" method="post">
-          #end
+          <form name="controllers" action="#psmlLink($jslink.Template)" method="post">
           #if ($action)
             <input name="$jslink.ActionKey" type="hidden" value="$action">
           #end
@@ -50,12 +45,7 @@
         $l10n.CUSTOMIZER_DECORATION  :
       </td>
       <td valign="middle">
-          #set ($mtype = $!data.Parameters.getString("mtype"))
-          #if ($!mtype) 
-            <form name="controls" action="$jslink.Template.addQueryData('mtype', $mtype)" method="post">
-          #else
-            <form name="controls" action="$jslink.Template" method="post">
-          #end
+          <form name="controls" action="#psmlLink($jslink.Template)" method="post">
           #if ($action) <input name="$jslink.ActionKey" type="hidden" value="$action"> #end
           <input type="hidden" name="eventSubmit_doControl" value="control">
           <select name="control" onChange="document.controls.submit()">
@@ -111,11 +101,7 @@
         $l10n.CUSTOMIZER_SECURITY_REF :
       </td>
       <td valign="middle">
-        #if ($!mtype) 
-          <form name="securityRefs" action="$jslink.Template.addQueryData('mtype', $mtype)" method="post">
-        #else
-          <form name="securityRefs" action="$jslink.Template" method="post">
-        #end
+        <form name="securityRefs" action="#psmlLink($jslink.Template)" method="post">
         #if ($action) 
             <input name="$jslink.ActionKey" type="hidden" value="$action"> 
         #end

Index: card-customize.vm
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed/webapp/WEB-INF/templates/vm/controllers/html/card-customize.vm,v
retrieving revision 1.12
diff -u -r1.12 card-customize.vm
--- card-customize.vm	2 Sep 2002 18:33:08 -0000	1.12
+++ card-customize.vm	4 Mar 2003 03:13:41 -0000
@@ -70,12 +70,7 @@
   #end    
     </td>
     <td valign="top" align="center">
-      #set ($mtype = $!data.Parameters.getString("mtype"))
-      #if ($!mtype) 
-        <form action="$jslink.Template.addQueryData('mtype', $mtype)" method="post">
-      #else
-        <form action="$jslink.Template" method="post">
-      #end
+      <form action="#psmlLink($jslink.Template)" method="post">
 #if ($!action) <input type="hidden" name="$jslink.ActionKey" value="$action"> #end
         <input type="hidden" name="position" value="$position" />
         <input type="image" border="0" alt="Delete" src="images/close.gif" name="eventSubmit_doDelete">
@@ -104,12 +99,7 @@
   <table cellspacing="2">
     <tr>
       <td>
-        #set ($mtype = $!data.Parameters.getString("mtype"))
-        #if ($!mtype) 
-            <form action="$jslink.Template.addQueryData('mtype', $mtype)" method="post">
-        #else
-            <form action="$jslink.Template" method="post">
-        #end
+        <form action="#psmlLink($jslink.Template)" method="post">
           #if ($!action) <input type="hidden" name="$jslink.ActionKey" value="$action" > #end
           <table cellspacing="2">
             <tr>

Index: column-customize.vm
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed/webapp/WEB-INF/templates/vm/controllers/html/column-customize.vm,v
retrieving revision 1.10
diff -u -r1.10 column-customize.vm
--- column-customize.vm	2 Sep 2002 18:33:08 -0000	1.10
+++ column-customize.vm	4 Mar 2003 03:13:51 -0000
@@ -71,12 +71,7 @@
       #end    
       </td>
       <td valign="top" align="center" >
-          #set ($mtype = $!data.Parameters.getString("mtype"))
-          #if ($!mtype) 
-            <form action="$jslink.Template.addQueryData('mtype', $mtype)" method="post">
-          #else
-            <form action="$jslink.Template" method="post">
-          #end
+          <form action="#psmlLink($jslink.Template)" method="post">
           #if ($!action) <input type="hidden" name="$jslink.ActionKey" value="$action"> #end
           <input type="hidden" name="position" value="$position">
           <input type="image" border="0" alt="$l10n.CUSTOMIZER_DELETE" src="images/close.gif" name="eventSubmit_doDelete">
@@ -105,12 +100,7 @@
   <table cellspacing="2">
     <tr>
       <td>
-          #set ($mtype = $!data.Parameters.getString("mtype"))
-          #if ($!mtype) 
-            <form action="$jslink.Template.addQueryData('mtype', $mtype)" method="post">
-          #else
-            <form action="$jslink.Template" method="post">
-          #end
+          <form action="#psmlLink($jslink.Template)" method="post">
           #if ($!action) <input type="hidden" name="$jslink.ActionKey" value="$action" > #end
           <table cellspacing="2">
             <tr>

Index: flow-customize.vm
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed/webapp/WEB-INF/templates/vm/controllers/html/flow-customize.vm,v
retrieving revision 1.4
diff -u -r1.4 flow-customize.vm
--- flow-customize.vm	23 Jul 2002 00:03:56 -0000	1.4
+++ flow-customize.vm	4 Mar 2003 03:14:02 -0000
@@ -70,12 +70,7 @@
       #end    
       </td>
       <td valign="top" align="center" >
-          #set ($mtype = $!data.Parameters.getString("mtype"))
-          #if ($!mtype) 
-            <form action="$jslink.Template.addQueryData('mtype', $mtype)" method="post">
-          #else
-            <form action="$jslink.Template" method="post">
-          #end
+          <form action="#psmlLink($jslink.Template)" method="post">
           #if ($!action) <input type="hidden" name="$jslink.ActionKey" value="$action"> #end
           <input type="hidden" name="position" value="$position">
           <input type="image" border="0" alt="$l10n.CUSTOMIZER_DELETE" src="images/close.gif" name="eventSubmit_doDelete">
@@ -104,12 +99,7 @@
   <table cellspacing="2">
     <tr>
       <td>
-          #set ($mtype = $!data.Parameters.getString("mtype"))
-          #if ($!mtype) 
-            <form action="$jslink.Template.addQueryData('mtype', $mtype)" method="post">
-          #else
-            <form action="$jslink.Template" method="post">
-          #end
+          <form action="#psmlLink($jslink.Template)" method="post">
           #if ($!action) <input type="hidden" name="$jslink.ActionKey" value="$action" > #end
           <table cellspacing="2">
             <tr>

Index: multicolumn-customize.vm
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed/webapp/WEB-INF/templates/vm/controllers/html/multicolumn-customize.vm,v
retrieving revision 1.15
diff -u -r1.15 multicolumn-customize.vm
--- multicolumn-customize.vm	15 Nov 2002 17:27:18 -0000	1.15
+++ multicolumn-customize.vm	4 Mar 2003 03:14:11 -0000
@@ -21,12 +21,7 @@
 #foreach ( $portlet in $column )
       <tr>
         <td width="100%">
-      #set ($mtype = $!data.Parameters.getString("mtype"))
-      #if ($!mtype) 
-        <form action="$jslink.Template.addQueryData('mtype', $mtype)" method="post">
-      #else
-        <form action="$jslink.Template" method="post">
-      #end
+      <form action="#psmlLink($jslink.Template)" method="post">
 #if ($action) <input type="hidden" name="$jslink.ActionKey" value="$action" /> #end
           <input type="hidden" name="id" value="$portlet.id" />
           <input type="hidden" name="col" value="$col" />
@@ -125,11 +120,7 @@
                 <table width="100%"> ## Including table to match alignment.
                   <tr>
                     <td>
-        #if ($!mtype) 
-                        <form name="decorations$ndx" action="$jslink.Template.addQueryData('mtype', $mtype)" method="post">
-        #else
-                        <form name="decorations$ndx" action="$jslink.Template" method="post">
-        #end
+        <form name="decorations$ndx" action="#psmlLink($jslink.Template)" method="post">
         #if ($action) 
                                 <input name="$jslink.ActionKey" type="hidden" value="$action"> 
         #end
@@ -164,12 +155,7 @@
   </tr>
 </table>
 <br>
-#set ($mtype = $!data.Parameters.getString("mtype"))
-#if ($!mtype) 
-  <form action="$jslink.Template.addQueryData('mtype', $mtype)" method="post">
-#else
-  <form action="$jslink.Template" method="post">
-#end
+<form action="#psmlLink($jslink.Template)" method="post">
   #if ($action) <input type="hidden" name="$jslink.ActionKey" value="$action" > #end
   <center>
     <table cellspacing="2">

Index: row-customize.vm
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed/webapp/WEB-INF/templates/vm/controllers/html/row-customize.vm,v
retrieving revision 1.9
diff -u -r1.9 row-customize.vm
--- row-customize.vm	2 Sep 2002 18:33:08 -0000	1.9
+++ row-customize.vm	4 Mar 2003 03:14:21 -0000
@@ -71,12 +71,7 @@
   #end    
     </td>
     <td valign="top" align="center">
-    #set ($mtype = $!data.Parameters.getString("mtype"))
-    #if ($!mtype) 
-      <form action="$jslink.Template.addQueryData('mtype', $mtype)" method="post">
-    #else
-      <form action="$jslink.Template" method="post">
-    #end
+    <form action="#psmlLink($jslink.Template)" method="post">
 #if ($!action) <input type="hidden" name="$jlink.ActionKey" value="$action"> #end
         <input type="hidden" name="position" value="$position">
         <input type="image" border="0" alt="Delete" src="images/close.gif" name="eventSubmit_doDelete">
@@ -105,12 +100,7 @@
   <table cellspacing="2">
     <tr>
       <td>
-        #set ($mtype = $!data.Parameters.getString("mtype"))
-        #if ($!mtype) 
-          <form action="$jslink.Template.addQueryData('mtype', $mtype)" method="post">
-        #else
-          <form action="$jslink.Template" method="post">
-        #end
+        <form action="#psmlLink($jslink.Template)" method="post">
           #if ($!action) <input type="hidden" name="$jlink.ActionKey" value="$action" > #end
           <table cellspacing="2">
             <tr>