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-2/portal/src/webapp/WEB-INF/pages default-page.psml
Date Thu, 08 Jan 2004 20:41:43 GMT
taylor      2004/01/08 12:41:43

  Modified:    portal/src/webapp/WEB-INF/db/hsql Registry.script
               portal/src/webapp/WEB-INF/pages default-page.psml
  Log:
  updated default page
  
  Revision  Changes    Path
  1.19      +7 -9      jakarta-jetspeed-2/portal/src/webapp/WEB-INF/db/hsql/Registry.script
  
  Index: Registry.script
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/db/hsql/Registry.script,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- Registry.script	6 Jan 2004 19:31:31 -0000	1.18
  +++ Registry.script	8 Jan 2004 20:41:42 -0000	1.19
  @@ -284,14 +284,12 @@
   INSERT INTO PROFILING_RULE VALUES('j1','org.apache.jetspeed.profiler.rules.impl.StandardProfilingRule','The
default profiling rule following the Jetspeed-1 hard-coded profiler fallback algorithm.')
   INSERT INTO PROFILING_RULE VALUES('path','org.apache.jetspeed.profiler.rules.impl.StandardProfilingRule','use
a path to locate.')
   INSERT INTO PROFILING_RULE VALUES('role-fallback','org.apache.jetspeed.profiler.rules.impl.RoleFallbackProfilingRule','A
role based fallback algorithm based on Jetspeed-1 role-based fallback')
  -INSERT INTO RULE_CRITERION VALUES('1','j1',0,'request.session','desktop','default-desktop',0)
  +INSERT INTO RULE_CRITERION VALUES('1','j1',0,'request.session','page','default-page',0)
   INSERT INTO RULE_CRITERION VALUES('10','path',0,'path','path','/',0)
  -INSERT INTO RULE_CRITERION VALUES('2','j1',1,'request.session','page','default-page',0)
  -INSERT INTO RULE_CRITERION VALUES('3','j1',2,'group.role.user','user',NULL,0)
  -INSERT INTO RULE_CRITERION VALUES('4','j1',3,'mediatype','mediatype',NULL,1)
  -INSERT INTO RULE_CRITERION VALUES('5','j1',4,'language','language',NULL,1)
  -INSERT INTO RULE_CRITERION VALUES('6','j1',5,'country','country',NULL,1)
  -INSERT INTO RULE_CRITERION VALUES('7','role-fallback',0,'request.session','desktop','default-desktop',0)
  -INSERT INTO RULE_CRITERION VALUES('8','role-fallback',1,'request.session','page','default-page',0)
  -INSERT INTO RULE_CRITERION VALUES('9','role-fallback',2,'role','role',NULL,2)
  +INSERT INTO RULE_CRITERION VALUES('2','j1',1,'group.role.user','user',NULL,0)
  +INSERT INTO RULE_CRITERION VALUES('3','j1',2,'mediatype','mediatype',NULL,1)
  +INSERT INTO RULE_CRITERION VALUES('4','j1',3,'language','language',NULL,1)
  +INSERT INTO RULE_CRITERION VALUES('5','j1',4,'country','country',NULL,1)
  +INSERT INTO RULE_CRITERION VALUES('6','role-fallback',0,'request.session','page','default-page',0)
  +INSERT INTO RULE_CRITERION VALUES('7','role-fallback',1,'role','role',NULL,2)
   INSERT INTO PRINCIPAL_RULE_ASSOC VALUES('anon','j1')
  
  
  
  1.4       +10 -15    jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/default-page.psml
  
  Index: default-page.psml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/default-page.psml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- default-page.psml	30 Dec 2003 06:37:40 -0000	1.3
  +++ default-page.psml	8 Jan 2004 20:41:42 -0000	1.4
  @@ -1,31 +1,26 @@
  -<?xml version="1.0" encoding="UTF-8"?>
   <page id="p001">
     <defaults
  -     skin="light-blue"
  +     skin="orange"
        layout-decorator="clear"
  -     portlet-decorator="box-titled"
  +     portlet-decorator="portletstd"
     />
     <title>My First PSML Page</title>
  -  <fragment id="f001" type="layout" name="Layout">
  -    <fragment id="pe000" type="portlet" name="PortletApplicationBrowser">
  -      <property layout="TwoColumns" name="row" value="0" />
  -      <property layout="TwoColumns" name="column" value="0" />      
  -    </fragment>
  +  <fragment id="f001" type="layout" name="TwoColumns">
       <fragment id="pe001" type="portlet" name="HelloPortlet">
         <property layout="TwoColumns" name="row" value="0" />
  -      <property layout="TwoColumns" name="column" value="1" />      
  +      <property layout="TwoColumns" name="column" value="0" />
       </fragment>
       <fragment id="pe002" type="portlet" name="JMXPortlet">
  -      <property layout="TwoColumns" name="row" value="1" />
  -      <property layout="TwoColumns" name="column" value="0" />      
  +      <property layout="TwoColumns" name="row" value="0" />
  +      <property layout="TwoColumns" name="column" value="1" />
       </fragment>
  -    <fragment id="pe003" type="portlet" name="CustomerList">
  +    <fragment id="pe003" type="portlet" name="PreferencePortlet">
         <property layout="TwoColumns" name="row" value="1" />
  -      <property layout="TwoColumns" name="column" value="1" />      
  +      <property layout="TwoColumns" name="column" value="0" />
       </fragment>
  -    <fragment id="pe004" type="portlet" name="CustomerInfo">
  +    <fragment id="pe004" type="portlet" name="CustomerList">
         <property layout="TwoColumns" name="row" value="1" />
  -      <property layout="TwoColumns" name="column" value="2" />      
  +      <property layout="TwoColumns" name="column" value="1" />
       </fragment>
     </fragment>
   </page>
  
  
  

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


Mime
View raw message