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/_user/user/_mediatype/html p001.psml
Date Fri, 19 Nov 2004 21:53:35 GMT
taylor      2004/11/19 13:53:35

  Modified:    portal/src/webapp/WEB-INF/pages/_user/user/anotherdir
                        p004.psml
               portal/src/webapp/WEB-INF/pages jsf-demo.psml rss.psml
                        default-page.psml
               portal/src/webapp/WEB-INF/pages/_role/user/top-links
                        top-page.psml
               portal/src/webapp/WEB-INF/pages/_user/user
                        nested-layout.psml
               portal/src/webapp/WEB-INF/pages/_role/manager
                        default-page.psml
               portal/src/webapp/WEB-INF/pages/_user/user/_mediatype/html
                        p001.psml
  Log:
  http://nagoya.apache.org/jira/browse/JS2-163
  
   Ive decided to cut back on the re-org of the demo portlets.
  Ate suggested that I do not combine the struts, jsf, perl, php and demo portlets all into
one big demo.
  Reason: because its better for users to clearly see the dependencies in a project based
on one bridge.
  I think he has a valid point.
  
  So instead the re-org involves:
  
  - new RSS app
  - new Bookmark portlet in /demo
  - new Calendar portlet in /jsf-demo
  - dropped the idea of a /general (/desktop) app, maybe later when Bookmark and Calendar
mature out of demo
  - move LocaleSelector into PAM (its dependent on J2, it has to go with other J2-dependent
portlets)
  
  Revision  Changes    Path
  1.3       +1 -1      jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/_user/user/anotherdir/p004.psml
  
  Index: p004.psml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/_user/user/anotherdir/p004.psml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- p004.psml	15 Nov 2004 06:02:20 -0000	1.2
  +++ p004.psml	19 Nov 2004 21:53:34 -0000	1.3
  @@ -22,7 +22,7 @@
     />
     <title>[USER 004] PSML Page</title>
     <fragment id="u4-xx1" type="layout" name="jetspeed::VelocityTwoColumns">
  -    <fragment id="u4-xx3" type="portlet" name="demo::HelloPortlet">
  +    <fragment id="u4-xx3" type="portlet" name="demo::BookmarkPortlet">
         <property layout="TwoColumns" name="row" value="0" />
         <property layout="TwoColumns" name="column" value="0" />
       </fragment>
  
  
  
  1.5       +6 -3      jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/jsf-demo.psml
  
  Index: jsf-demo.psml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/jsf-demo.psml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- jsf-demo.psml	9 Nov 2004 01:28:30 -0000	1.4
  +++ jsf-demo.psml	19 Nov 2004 21:53:34 -0000	1.5
  @@ -21,13 +21,16 @@
        portlet-decorator="tigris"
     />
     
  -   <title>JSF Guess Number Portlet</title>
  +   <title>JSF Demo</title>
     <fragment id="jsfportletspage" type="layout" name="jetspeed::VelocityTwoColumns">
        <fragment id="jsfGuessNumber1" type="portlet" name="jsf-demo::guessNumber">
         <property layout="TwoColumns" name="row" value="0" />
         <property layout="TwoColumns" name="column" value="0" />
  -     </fragment>                                                            
  -    
  +     </fragment>
  +     <fragment id="jsfCalendar" type="portlet" name="jsf-demo::CalendarPortlet">
  +      <property layout="TwoColumns" name="row" value="0" />
  +      <property layout="TwoColumns" name="column" value="1" />
  +     </fragment>                                                            	   
                                                             
     </fragment>
     <metadata name="title" xml:lang="ja">
           JSF 数当てポートレット
  
  
  
  1.2       +8 -1      jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/rss.psml
  
  Index: rss.psml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/rss.psml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- rss.psml	15 Nov 2004 06:02:20 -0000	1.1
  +++ rss.psml	19 Nov 2004 21:53:34 -0000	1.2
  @@ -26,6 +26,13 @@
         <property layout="TwoColumns" name="row" value="0" />
         <property layout="TwoColumns" name="column" value="1" />
       </fragment>
  -
     </fragment>
  +  <!-- allow all users to view -->
  +  <security-constraints>
  +    <security-constraint>
  +      <users>*</users>
  +      <permissions>view, edit</permissions>
  +    </security-constraint>
  +  </security-constraints>
  +  
   </page>
  
  
  
  1.30      +7 -3      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.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- default-page.psml	19 Nov 2004 03:07:42 -0000	1.29
  +++ default-page.psml	19 Nov 2004 21:53:34 -0000	1.30
  @@ -28,7 +28,7 @@
     </metadata>
   
     <fragment id="dp-1" type="layout" name="jetspeed::VelocityTwoColumns">
  -    <fragment id="dp-3" type="portlet" name="localeselector::LocaleSelector">
  +    <fragment id="dp-3" type="portlet" name="pam::LocaleSelector">
         <property layout="TwoColumns" name="row" value="0" />
         <property layout="TwoColumns" name="column" value="0" />
       </fragment>                                
  @@ -47,11 +47,15 @@
       <fragment id="dp-9" type="portlet" name="demo::IFramePortlet">
         <property layout="TwoColumns" name="row" value="2" />
         <property layout="TwoColumns" name="column" value="0" />
  -    </fragment>	
  +    </fragment>
       <fragment id="dp-17" type="portlet" name="demo::UserInfoTest">
         <property layout="TwoColumns" name="row" value="2" />
         <property layout="TwoColumns" name="column" value="1" />
  -    </fragment>	
  +    </fragment>
  +    <fragment id="dp-18" type="portlet" name="demo::BookmarkPortlet">
  +      <property layout="TwoColumns" name="row" value="3" />
  +      <property layout="TwoColumns" name="column" value="1" />
  +    </fragment>
     </fragment>
   
     <!-- allow all users to view -->
  
  
  
  1.4       +8 -0      jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/_role/user/top-links/top-page.psml
  
  Index: top-page.psml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/_role/user/top-links/top-page.psml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- top-page.psml	15 Nov 2004 06:02:20 -0000	1.3
  +++ top-page.psml	19 Nov 2004 21:53:35 -0000	1.4
  @@ -25,5 +25,13 @@
         <property layout="TwoColumns" name="row" value="0" />
         <property layout="TwoColumns" name="column" value="1" />
       </fragment>    
  +    <fragment id="utp-4" type="portlet" name="demo::BookmarkPortlet">
  +      <property layout="TwoColumns" name="row" value="0" />
  +      <property layout="TwoColumns" name="column" value="1" />
  +    </fragment>    	
  +    <fragment id="utp-4" type="portlet" name="jsf-demo::CalendarPortlet">
  +      <property layout="TwoColumns" name="row" value="0" />
  +      <property layout="TwoColumns" name="column" value="1" />
  +    </fragment>    		
     </fragment>
   </page>
  
  
  
  1.5       +1 -1      jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/_user/user/nested-layout.psml
  
  Index: nested-layout.psml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/_user/user/nested-layout.psml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- nested-layout.psml	19 Nov 2004 03:07:42 -0000	1.4
  +++ nested-layout.psml	19 Nov 2004 21:53:35 -0000	1.5
  @@ -4,7 +4,7 @@
     <title>Nested Layout Test</title>
     <short-title>Nested Layout</short-title>
     <fragment id="100393" type="layout" name="jetspeed::VelocityOneColumn">
  -    <fragment id="100939" type="portlet" name="localeselector::LocaleSelector">
  +    <fragment id="100939" type="portlet" name="pam::LocaleSelector">
         <property layout="OneColumn" name="row" value="0"/>
       </fragment>                                
       <fragment id="100345" type="layout" name="jetspeed::VelocityTwoColumns">
  
  
  
  1.6       +2 -2      jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/_role/manager/default-page.psml
  
  Index: default-page.psml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/_role/manager/default-page.psml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- default-page.psml	15 Nov 2004 06:02:20 -0000	1.5
  +++ default-page.psml	19 Nov 2004 21:53:35 -0000	1.6
  @@ -22,11 +22,11 @@
     />
     <title>Manager Role Page</title>
     <fragment id="mrp-xx1" type="layout" name="jetspeed::TwoColumns">
  -    <fragment id="mrp-xx3" type="portlet" name="demo::HelloPortlet">
  +    <fragment id="mrp-xx3" type="portlet" name="demo::BookmarkPortlet">
         <property layout="TwoColumns" name="row" value="0" />
         <property layout="TwoColumns" name="column" value="0" />
       </fragment>
  -    <fragment id="mrp-xx5" type="portlet" name="demo::PreferencePortlet">
  +    <fragment id="mrp-xx5" type="portlet" name="jsf-demo::CalendarPortlet">
         <property layout="TwoColumns" name="row" value="0" />
         <property layout="TwoColumns" name="column" value="1" />
       </fragment>
  
  
  
  1.3       +1 -1      jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/_user/user/_mediatype/html/p001.psml
  
  Index: p001.psml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/_user/user/_mediatype/html/p001.psml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- p001.psml	15 Nov 2004 06:02:20 -0000	1.2
  +++ p001.psml	19 Nov 2004 21:53:35 -0000	1.3
  @@ -22,7 +22,7 @@
     />
     <title>[USER 001] PSML Page</title>
     <fragment id="u1-xx1" type="layout" name="jetspeed::TwoColumns">
  -    <fragment id="u1-xx3" type="portlet" name="demo::HelloPortlet">
  +    <fragment id="u1-xx3" type="portlet" name="demo::BookmarkPortlet">
         <property layout="TwoColumns" name="row" value="0" />
         <property layout="TwoColumns" name="column" value="0" />
       </fragment>
  
  
  

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