portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tay...@apache.org
Subject cvs commit: jakarta-jetspeed/webapp/WEB-INF/templates/vm/portlets/html browser-psml.vm customizer-portlet.vm customizer-portletset-add.vm customizer-portletset-addset.vm customizer-portletset-general.vm customizer-portletset-layout.vm customizer-portletset.vm
Date Tue, 23 Jul 2002 00:03:57 GMT
taylor      2002/07/22 17:03:57

  Modified:    src/java/org/apache/jetspeed/modules/actions/controllers
                        MultiColumnControllerAction.java
                        RowColumnControllerAction.java
               src/java/org/apache/jetspeed/modules/actions/controls
                        Customize.java
               src/java/org/apache/jetspeed/modules/actions/portlets
                        CustomizeSetAction.java
               src/java/org/apache/jetspeed/om/dbpsml/map
                        JetspeedGroupProfileMapBuilder.java
                        JetspeedRoleProfileMapBuilder.java
                        JetspeedUserProfileMapBuilder.java
               src/java/org/apache/jetspeed/services/profiler
                        JetspeedProfilerService.java
               src/java/org/apache/jetspeed/services/psmlmanager
                        TestMarshalPsml.java
               src/java/org/apache/jetspeed/util AutoProfile.java
               src/java/org/apache/jetspeed/util/template
                        BaseJetspeedLink.java JetspeedLink.java
               webapp/WEB-INF/conf JetspeedSecurity.properties
               webapp/WEB-INF/db jetspeed.properties jetspeed.script
               webapp/WEB-INF/psml/test testcase.psml
               webapp/WEB-INF/psml/user/admin/wml default.psml
               webapp/WEB-INF/psml/user/anon/wml default.psml
               webapp/WEB-INF/psml/user/anon/wml/en default.psml
               webapp/WEB-INF/psml/user/turbine/wml default.psml
               webapp/WEB-INF/templates/vm/controllers/html
                        card-customize.vm column-customize.vm
                        flow-customize.vm multicolumn-customize.vm
                        row-customize.vm
               webapp/WEB-INF/templates/vm/navigations/html top.vm
               webapp/WEB-INF/templates/vm/portlets/html browser-psml.vm
                        customizer-portlet.vm customizer-portletset-add.vm
                        customizer-portletset-addset.vm
                        customizer-portletset-general.vm
                        customizer-portletset-layout.vm
                        customizer-portletset.vm
  Added:       webapp/WEB-INF/psml/group/Jetspeed/html default.psml
                        news.psml
               webapp/WEB-INF/psml/group/apache/html default.psml news.psml
               webapp/WEB-INF/psml/role/admin/html default.psml
               webapp/WEB-INF/psml/role/user/html default.psml
  Removed:     webapp/WEB-INF/psml/group/Jetspeed default.psml news.psml
               webapp/WEB-INF/psml/group/apache default.psml news.psml
               webapp/WEB-INF/psml/role/admin default.psml
               webapp/WEB-INF/psml/role/user default.psml
  Log:
  Updated customizer to better support customizing any PSML resource in the system (group, role, mediatype, language ...)
  Tested from PSML Browser.
  
  The customizer needs a lot of work, however I won't have time for several weeks at least.
  If anyone wants to continue I can point them in the right direction.
  One example of smelly code needing a rewrite is AutoProfile.java - which hardcodes mediatypes.
  
  Revision  Changes    Path
  1.13      +13 -1     jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/controllers/MultiColumnControllerAction.java
  
  Index: MultiColumnControllerAction.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/controllers/MultiColumnControllerAction.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- MultiColumnControllerAction.java	30 Jun 2002 05:23:19 -0000	1.12
  +++ MultiColumnControllerAction.java	23 Jul 2002 00:03:54 -0000	1.13
  @@ -356,6 +356,13 @@
               try
               {
                   jsLink = JetspeedLinkFactory.getInstance(data);
  +                String mtype = data.getParameters().getString("mtype");
  +                if (mtype != null)
  +                {
  +                    jsLink.setMediaType(mtype);
  +                    jsLink.addQueryData("mtype", mtype);
  +                }
  +
               } catch (Exception e)
               {
                   Log.error(e);
  @@ -369,7 +376,6 @@
       public void doSave(RunData data, Context context)
       {
           Profile profile = ((JetspeedRunData)data).getProfile();
  -System.out.println("In " + this.getClass().getName() + ".doSave()");
           List[] columns = (List[])data.getUser().getTemp("columns");
   
           for (int col=0; col < columns.length; col++)
  @@ -382,6 +388,12 @@
   
           try
           {
  +            String mtype = data.getParameters().getString("mtype");
  +            if (mtype != null)
  +            {
  +                profile.setMediaType(mtype);
  +            }
  +
               profile.store();
           }
           catch (Exception e)
  
  
  
  1.14      +26 -12    jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/controllers/RowColumnControllerAction.java
  
  Index: RowColumnControllerAction.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/controllers/RowColumnControllerAction.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- RowColumnControllerAction.java	3 Jul 2002 17:10:19 -0000	1.13
  +++ RowColumnControllerAction.java	23 Jul 2002 00:03:54 -0000	1.14
  @@ -73,6 +73,7 @@
   import org.apache.jetspeed.util.AutoProfile;
   import org.apache.jetspeed.util.template.JetspeedLink;
   import org.apache.jetspeed.util.template.JetspeedLinkFactory;
  +import org.apache.jetspeed.services.Profiler;
   
   // Turbine stuff
   //import org.apache.turbine.util.DynamicURI;
  @@ -302,6 +303,13 @@
               try
               {
                   jsLink = JetspeedLinkFactory.getInstance(data);
  +                String mtype = data.getParameters().getString("mtype");
  +                if (mtype != null)
  +                {
  +                    jsLink.setMediaType(mtype);
  +                    jsLink.addQueryData("mtype", mtype);
  +                }
  +
               } catch (Exception e)
               {
                   Log.error(e);
  @@ -327,6 +335,12 @@
   
           try
           {
  +            String mtype = data.getParameters().getString("mtype");
  +            if (mtype != null)
  +            {
  +                profile.setMediaType(mtype);
  +            }
  +
               profile.store();
           }
           catch (Exception e)
  @@ -365,7 +379,7 @@
         Profile profile = jdata.getProfile();
   
         // ADDED for WML
  -      boolean isWML = (profile.getMediaType().equalsIgnoreCase("wml"));
  +      //boolean isWML = (profile.getMediaType().equalsIgnoreCase("wml"));
   
   
           if (customizedSet == null) return;
  @@ -397,8 +411,8 @@
                               set.removePortlets(i);
   
                               // MODIFIED: Save changes for wml profiles
  -                            if (isWML)
  -                              doSave(data, null);
  +                            //if (isWML)
  +                            //  doSave(data, null);
   
                               return;
                           }
  @@ -420,8 +434,8 @@
                               set.removeEntry(i);
   
                               // MODIFIED: Save changes for wml profiles
  -                            if (isWML)
  -                              doSave(data, null);
  +                            //if (isWML)
  +                            //  doSave(data, null);
                               return;
                           }
                       }
  @@ -433,8 +447,8 @@
                       set.removePortlets(position);
   
                       // MODIFIED: Save changes for wml profiles
  -                    if (isWML)
  -                      doSave(data, null);
  +                    //if (isWML)
  +                    //  doSave(data, null);
                       return;
                   }
   
  @@ -443,8 +457,8 @@
                       set.removeEntry(position);
   
                       // MODIFIED: Save changes for wml profiles
  -                    if (isWML)
  -                      doSave(data, null);
  +                    //if (isWML)
  +                    //  doSave(data, null);
                       return;
                   }
               }
  @@ -499,7 +513,7 @@
           Profile profile = jdata.getProfile();
   
           // ADDED for WML
  -        boolean isWML = (profile.getMediaType().equalsIgnoreCase("wml"));
  +        //boolean isWML = (profile.getMediaType().equalsIgnoreCase("wml"));
   
   
           if (customizedSet == null) return;
  @@ -632,7 +646,7 @@
   
   
       // MODIFIED: Save changes for wml profiles
  -    if (isWML)
  -      doSave(data, null);
  +    //if (isWML)
  +    //  doSave(data, null);
       }
   }
  
  
  
  1.11      +1 -1      jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/controls/Customize.java
  
  Index: Customize.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/controls/Customize.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- Customize.java	20 Jul 2002 04:48:32 -0000	1.10
  +++ Customize.java	23 Jul 2002 00:03:54 -0000	1.11
  @@ -95,7 +95,7 @@
           // Andreas Kempf, Siemens ICM S CP PE, Munich
           // ---------------------------------------------------------------------
   
  -        String editMediaType = rundata.getParameters().getString ("mediatype");
  +        String editMediaType = rundata.getParameters().getString ("mtype");
           String resetStack = rundata.getParameters().getString ("reset");
           
           // RESET (remove) all Stackentries - used on first customization!!!
  
  
  
  1.21      +12 -6     jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/portlets/CustomizeSetAction.java
  
  Index: CustomizeSetAction.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/portlets/CustomizeSetAction.java,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- CustomizeSetAction.java	20 Jul 2002 04:48:32 -0000	1.20
  +++ CustomizeSetAction.java	23 Jul 2002 00:03:54 -0000	1.21
  @@ -145,8 +145,7 @@
           String mediaType = jdata.getProfile().getMediaType ();
   
           // set velocity variable of mediatype (displayed in the customizer menu)
  -        context.put("mediatype", profile.getMediaType());
  -
  +        context.put("mtype", profile.getMediaType());
   
           // make the list of already used panes/portlets available through the 'runs' reference
           context.put("runs", AutoProfile.getPortletList(rundata));
  @@ -311,6 +310,12 @@
           Profile profile = ((JetspeedRunData)rundata).getProfile();
           try
           {
  +            String mtype = rundata.getParameters().getString("mtype");
  +
  +            if (mtype != null)
  +            {
  +                profile.setMediaType(mtype);
  +            }
               profile.store();
           }
           catch (Exception e)
  @@ -363,7 +368,8 @@
            * Andreas Kempf, Siemens ICM S CP PE, Munich
            * mailto: A.Kempf@web.de
            */
  -        boolean isWML = AutoProfile.doIt (rundata, true).getMediaType().equalsIgnoreCase("wml");
  +        //boolean isWML = AutoProfile.doIt (rundata, true).getMediaType().equalsIgnoreCase("wml");
  +        AutoProfile.doIt (rundata, true);
   
           PortletSet set = (PortletSet)((JetspeedRunData)rundata).getCustomized();
           String[] pnames = rundata.getParameters().getStrings("pname");
  @@ -409,8 +415,8 @@
                       {
                         Entry p = new PsmlEntry();
                         // add the ClearPortletControl to wml entries      
  -                      if (isWML)
  -                        p.setControl (ctrl);
  +                      //if (isWML)
  +                      //  p.setControl (ctrl);
                       
                         p.setParent(pnames[i]);
                         p.setId(JetspeedIdGenerator.getNextPeid());
  @@ -430,12 +436,12 @@
            * last modified: 10/31/01
            * Andreas Kempf, Siemens ICM S CP PE, Munich
            * mailto: A.Kempf@web.de
  -         */
           if (isWML)
           {
             ((JetspeedRunData)rundata).getProfile().store();
             //rundata.save();
           }
  +         */
           
       }
       
  
  
  
  1.8       +1 -1      jakarta-jetspeed/src/java/org/apache/jetspeed/om/dbpsml/map/JetspeedGroupProfileMapBuilder.java
  
  Index: JetspeedGroupProfileMapBuilder.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/om/dbpsml/map/JetspeedGroupProfileMapBuilder.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- JetspeedGroupProfileMapBuilder.java	19 Jul 2002 20:56:19 -0000	1.7
  +++ JetspeedGroupProfileMapBuilder.java	23 Jul 2002 00:03:54 -0000	1.8
  @@ -11,7 +11,7 @@
   /**
     *  This class was autogenerated by Torque on: 
     *
  -  * [Thu Jul 18 10:48:37 PDT 2002]
  +  * [Mon Jul 22 11:16:52 PDT 2002]
     *
     */
   public class JetspeedGroupProfileMapBuilder implements MapBuilder
  
  
  
  1.8       +1 -1      jakarta-jetspeed/src/java/org/apache/jetspeed/om/dbpsml/map/JetspeedRoleProfileMapBuilder.java
  
  Index: JetspeedRoleProfileMapBuilder.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/om/dbpsml/map/JetspeedRoleProfileMapBuilder.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- JetspeedRoleProfileMapBuilder.java	19 Jul 2002 20:56:19 -0000	1.7
  +++ JetspeedRoleProfileMapBuilder.java	23 Jul 2002 00:03:54 -0000	1.8
  @@ -11,7 +11,7 @@
   /**
     *  This class was autogenerated by Torque on: 
     *
  -  * [Thu Jul 18 10:48:37 PDT 2002]
  +  * [Mon Jul 22 11:16:52 PDT 2002]
     *
     */
   public class JetspeedRoleProfileMapBuilder implements MapBuilder
  
  
  
  1.8       +1 -1      jakarta-jetspeed/src/java/org/apache/jetspeed/om/dbpsml/map/JetspeedUserProfileMapBuilder.java
  
  Index: JetspeedUserProfileMapBuilder.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/om/dbpsml/map/JetspeedUserProfileMapBuilder.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- JetspeedUserProfileMapBuilder.java	19 Jul 2002 20:56:19 -0000	1.7
  +++ JetspeedUserProfileMapBuilder.java	23 Jul 2002 00:03:54 -0000	1.8
  @@ -11,7 +11,7 @@
   /**
     *  This class was autogenerated by Torque on: 
     *
  -  * [Thu Jul 18 10:48:37 PDT 2002]
  +  * [Mon Jul 22 11:16:52 PDT 2002]
     *
     */
   public class JetspeedUserProfileMapBuilder implements MapBuilder
  
  
  
  1.34      +11 -1     jakarta-jetspeed/src/java/org/apache/jetspeed/services/profiler/JetspeedProfilerService.java
  
  Index: JetspeedProfilerService.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/services/profiler/JetspeedProfilerService.java,v
  retrieving revision 1.33
  retrieving revision 1.34
  diff -u -r1.33 -r1.34
  --- JetspeedProfilerService.java	28 Jun 2002 05:37:33 -0000	1.33
  +++ JetspeedProfilerService.java	23 Jul 2002 00:03:54 -0000	1.34
  @@ -669,6 +669,9 @@
               paramMediaType = rundata.getParameters().getString( Profiler.PARAM_MEDIA_TYPE );
               if (null != paramMediaType)
                   return paramMediaType;
  +            paramMediaType = rundata.getParameters().getString( "mtype" );
  +            if (null != paramMediaType)
  +                return paramMediaType;
           }
   
           MimeType mimeType = cm.getPreferredType();
  @@ -767,6 +770,13 @@
           if (null != page)
           {
               uri.addPathInfo(Profiler.PARAM_PAGE, page);
  +        }
  +
  +       // check mediatype to add to the uri
  +        String mtype = data.getParameters().getString("mtype");
  +        if (null != mtype)
  +        {
  +            uri.addPathInfo(Profiler.PARAM_MEDIA_TYPE, mtype);
           }
   
           return uri;
  
  
  
  1.8       +3 -5      jakarta-jetspeed/src/java/org/apache/jetspeed/services/psmlmanager/TestMarshalPsml.java
  
  Index: TestMarshalPsml.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/services/psmlmanager/TestMarshalPsml.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- TestMarshalPsml.java	28 Jun 2002 05:37:33 -0000	1.7
  +++ TestMarshalPsml.java	23 Jul 2002 00:03:54 -0000	1.8
  @@ -300,15 +300,13 @@
                   assertTrue(ref.getId().equals("300"));
                   Portlets epr = ref.getPortletsReference();
                   assertNotNull(epr);
  -                assertTrue(ref.getPath().equals("group/apache/page/news"));
  +                assertTrue(ref.getPath().equals("group/apache/page/news/media-type/html"));
                   assertTrue(epr.getMetaInfo().getTitle().equals("Default Apache News page"));
                   // DST: - TODO: only use 'test' psml for unit tests -
                   // otherwise the tests are against moving targets;
                   // DST: assertTrue(epr.getController().getParameter("mode").getValue().equals("row"));
                   // DST: assertTrue(epr.getSkin().getParameter("selected-color").getValue().equals("#990000"));
  -                Portlets epr2 = epr.getPortlets(0);
  -                assertNotNull(epr2);
  -                Entry ent = epr2.getEntry(0);
  +                Entry ent = epr.getEntry(0);
                   assertTrue(ent.getParent().equals("Apacheweek"));
   
                   Iterator itt = p.getPortletsIterator();
  
  
  
  1.5       +29 -12    jakarta-jetspeed/src/java/org/apache/jetspeed/util/AutoProfile.java
  
  Index: AutoProfile.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/util/AutoProfile.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- AutoProfile.java	20 Jul 2002 04:48:32 -0000	1.4
  +++ AutoProfile.java	23 Jul 2002 00:03:55 -0000	1.5
  @@ -29,12 +29,6 @@
        */
       public static Profile loadProfile (RunData rundata, String mediaType) throws Exception
       {
  -
  -System.out.println("LOADING PROFILE: " + mediaType);
  -//      Profile profile = Profiler.getProfile(rundata);
  -//      ((JetspeedRunData)rundata).setProfile (profile);
  -//      return profile;
  -
         if ((mediaType != null) && (mediaType.equalsIgnoreCase("wml")))
         {
           
  @@ -45,15 +39,23 @@
           // It is essential that a session object exists!
           rundata.getSession().setAttribute ("customizeType", "wml");
         }
  -      else
  +      else if ((mediaType != null) && (mediaType.equalsIgnoreCase("xml")))
         {
  -
           ((JetspeedRunData)rundata).getProfile().store();
  -        Profile myPro = Profiler.getProfile (rundata, MimeType.HTML);
  +        Profile myPro = Profiler.getProfile (rundata, MimeType.XML);
           ((JetspeedRunData)rundata).setProfile (myPro);
   
           // It is essential that a session object exists!
  -        rundata.getSession().setAttribute ("customizeType", "html");
  +        rundata.getSession().setAttribute ("customizeType", "xml");
  +      }
  +      else
  +      {
  +          ((JetspeedRunData)rundata).getProfile().store();
  +          Profile myPro = Profiler.getProfile (rundata, MimeType.HTML);
  +          ((JetspeedRunData)rundata).setProfile (myPro);
  +
  +          // It is essential that a session object exists!
  +          rundata.getSession().setAttribute ("customizeType", "html");
         }
   
         return ((JetspeedRunData)rundata).getProfile();                
  @@ -90,8 +92,23 @@
           else
               return loadProfile (rundata, "wml");
         }
  -      else
  -      if ((mediaType != null) && (mediaType.equalsIgnoreCase ("html")))
  +      else if ((mediaType != null) && (mediaType.equalsIgnoreCase ("xml")))
  +      {
  +          // WML Profil nicht laden, wenn bereits vorhanden!
  +          if (notForce)                
  +          {
  +            if (!((JetspeedRunData)rundata).getProfile().getMediaType ().equalsIgnoreCase("xml"))
  +            {
  +              return loadProfile (rundata, "xml");
  +            }
  +          }
  +          // WML auf jeden Fall neu laden!
  +          else
  +              return loadProfile (rundata, "xml");
  +
  +
  +      }
  +      else if ((mediaType != null) && (mediaType.equalsIgnoreCase ("html")))
         {
           // HTML Profil nicht laden, wenn bereits vorhanden!
           if (notForce)                
  
  
  
  1.14      +6 -1      jakarta-jetspeed/src/java/org/apache/jetspeed/util/template/BaseJetspeedLink.java
  
  Index: BaseJetspeedLink.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/util/template/BaseJetspeedLink.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- BaseJetspeedLink.java	8 Jul 2002 10:44:49 -0000	1.13
  +++ BaseJetspeedLink.java	23 Jul 2002 00:03:55 -0000	1.14
  @@ -1234,4 +1234,9 @@
           // empty
       }
       
  +    public DynamicURI setMediaType(String mediaType)
  +    {
  +        return getLink( JetspeedLink.CURRENT, null, null, JetspeedLink.DEFAULT, null, null,null,null,mediaType);
  +    }
  +
   }
  
  
  
  1.11      +3 -1      jakarta-jetspeed/src/java/org/apache/jetspeed/util/template/JetspeedLink.java
  
  Index: JetspeedLink.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/util/template/JetspeedLink.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- JetspeedLink.java	8 Jul 2002 10:44:49 -0000	1.10
  +++ JetspeedLink.java	23 Jul 2002 00:03:55 -0000	1.11
  @@ -448,6 +448,8 @@
        */
       public DynamicURI setPage(String page, String paneName);
       
  +    public DynamicURI setMediaType(String mediaType);
  +
       /**
        * Return an link to a specific portlet using the portet's id
        *
  
  
  
  1.19      +0 -0      jakarta-jetspeed/webapp/WEB-INF/conf/JetspeedSecurity.properties
  
  Index: JetspeedSecurity.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/conf/JetspeedSecurity.properties,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  
  
  
  1.15      +1 -1      jakarta-jetspeed/webapp/WEB-INF/db/jetspeed.properties
  
  Index: jetspeed.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/db/jetspeed.properties,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- jetspeed.properties	16 Jul 2002 17:27:07 -0000	1.14
  +++ jetspeed.properties	23 Jul 2002 00:03:55 -0000	1.15
  @@ -1,4 +1,4 @@
   #Hypersonic SQL database
  -#Tue Jul 16 09:48:08 PDT 2002
  +#Mon Jul 22 16:57:40 PDT 2002
   version=1.4
   modified=yes
  
  
  
  1.18      +1 -1      jakarta-jetspeed/webapp/WEB-INF/db/jetspeed.script
  
  Index: jetspeed.script
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/db/jetspeed.script,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- jetspeed.script	16 Jul 2002 17:27:07 -0000	1.17
  +++ jetspeed.script	23 Jul 2002 00:03:55 -0000	1.18
  @@ -164,4 +164,4 @@
   INSERT INTO COFFEES VALUES('KenyanGrade',2,7.99,1,2)
   INSERT INTO COFFEES VALUES('JoeGrade',3,7.99,1,2)
   INSERT INTO COFFEES VALUES('CantThinkOfAnymoreGrade',4,7.99,1,2)
  -/*C1*/CONNECT USER sa PASSWORD ""
  +/*C2*/CONNECT USER sa PASSWORD ""
  
  
  
  1.1                  jakarta-jetspeed/webapp/WEB-INF/psml/group/Jetspeed/html/default.psml
  
  Index: default.psml
  ===================================================================
  <?xml version="1.0" encoding="UTF-8"?>
  <portlets id="P-ef3491cc2a-10002">
      <metainfo>
          <title>Default Jetspeed Group page</title>
      </metainfo>
      <skin name="orange-red"/>
      <controller name="RowController"/>
      <entry id="P-ef3491cc34-10004" parent="Apacheweek"/>
      <entry id="P-ef3491cc34-10005" parent="Mozilla">
          <parameter name="itemDisplayed" value="5"/>
      </entry>
      <entry id="P-ef3491cc34-10007" parent="XMLHack"/>
  </portlets>
  
  
  
  1.1                  jakarta-jetspeed/webapp/WEB-INF/psml/group/Jetspeed/html/news.psml
  
  Index: news.psml
  ===================================================================
  <?xml version="1.0" encoding="iso-8859-1"?>
  <portlets user="default" xmlns="http://xml.apache.org/jetspeed/2000/psml">
      <metainfo>
          <title>Default Jetspeed News page</title>
      </metainfo>
      <skin name="orange-red" />
      <controller name="ColumnController"/>
      <control name="TitlePortletControl"/>
      <entry id="P-ef3477167b-1001c" parent="Apacheweek"/>
      <entry id="P-ef3477167b-1001d" parent="XMLHack"/>
  </portlets>
  
  
  1.1                  jakarta-jetspeed/webapp/WEB-INF/psml/group/apache/html/default.psml
  
  Index: default.psml
  ===================================================================
  <?xml version="1.0" encoding="UTF-8"?>
  <portlets user="default" >
      <metainfo>
        <title>Default Apache Group page</title>
      </metainfo>
  
    <controller name="RowController"/>
    <control name="TitlePortletControl"/>
  
      <skin>
        <property name="background-color" value="#eeeeee"/>
      </skin>
  
      <entry type="ref" parent="Apacheweek"/>
      <entry type="ref" parent="Mozilla">
        <parameter name="itemDisplayed" value="5"/>
      </entry>
  
      <entry type="ref" parent="XMLHack"/>
  
  </portlets>
  
  
  1.1                  jakarta-jetspeed/webapp/WEB-INF/psml/group/apache/html/news.psml
  
  Index: news.psml
  ===================================================================
  <?xml version="1.0" encoding="iso-8859-1"?>
  <portlets id='5000' xmlns="http://xml.apache.org/jetspeed/2000/psml">
      <metainfo>
        <title>Default Apache News page</title>
      </metainfo>
  
    <skin name="orange-red" />
  
     <controller name="ColumnController"/>
  
    <entry id='5001' type="ref" parent="Apacheweek">
    </entry>
  
    <entry id='5002' type="ref" parent="XMLHack">
    </entry>
  
  
  </portlets>
  
  
  1.1                  jakarta-jetspeed/webapp/WEB-INF/psml/role/admin/html/default.psml
  
  Index: default.psml
  ===================================================================
  <?xml version="1.0" encoding="iso-8859-1"?>
  <portlets user="default" xmlns="http://xml.apache.org/jetspeed/2000/psml">
  
    <controller name="TwoColumns" />
    <skin name="orange-red" />
  
    <entry type="ref" parent="Apacheweek">
      <layout>
        <property name="row" value="0"/>
        <property name="column" value="0"/>
      </layout>
    </entry>
  
    <entry type="ref" parent="Mozilla">
      <parameter name="itemDisplayed" value="5"/>
      <layout>
        <property name="row" value="1"/>
        <property name="column" value="0"/>
      </layout>
    </entry>
  
    <entry type="ref" parent="XMLHack">
      <layout>
        <property name="row" value="0"/>
        <property name="column" value="1"/>
      </layout>
    </entry>
  
  </portlets>
  
  
  1.1                  jakarta-jetspeed/webapp/WEB-INF/psml/role/user/html/default.psml
  
  Index: default.psml
  ===================================================================
  <?xml version="1.0" encoding="iso-8859-1"?>
  <portlets user="default" xmlns="http://xml.apache.org/jetspeed/2000/psml">
  
    <controller name="TwoColumns" />
    <skin name="orange-red" />
  
    <entry type="ref" parent="Apacheweek">
      <layout>
        <property name="row" value="0"/>
        <property name="column" value="0"/>
      </layout>
    </entry>
  
    <entry type="ref" parent="Mozilla">
      <parameter name="itemDisplayed" value="5"/>
      <layout>
        <property name="row" value="1"/>
        <property name="column" value="0"/>
      </layout>
    </entry>
  
    <entry type="ref" parent="XMLHack">
      <layout>
        <property name="row" value="0"/>
        <property name="column" value="1"/>
      </layout>
    </entry>
  
  </portlets>
  
  
  1.6       +2 -2      jakarta-jetspeed/webapp/WEB-INF/psml/test/testcase.psml
  
  Index: testcase.psml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/psml/test/testcase.psml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- testcase.psml	28 Jun 2002 05:37:38 -0000	1.5
  +++ testcase.psml	23 Jul 2002 00:03:56 -0000	1.6
  @@ -68,8 +68,8 @@
               </layout>
           </entry>
   
  -        <reference id='300' name='ReferenceTest' path='group/apache/page/news'/>
  -        <reference id='301' name='ReferenceTest2' path='group/apache'/>
  +        <reference id='300' name='ReferenceTest' path='group/apache/page/news/media-type/html'/>
  +        <reference id='301' name='ReferenceTest2' path='group/apache/media-type/html'/>
   
       </portlets>
   
  
  
  
  1.3       +8 -3      jakarta-jetspeed/webapp/WEB-INF/psml/user/admin/wml/default.psml
  
  Index: default.psml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/psml/user/admin/wml/default.psml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- default.psml	4 May 2002 18:03:20 -0000	1.2
  +++ default.psml	23 Jul 2002 00:03:56 -0000	1.3
  @@ -2,8 +2,13 @@
   <portlets xmlns="http://www.apache.org/2000/02/CVS">
       <controller name="FlowPortletController"/>
       <control name="ClearPortletControl"/>
  -    <portlets>
  -        <controller name="ColumnController"/>
  +
  +      <entry parent="StockQuote">
           <control name="ClearPortletControl"/>
  -    </portlets>
  +      </entry>
  +
  +      <entry parent="MyWeather">
  +        <control name="ClearPortletControl"/>
  +      </entry>
  +
   </portlets>
  
  
  
  1.3       +0 -3      jakarta-jetspeed/webapp/WEB-INF/psml/user/anon/wml/default.psml
  
  Index: default.psml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/psml/user/anon/wml/default.psml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- default.psml	28 Jun 2002 05:37:38 -0000	1.2
  +++ default.psml	23 Jul 2002 00:03:56 -0000	1.3
  @@ -4,7 +4,6 @@
   <controller name="FlowPortletController"/>
   <control name="ClearPortletControl"/>
   
  -<portlets>
         <controller name="ColumnController"/>
         <control name="ClearPortletControl"/>
   
  @@ -15,7 +14,5 @@
         <entry parent="MyWeather">
           <control name="ClearPortletControl"/>
         </entry>
  -
  -</portlets>
   
   </portlets>
  
  
  
  1.3       +7 -10     jakarta-jetspeed/webapp/WEB-INF/psml/user/anon/wml/en/default.psml
  
  Index: default.psml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/psml/user/anon/wml/en/default.psml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- default.psml	28 Jun 2002 05:37:38 -0000	1.2
  +++ default.psml	23 Jul 2002 00:03:56 -0000	1.3
  @@ -1,17 +1,14 @@
  -<?xml version="1.0" encoding="iso-8859-1"?>
  -<portlets xmlns="http://xml.apache.org/jetspeed/2000/psml">
  -
  -<controller name="FlowPortletController"/>
  -<control name="ClearPortletControl"/>
  -
  -<portlets>
  -      <controller name="ColumnController"/>
  -      <control name="ClearPortletControl"/>
  +<?xml version="1.0" encoding="UTF-8"?>
  +<portlets xmlns="http://www.apache.org/2000/02/CVS">
  +    <controller name="FlowPortletController"/>
  +    <control name="ClearPortletControl"/>
   
         <entry parent="StockQuote">
           <control name="ClearPortletControl"/>
         </entry>
   
  -</portlets>
  +      <entry parent="MyWeather">
  +        <control name="ClearPortletControl"/>
  +      </entry>
   
   </portlets>
  
  
  
  1.5       +8 -3      jakarta-jetspeed/webapp/WEB-INF/psml/user/turbine/wml/default.psml
  
  Index: default.psml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/psml/user/turbine/wml/default.psml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- default.psml	4 May 2002 18:03:20 -0000	1.4
  +++ default.psml	23 Jul 2002 00:03:56 -0000	1.5
  @@ -2,9 +2,14 @@
   <portlets xmlns="http://www.apache.org/2000/02/CVS">
       <controller name="FlowPortletController"/>
       <control name="ClearPortletControl"/>
  -    <portlets>
  -        <controller name="ColumnController"/>
  +
  +      <entry parent="StockQuote">
           <control name="ClearPortletControl"/>
  -    </portlets>
  +      </entry>
  +
  +      <entry parent="MyWeather">
  +        <control name="ClearPortletControl"/>
  +      </entry>
  +
   </portlets>
   
  
  
  
  1.11      +12 -2     jakarta-jetspeed/webapp/WEB-INF/templates/vm/controllers/html/card-customize.vm
  
  Index: card-customize.vm
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/vm/controllers/html/card-customize.vm,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- card-customize.vm	23 May 2002 03:23:42 -0000	1.10
  +++ card-customize.vm	23 Jul 2002 00:03:56 -0000	1.11
  @@ -69,7 +69,12 @@
     #end    
       </td>
       <td valign="top" align="center">
  -      <form action="$jslink.Template" method="post">
  +      #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
   #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">
  @@ -98,7 +103,12 @@
     <table cellspacing="2">
       <tr>
         <td>
  -        <form action="$jslink.Template" method="post">
  +        #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
             #if ($!action) <input type="hidden" name="$jslink.ActionKey" value="$action" > #end
             <table cellspacing="2">
               <tr>
  
  
  
  1.9       +12 -2     jakarta-jetspeed/webapp/WEB-INF/templates/vm/controllers/html/column-customize.vm
  
  Index: column-customize.vm
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/vm/controllers/html/column-customize.vm,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- column-customize.vm	23 May 2002 03:23:42 -0000	1.8
  +++ column-customize.vm	23 Jul 2002 00:03:56 -0000	1.9
  @@ -70,7 +70,12 @@
         #end    
         </td>
         <td valign="top" align="center" >
  -        <form action="$jslink.Template" method="post">
  +          #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
             #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">
  @@ -99,7 +104,12 @@
     <table cellspacing="2">
       <tr>
         <td>
  -        <form action="$jslink.Template" method="post">
  +          #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
             #if ($!action) <input type="hidden" name="$jslink.ActionKey" value="$action" > #end
             <table cellspacing="2">
               <tr>
  
  
  
  1.4       +12 -2     jakarta-jetspeed/webapp/WEB-INF/templates/vm/controllers/html/flow-customize.vm
  
  Index: flow-customize.vm
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/vm/controllers/html/flow-customize.vm,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- flow-customize.vm	23 May 2002 03:23:42 -0000	1.3
  +++ flow-customize.vm	23 Jul 2002 00:03:56 -0000	1.4
  @@ -70,7 +70,12 @@
         #end    
         </td>
         <td valign="top" align="center" >
  -        <form action="$jslink.Template" method="post">
  +          #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
             #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">
  @@ -99,7 +104,12 @@
     <table cellspacing="2">
       <tr>
         <td>
  -        <form action="$jslink.Template" method="post">
  +          #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
             #if ($!action) <input type="hidden" name="$jslink.ActionKey" value="$action" > #end
             <table cellspacing="2">
               <tr>
  
  
  
  1.11      +12 -2     jakarta-jetspeed/webapp/WEB-INF/templates/vm/controllers/html/multicolumn-customize.vm
  
  Index: multicolumn-customize.vm
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/vm/controllers/html/multicolumn-customize.vm,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- multicolumn-customize.vm	30 Jun 2002 05:23:19 -0000	1.10
  +++ multicolumn-customize.vm	23 Jul 2002 00:03:56 -0000	1.11
  @@ -19,7 +19,12 @@
   #foreach ( $portlet in $column )
         <tr>
           <td width="100%">
  -          <form action="$jslink.Template" method="post">
  +      #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
   #if ($action) <input type="hidden" name="$jslink.ActionKey" value="$action" /> #end
             <input type="hidden" name="col" value="$col" />
             <input type="hidden" name="row" value="$row" />
  @@ -117,7 +122,12 @@
     </tr>
   </table>
   <br>
  -<form action="$jslink.Template" method="post">
  +#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
     #if ($action) <input type="hidden" name="$jslink.ActionKey" value="$action" > #end
     <center>
       <input type="submit" name="eventSubmit_doSave" value="$l10n.CUSTOMIZER_SAVEAPPLY" >
  
  
  
  1.8       +12 -2     jakarta-jetspeed/webapp/WEB-INF/templates/vm/controllers/html/row-customize.vm
  
  Index: row-customize.vm
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/vm/controllers/html/row-customize.vm,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- row-customize.vm	23 May 2002 03:23:42 -0000	1.7
  +++ row-customize.vm	23 Jul 2002 00:03:56 -0000	1.8
  @@ -70,7 +70,12 @@
     #end    
       </td>
       <td valign="top" align="center">
  -      <form action="$jlink" method="post">
  +    #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
   #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">
  @@ -99,7 +104,12 @@
     <table cellspacing="2">
       <tr>
         <td>
  -        <form action="$jlink" method="post">
  +        #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
             #if ($!action) <input type="hidden" name="$jlink.ActionKey" value="$action" > #end
             <table cellspacing="2">
               <tr>
  
  
  
  1.18      +1 -1      jakarta-jetspeed/webapp/WEB-INF/templates/vm/navigations/html/top.vm
  
  Index: top.vm
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/vm/navigations/html/top.vm,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- top.vm	20 Jul 2002 04:48:32 -0000	1.17
  +++ top.vm	23 Jul 2002 00:03:56 -0000	1.18
  @@ -45,7 +45,7 @@
               <td align="right"  style="font-size:10">
                 $l10n.TOP_CUSTOMIZE: 
                 <a href="$jslink.setAction("controls.Customize").addQueryData("reset","on")" style="font-size:10">HTML</a>
  -              <a href="$jslink.setAction("controls.Customize").addQueryData("reset","on").addQueryData("media-type","wml")"  style="font-size:10">WML</a>
  +              <a href="$jslink.setAction("controls.Customize").addQueryData("reset","on").addQueryData("mtype","wml")"  style="font-size:10">WML</a>
               </td>
             </tr>
             <tr>
  
  
  
  1.5       +2 -1      jakarta-jetspeed/webapp/WEB-INF/templates/vm/portlets/html/browser-psml.vm
  
  Index: browser-psml.vm
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/vm/portlets/html/browser-psml.vm,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- browser-psml.vm	20 Jul 2002 02:04:28 -0000	1.4
  +++ browser-psml.vm	23 Jul 2002 00:03:56 -0000	1.5
  @@ -73,7 +73,8 @@
       #end
   
       #if ($mediaType != "null")
  -        #set ($link1 = $link1.addPathInfo("media-type",$mediaType))
  +        #set ($link1 = $link1.addPathInfo("mtype",$mediaType))
  +        #set ($link1 = $link1.addPathInfo("reset","on"))
           #set ($blank = $blank + 1 )
           #if($prevMediaType == $mediaType)
               #if($prevCatName == $catName)
  
  
  
  1.9       +6 -1      jakarta-jetspeed/webapp/WEB-INF/templates/vm/portlets/html/customizer-portlet.vm
  
  Index: customizer-portlet.vm
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/vm/portlets/html/customizer-portlet.vm,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- customizer-portlet.vm	2 Jul 2002 07:22:38 -0000	1.8
  +++ customizer-portlet.vm	23 Jul 2002 00:03:56 -0000	1.9
  @@ -1,7 +1,12 @@
   <!-- WEB-INF\templates\vm\portlets\html\customizer-portlet.vm -->
   <br>
   #set ($config = $portlet.PortletConfig)
  -<form action=" $jslink.Template" method="post">
  +#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
   #if ($action)
     <input name="$jslink.ActionKey" type="hidden" value="$action">
   #end
  
  
  
  1.9       +6 -1      jakarta-jetspeed/webapp/WEB-INF/templates/vm/portlets/html/customizer-portletset-add.vm
  
  Index: customizer-portletset-add.vm
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/vm/portlets/html/customizer-portletset-add.vm,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- customizer-portletset-add.vm	19 Jul 2002 20:56:19 -0000	1.8
  +++ customizer-portletset-add.vm	23 Jul 2002 00:03:56 -0000	1.9
  @@ -1,6 +1,11 @@
   <!-- WEB-INF\templates\vm\portlets\html\customizer-portletset-add.vm -->
   <br>
  -<form action="$jslink.Template" method="post">
  +#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
     #if ($action) <input name="$jslink.ActionKey" type="hidden" value="$action" > #end 
     <center>
       <table width="80%" border="1" cellspacing="0">
  
  
  
  1.6       +6 -1      jakarta-jetspeed/webapp/WEB-INF/templates/vm/portlets/html/customizer-portletset-addset.vm
  
  Index: customizer-portletset-addset.vm
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/vm/portlets/html/customizer-portletset-addset.vm,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- customizer-portletset-addset.vm	7 May 2002 14:17:06 -0000	1.5
  +++ customizer-portletset-addset.vm	23 Jul 2002 00:03:56 -0000	1.6
  @@ -1,6 +1,11 @@
   <!-- WEB-INF\templates\vm\portlets\html\customizer-portletset-addset.vm -->
   <br>
  -<form action="$jslink.Template" method="post">
  +#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
     #if ($action) <input name="$jslink.ActionKey" type="hidden" value="$action"> #end
     <table width="100%" cellspacing="2" cellpadding="0">
       <tr>
  
  
  
  1.6       +6 -1      jakarta-jetspeed/webapp/WEB-INF/templates/vm/portlets/html/customizer-portletset-general.vm
  
  Index: customizer-portletset-general.vm
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/vm/portlets/html/customizer-portletset-general.vm,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- customizer-portletset-general.vm	7 May 2002 14:17:06 -0000	1.5
  +++ customizer-portletset-general.vm	23 Jul 2002 00:03:56 -0000	1.6
  @@ -1,6 +1,11 @@
   <!-- WEB-INF\templates\vm\portlets\html\customizer-portletset-general.vm -->
   <br>
  -<form action="$jslink.Template" method="post">
  +#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
     #if ($action) <input name="$jslink.ActionKey" type="hidden" value="$action"> #end
     <table cellspacing="2" cellpadding="0">
       <tr>
  
  
  
  1.10      +29 -10    jakarta-jetspeed/webapp/WEB-INF/templates/vm/portlets/html/customizer-portletset-layout.vm
  
  Index: customizer-portletset-layout.vm
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/vm/portlets/html/customizer-portletset-layout.vm,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- customizer-portletset-layout.vm	20 Jul 2002 04:48:33 -0000	1.9
  +++ customizer-portletset-layout.vm	23 Jul 2002 00:03:56 -0000	1.10
  @@ -9,13 +9,18 @@
           $l10n.CUSTOMIZER_LAYOUT :
         </td>
         <td valign="middle">
  -        <form name="controllers" action="$jslink.Template" method="post">
  +          #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
             #if ($action)
               <input name="$jslink.ActionKey" type="hidden" value="$action">
             #end
               <input type="hidden" name="eventSubmit_doLayout" value="layout">
             ## No Controller-Selection for WML Profiles
  -          #if (($!mediatype=="wml") || ($!mediatype=="WML"))
  +          #if (($!mtype=="wml") || ($!mtype=="WML"))
               <select name="controller" onChange="document.controllers.submit()" disabled>
             #else
               <select name="controller" onChange="document.controllers.submit()">
  @@ -31,7 +36,7 @@
             #end
             </select>
             ## No submit-Button for WML Profiles
  -          #if (($!mediatype=="wml") || ($!mediatype=="WML"))
  +          #if (($!mtype=="wml") || ($!mtype=="WML"))
   ##            <input type="submit" value="OK" disabled class="BUTON">
             #else
   ##            <input type="submit" name="btn_submit" value="OK" disabled>
  @@ -45,7 +50,12 @@
           $l10n.CUSTOMIZER_DECORATION  :
         </td>
         <td valign="middle">
  -        <form name="controls" action="$jslink.Template" method="post">
  +          #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
             #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()">
  @@ -64,10 +74,15 @@
           $l10n.CUSTOMIZER_SKIN :
         </td>
         <td valign="middle">
  -        <form name="skins" action="$jslink.Template" method="post">
  +        #set ($mtype = $!data.Parameters.getString("mtype"))
  +        #if ($!mtype) 
  +          <form name="skins" action="$jslink.Template.addQueryData('mtype', $mtype)" method="post">
  +        #else
  +          <form name="skins" action="$jslink.Template" method="post">
  +        #end
           #if ($action) <input name="$jslink.ActionKey" type="hidden" value="$action" > #end
           <input type="hidden" name="eventSubmit_doSkin" value="skin">        ## No Controller-Selection for WML Profiles
  -        #if (($!mediatype=="wml") || ($!mediatype=="WML"))
  +        #if (($!mtype=="wml") || ($!mtype=="WML"))
             <select name="skin" onChange="document.skins.submit()" disabled>
           #else
             <select name="skin" onChange="document.skins.submit()">
  @@ -80,7 +95,7 @@
           </select>
   
           ## No submit-Button for WML Profiles
  -        #if (($!mediatype=="wml") || ($!mediatype=="WML"))
  +        #if (($!mtype=="wml") || ($!mtype=="WML"))
   ##        <input type="submit" value="OK" disabled>
           #else
   ##        <input type="submit" value="OK">
  @@ -95,10 +110,14 @@
           $l10n.CUSTOMIZER_SECURITY_REF :
         </td>
         <td valign="middle">
  -        <form name="securityRefs" action="$jslink.Template" method="post">
  +        #if ($!mtype) 
  +          <form name="securityRefs" action="$jslink.Template.addQueryData('mtype', $mtype)" method="post">
  +        #else
  +          <form name="securityRefs" action="$jslink.Template" method="post">
  +        #end
           #if ($action) <input name="$jslink.ActionKey" type="hidden" value="$action" > #end
           <input type="hidden" name="eventSubmit_doSecurity" value="securityRef">        ## No Controller-Selection for WML Profiles
  -        #if (($!mediatype=="wml") || ($!mediatype=="WML"))
  +        #if (($!mtype=="wml") || ($!mtype=="WML"))
             <select name="securityRef" onChange="document.securityRefs.submit()" disabled>
           #else
             <select name="securityRef" onChange="document.securityRefs.submit()">
  @@ -111,7 +130,7 @@
           </select>
   
           ## No submit-Button for WML Profiles
  -        #if (($!mediatype=="wml") || ($!mediatype=="WML"))
  +        #if (($!mtype=="wml") || ($!mtype=="WML"))
   ##        <input type="submit" value="OK" disabled>
           #else
   ##        <input type="submit" value="OK">
  
  
  
  1.11      +25 -6     jakarta-jetspeed/webapp/WEB-INF/templates/vm/portlets/html/customizer-portletset.vm
  
  Index: customizer-portletset.vm
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/vm/portlets/html/customizer-portletset.vm,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- customizer-portletset.vm	20 Jul 2002 04:48:33 -0000	1.10
  +++ customizer-portletset.vm	23 Jul 2002 00:03:57 -0000	1.11
  @@ -3,21 +3,31 @@
     <tr>
       <td align="left" nowrap width="20%" >
         ## Show customizer content-type
  -      #if ($mediatype)
  -        $l10n.CUSTOMIZER_MEDIATYPE : <b>$mediatype</b>
  +      #if ($mtype)
  +        $l10n.CUSTOMIZER_MEDIATYPE : <b>$mtype</b>
         #else
           &nbsp;
         #end
       </td>
  +#set ($mtype = $!data.Parameters.getString("mtype"))
   
       <td align="center"  width="20%" valign="middle">
  -      <form action=" $jslink.Template.addPathInfo("mode","layout")">
  +      #if ($!mtype) 
  +        <form action="$jslink.Template.addPathInfo("mode","layout").addQueryData('mtype', $mtype)" method="post">
  +      #else
  +        <form action="$jslink.Template" method="post">
  +      #end
           <input type="submit" value="$l10n.CUSTOMIZER_EDITLAYOUT">
         </form>
       </td>
   
       <td nowrap align="center" width="20%">
  -      <form action=" $jslink.Template.addPathInfo("mode","add")">
  +      #if ($!mtype) 
  +        <form action="$jslink.Template.addPathInfo("mode","add").addQueryData('mtype', $mtype)" method="post">
  +      #else
  +        <form action="$jslink.Template" method="post">
  +      #end
  +
           #if ($allowportlet=="true")
             <input type="submit" value="$l10n.CUSTOMIZER_ADDPORTLET" >
           #else
  @@ -27,7 +37,11 @@
      </td>
     
      <td nowrap align="center" width="20%">
  -      <form action=" $jslink.Template.addPathInfo("mode","addset")">
  +      #if ($!mtype) 
  +        <form action="$jslink.Template.addPathInfo("mode","addset").addQueryData('mtype', $mtype)" method="post">
  +      #else
  +        <form action="$jslink.Template" method="post">
  +      #end
           #if ($allowpane=="true")
             <input type="submit" value="$l10n.CUSTOMIZER_ADDPANE" >
           #else
  @@ -37,7 +51,12 @@
       </td>
   
       <td nowrap align="center" width="20%">
  -      <form action=" $jslink.Template.addPathInfo("mode","general")">
  +      #if ($!mtype) 
  +        <form action="$jslink.Template.addPathInfo("mode","general").addQueryData('mtype', $mtype)" method="post">
  +      #else
  +        <form action="$jslink.Template" method="post">
  +      #end
  +
           #if ($allowproperties=="true")
             <input type="submit" value="$l10n.CUSTOMIZER_EDITPROPERTIES">
           #else
  
  
  

--
To unsubscribe, e-mail:   <mailto:jetspeed-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:jetspeed-dev-help@jakarta.apache.org>


Mime
View raw message