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/rss admin.rss
Date Tue, 16 Jul 2002 19:10:41 GMT
taylor      2002/07/16 12:10:41

  Modified:    .        RELEASE-TODO project.properties project.xml
               build    build.xml
               docs/channels jetspeed.rss turbine.rss
               src/java/org/apache/jetspeed/services/psmlmanager/db
                        DatabasePsmlManagerService.java
               src/java/org/apache/jetspeed/services/rundata
                        DefaultJetspeedRunData.java
               webapp/WEB-INF/conf JetspeedSecurity.properties admin.xreg
                        demo-portlets.xreg portlets.xreg
               webapp/WEB-INF/psml/user/anon/html/en default.psml
               webapp/WEB-INF/templates/jsp/navigations/html bottom.jsp
               webapp/WEB-INF/templates/jsp/portlets/html hello.jsp
               webapp/WEB-INF/templates/vm/navigations/html bottom.vm
               webapp/rss admin.rss
  Log:
  Started on 1.4b1 release
   - changed version number
   - fixed bugs in portlet titles
   - clean up of example portlets
   - added some functionality to HelloJSP
   - applied Glenn Golden's patch to DBPSML service
   - referenced new PSML Browser directly on Admin user page
   - fixed bad links in Turbine portlet
  
  Revision  Changes    Path
  1.9       +2 -2      jakarta-jetspeed/RELEASE-TODO
  
  Index: RELEASE-TODO
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/RELEASE-TODO,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- RELEASE-TODO	14 Dec 2001 13:04:30 -0000	1.8
  +++ RELEASE-TODO	16 Jul 2002 19:10:39 -0000	1.9
  @@ -24,7 +24,7 @@
   - clean your distribution (remove Jetspeed.jar from you classpath).  This will 
     ensure a clean build
   
  -- Use JDK 1.2 when compiling (do not use Jikes for distribution)
  +- Use JDK 1.3 or greater when compiling (do not use Jikes for distribution)
   
   - build sitebook docs (./build.sh site)
   
  
  
  
  1.4       +1 -1      jakarta-jetspeed/project.properties
  
  Index: project.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/project.properties,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- project.properties	5 Apr 2002 10:02:35 -0000	1.3
  +++ project.properties	16 Jul 2002 19:10:39 -0000	1.4
  @@ -16,4 +16,4 @@
   src.dir = src
   
   
  -announcement = 1.3a3-dev
  +announcement = 1.4b1
  
  
  
  1.8       +1 -1      jakarta-jetspeed/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/project.xml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- project.xml	1 Jun 2002 22:39:19 -0000	1.7
  +++ project.xml	16 Jul 2002 19:10:39 -0000	1.8
  @@ -4,7 +4,7 @@
     <pomVersion>3</pomVersion>
     <name>jakarta-jetspeed</name>
     <id>jetspeed</id>
  -  <currentVersion>1.3a3-dev</currentVersion>
  +  <currentVersion>1.4b1</currentVersion>
     <organization>
       <name>Apache Software Foundation</name>
       <url>http://www.apache.org/</url>
  
  
  
  1.150     +1 -1      jakarta-jetspeed/build/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/build/build.xml,v
  retrieving revision 1.149
  retrieving revision 1.150
  diff -u -r1.149 -r1.150
  --- build.xml	16 Jul 2002 03:04:30 -0000	1.149
  +++ build.xml	16 Jul 2002 19:10:39 -0000	1.150
  @@ -54,7 +54,7 @@
   
       <property name="project.fullname" value="Jetspeed Portal Implementation"/>
       <property name="project.name" value="jetspeed"/>
  -    <property name="project.version" value="1.3a3-dev"/>      
  +    <property name="project.version" value="1.4b1"/>      
   
       <!-- =================================================================== -->
       <!-- Set the properties related to the source tree                       -->
  
  
  
  1.6       +1 -1      jakarta-jetspeed/docs/channels/jetspeed.rss
  
  Index: jetspeed.rss
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/docs/channels/jetspeed.rss,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- jetspeed.rss	14 Dec 2001 12:22:17 -0000	1.5
  +++ jetspeed.rss	16 Jul 2002 19:10:39 -0000	1.6
  @@ -36,7 +36,7 @@
       
           <item>
               <title>Download the latest release</title>
  -            <link>http://jakarta.apache.org/builds/jakarta-jetspeed/release/v1.3a2/</link>
  +            <link>http://jakarta.apache.org/builds/jakarta-jetspeed/release/v1.4b1/</link>
               <description>
               This is where you can find the latest release of the Jetspeed
               application
  
  
  
  1.4       +5 -4      jakarta-jetspeed/docs/channels/turbine.rss
  
  Index: turbine.rss
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/docs/channels/turbine.rss,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- turbine.rss	15 Mar 2001 03:15:12 -0000	1.3
  +++ turbine.rss	16 Jul 2002 19:10:39 -0000	1.4
  @@ -18,11 +18,12 @@
           </item>
       
           <item>
  -            <title>TDK</title>
  -            <link>http://jakarta.apache.org/turbine/tdk/</link>
  +            <title>Torque</title>
  +            <link>http://jakarta.apache.org/turbine/torque/</link>
               <description>
  -            The Turbine Development Kit allows you quickly create your
  -            Turbine application
  +            Torque is a persistence layer. Torque generates all the database resources
required by your application 
  +            and includes a runtime environment to run the generated classes. Torque was
developed as part of the Turbine Framework. 
  +            It is now decoupled and can be used by itself. 
               </description>
           </item>
       
  
  
  
  1.17      +25 -8     jakarta-jetspeed/src/java/org/apache/jetspeed/services/psmlmanager/db/DatabasePsmlManagerService.java
  
  Index: DatabasePsmlManagerService.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/services/psmlmanager/db/DatabasePsmlManagerService.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- DatabasePsmlManagerService.java	28 Jun 2002 05:37:33 -0000	1.16
  +++ DatabasePsmlManagerService.java	16 Jul 2002 19:10:39 -0000	1.17
  @@ -115,7 +115,7 @@
   import java.util.Map;
   import java.util.Set;
   import java.util.Vector;
  -import java.util.WeakHashMap;
  +import java.util.HashMap;
   import java.io.IOException;
   import java.io.FileReader;
   import java.io.File;
  @@ -137,7 +137,7 @@
                                        implements PsmlManagerService, DBOperations
   {
   
  -    private Map psmlCache = new WeakHashMap();
  +    private Map psmlCache = new HashMap();
   
       /** The watcher for the document locations */
       private CacheRefresher refresher = null;
  @@ -328,7 +328,6 @@
                                               refresh(stringToLocator(locator)); 
   
                                   // over write the existing document in cache
  -                Log.info("Putting profile in cache, Locator string: " + locator);
                                   psmlCache.put(locator, doc);
                               }
                           }
  @@ -497,14 +496,26 @@
           }
   
           PSMLDocument psmldoc = null;
  +        String locStr = locatorToString(locator);
  +        boolean inCache = false;
   
           synchronized (psmlCache)
           {
  -            Log.info("Getting profile from cache, Locator string: " + locatorToString(locator));
  -            psmldoc = (PSMLDocument)psmlCache.get(locatorToString(locator));
  -        }
  +            // psmldoc = (PSMLDocument)psmlCache.get(locatorToString(locator));
  +            // if we have seached and found nothing, this is cached as a null value
  +            // so check to see if the key is there
  +            inCache = psmlCache.containsKey(locStr);
  +            if (inCache) 
  +            {
  +                psmldoc = (PSMLDocument)psmlCache.get(locStr);
  +            }
  +         }
  +         //Log.info("DatabasePsmlManagerService.getDocument(): psmlcache: " +
  +         //  (inCache ? ((psmldoc == null) ? "null present" : "doc present") : "not in
cache") + " : " + locStr);
  + 
   
  -        if (psmldoc != null)
  +        // if in the cache, doc or null, return what's in the cache
  +        if (inCache)
           {
               return psmldoc;
           }
  @@ -915,6 +926,12 @@
                   }
                   return psmldoc;
               } 
  +            else
  +            {
  +                // cache the fact that there is NO document matching this profile
  +                psmlCache.put(locatorToString(locator), null);
  +                Log.info("Putting null in cache, in refresh method, Locator string: " +
locatorToString(locator));
  +            }
           }
           catch (Exception e)
           {
  
  
  
  1.13      +2 -2      jakarta-jetspeed/src/java/org/apache/jetspeed/services/rundata/DefaultJetspeedRunData.java
  
  Index: DefaultJetspeedRunData.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/services/rundata/DefaultJetspeedRunData.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- DefaultJetspeedRunData.java	28 Jun 2002 05:37:33 -0000	1.12
  +++ DefaultJetspeedRunData.java	16 Jul 2002 19:10:40 -0000	1.13
  @@ -171,7 +171,7 @@
               
               if ((last!=null) && (p.getName().equals(last.getName())) &&
(p.getTitle().equals(last.getTitle())))
               {
  -            System.out.println ("Portlet already used!!!");
  +                //System.out.println ("Portlet already used!!!");
               }
               else
                 stack.push(p);
  
  
  
  1.8       +1 -1      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.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  
  
  
  1.22      +1 -1      jakarta-jetspeed/webapp/WEB-INF/conf/admin.xreg
  
  Index: admin.xreg
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/conf/admin.xreg,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- admin.xreg	3 Jul 2002 21:07:17 -0000	1.21
  +++ admin.xreg	16 Jul 2002 19:10:40 -0000	1.22
  @@ -363,7 +363,7 @@
       <security-ref parent="user-only"/>
       <parameter name="template" value="browser-psml"/>
       <parameter name="customize-template" value="browser-psml-customize"/>
  -    <parameter name="page-size" value="5"/>
  +    <parameter name="page-size" value="25"/>
       <parameter name="action" value="portlets.PsmlBrowseAction"/>
       <meta-info>
         <title>Psml browser</title>
  
  
  
  1.18      +4 -0      jakarta-jetspeed/webapp/WEB-INF/conf/demo-portlets.xreg
  
  Index: demo-portlets.xreg
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/conf/demo-portlets.xreg,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- demo-portlets.xreg	14 Jul 2002 02:44:19 -0000	1.17
  +++ demo-portlets.xreg	16 Jul 2002 19:10:40 -0000	1.18
  @@ -140,6 +140,10 @@
           <parameter name="openinpopup" value="true" hidden="false"/>
           <url>/rss/Jetspeed.rss</url>
           <category>news.software.opensource</category>
  +        <meta-info>
  +            <title>Jetspeed Documentation</title>
  +            <description>Jetspeed Documentation Portlet</description>
  +        </meta-info>
       </portlet-entry>
       <portlet-entry name="JavaWeb" hidden="false" type="ref"
           parent="WebPagePortlet" application="false">
  
  
  
  1.25      +8 -0      jakarta-jetspeed/webapp/WEB-INF/conf/portlets.xreg
  
  Index: portlets.xreg
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/conf/portlets.xreg,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- portlets.xreg	28 Jun 2002 05:37:37 -0000	1.24
  +++ portlets.xreg	16 Jul 2002 19:10:40 -0000	1.25
  @@ -122,12 +122,20 @@
           <classname>org.apache.jetspeed.portal.portlets.JetspeedContent</classname>
           <parameter name="provider-name" value="jetspeed" hidden="false"/>
           <media-type ref="html"/>
  +        <meta-info>
  +            <title>Jetspeed Content Example</title>
  +            <description>Example of Jetspeed Content portlet.</description>
  +        </meta-info>
       </portlet-entry>
       <portlet-entry name="AdminInfo" hidden="false" type="ref"
           parent="RSS" application="false">
           <security-ref parent="default"/>
           <url>/rss/admin.rss</url>
           <category>rss</category>
  +        <meta-info>
  +            <title>Admininistrative Portlets</title>
  +            <description>List of most useful Administrative portlets.</description>
  +        </meta-info>
       </portlet-entry>
       <portlet-entry name="AdminScreen" hidden="false" type="instance" application="false">
           <meta-info>
  
  
  
  1.4       +6 -6      jakarta-jetspeed/webapp/WEB-INF/psml/user/anon/html/en/default.psml
  
  Index: default.psml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/psml/user/anon/html/en/default.psml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- default.psml	1 Jul 2002 05:54:10 -0000	1.3
  +++ default.psml	16 Jul 2002 19:10:40 -0000	1.4
  @@ -26,12 +26,6 @@
       </portlets>
   
       <portlets>
  -      <entry id="808" parent="InstanceExample">
  -          <parameter name="country" value="Brazil"/>
  -      </entry>
  -      <entry id="809" parent="InstanceExample">
  -          <parameter name="country" value="Germany"/>
  -      </entry>
         <entry parent="Jetspeed"/>
         <entry parent="Welcome"/>
       </portlets>
  @@ -102,6 +96,12 @@
   
       <portlets>
         <entry parent="HelloVelocityCached"/>
  +      <entry id="808" parent="InstanceExample">
  +          <parameter name="country" value="Brazil"/>
  +      </entry>
  +      <entry id="809" parent="InstanceExample">
  +          <parameter name="country" value="Germany"/>
  +      </entry>
         <layout>
         	<property name="row" value="1"/>
         	<property name="column" value="1"/>
  
  
  
  1.5       +1 -1      jakarta-jetspeed/webapp/WEB-INF/templates/jsp/navigations/html/bottom.jsp
  
  Index: bottom.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/jsp/navigations/html/bottom.jsp,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- bottom.jsp	14 Dec 2001 12:30:57 -0000	1.4
  +++ bottom.jsp	16 Jul 2002 19:10:40 -0000	1.5
  @@ -3,7 +3,7 @@
   <p>
     <IMG align="right" src="<jetspeed:contentUri href="images/feather.gif" />">
     <font size="-2">
  -    Apache Jetspeed 1.3a3-dev<br />
  +    Apache Jetspeed Portal - Version 1.4b1<br />
       &copy; Apache Software Foundation 2001
     </font>
   </p>
  
  
  
  1.2       +54 -2     jakarta-jetspeed/webapp/WEB-INF/templates/jsp/portlets/html/hello.jsp
  
  Index: hello.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/jsp/portlets/html/hello.jsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- hello.jsp	2 Jul 2001 07:59:54 -0000	1.1
  +++ hello.jsp	16 Jul 2002 19:10:40 -0000	1.2
  @@ -1,4 +1,56 @@
  -
  +<%@ page language="java"
  +         session="false"
  +%>
  +<%@ taglib uri='/WEB-INF/templates/jsp/tld/template.tld' prefix='jetspeed' %>
   <p>
  -<b>JSP</b> Hello World
  +Jetspeed JSP Hello World Example
  +<br/><br/>
  +    <b><center>Examples of jetspeed:info</center></b>
  +    <table>
  +      <tr>
  +        <th>requestedInfo</th>
  +        <th>Returned Value</th>
  +      </tr>
  +      <tr>
  +        <td>Email</td>
  +        <td><jetspeed:info requestedInfo="Email" /></td>
  +      </tr>
  +      <tr>
  +        <td>FirstName</td>
  +        <td><jetspeed:info requestedInfo="FirstName" /></td>
  +      </tr>
  +      <tr>
  +        <td>LastName</td>
  +        <td><jetspeed:info requestedInfo="LastName" /></td>
  +      </tr>
  +      <tr>
  +        <td>UserName</td>
  +        <td><jetspeed:info requestedInfo="UserName" /></td>
  +      </tr>
  +      <tr>
  +        <td>ServerDate</td>
  +        <td><jetspeed:info requestedInfo="ServerDate" /></td>
  +      </tr>
  +    </table>
  +<br/><br/>
  +    <b><center>Examples of jetspeed:contentUri</center></b>
  +    <table>
  +      <tr>
  +        <th>href</th>
  +        <th>Returned Value</th>
  +      </tr>
  +      <tr>
  +        <td>apidocs/</td>
  +        <td><jetspeed:contentUri href="apidocs/" /></td>
  +      </tr>
  +      <tr>
  +        <td>docs/</td>
  +        <td><jetspeed:contentUri href="docs/" /></td>
  +      </tr>
  +      <tr>
  +        <td>rss/</td>
  +        <td><jetspeed:contentUri href="rss/" /></td>
  +      </tr>
  +    </table>
  +
   </p>
  
  
  
  1.9       +1 -1      jakarta-jetspeed/webapp/WEB-INF/templates/vm/navigations/html/bottom.vm
  
  Index: bottom.vm
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/vm/navigations/html/bottom.vm,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- bottom.vm	6 Mar 2002 21:08:18 -0000	1.8
  +++ bottom.vm	16 Jul 2002 19:10:40 -0000	1.9
  @@ -3,7 +3,7 @@
     <tr>
       <td align="left">
        <small>
  -       Apache Jetspeed 1.3a3-dev<br/>
  +       Apache Jetspeed Portal - Version 1.4b1<br/>
          &copy; Apache Software Foundation 2001
        </small>
       </td>
  
  
  
  1.7       +11 -4     jakarta-jetspeed/webapp/rss/admin.rss
  
  Index: admin.rss
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/webapp/rss/admin.rss,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- admin.rss	19 Apr 2002 04:36:12 -0000	1.6
  +++ admin.rss	16 Jul 2002 19:10:41 -0000	1.7
  @@ -5,11 +5,18 @@
       <title>Jetspeed Administration</title>
       <description>
         The Jetspeed Administration features are mainly 
  -      implemented in a few administrative portlets which you can access
  -      from the admin user home page by chosing the "Admin" tab.
  -      The following admin portlets are implemented in 1.3a2
  +      implemented in administrative portlets which you can access
  +      from the admin user home page by chosing the "Admin" and "Security" tabs.
  +      Here are some the most common administrative portlets from both tabs:
       </description>
  -  
  +
  +    <item>
  +      <title>PSML Browser</title>
  +      <description>
  +        This portlet allows the administrator to edit the PSML for all users and resources
in the portal.
  +      </description>    
  +      <link>./portal?action=controls.Maximize&#38;js_peid=344</link>
  +    </item>  
       <item>
         <title>Global</title>
         <description>
  
  
  

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