morciuch    2003/09/16 09:29:29

  Modified:    docs/site catalog.html diskcache.html
                        portlet_config_common.html
               webapp/WEB-INF/conf portlets.xreg
               xdocs    catalog.xml diskcache.xml portlet_config_common.xml
  Added:       webapp/WEB-INF/templates/jsp/portlets/html
                        java-applet-portlet.jsp
  Log:
  Contributed Java applet portlet (see Bugzilla issue# 23198)
  
  Revision  Changes    Path
  1.24      +3 -0      jakarta-jetspeed/docs/site/catalog.html
  
  Index: catalog.html
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/docs/site/catalog.html,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- catalog.html      5 Sep 2003 16:41:16 -0000       1.23
  +++ catalog.html      16 Sep 2003 16:29:28 -0000      1.24
  @@ -159,6 +159,9 @@
       <li>
             <a href="portlet_config_WebClippingPortlet.html">Web Clipping Portlet</a> 
        </li>   
  +    <li>
  +          <a href="portlet_config_AppletPortlet.html">Java Applet Portlet</a> 
  +     </li>   
           </ul>
                                                   <a 
href="portlet_config_common.html">Configuration common to many standard portlets</a>
                               </blockquote>
  
  
  
  1.31      +9 -7      jakarta-jetspeed/docs/site/diskcache.html
  
  Index: diskcache.html
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/docs/site/diskcache.html,v
  retrieving revision 1.30
  retrieving revision 1.31
  diff -u -r1.30 -r1.31
  --- diskcache.html    25 Aug 2003 06:18:39 -0000      1.30
  +++ diskcache.html    16 Sep 2003 16:29:28 -0000      1.31
  @@ -5,7 +5,6 @@
           
   <!-- start the processing -->
       <!-- ====================================================================== -->
  -    <!-- GENERATED FILE, DO NOT EDIT, EDIT THE XML FILE IN xdocs INSTEAD! -->
       <!-- Main Page Section -->
       <!-- ====================================================================== -->
       <html>
  @@ -15,7 +14,6 @@
                           
              
                                       
  -                        
               <title>Jetspeed - Disk Cache</title>
           </head>
   
  @@ -180,10 +178,14 @@
   
       <li>
       DiskCacheDaemon:  Continually goes over every entry within the cache at a 
  -    set interval.  If an entry is noticed to be out of date (either by HTTP 
  -    header info or by a MAX interval) it is fetched and placed and the updated
  -    version placed within the cache.  All Portlets and code that utilize this 
  -    URL will be updated.
  +    set interval (the frequency is controlled using daemon.diskcachedaemon.interval 
  +    property - you can also start this process manually using the 
DaemonAdminPortlet). 
  +    If an entry is noticed to be out of date (either by HTTP header info or by a 
  +    MAX interval) it is fetched and placed and the updated version placed within 
the cache.  
  +    All Portlets and code that utilize this URL will be updated. External URL entry 
that 
  +    returns an "Expires:" header will use the returned value. The URL entry that 
specifies 
  +    "0" or does not have an "Expires:" header will be expired based on 
cache.default.expiration
  +    property (every 15 minutes by default).
       </li>
   
       <li>
  @@ -239,7 +241,7 @@
                   </td></tr>
                   <tr><td colspan="2">
                       <div align="center"><font color="#525D76" size="-1"><em>
  -                    Copyright &#169; 1999-2003, Apache Software Foundation
  +                    Copyright &#169; 1999-2002, Apache Software Foundation
                       </em></font></div>
                   </td></tr>
               </table>
  
  
  
  1.29      +40 -35    jakarta-jetspeed/docs/site/portlet_config_common.html
  
  Index: portlet_config_common.html
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/docs/site/portlet_config_common.html,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- portlet_config_common.html        25 Aug 2003 06:18:39 -0000      1.28
  +++ portlet_config_common.html        16 Sep 2003 16:29:28 -0000      1.29
  @@ -5,7 +5,6 @@
           
   <!-- start the processing -->
       <!-- ====================================================================== -->
  -    <!-- GENERATED FILE, DO NOT EDIT, EDIT THE XML FILE IN xdocs INSTEAD! -->
       <!-- Main Page Section -->
       <!-- ====================================================================== -->
       <html>
  @@ -15,7 +14,6 @@
                           
              
                                       
  -                        
               <title>Jetspeed - Portlet Configuration How To</title>
           </head>
   
  @@ -183,16 +181,16 @@
     </p>
                                                   <table>
                           <tr>
  -                        <th bgcolor="#039acc" colspan="" rowspan="" valign="top" 
align="left">
  +                        <td bgcolor="#039acc" colspan="" rowspan="" valign="top" 
align="left">
       <font color="#000000" size="-1" face="arial,helvetica,sanserif">
                   Attribute Name
               </font>
  -</th>
  -                                <th bgcolor="#039acc" colspan="" rowspan="" 
valign="top" align="left">
  +</td>
  +                                <td bgcolor="#039acc" colspan="" rowspan="" 
valign="top" align="left">
       <font color="#000000" size="-1" face="arial,helvetica,sanserif">
                   Description
               </font>
  -</th>
  +</td>
               </tr>
                                   <tr>
                           <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" 
align="left">
  @@ -332,16 +330,16 @@
       </p>
                                                   <table>
                           <tr>
  -                        <th bgcolor="#039acc" colspan="" rowspan="" valign="top" 
align="left">
  +                        <td bgcolor="#039acc" colspan="" rowspan="" valign="top" 
align="left">
       <font color="#000000" size="-1" face="arial,helvetica,sanserif">
                   Parent Element
               </font>
  -</th>
  -                                <th bgcolor="#039acc" colspan="" rowspan="" 
valign="top" align="left">
  +</td>
  +                                <td bgcolor="#039acc" colspan="" rowspan="" 
valign="top" align="left">
       <font color="#000000" size="-1" face="arial,helvetica,sanserif">
                   Default
               </font>
  -</th>
  +</td>
               </tr>
                                   <tr>
                           <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" 
align="left">
  @@ -439,16 +437,16 @@
     </p>
                                                   <table>
                           <tr>
  -                        <th bgcolor="#039acc" colspan="" rowspan="" valign="top" 
align="left">
  +                        <td bgcolor="#039acc" colspan="" rowspan="" valign="top" 
align="left">
       <font color="#000000" size="-1" face="arial,helvetica,sanserif">
                   Attribute Name
               </font>
  -</th>
  -                                <th bgcolor="#039acc" colspan="" rowspan="" 
valign="top" align="left">
  +</td>
  +                                <td bgcolor="#039acc" colspan="" rowspan="" 
valign="top" align="left">
       <font color="#000000" size="-1" face="arial,helvetica,sanserif">
                   Description
               </font>
  -</th>
  +</td>
               </tr>
                                   <tr>
                           <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" 
align="left">
  @@ -541,16 +539,16 @@
                                                   <br />
                                                   <table>
                           <tr>
  -                        <th bgcolor="#039acc" colspan="" rowspan="" valign="top" 
align="left">
  +                        <td bgcolor="#039acc" colspan="" rowspan="" valign="top" 
align="left">
       <font color="#000000" size="-1" face="arial,helvetica,sanserif">
                   Parameter Name
               </font>
  -</th>
  -                                <th bgcolor="#039acc" colspan="" rowspan="" 
valign="top" align="left">
  +</td>
  +                                <td bgcolor="#039acc" colspan="" rowspan="" 
valign="top" align="left">
       <font color="#000000" size="-1" face="arial,helvetica,sanserif">
                   Description
               </font>
  -</th>
  +</td>
               </tr>
                                   <tr>
                           <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" 
align="left">
  @@ -702,16 +700,16 @@
     </p>
                                                   <table>
                           <tr>
  -                        <th bgcolor="#039acc" colspan="" rowspan="" valign="top" 
align="left">
  +                        <td bgcolor="#039acc" colspan="" rowspan="" valign="top" 
align="left">
       <font color="#000000" size="-1" face="arial,helvetica,sanserif">
                   Character
               </font>
  -</th>
  -                                <th bgcolor="#039acc" colspan="" rowspan="" 
valign="top" align="left">
  +</td>
  +                                <td bgcolor="#039acc" colspan="" rowspan="" 
valign="top" align="left">
       <font color="#000000" size="-1" face="arial,helvetica,sanserif">
                   XML Entity
               </font>
  -</th>
  +</td>
               </tr>
                                   <tr>
                           <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" 
align="left">
  @@ -752,16 +750,16 @@
               </table>
                                                   <table>
                           <tr>
  -                        <th bgcolor="#039acc" colspan="" rowspan="" valign="top" 
align="left">
  +                        <td bgcolor="#039acc" colspan="" rowspan="" valign="top" 
align="left">
       <font color="#000000" size="-1" face="arial,helvetica,sanserif">
                   Allowable Protocols
               </font>
  -</th>
  -                                <th bgcolor="#039acc" colspan="" rowspan="" 
valign="top" align="left">
  +</td>
  +                                <td bgcolor="#039acc" colspan="" rowspan="" 
valign="top" align="left">
       <font color="#000000" size="-1" face="arial,helvetica,sanserif">
                   Description
               </font>
  -</th>
  +</td>
               </tr>
                                   <tr>
                           <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" 
align="left">
  @@ -799,6 +797,13 @@
       <dt><tt>&lt;url&gt;index.html&lt;/url&gt;</tt></dt><dd>No protocol, http:// or 
hostname</dd>
       
<dt><tt>&lt;url&gt;http://search.yahoo.com/search?p=jetspeed&amp;n=100&lt;/url&gt;</tt></dt><dd>Contains
 &amp; instead of &amp;amp;.</dd>
     </dl>
  +                                                <p>
  +    <strong>Remote URL caching:</strong>
  +  </p>
  +                                                <p>
  +     Portlet types extending the FileWatchPortlet (for example, NewRSSPortlet), 
read their remote URLs using the JetspeedCache. JetspeedCache uses DiskCacheDaemon to 
  +     manage refreshing of these URLs upon their change or expiration. See the <a 
href="diskcache.html">DiskCache</a> for further details.
  +  </p>
                               </blockquote>
           </p>
         </td></tr>
  @@ -817,16 +822,16 @@
     </p>
                                                   <table>
                           <tr>
  -                        <th bgcolor="#039acc" colspan="" rowspan="" valign="top" 
align="left">
  +                        <td bgcolor="#039acc" colspan="" rowspan="" valign="top" 
align="left">
       <font color="#000000" size="-1" face="arial,helvetica,sanserif">
                   Attribute Name
               </font>
  -</th>
  -                                <th bgcolor="#039acc" colspan="" rowspan="" 
valign="top" align="left">
  +</td>
  +                                <td bgcolor="#039acc" colspan="" rowspan="" 
valign="top" align="left">
       <font color="#000000" size="-1" face="arial,helvetica,sanserif">
                   Description
               </font>
  -</th>
  +</td>
               </tr>
                                   <tr>
                           <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" 
align="left">
  @@ -865,16 +870,16 @@
     </p>
                                                   <table>
                           <tr>
  -                        <th bgcolor="#039acc" colspan="" rowspan="" valign="top" 
align="left">
  +                        <td bgcolor="#039acc" colspan="" rowspan="" valign="top" 
align="left">
       <font color="#000000" size="-1" face="arial,helvetica,sanserif">
                   Attribute Name
               </font>
  -</th>
  -                                <th bgcolor="#039acc" colspan="" rowspan="" 
valign="top" align="left">
  +</td>
  +                                <td bgcolor="#039acc" colspan="" rowspan="" 
valign="top" align="left">
       <font color="#000000" size="-1" face="arial,helvetica,sanserif">
                   Description
               </font>
  -</th>
  +</td>
               </tr>
                                   <tr>
                           <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" 
align="left">
  @@ -1067,7 +1072,7 @@
                   </td></tr>
                   <tr><td colspan="2">
                       <div align="center"><font color="#525D76" size="-1"><em>
  -                    Copyright &#169; 1999-2003, Apache Software Foundation
  +                    Copyright &#169; 1999-2002, Apache Software Foundation
                       </em></font></div>
                   </td></tr>
               </table>
  
  
  
  1.42      +18 -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.41
  retrieving revision 1.42
  diff -u -r1.41 -r1.42
  --- portlets.xreg     5 Sep 2003 16:41:17 -0000       1.41
  +++ portlets.xreg     16 Sep 2003 16:29:28 -0000      1.42
  @@ -299,4 +299,22 @@
           <category>proxy</category>
       </portlet-entry>
   
  +     <portlet-entry name="AppletPortlet" hidden="true" type="ref" parent="JSP" 
application="false">
  +        <media-type ref="html"/>
  +        <parameter name="template" value="java-applet-portlet.jsp" hidden="true"/>  
      
  +        <parameter name="width" value="640" hidden="false">
  +            <meta-info>
  +                <title>Width</title>
  +                <description>Specify width for this applet</description>
  +            </meta-info>
  +        </parameter>        
  +        <parameter name="height" value="480" hidden="false">
  +            <meta-info>
  +                <title>Height</title>
  +                <description>Specify height for this applet</description>
  +            </meta-info>
  +        </parameter>        
  +        <category>applet</category>
  +    </portlet-entry>
  +
   </registry>
  
  
  
  1.1                  
jakarta-jetspeed/webapp/WEB-INF/templates/jsp/portlets/html/java-applet-portlet.jsp
  
  Index: java-applet-portlet.jsp
  ===================================================================
  <%@ taglib uri='/WEB-INF/templates/jsp/tld/template.tld' prefix='jetspeed' %>
  
  <%@ page import = "org.apache.turbine.util.RunData" %>
  <%@ page import = "org.apache.turbine.util.ContentURI" %>
  
  <%@ page import = "org.apache.jetspeed.portal.Portlet" %>
  
  <%@ page import = "java.util.Hashtable" %>
  <%@ page import = "java.util.Enumeration" %>
  
  <% 
  RunData data = (RunData) request.getAttribute("rundata");
  Portlet portlet = (Portlet) request.getAttribute("portlet");
  String name = null;
  String archive = null;
  String border = null;
  String align = null;
  String height = null;
  String width = null;
  String codebase = null;
  String code = null;
  if (portlet != null)
  {
      name = portlet.getPortletConfig().getInitParameter("name");
      archive = portlet.getPortletConfig().getInitParameter("archive");
      border = portlet.getPortletConfig().getInitParameter("border");
      align = portlet.getPortletConfig().getInitParameter("align");
      height = portlet.getPortletConfig().getInitParameter("height");
      width = portlet.getPortletConfig().getInitParameter("width");
      codebase = portlet.getPortletConfig().getInitParameter("codebase", ".");
      if (codebase.equals("."))
      {
          codebase = new ContentURI(data).getURI("").toString();
      }
      code = portlet.getPortletConfig().getInitParameter("code");
  %>
          
  <applet <%=name == null ? "" : "name=\"" + name + "\""%> 
          <%=archive == null ? "" : "archive=\"" + archive + "\""%> 
          <%=border == null ? "" : "border=\"" + border + "\""%> 
          <%=align == null ? "" : "align=\"" + align + "\""%> 
          <%=height == null ? "" : "height=\"" + height + "\""%> 
          <%=width == null ? "" : "width=\"" + width + "\""%>             
          <%=codebase == null ? "" : "codebase=\"" + codebase + "\""%>         
          <%=code == null ? "" : "code=\"" + code + "\""%>>
  <%
      Hashtable parms = new Hashtable();
      parms.putAll(portlet.getPortletConfig().getInitParameters());
      for (Enumeration e = parms.keys(); e.hasMoreElements(); )
      {
          String key = (String) e.nextElement();
          String value = (String) parms.get(key);
          if 
("name,archive,border,align,height,width,codebase,code,template,action".indexOf(key) < 
0)
          {
  %>
          <param name="<%=key%>" value="<%=value%>">
  <% 
          }
      }
  %>
  </applet>
  <%
  }
  %>
  
  
  
  
  1.6       +3 -0      jakarta-jetspeed/xdocs/catalog.xml
  
  Index: catalog.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/xdocs/catalog.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- catalog.xml       5 Sep 2003 16:41:17 -0000       1.5
  +++ catalog.xml       16 Sep 2003 16:29:29 -0000      1.6
  @@ -39,6 +39,9 @@
       <li>
             <a href="portlet_config_WebClippingPortlet.html">Web Clipping Portlet</a> 
        </li>   
  +    <li>
  +          <a href="portlet_config_AppletPortlet.html">Java Applet Portlet</a> 
  +     </li>   
           </ul>
        <a href="portlet_config_common.html">Configuration common to many standard 
portlets</a>
       </section>
  
  
  
  1.5       +8 -4      jakarta-jetspeed/xdocs/diskcache.xml
  
  Index: diskcache.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/xdocs/diskcache.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- diskcache.xml     20 Feb 2001 10:43:44 -0000      1.4
  +++ diskcache.xml     16 Sep 2003 16:29:29 -0000      1.5
  @@ -46,10 +46,14 @@
   
       <li>
       DiskCacheDaemon:  Continually goes over every entry within the cache at a 
  -    set interval.  If an entry is noticed to be out of date (either by HTTP 
  -    header info or by a MAX interval) it is fetched and placed and the updated
  -    version placed within the cache.  All Portlets and code that utilize this 
  -    URL will be updated.
  +    set interval (the frequency is controlled using daemon.diskcachedaemon.interval 
  +    property - you can also start this process manually using the 
DaemonAdminPortlet). 
  +    If an entry is noticed to be out of date (either by HTTP header info or by a 
  +    MAX interval) it is fetched and placed and the updated version placed within 
the cache.  
  +    All Portlets and code that utilize this URL will be updated. External URL entry 
that 
  +    returns an "Expires:" header will use the returned value. The URL entry that 
specifies 
  +    "0" or does not have an "Expires:" header will be expired based on 
cache.default.expiration
  +    property (every 15 minutes by default).
       </li>
   
       <li>
  
  
  
  1.12      +7 -0      jakarta-jetspeed/xdocs/portlet_config_common.xml
  
  Index: portlet_config_common.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/xdocs/portlet_config_common.xml,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- portlet_config_common.xml 2 Jul 2003 22:34:46 -0000       1.11
  +++ portlet_config_common.xml 16 Sep 2003 16:29:29 -0000      1.12
  @@ -403,6 +403,13 @@
       <dt><tt>&lt;url&gt;index.html&lt;/url&gt;</tt></dt><dd>No protocol, http:// or 
hostname</dd>
       
<dt><tt>&lt;url&gt;http://search.yahoo.com/search?p=jetspeed&amp;n=100&lt;/url&gt;</tt></dt><dd>Contains
 &amp; instead of &amp;amp;.</dd>
     </dl>
  +  <p>
  +    <strong>Remote URL caching:</strong>
  +  </p>
  +  <p>
  +     Portlet types extending the FileWatchPortlet (for example, NewRSSPortlet), 
read their remote URLs using the JetspeedCache. JetspeedCache uses DiskCacheDaemon to 
  +     manage refreshing of these URLs upon their change or expiration. See the <a 
href="diskcache.html">DiskCache</a> for further details.
  +  </p>  
   </section>
   
   <section name='Element: security-ref'>
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to