jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ang...@apache.org
Subject svn commit: r597406 - in /jackrabbit/trunk/jackrabbit-webapp/src/main/webapp: index.jsp populate.jsp search.jsp swr.jsp
Date Thu, 22 Nov 2007 13:26:36 GMT
Author: angela
Date: Thu Nov 22 05:26:35 2007
New Revision: 597406

URL: http://svn.apache.org/viewvc?rev=597406&view=rev
Log:
minor improvement to the webapp-jsps

Modified:
    jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/index.jsp
    jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/populate.jsp
    jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/search.jsp
    jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/swr.jsp

Modified: jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/index.jsp
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/index.jsp?rev=597406&r1=597405&r2=597406&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/index.jsp (original)
+++ jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/index.jsp Thu Nov 22 05:26:35 2007
@@ -1,6 +1,7 @@
 <%@ page import="org.apache.jackrabbit.j2ee.JCRWebdavServerServlet,
 		 org.apache.jackrabbit.j2ee.RepositoryAccessServlet,
 		 org.apache.jackrabbit.j2ee.SimpleWebdavServlet,
+		 java.net.URI,
                  javax.jcr.Repository"%><%
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -18,11 +19,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-%><html>
+%>
+<html>
 <head>
-<title>Jackrabbit JCR-Server</title>
+<title>Welcome to Apache Jackrabbit - WebDAV Server</title>
+<link rel="shortcut icon" href="<%= request.getContextPath() %>/images/favicon.ico"
type="image/vnd.microsoft.icon">
+<style type="text/css" media="all">
+      @import url("<%= request.getContextPath() %>/css/default.css");
+</style>
 </head>
-<body style="font-family:monospace">
+<body>
 <%
     Repository rep;
     try {
@@ -33,54 +39,137 @@
         return;
     }
 
-%><h1>JCR-Server</h1>
-<h3>JCR-Server provides 2 views</h3><p/>
+%>
+<div id="bodyColumn">
+<a href="http://jackrabbit.apache.org"><img src="<%= request.getContextPath()
%>/images/jackrabbitlogo.gif" alt="" /></a><br>
+<h2>Jackrabbit WebDAV Server</h2>
+<p>
+Welcome to the Jackrabbit WebDAV Server.
+It currently provides 2 WebDAV servlets that allow distinct views to the JCR 
+repository:
+
 <ol>
-    <li>
-        <b>Filebased View</b> (SimpleWebdavServlet)<p/>
-        Filebased ("Simple") WebDAV View to the JSR170 repository.<p/>
-        Enter the following URL to your WebDAV client:<br>
-        http://&lt;<i>host</i>&gt;:&lt;<i>port</i>&gt;<%=
request.getContextPath() %><%= SimpleWebdavServlet.getPathPrefix(pageContext.getServletContext())
%>/&lt;<i>workspace name</i>&gt;/
-        <p/>
-        <ul>
-            <li><a href="<%= request.getContextPath() %><%= SimpleWebdavServlet.getPathPrefix(pageContext.getServletContext())
%>/default/">Browser View</a></li>
-            <li><a href="<%= request.getContextPath() %>/search.jsp">Search</a>
for files in Workspace default</li>
-            <li>Nothing to search for? Use this tool to <a href="<%= request.getContextPath()
%>/populate.jsp">populate</a> the workspace with content.</li>
-            <li>Context Path: <%= request.getContextPath() %></li>
-            <li>Resource Path Prefix: <%= SimpleWebdavServlet.getPathPrefix(pageContext.getServletContext())
%></li>
-            <li>Workspace Name: see /WEB-INF/repository/repository.xml (Default = 'default')</li>
-            <li>Source: /jcr-server/server/webdav/simple</li>
-        </ul>
-        <p/>
-    </li>
-    <li>
-        <b>Item View</b> (JCRServerServlet)<p/>
-        Itembased WebDAV View to the JSR170 repository, mapping the functionality
-        provided by JSR170 to WebDAV, in order to allow remoting of JSR170 via
-        WebDAV. Some more details regarding remoting are available as initial
-        draft "<a href="http://www.day.com/jsr170/server/JCR_Webdav_Protocol.zip">JCR_Webdav_Protocol.zip</a>".
-        In addition the implementation attempts to cover functionality of RFC 2518 and
-        its extensions wherever possible, namely<br>
-        <ul>
-            <li><a href="http://www.ietf.org/rfc/rfc2518.txt">RFC 2518 (WebDAV
1,2)</a></li>
-            <li><a href="http://www.ietf.org/rfc/rfc3253.txt">RFC 3253 (DeltaV)</a></li>
-            <li><a href="http://www.ietf.org/rfc/rfc3648.txt">RFC 3648 (Ordering)</a></li>
-            <li><a href="http://greenbytes.de/tech/webdav/draft-reschke-webdav-search-latest.html">Internet
Draft WebDAV Search</a>.</li>
-        </ul>
-        <p/>
-        Enter the following URL to your WebDAV client:<br>
-        http://&lt;<i>host</i>&gt;:&lt;<i>port</i>&gt;<%=
request.getContextPath() %><%= JCRWebdavServerServlet.getPathPrefix(pageContext.getServletContext())
%>/
-        <p/>
-        <ul>
-            <li>Browser View: - Not Available - ("<%= request.getContextPath() %><%=
JCRWebdavServerServlet.getPathPrefix(pageContext.getServletContext()) %>/")</li>
-            <li>Context Path: <%= request.getContextPath() %></li>
-            <li>Resource Path Prefix: <%= JCRWebdavServerServlet.getPathPrefix(pageContext.getServletContext())
%></li>
-            <li>Workspace Name: - Not required - (available workspaces are mapped as
resources)</li>
-            <li>Source: /jcr-server/server/webdav/jcr</li>
-        </ul>
-    </li>
+<li><a href="#simple">Standard WebDAV Server</a></li>
+<li><a href="#remoting">JCR WebDAV Server</a></li>
 </ol>
-<p/>
-<hr size="1"><em>Powered by <a href="<%= rep.getDescriptor(Repository.REP_VENDOR_URL_DESC)
%>"><%= rep.getDescriptor(Repository.REP_NAME_DESC)%></a> version <%=
rep.getDescriptor(Repository.REP_VERSION_DESC) %>.</em>
+</p>
+<p>
+See also the Jackrabbit <a href="http://jackrabbit.apache.org/doc/components/jcr-server.html">Jcr-Server</a>

+component for further information.</p>
+
+<a name="simple"></a>
+<h3>Standard WebDAV Server</h3><br>
+
+The default WebDAV server (aka: Simple Server) represents a DAV1,2 and DeltaV compliant WebDAV

+server implementation. It covers a filebase view to the JCR repository, suitable 
+for everybody looking for standard WebDAV functionality.
+
+<p>
+Enter the following URL to your WebDAV client:
+</p>
+<p>
+<%
+URI uri = new URI(request.getRequestURL().toString());
+String href = uri.getScheme() + "://" + uri.getHost() + ":" + uri.getPort() + request.getContextPath()
+ SimpleWebdavServlet.getPathPrefix(pageContext.getServletContext()) + "/default/";
+%>
+<a href="<%= href %>"><%= href %></a>
+
+</p>
+<p>
+Note, that <i>/default</i> is an assumption regarding the name of your default
workspace such as 
+configured in the <i>repository.xml</i>.
+</p>
+
+<br><h5>Links</h5>
+<ul>
+    <li><a href="<%= request.getContextPath() %><%= SimpleWebdavServlet.getPathPrefix(pageContext.getServletContext())
%>/default/">Browser View</a></li>
+    <li><a href="<%= request.getContextPath() %>/search.jsp">Search</a>
for files in the default workspace.</li>
+    <li>Nothing to search for?<br><a href="<%= request.getContextPath()
%>/populate.jsp">Populate</a> the default workspace with content.</li>
+</ul>
+
+<br><h5>Supported WebDAV functionality</h5>
+<ul>
+<li><a href="http://www.ietf.org/rfc/rfc2518.txt">RFC 2518 (WebDAV 1,2)</a></li>
+<li><a href="http://www.ietf.org/rfc/rfc3253.txt">RFC 3253 (DeltaV)</a></li>
+</ul> 
+
+<br><h5>Configuration</h5>
+<ul>
+    <li>Context path: <%= request.getContextPath() %></li>
+    <li>Resource path prefix: <%= SimpleWebdavServlet.getPathPrefix(pageContext.getServletContext())
%></li>
+    <li>Workspace name: see <i>/WEB-INF/repository/repository.xml</i><br>
+        The default value = 'default'</li>
+    <li>Additional servlet configuration: see <i>/WEB-INF/web.xml</i></li>
+    <li>WebDAV specific resource configuration: see <i>/WEB-INF/config.xml</i></li>
+</ul>
+
+
+
+<a name="remoting"></a>
+
+<h3>JCR WebDAV Server</h3><br>
+
+Itembased WebDAV View to the JCR repository, mapping the functionality
+provided by JSR 170 to the WebDAV protocol in order to allow remoting of JSR170 via
+WebDAV. Some more details regarding remoting are available as initial
+draft "<a href="http://www.day.com/jsr170/server/JCR_Webdav_Protocol.zip">JCR_Webdav_Protocol.zip</a>".
+
+<p>
+Enter one of the following URLs to your WebDAV client:
+
+<ul>
+<li>
+<%
+uri = new URI(request.getRequestURL().toString());
+href = uri.getScheme() + "://" + uri.getHost() + ":" + uri.getPort() + request.getContextPath()
+ JCRWebdavServerServlet.getPathPrefix(pageContext.getServletContext());
+%>
+<a href="<%= href %>"><%= href %></a><br>
+to expose all workspaces of your JCR repository
+</li>
+<li>
+<%
+String shref = href + "/default/jcr:root";
+%>
+<a href="<%= shref %>"><%= shref %></a><br>
+to expose a single workspace (example with workspace named 'default') of your JCR repository.
+</li>
+</ul>
+</p>
+<p>
+Note, that <i>/default</i> is an assumption regarding the name of your default
workspace such as 
+configured in the <i>repository.xml</i>.
+</p>
+<br><h5>Links</h5>
+<ul>
+    <li><a href="<%= href %>">Browser View</a></li>
+</ul>
+
+
+<br><h5>Supported WebDAV functionality</h5>
+<p>
+This implementation focuses on remoting rather than standard WebDAV functionality
+or compatibility with existing WebDAV clients.
+The following RFCs are used to implement the remoting functionality:
+<ul>
+    <li><a href="http://www.ietf.org/rfc/rfc2518.txt">RFC 2518 (WebDAV 1,2)</a></li>
+    <li><a href="http://www.ietf.org/rfc/rfc3253.txt">RFC 3253 (DeltaV)</a></li>
+    <li><a href="http://www.ietf.org/rfc/rfc3648.txt">RFC 3648 (Ordering)</a></li>
+    <li><a href="http://greenbytes.de/tech/webdav/draft-reschke-webdav-search-latest.html">Internet
Draft WebDAV Search</a>.</li>
+</ul>
+For the client counterpart of this WebDAV servlet please take a look at
+the <a href="https://svn.apache.org/repos/asf/jackrabbit/sandbox/spi/spi2dav">Spi2Dav</a>
sandbox project.
+</p>
+
+<br><h5>Configuration</h5>
+<ul>
+    <li>Context Path: <%= request.getContextPath() %></li>
+    <li>Resource Path Prefix: <%= JCRWebdavServerServlet.getPathPrefix(pageContext.getServletContext())
%></li>
+    <li>Workspace Name: <i>optional</i> (available workspaces are mapped
as resources)</li>
+    <li>Additional servlet configuration: see <i>/WEB-INF/web.xml</i></li>
+</ul>
+</div>
+<div id="footer">
+<em>Powered by <a href="<%= rep.getDescriptor(Repository.REP_VENDOR_URL_DESC)
%>"><%= rep.getDescriptor(Repository.REP_NAME_DESC)%></a> version <%=
rep.getDescriptor(Repository.REP_VERSION_DESC) %>.</em>
+</div>
 </body>
 </html>

Modified: jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/populate.jsp
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/populate.jsp?rev=597406&r1=597405&r2=597406&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/populate.jsp (original)
+++ jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/populate.jsp Thu Nov 22 05:26:35 2007
@@ -75,8 +75,13 @@
             }
         }
 %><html>
-  <head><title>Populate workspace: <%= wspName %></title><script><!--
-
+<head>
+<title>Welcome to Apache Jackrabbit - Populate workspace: <%= wspName %></title>
+<link rel="shortcut icon" href="<%= request.getContextPath() %>/images/favicon.ico"
type="image/vnd.microsoft.icon">
+<style type="text/css" media="all">
+      @import url("<%= request.getContextPath() %>/css/default.css");
+</style>
+<script><!--
 function draw() {
 	// draw the bar
 	document.write('<table cellspacing="0" cellpadding="0" style="border-color:' + this.borderColor
+ '; border-width:' + this.borderWidth + '; border-style:' + this.borderStyle + '">');
@@ -127,17 +132,19 @@
 ProgressBar.prototype.borderWidth = "2px";
 
 // -->
-</script></head>
+</script>
+</head>
   <body>
-    <h2>Populate workspace: <%= wspName %></h2>
+  <div id="bodyColumn">
+  <a href="http://jackrabbit.apache.org"><img src="<%= request.getContextPath()
%>/images/jackrabbitlogo.gif" alt="" /></a><br>
+  <h2>Populate workspace: "<%= wspName %>"</h2><br>
     <%
         if (seedWord != null && numDocs > 0 && filetypes.size() > 0)
{
     %>
-    Overall progress:
-    <p/>
+    <h6>Overall progress</h6>
     <script>var pb = new ProgressBar(<%= numDocs %>, 300, 30);pb.draw();</script>
-    Downloading document:
-    <p/>
+    
+    <br><h6>Downloading document</h6>
     <script>var dp = new ProgressBar(1000, 300, 30);dp.draw();</script>
     <%
             Node root = jcrSession.getRootNode();
@@ -255,14 +262,18 @@
     <%
         }
     %>
-    <p/>
     <form>
-      <table border=0 cellpadding=5 cellspacing=0 width=100%>
+      <table>
       <tr><td>Seed word:</td><td><input name="seed" type="text"
size="30" value="<%= seedWord == null ? "download" : seedWord %>"/></td></tr>
       <tr><td>Number of documents:</td><td><input name="num" type="text"
size="30" value="<%= numDocs == 0 ? 100 : numDocs %>"/></td></tr>
       <tr valign="top"><td>Document types:</td><td><input name="filetype"
type="checkbox" value="pdf" <%= filetypes.contains("pdf") ? "checked" : "" %>/> Adobe
Acrobat PDF<br/><input name="filetype" type="checkbox" value="rtf" <%= filetypes.contains("rtf")
? "checked" : "" %>/> Rich Text Format<br/><input name="filetype" type="checkbox"
value="doc" <%= filetypes.contains("doc") ? "checked" : "" %>/> Microsoft Word<br/><input
name="filetype" type="checkbox" value="ppt" <%= filetypes.contains("ppt") ? "checked" :
"" %>/> Microsoft PowerPoint<br/><input name="filetype" type="checkbox" value="xls"
<%= filetypes.contains("xls") ? "checked" : "" %>/> Microsoft Excel<br/></td></tr>
       <tr><td>&nbsp;</td><td><input type="submit" value="Populate!"/></td></tr>
+      </table>
     </form>
+  </div>
+  <div id="footer">
+  <em>Powered by <a href="<%= rep.getDescriptor(Repository.REP_VENDOR_URL_DESC)
%>"><%= rep.getDescriptor(Repository.REP_NAME_DESC)%></a> version <%=
rep.getDescriptor(Repository.REP_VERSION_DESC) %>.</em>
+  </div>
   </body>
 </html><%
     } finally {

Modified: jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/search.jsp
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/search.jsp?rev=597406&r1=597405&r2=597406&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/search.jsp (original)
+++ jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/search.jsp Thu Nov 22 05:26:35 2007
@@ -127,85 +127,23 @@
             }
         }
 %><html>
-  <head>
-    <title>Jackrabbit Search</title>
-    <link rel="shortcut icon" href="<%= request.getContextPath() %>/images/favicon.ico"
type="image/vnd.microsoft.icon">
-    <style><!--
-div,td{color:#000}
-.f{color:#666}
-.flc,.fl:link{color:#77c}
-a:link,.w,a.w:link,.w a:link,.q:visited,.q:link,.q:active,.q{color:#00c}
-a:visited,.fl:visited{color:#551a8b}
-a:active,.fl:active{color:red}
-.t{background:#e5ecf9;color:#000}
-.bb{border-bottom:1px solid #36c}
-.bt{border-top:1px solid #36c}
-.j{width:34em}
-.h{color:#36c}
-.i,.i:link{color:#a90a08}
-.a,.a:link{color:green}
-.z{display:none}
-div.n{margin-top:1ex}
-.n a{font-size:10pt;color:#000}
-.n .i{font-size:10pt;font-weight:bold}
-.b a{font-size:12pt;color:#00c;font-weight:bold}
-#np,#nn,.nr,#logo span,.ch{cursor:pointer;cursor:hand}
-.tas{padding:3px 3px 3px 5px}
-.taf{padding:3px 3px 6px 5px}
-.tam{padding:6px 3px 6px 5px}
-.tal{padding:6px 3px 3px 5px}
-.sl,.r{font-weight:normal;margin:0;display:inline}
-.sl{font-size:84%}
-.r{font-size:1em}
-.e{margin:.75em 0}
-.mblink:visited{color:#00c}
-.sm{display:block;margin:0;margin-left:40px}
-.bl{display:none}
-.fl2,.fl2:link,.fl2:visited{color:#77c}
-.fl2:active{color:red}
-#navbar div,#logo span{background:url(<%= request.getContextPath() %>/images/jackrabbitlogo.gif)
no-repeat;overflow:hidden;height:83px}
-#navbar .nr{background-position:-235px 0;width:22px}
-#navbar #np{background-position:-95px;width:140px}
-#navbar #nf{background-position:-95px 0;width:140px}
-#navbar #nc{background-position:-235px 0;width:22px}
-#navbar #nn{background-position:-279px 0;width:66px;margin-right:34px}
-#navbar #nl{background-position:-279px 0;width:46px}
-#logo{display:block;width:320px;height:83px;position:relative;overflow:hidden}
-#logo span{background-position:0 0px;position:absolute;top:0;left:0;width:100%;height:100%}
-body,td,div,.p,a{font-family:arial,sans-serif}
-.g{margin:1em 0}
-#sd{font-size:113%;font-weight:bold}
-#ap{font-size:64%}
---></style></head>
-  <bodybgcolor="#ffffff" topmargin="3" marginheight="3">
-  <table border=0 cellpadding=0 cellspacing=0 width=100% style=clear:left>
+<head>
+<title>Welcome to Apache Jackrabbit - Search</title>
+<link rel="shortcut icon" href="<%= request.getContextPath() %>/images/favicon.ico"
type="image/vnd.microsoft.icon">
+<style type="text/css" media="all">
+      @import url("<%= request.getContextPath() %>/css/default.css");
+</style>
+</head>
+  <body>
+  <div id="bodyColumn">
+  <a href="http://jackrabbit.apache.org"><img src="<%= request.getContextPath()
%>/images/jackrabbitlogo.gif" alt="" /></a><br>
+  <h2>Jackrabbit Search</h2>
+  <br><h5>Workspace: <%= wspName %></h5>
+  <table>
     <tr><form name=gs method=GET>
-      <td valign=top><a id=logo href="http://jackrabbit.apache.org/" title="Go to
Jackrabbit Home">Jackrabbit<span></span></a></td>
-      <td>&nbsp;&nbsp;</td>
-      <td valign=top width=100% style="padding-top:8px">
-        <table cellpadding=0 cellspacing=0 border=0>
-          <tr>
-            <td height=14 valign=bottom>
-              <img align=right alt="" height=1 width=1><style>#lgpd{display:none}</style>
-              <table border=0 cellspacing=0 cellpadding=4>
-                <tr>
-                  <td nowrap><font size=-1><b>Workspace: <%= wspName
%></b></font></td>
-                </tr>
-              </table>
-            </td>
-          </tr>
-          <tr>
-            <td>
-              <table border=0 cellpadding=0 cellspacing=0>
-                <tr>
-                  <td nowrap>
-                    <input type=text name=q size=41 maxlength=2048 value="<%= q %>"
title="Search"><font size=-1> <input type=submit value="Search"><span id=hf></span></font>
-                  </td>
-                </tr>
-              </table>
-            </td>
-          </tr>
-        </table>
+      <td valign=top width=100%"><br>
+        <input type=text name=q size=41 maxlength=2048 value="<%= q %>" title="Search">
+        <input type=submit value="Search"><br><br>
       </td></form>
     </tr>
   </table>
@@ -213,9 +151,6 @@
   <%
     if (rows != null && rows.getSize() == 0) {
   %>
-  <table border=0 cellpadding=0 cellspacing=0 width=100% class="t bt">
-    <tr><td nowrap><span id=sd>&nbsp;Workspace: <%= wspName %>&nbsp;</span></td></tr>
-  </table>
   <%
       if (suggestedQuery != null) {
         %><p><font class="p" color="#cc0000">Did you mean: </font><a
href="search.jsp?q=<%= suggestedQuery %>" class="p"><b><i><%= suggestedQuery
%></i></b></a>&nbsp;&nbsp;<br></p><%
@@ -228,14 +163,14 @@
     } else if (rows != null) {
   %>
   <table border=0 cellpadding=0 cellspacing=0 width=100% class="t bt">
-    <tr><td nowrap><span id=sd>&nbsp;Workspace: <%= wspName %>&nbsp;</span></td><td
align=right nowrap><font size=-1>Results <b><%= from + 1 %></b>
- <b><%= to %></b> of about <b><%= totalResults %></b>
<%= queryTerms %>. (<b><%= executedIn %></b> seconds)&nbsp;</font></td></tr>
+    <tr><td><font size=-1>Results <b><%= from + 1 %></b>
- <b><%= to %></b> of about <b><%= totalResults %></b>
<%= queryTerms %>. (<b><%= executedIn %></b> seconds)&nbsp;</font></td></tr>
   </table>
   <%
       if (suggestedQuery != null) {
         %><p><font class="p" color="#cc0000">Did you mean: </font><a
href="search.jsp?q=<%= suggestedQuery %>" class="p"><b><i><%= suggestedQuery
%></i></b></a>&nbsp;&nbsp;<br></p><%
       }
   %>
-  <div id=res>
+  <div>
     <%
       while (rows.hasNext() && rows.getPosition() < to) {
           Row r = rows.nextRow();
@@ -249,13 +184,12 @@
           DateFormat df = SimpleDateFormat.getDateInstance(SimpleDateFormat.LONG);
           String lastModified = df.format(resource.getProperty("jcr:lastModified").getDate().getTime());
     %>
-    <div class=g><h2 class=r><a href="<%= request.getContextPath() %>/repository/<%=
wspName %><%= file.getPath() %>" class=l><%= file.getName() %></a></h2>
+    <h6><a href="<%= request.getContextPath() %>/repository/<%= wspName
%><%= file.getPath() %>" class=l><%= file.getName() %></a></h6>
       <table border=0 cellpadding=0 cellspacing=0>
-        <tr><td class="j"><font size=-1><%= r.getValue("rep:excerpt(jcr:content)").getString()
%>
-          <span class=a><%= file.getPath() %> - <%= size %> - <%= lastModified
%> - </span><nobr><a class=fl href="<%= request.getContextPath() %>/search.jsp?q=related:<%=
URLEncoder.encode(file.getPath(), "UTF-8") %>">Similar pages</a></nobr></font><!--n--></td>
+        <tr><td><font><%= r.getValue("rep:excerpt(jcr:content)").getString()
%>
+          <%= file.getPath() %> - <%= size %> - <%= lastModified %> - <nobr><a
href="<%= request.getContextPath() %>/search.jsp?q=related:<%= URLEncoder.encode(file.getPath(),
"UTF-8") %>">Similar pages</a></nobr></font></td>
         </tr>
       </table>
-    </div>
     <%
       } // while
     %>
@@ -265,28 +199,28 @@
   <%
     if (indexes.size() > 1) {
   %>
-  <div id=navbar class=n>
-    <table border=0 cellpadding=0 width=1% cellspacing=0 align=center>
-      <tr align=center style=text-align:center valign=top>
-        <td valign=bottom nowrap><font size=-1>Result&nbsp;Page:&nbsp;</font>
+  <div>
+    <table border=0 cellpadding=0 cellspacing=0 align=center>
+      <tr>
+        <td><font size=-1>Result&nbsp;Page:&nbsp;
         <%
         if (currentPageIndex != ((Long) indexes.get(0)).longValue()) {
-            %><td nowrap align=right class=b><a href=search.jsp?q=<%= q %>&start=<%=
(currentPageIndex - 1) * 10 %>><div id=np></div>Previous</a><%
+            %><td nowrap align=right><a href=search.jsp?q=<%= q %>&start=<%=
(currentPageIndex - 1) * 10 %>>Previous</a><%
         } else {
-            %><td nowrap ><div id=nf></div><%
+            %><td nowrap ><font size=-1><%
         }
         for (Iterator it = indexes.iterator(); it.hasNext(); ) {
             long pageIdx = ((Long) it.next()).longValue();
             if (pageIdx == currentPageIndex) {
-                %><td nowrap><div id=nc></div><span class=i><%=
pageIdx + 1 %></span><%
+                %><td nowrap><font size=-1><%= pageIdx + 1 %><%
             } else {
-                %><td nowrap><a href=search.jsp?q=<%= q %>&start=<%=
pageIdx * 10 %>><div class=nr></div><%= pageIdx + 1 %></a><%
+                %><td nowrap><font size=-1><a href=search.jsp?q=<%=
q %>&start=<%= pageIdx * 10 %>><%= pageIdx + 1 %></a><%
             }
         }
         if (currentPageIndex < (maxPage - 1)) {
-            %><td nowrap class=b><a href=search.jsp?q=<%= q %>&start=<%=
(currentPageIndex + 1) * 10 %>><div id=nn></div>Next</a><%
+            %><td nowrap><font size=-1><a href=search.jsp?q=<%= q %>&start=<%=
(currentPageIndex + 1) * 10 %>>Next</a><%
         } else {
-            %><td nowrap ><div id=nl></div><%
+            %><td nowrap ><%
         }
         %>
     </table>
@@ -295,20 +229,17 @@
     }
   %>
 
-  <center>
+
     <br clear=all><br>
-    <table border=0 cellpadding=0 cellspacing=0 width=100% class="ft t bb bt">
-      <tr><td align=center>&nbsp;<br>
-        <table border=0 cellpadding=0 cellspacing=0 align=center><form method=GET
action=<%= request.getContextPath() %>/search.jsp><tr><td nowrap>
+    <table>
+      <tr><td><br><form method=GET action=<%= request.getContextPath()
%>/search.jsp>
           <font size=-1><input type=text name=q size=31 maxlength=2048 value="<%=
q %>" title="Search"> <input type=submit value="Search">
-          </font></td></tr></form>
-        </table>
+          </font></form>
         <br><font size=-1>
         <a href="<%= request.getContextPath() %>/swr.jsp?q=<%= q %>&swrnum=<%=
rows.getSize() %>">Search&nbsp;within&nbsp;results</a> | <a href="http://issues.apache.org/jira/browse/JCR"
target=_blank>Dissatisfied? Help us improve</a></font><br>
         <br>
       </td></tr>
     </table>
-  </center>
 
   <%
     } // if (rows != null)
@@ -318,14 +249,10 @@
         tableClass = " class=\"t n bt\"";
     }
   %>
-
-  <center>
-    <p><hr class=z>
-    <table border=0 cellpadding=2 cellspacing=0 width=100%<%= tableClass %>>
-      <tr><td align=center><font size=-1><a href="http://jackrabbit.apache.org/">Jackrabbit&nbsp;Home</a></font></td></tr>
-    </table>
-    <br><font size=-1 class=p>&copy;<%= Calendar.getInstance().get(Calendar.YEAR)
%> Apache Jackrabbit</font>
-  </center>
+  </div>
+  <div id="footer">
+  <em>Powered by <a href="<%= rep.getDescriptor(Repository.REP_VENDOR_URL_DESC)
%>"><%= rep.getDescriptor(Repository.REP_NAME_DESC)%></a> version <%=
rep.getDescriptor(Repository.REP_VERSION_DESC) %>.</em>
+  </div>
   </body>
 </html><%
     } finally {

Modified: jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/swr.jsp
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/swr.jsp?rev=597406&r1=597405&r2=597406&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/swr.jsp (original)
+++ jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/swr.jsp Thu Nov 22 05:26:35 2007
@@ -46,61 +46,39 @@
         }
         %>
 <html>
-  <head><title>Search within results</title>
-    <link rel="shortcut icon" href="<%= request.getContextPath() %>/images/favicon.ico"
type="image/vnd.microsoft.icon">
-    <style><!--
-div,td{color:#000}
-.f{color:#666}
-.flc,.fl:link{color:#77c}
-a:link,.w,a.w:link,.w a:link,.q:visited,.q:link,.q:active,.q{color:#00c}
-a:visited,.fl:visited{color:#551a8b}
-a:active,.fl:active{color:red}
-.t{background:#e5ecf9;color:#000}
-.bb{border-bottom:1px solid #36c}
-.bt{border-top:1px solid #36c}
-.j{width:34em}
-.h{color:#36c}
-.i,.i:link{color:#a90a08}
-.a,.a:link{color:green}
-.z{display:none}
-div.n{margin-top:1ex}
-.n a{font-size:10pt;color:#000}
-.n .i{font-size:10pt;font-weight:bold}
-.b a{font-size:12pt;color:#00c;font-weight:bold}
-#np,#nn,.nr,#logo span,.ch{cursor:pointer;cursor:hand}
-.tas{padding:3px 3px 3px 5px}
-.taf{padding:3px 3px 6px 5px}
-.tam{padding:6px 3px 6px 5px}
-.tal{padding:6px 3px 3px 5px}
-.sl,.r{font-weight:normal;margin:0;display:inline}
-.sl{font-size:84%}
-.r{font-size:1em}
-.e{margin:.75em 0}
-.bl{display:none}
-.fl2,.fl2:link,.fl2:visited{color:#77c}
-.fl2:active{color:red}
-#navbar div,#logo span{background:url(<%= request.getContextPath() %>/images/jackrabbitlogo.gif)
no-repeat;overflow:hidden;height:26px}
-#logo{display:block;width:150px;height:52px;position:relative;overflow:hidden;margin:15px
0 12px}
-#logo span{background-position:0 -26px;position:absolute;top:0;left:0;width:100%;height:100%}
-body,td,div,.p,a{font-family:arial,sans-serif}
-.g{margin:1em 0}
-#sd{font-size:113%;font-weight:bold}
-#ap{font-size:64%}
---></style></head>
-  <body bgcolor=#ffffff text=#000000 onload=document.f.as_q.focus() link=#0000cc vlink=#551A8B
alink=#ff0000>
+<head>
+<title>Welcome to Apache Jackrabbit - Search within results</title>
+<link rel="shortcut icon" href="<%= request.getContextPath() %>/images/favicon.ico"
type="image/vnd.microsoft.icon">
+<style type="text/css" media="all">
+      @import url("<%= request.getContextPath() %>/css/default.css");
+</style>
+</head>
+  <body>
+  <div id="bodyColumn">
+  <a href="http://jackrabbit.apache.org"><img src="<%= request.getContextPath()
%>/images/jackrabbitlogo.gif" alt="" /></a><br>
+  <h2>Search within results</h2>
+</head>
+  <body onload=document.f.as_q.focus()>
     <form name=f action="search.jsp">
       <table border=0 cellpadding=0 cellspacing=0 width=100%>
-        <tr><td valign=top><a href=/><img border=0 src="<%= request.getContextPath()
%>/images/jackrabbitlogo.gif" width=320 height=83 alt=Jackrabbit></a><br><center><font
face=arial,sans-serif color=green><b>Search&nbsp;within&nbsp;results</b></font></center></td><td><table
border=0 width=100%><tr><td><font face=arial,sans-serif><br>There
were about <b><%= numResults %></b> results for <b><%= q %></b>.<br>Use
the search box below to search within these results.<br><br></font></td></tr></table></td></tr><tr><td
width=205 align=right>&nbsp;</td><td valign=middle><INPUT type=hidden
name=q value="<%= q %>"><INPUT type=text name=as_q size=31 maxlength=256 value=""><INPUT
type=submit VALUE="Search&nbsp;within&nbsp;results"></font></td></tr>
+        <tr><table border=0 width=100%><tr><td><br>There were
about <b><%= numResults %></b> results for <b><%= q %></b>.<br>
+        Use the search box below to search within these results.<br><br></td></tr></table>
+        </td></tr>
+        <tr><td valign=middle>
+        <table border=0 width=100%><tr><td>
+        <INPUT type=hidden name=q value="<%= q %>">
+        <INPUT type=text name=as_q size=31 maxlength=256 value="">
+        <INPUT type=submit VALUE="Search&nbsp;within&nbsp;results">
+        </td></tr></table>
+        </td></tr>
       </table>
     </form>
     <br>
-    <center>
-      <p><hr class=z>
-      <table border=0 cellpadding=2 cellspacing=0 width=100% class="t n bt">
-        <tr><td align=center><font size=-1><a href="http://jackrabbit.apache.org">Jackrabbit&nbsp;Home</a></td></tr>
-      </table>
-      <br><font size=-1 class=p>&copy;<%= Calendar.getInstance().get(Calendar.YEAR)
%> Apache Jackrabbit</font>
-    </center>
+  
+  </div>
+  <div id="footer">
+  <em>Powered by <a href="<%= rep.getDescriptor(Repository.REP_VENDOR_URL_DESC)
%>"><%= rep.getDescriptor(Repository.REP_NAME_DESC)%></a> version <%=
rep.getDescriptor(Repository.REP_VERSION_DESC) %>.</em>
+  </div>
 
   </body>
 



Mime
View raw message