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. */ -%> +%> + -Jackrabbit JCR-Server +Welcome to Apache Jackrabbit - WebDAV Server + + - + <% Repository rep; try { @@ -33,54 +39,137 @@ return; } -%>

JCR-Server

-

JCR-Server provides 2 views

+%> +

+
+

Jackrabbit WebDAV Server

+

+Welcome to the Jackrabbit WebDAV Server. +It currently provides 2 WebDAV servlets that allow distinct views to the JCR +repository: +

    -
  1. - Filebased View (SimpleWebdavServlet)

    - Filebased ("Simple") WebDAV View to the JSR170 repository.

    - Enter the following URL to your WebDAV client:
    - http://<host>:<port><%= request.getContextPath() %><%= SimpleWebdavServlet.getPathPrefix(pageContext.getServletContext()) %>/<workspace name>/ -

    -

      -
    • Browser View
    • -
    • Search for files in Workspace default
    • -
    • Nothing to search for? Use this tool to populate the workspace with content.
    • -
    • Context Path: <%= request.getContextPath() %>
    • -
    • Resource Path Prefix: <%= SimpleWebdavServlet.getPathPrefix(pageContext.getServletContext()) %>
    • -
    • Workspace Name: see /WEB-INF/repository/repository.xml (Default = 'default')
    • -
    • Source: /jcr-server/server/webdav/simple
    • -
    -

    -

  2. -
  3. - Item View (JCRServerServlet)

    - 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 "JCR_Webdav_Protocol.zip". - In addition the implementation attempts to cover functionality of RFC 2518 and - its extensions wherever possible, namely
    -

    -

    - Enter the following URL to your WebDAV client:
    - http://<host>:<port><%= request.getContextPath() %><%= JCRWebdavServerServlet.getPathPrefix(pageContext.getServletContext()) %>/ -

    -

      -
    • Browser View: - Not Available - ("<%= request.getContextPath() %><%= JCRWebdavServerServlet.getPathPrefix(pageContext.getServletContext()) %>/")
    • -
    • Context Path: <%= request.getContextPath() %>
    • -
    • Resource Path Prefix: <%= JCRWebdavServerServlet.getPathPrefix(pageContext.getServletContext()) %>
    • -
    • Workspace Name: - Not required - (available workspaces are mapped as resources)
    • -
    • Source: /jcr-server/server/webdav/jcr
    • -
    -
  4. +
  5. Standard WebDAV Server
  6. +
  7. JCR WebDAV Server
-

-


Powered by <%= rep.getDescriptor(Repository.REP_NAME_DESC)%> version <%= rep.getDescriptor(Repository.REP_VERSION_DESC) %>. +

+

+See also the Jackrabbit Jcr-Server +component for further information.

+ + +

Standard WebDAV Server


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

+Enter the following URL to your WebDAV client: +

+

+<% +URI uri = new URI(request.getRequestURL().toString()); +String href = uri.getScheme() + "://" + uri.getHost() + ":" + uri.getPort() + request.getContextPath() + SimpleWebdavServlet.getPathPrefix(pageContext.getServletContext()) + "/default/"; +%> +<%= href %> + +

+

+Note, that /default is an assumption regarding the name of your default workspace such as +configured in the repository.xml. +

+ +
Links
+ + +
Supported WebDAV functionality
+ + +
Configuration
+ + + + + + +

JCR WebDAV Server


+ +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 "JCR_Webdav_Protocol.zip". + +

+Enter one of the following URLs to your WebDAV client: + +

+

+

+Note, that /default is an assumption regarding the name of your default workspace such as +configured in the repository.xml. +

+
Links
+ + + +
Supported WebDAV functionality
+

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

+For the client counterpart of this WebDAV servlet please take a look at +the Spi2Dav sandbox project. +

+ +
Configuration
+ +
+ 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 @@ } } %> - Populate workspace: <%= wspName %> + + -

Populate workspace: <%= wspName %>

+
+
+

Populate workspace: "<%= wspName %>"


<% if (seedWord != null && numDocs > 0 && filetypes.size() > 0) { %> - Overall progress: -

+

Overall progress
- Downloading document: -

+ +

Downloading document
<% Node root = jcrSession.getRootNode(); @@ -255,14 +262,18 @@ <% } %> -

- +
+
Seed word:"/>
Number of documents:
Document types:/> Adobe Acrobat PDF
/> Rich Text Format
/> Microsoft Word
/> Microsoft PowerPoint
/> Microsoft Excel
 
+
+ <% } 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 @@ } } %> - - Jackrabbit Search - - - - + +Welcome to Apache Jackrabbit - Search + + + + +
+
+

Jackrabbit Search

+
Workspace: <%= wspName %>
+
- - -
   - - - - - - - -
- - - - - -
Workspace: <%= wspName %>
-
- - - - -
- -
-
+

+ +

@@ -213,9 +151,6 @@ <% if (rows != null && rows.getSize() == 0) { %> - - -
 Workspace: <%= wspName %> 
<% if (suggestedQuery != null) { %>

Did you mean: <%= suggestedQuery %>  

<% @@ -228,14 +163,14 @@ } else if (rows != null) { %> - +
 Workspace: <%= wspName %> Results <%= from + 1 %> - <%= to %> of about <%= totalResults %> <%= queryTerms %>. (<%= executedIn %> seconds) 
Results <%= from + 1 %> - <%= to %> of about <%= totalResults %> <%= queryTerms %>. (<%= executedIn %> seconds) 
<% if (suggestedQuery != null) { %>

Did you mean: <%= suggestedQuery %>  

<% } %> -
+
<% 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()); %> -

<%= file.getName() %>

+
<%= file.getName() %>
- +
<%= r.getValue("rep:excerpt(jcr:content)").getString() %> - <%= file.getPath() %> - <%= size %> - <%= lastModified %> - ">Similar pages
<%= r.getValue("rep:excerpt(jcr:content)").getString() %> + <%= file.getPath() %> - <%= size %> - <%= lastModified %> - ">Similar pages
-
<% } // while %> @@ -265,28 +199,28 @@ <% if (indexes.size() > 1) { %> -