jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From resc...@apache.org
Subject svn commit: r1297525 - in /jackrabbit/branches/2.4/jackrabbit-webapp/src/main/webapp: error/classpath.jsp error/repository.jsp footer.jsp header.jsp local.jsp remote.jsp troubleshooting.jsp webdav-jcr.jsp
Date Tue, 06 Mar 2012 15:29:56 GMT
Author: reschke
Date: Tue Mar  6 15:29:55 2012
New Revision: 1297525

URL: http://svn.apache.org/viewvc?rev=1297525&view=rev
Log:
set svn:eol-style to native, sanitize line ends

Modified:
    jackrabbit/branches/2.4/jackrabbit-webapp/src/main/webapp/error/classpath.jsp   (contents, props changed)
    jackrabbit/branches/2.4/jackrabbit-webapp/src/main/webapp/error/repository.jsp   (contents, props changed)
    jackrabbit/branches/2.4/jackrabbit-webapp/src/main/webapp/footer.jsp   (contents, props changed)
    jackrabbit/branches/2.4/jackrabbit-webapp/src/main/webapp/header.jsp   (contents, props changed)
    jackrabbit/branches/2.4/jackrabbit-webapp/src/main/webapp/local.jsp   (contents, props changed)
    jackrabbit/branches/2.4/jackrabbit-webapp/src/main/webapp/remote.jsp   (contents, props changed)
    jackrabbit/branches/2.4/jackrabbit-webapp/src/main/webapp/troubleshooting.jsp   (contents, props changed)
    jackrabbit/branches/2.4/jackrabbit-webapp/src/main/webapp/webdav-jcr.jsp   (contents, props changed)

Modified: jackrabbit/branches/2.4/jackrabbit-webapp/src/main/webapp/error/classpath.jsp
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.4/jackrabbit-webapp/src/main/webapp/error/classpath.jsp?rev=1297525&r1=1297524&r2=1297525&view=diff
==============================================================================
--- jackrabbit/branches/2.4/jackrabbit-webapp/src/main/webapp/error/classpath.jsp (original)
+++ jackrabbit/branches/2.4/jackrabbit-webapp/src/main/webapp/error/classpath.jsp Tue Mar  6 15:29:55 2012
@@ -1,29 +1,29 @@
-<%--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
---%><%
-request.setAttribute("title", "JCR API Not Found");
-%><jsp:include page="../header.jsp"/>
-<p>
-The <code>javax.jcr.Repository</code> interface from the JCR API could not
-be loaded.
-</p>
-<p>
-To resolve this issue, you need to make the <code>jcr-2.0.jar</code> file
-available in the shared classpath of the servlet container. The file is
-available for download from the
-<a href="http://www.jcp.org/en/jsr/summary?id=283">JSR 283</a> web page.
+<%--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+--%><%
+request.setAttribute("title", "JCR API Not Found");
+%><jsp:include page="../header.jsp"/>
+<p>
+The <code>javax.jcr.Repository</code> interface from the JCR API could not
+be loaded.
 </p>
-<jsp:include page="../footer.jsp"/>
+<p>
+To resolve this issue, you need to make the <code>jcr-2.0.jar</code> file
+available in the shared classpath of the servlet container. The file is
+available for download from the
+<a href="http://www.jcp.org/en/jsr/summary?id=283">JSR 283</a> web page.
+</p>
+<jsp:include page="../footer.jsp"/>

Propchange: jackrabbit/branches/2.4/jackrabbit-webapp/src/main/webapp/error/classpath.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: jackrabbit/branches/2.4/jackrabbit-webapp/src/main/webapp/error/repository.jsp
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.4/jackrabbit-webapp/src/main/webapp/error/repository.jsp?rev=1297525&r1=1297524&r2=1297525&view=diff
==============================================================================
--- jackrabbit/branches/2.4/jackrabbit-webapp/src/main/webapp/error/repository.jsp (original)
+++ jackrabbit/branches/2.4/jackrabbit-webapp/src/main/webapp/error/repository.jsp Tue Mar  6 15:29:55 2012
@@ -1,42 +1,42 @@
-<%--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
---%><%@ page isErrorPage="true"
-             import="org.apache.jackrabbit.util.Text,
-                     java.io.StringWriter,
-                     java.io.PrintWriter"%><%
-request.setAttribute("title", "Repository Error");
-%><jsp:include page="../header.jsp"/>
-<p>
-  The content repository operation failed with the following
-  <%= exception.getClass().getSimpleName() %> error:
-</p>
-<blockquote><%= Text.encodeIllegalXMLCharacters(exception.getMessage()) %></blockquote>
-<p>
-  See the
-  <a href="<%= Text.encodeIllegalXMLCharacters(request.getContextPath()) %>/troubleshooting.jsp">troubleshooting page</a>
-  for ideas on how to resolve this issue.
-</p>
-
-<h2>Exception stack trace</h2>
-<p>
-  Below is the full exception stack trace associated with this error:
-</p>
-<%
-StringWriter buffer = new StringWriter();
-exception.printStackTrace(new PrintWriter(buffer));
-%>
+<%--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+--%><%@ page isErrorPage="true"
+             import="org.apache.jackrabbit.util.Text,
+                     java.io.StringWriter,
+                     java.io.PrintWriter"%><%
+request.setAttribute("title", "Repository Error");
+%><jsp:include page="../header.jsp"/>
+<p>
+  The content repository operation failed with the following
+  <%= exception.getClass().getSimpleName() %> error:
+</p>
+<blockquote><%= Text.encodeIllegalXMLCharacters(exception.getMessage()) %></blockquote>
+<p>
+  See the
+  <a href="<%= Text.encodeIllegalXMLCharacters(request.getContextPath()) %>/troubleshooting.jsp">troubleshooting page</a>
+  for ideas on how to resolve this issue.
+</p>
+
+<h2>Exception stack trace</h2>
+<p>
+  Below is the full exception stack trace associated with this error:
+</p>
+<%
+StringWriter buffer = new StringWriter();
+exception.printStackTrace(new PrintWriter(buffer));
+%>
 <pre><%= Text.encodeIllegalXMLCharacters(buffer.toString()) %></pre>
-<jsp:include page="../footer.jsp"/>
+<jsp:include page="../footer.jsp"/>

Propchange: jackrabbit/branches/2.4/jackrabbit-webapp/src/main/webapp/error/repository.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: jackrabbit/branches/2.4/jackrabbit-webapp/src/main/webapp/footer.jsp
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.4/jackrabbit-webapp/src/main/webapp/footer.jsp?rev=1297525&r1=1297524&r2=1297525&view=diff
==============================================================================
--- jackrabbit/branches/2.4/jackrabbit-webapp/src/main/webapp/footer.jsp (original)
+++ jackrabbit/branches/2.4/jackrabbit-webapp/src/main/webapp/footer.jsp Tue Mar  6 15:29:55 2012
@@ -1,26 +1,26 @@
-<%--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
---%>
-      </div>
-      <div id="footer">
-        <p>
-          Powered by
-          <a href="http://jackrabbit.apache.org/">Apache Jackrabbit</a>.
-        </p>
-      </div>
-    </div>
-  </body>
-</html>
+<%--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+--%>
+      </div>
+      <div id="footer">
+        <p>
+          Powered by
+          <a href="http://jackrabbit.apache.org/">Apache Jackrabbit</a>.
+        </p>
+      </div>
+    </div>
+  </body>
+</html>

Propchange: jackrabbit/branches/2.4/jackrabbit-webapp/src/main/webapp/footer.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: jackrabbit/branches/2.4/jackrabbit-webapp/src/main/webapp/header.jsp
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.4/jackrabbit-webapp/src/main/webapp/header.jsp?rev=1297525&r1=1297524&r2=1297525&view=diff
==============================================================================
--- jackrabbit/branches/2.4/jackrabbit-webapp/src/main/webapp/header.jsp (original)
+++ jackrabbit/branches/2.4/jackrabbit-webapp/src/main/webapp/header.jsp Tue Mar  6 15:29:55 2012
@@ -1,89 +1,89 @@
-<%--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
---%>
-<%@page import="org.apache.jackrabbit.util.Text"%>
-<%
-String title =
-    Text.encodeIllegalXMLCharacters(request.getAttribute("title").toString());
-String context =
-    Text.encodeIllegalXMLCharacters(request.getContextPath());
-%>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-          "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-  <head>
-    <title><%= title %></title>
-    <link rel="stylesheet"
-          href="<%= context %>/css/default.css"
-          type="text/css"/>
-    <link rel="shortcut icon"
-          href="<%= context %>/images/favicon.ico"
-          type="image/vnd.microsoft.icon" />
-  </head>
-  <body>
-    <div id="page">
-      <div id="banner">
-        <p id="jcr">
-          <a href="<%= context %>/">
-            <img src="<%= context %>/images/jlogo.gif"
-                 alt="Apache Jackrabbit" height="100" width="336"/>
-          </a>
-        </p>
-        <p id="asf">
-          <a href="http://www.apache.org/">
-            <img src="<%= context %>/images/asf-logo.gif"
-                 alt="Apache Software Foundation" height="100" width="387"/>
-          </a>
-        </p>
-      </div>
-      <div id="navigation">
-        <ul>
-          <li>Jackrabbit JCR Server
-            <ul>
-              <li><a href="<%= context %>/">Welcome</a></li>
-              <li><a href="<%= context %>/webdav-simple.jsp">Standard WebDAV</a></li>
-              <li><a href="<%= context %>/webdav-jcr.jsp">JCR Remoting</a></li>
-              <li><a href="<%= context %>/remote.jsp">Remote access</a></li>
-              <li><a href="<%= context %>/local.jsp">Local access</a></li>
-              <li><a href="<%= context %>/troubleshooting.jsp">Troubleshooting</a></li>
-              <li><a href="<%= context %>/about.jsp">About Jackrabbit</a></li>
-            </ul>
-          </li>
-          <li>Default workspace
-            <ul>
-              <li><a href="<%= context %>/repository/default/">Browse</a></li>
-              <li><a href="<%= context %>/search.jsp">Search</a></li>
-              <li><a href="<%= context %>/populate.jsp">Populate</a></li>
-            </ul>
-          </li>
-          <li>Apache Jackrabbit
-            <ul>
-              <li><a href="http://jackrabbit.apache.org/">Apache Jackrabbit</a></li>
-              <li><a href="http://jackrabbit.apache.org/api/2.3/">Jackrabbit API</a></li>
-              <li><a href="http://wiki.apache.org/jackrabbit/FrontPage">Jackrabbit Wiki</a></li>
-            </ul>
-          </li>
-          <li>JCR
-            <ul>
-              <li><a href="http://jcp.org/en/jsr/detail?id=170">JSR 170</a></li>
-              <li><a href="http://jcp.org/en/jsr/detail?id=283">JSR 283</a></li>
-              <li><a href="http://www.day.com/maven/javax.jcr/javadocs/jcr-2.0/">JCR 2.0 API</a></li>
-            </ul>
-          </li>
-        </ul>
-      </div>
-      <div id="content">
-        <h2><%= title %></h2>
+<%--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+--%>
+<%@page import="org.apache.jackrabbit.util.Text"%>
+<%
+String title =
+    Text.encodeIllegalXMLCharacters(request.getAttribute("title").toString());
+String context =
+    Text.encodeIllegalXMLCharacters(request.getContextPath());
+%>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+          "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+  <head>
+    <title><%= title %></title>
+    <link rel="stylesheet"
+          href="<%= context %>/css/default.css"
+          type="text/css"/>
+    <link rel="shortcut icon"
+          href="<%= context %>/images/favicon.ico"
+          type="image/vnd.microsoft.icon" />
+  </head>
+  <body>
+    <div id="page">
+      <div id="banner">
+        <p id="jcr">
+          <a href="<%= context %>/">
+            <img src="<%= context %>/images/jlogo.gif"
+                 alt="Apache Jackrabbit" height="100" width="336"/>
+          </a>
+        </p>
+        <p id="asf">
+          <a href="http://www.apache.org/">
+            <img src="<%= context %>/images/asf-logo.gif"
+                 alt="Apache Software Foundation" height="100" width="387"/>
+          </a>
+        </p>
+      </div>
+      <div id="navigation">
+        <ul>
+          <li>Jackrabbit JCR Server
+            <ul>
+              <li><a href="<%= context %>/">Welcome</a></li>
+              <li><a href="<%= context %>/webdav-simple.jsp">Standard WebDAV</a></li>
+              <li><a href="<%= context %>/webdav-jcr.jsp">JCR Remoting</a></li>
+              <li><a href="<%= context %>/remote.jsp">Remote access</a></li>
+              <li><a href="<%= context %>/local.jsp">Local access</a></li>
+              <li><a href="<%= context %>/troubleshooting.jsp">Troubleshooting</a></li>
+              <li><a href="<%= context %>/about.jsp">About Jackrabbit</a></li>
+            </ul>
+          </li>
+          <li>Default workspace
+            <ul>
+              <li><a href="<%= context %>/repository/default/">Browse</a></li>
+              <li><a href="<%= context %>/search.jsp">Search</a></li>
+              <li><a href="<%= context %>/populate.jsp">Populate</a></li>
+            </ul>
+          </li>
+          <li>Apache Jackrabbit
+            <ul>
+              <li><a href="http://jackrabbit.apache.org/">Apache Jackrabbit</a></li>
+              <li><a href="http://jackrabbit.apache.org/api/2.3/">Jackrabbit API</a></li>
+              <li><a href="http://wiki.apache.org/jackrabbit/FrontPage">Jackrabbit Wiki</a></li>
+            </ul>
+          </li>
+          <li>JCR
+            <ul>
+              <li><a href="http://jcp.org/en/jsr/detail?id=170">JSR 170</a></li>
+              <li><a href="http://jcp.org/en/jsr/detail?id=283">JSR 283</a></li>
+              <li><a href="http://www.day.com/maven/javax.jcr/javadocs/jcr-2.0/">JCR 2.0 API</a></li>
+            </ul>
+          </li>
+        </ul>
+      </div>
+      <div id="content">
+        <h2><%= title %></h2>

Propchange: jackrabbit/branches/2.4/jackrabbit-webapp/src/main/webapp/header.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: jackrabbit/branches/2.4/jackrabbit-webapp/src/main/webapp/local.jsp
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.4/jackrabbit-webapp/src/main/webapp/local.jsp?rev=1297525&r1=1297524&r2=1297525&view=diff
==============================================================================
--- jackrabbit/branches/2.4/jackrabbit-webapp/src/main/webapp/local.jsp (original)
+++ jackrabbit/branches/2.4/jackrabbit-webapp/src/main/webapp/local.jsp Tue Mar  6 15:29:55 2012
@@ -1,103 +1,103 @@
-<%--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
---%><%@page import="org.apache.jackrabbit.util.Text"%><%
-request.setAttribute("title", "Local Repository Access");
-%><jsp:include page="header.jsp"/>
-<p>
-  The content repository within this web application can be accessed
-  locally by other web applications within the same servlet container.
-  Local access is much faster than <a href="remote.jsp">remote access</a>.
-</p>
-<p>
-  The content repository is made available both through JNDI and the
-  web application context.
-</p>
-
-<h3>Accessing the repository through JNDI</h3>
-<p>
-  By default the repository is only made available in a dummy JNDI directory
-  local to this web application. However, you can make the repository globally
-  available if your servlet container allows a web application to modify the
-  global JNDI directory or you are using some other JNDI directory that can
-  manage unserializable Java objects.
-</p>
-<p>
-  To bind the the repository to such a JNDI directory, you need to modify
-  the <code>java.naming</code> parameters in either the /WEB-INF/web.xml
-  deployment descriptor or the jackrabbit/bootstrap.properties file. You need
-  to redeploy this web application to activate the changes.
-</p>
-<p>
-  Use the following code to access a repository bound in a JNDI directory:
-</p>
-<pre>
-<b>import</b> javax.jcr.Repository;
-<b>import</b> javax.naming.Context;
-<b>import</b> javax.naming.InitialContext;
-
-Context context = <b>new</b> InitialContext(...);
-Repository repository = (Repository) context.lookup(...);
-</pre>
-
-<h3>Accessing the repository through servlet context</h3>
-<p>
-  This web application makes the repository available as the
-  <code>javax.jcr.Repository</code> attribute in the application context.
-  If your servlet container supports cross-context access, you can
-  access the repository directly using that attribute.
-</p>
-<p>
-  For example in <a href="http://tomcat.apache.org/">Apache Tomcat</a>
-  you can enable cross-context access by setting the <code>crossContext</code>
-  attribute to true in the &lt;Context/&gt; configuration.
-</p>
-<p>
-  Use the following code to access a repository through the servlet context:
-</p>
-<pre>
-<b>import</b> javax.jcr.Repository;
-<b>import</b> javax.servlet.ServletContext;
-
-ServletContext context = ...; // <em>context of your servlet</em>
-ServletContext jackrabbit =
-    context.getContext("<em><%= Text.encodeIllegalXMLCharacters(request.getContextPath()) %></em>");
-Repository repository = (Repository)
-    context.getAttribute(Repository.<b>class</b>.getName()).
-</pre>
-
-<h3>Using the jackrabbit-jcr-servlet component</h3>
-<p>
-  The <em>jackrabbit-jcr-servlet</em> component contains utility classes
-  for use within JCR web applications. With that component you can hide
-  both the above and the <a href="remote.jsp">remote access</a> options
-  from your code, and use just the following to access a repository:
-</p>
-<pre>
-<b>import</b> javax.jcr.Repository;
-<b>import</b> org.apache.jackrabbit.servlet.ServletRepository;
-
-<b>public class</b> MyServlet <b>extends</b> HttpServlet {
-
-    <b>private final</b> Repository repository = <b>new</b> ServletRepository(<b>this</b>);
-
-    // ...
-
-}
-</pre>
-<p>
-  See the jackrabbit-jcr-servlet documentation for more details.
-</p>
-<jsp:include page="footer.jsp"/>
+<%--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+--%><%@page import="org.apache.jackrabbit.util.Text"%><%
+request.setAttribute("title", "Local Repository Access");
+%><jsp:include page="header.jsp"/>
+<p>
+  The content repository within this web application can be accessed
+  locally by other web applications within the same servlet container.
+  Local access is much faster than <a href="remote.jsp">remote access</a>.
+</p>
+<p>
+  The content repository is made available both through JNDI and the
+  web application context.
+</p>
+
+<h3>Accessing the repository through JNDI</h3>
+<p>
+  By default the repository is only made available in a dummy JNDI directory
+  local to this web application. However, you can make the repository globally
+  available if your servlet container allows a web application to modify the
+  global JNDI directory or you are using some other JNDI directory that can
+  manage unserializable Java objects.
+</p>
+<p>
+  To bind the the repository to such a JNDI directory, you need to modify
+  the <code>java.naming</code> parameters in either the /WEB-INF/web.xml
+  deployment descriptor or the jackrabbit/bootstrap.properties file. You need
+  to redeploy this web application to activate the changes.
+</p>
+<p>
+  Use the following code to access a repository bound in a JNDI directory:
+</p>
+<pre>
+<b>import</b> javax.jcr.Repository;
+<b>import</b> javax.naming.Context;
+<b>import</b> javax.naming.InitialContext;
+
+Context context = <b>new</b> InitialContext(...);
+Repository repository = (Repository) context.lookup(...);
+</pre>
+
+<h3>Accessing the repository through servlet context</h3>
+<p>
+  This web application makes the repository available as the
+  <code>javax.jcr.Repository</code> attribute in the application context.
+  If your servlet container supports cross-context access, you can
+  access the repository directly using that attribute.
+</p>
+<p>
+  For example in <a href="http://tomcat.apache.org/">Apache Tomcat</a>
+  you can enable cross-context access by setting the <code>crossContext</code>
+  attribute to true in the &lt;Context/&gt; configuration.
+</p>
+<p>
+  Use the following code to access a repository through the servlet context:
+</p>
+<pre>
+<b>import</b> javax.jcr.Repository;
+<b>import</b> javax.servlet.ServletContext;
+
+ServletContext context = ...; // <em>context of your servlet</em>
+ServletContext jackrabbit =
+    context.getContext("<em><%= Text.encodeIllegalXMLCharacters(request.getContextPath()) %></em>");
+Repository repository = (Repository)
+    context.getAttribute(Repository.<b>class</b>.getName()).
+</pre>
+
+<h3>Using the jackrabbit-jcr-servlet component</h3>
+<p>
+  The <em>jackrabbit-jcr-servlet</em> component contains utility classes
+  for use within JCR web applications. With that component you can hide
+  both the above and the <a href="remote.jsp">remote access</a> options
+  from your code, and use just the following to access a repository:
+</p>
+<pre>
+<b>import</b> javax.jcr.Repository;
+<b>import</b> org.apache.jackrabbit.servlet.ServletRepository;
+
+<b>public class</b> MyServlet <b>extends</b> HttpServlet {
+
+    <b>private final</b> Repository repository = <b>new</b> ServletRepository(<b>this</b>);
+
+    // ...
+
+}
+</pre>
+<p>
+  See the jackrabbit-jcr-servlet documentation for more details.
+</p>
+<jsp:include page="footer.jsp"/>

Propchange: jackrabbit/branches/2.4/jackrabbit-webapp/src/main/webapp/local.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: jackrabbit/branches/2.4/jackrabbit-webapp/src/main/webapp/remote.jsp
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.4/jackrabbit-webapp/src/main/webapp/remote.jsp?rev=1297525&r1=1297524&r2=1297525&view=diff
==============================================================================
--- jackrabbit/branches/2.4/jackrabbit-webapp/src/main/webapp/remote.jsp (original)
+++ jackrabbit/branches/2.4/jackrabbit-webapp/src/main/webapp/remote.jsp Tue Mar  6 15:29:55 2012
@@ -1,106 +1,106 @@
-<%@ page import="java.net.URI"%><%--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
---%><%@page import="org.apache.jackrabbit.util.Text"%><%
-request.setAttribute("title", "Remote Repository Access");
-
-URI uri = new URI(request.getRequestURL().toString());
-String base =
-    uri.getScheme() + "://" + uri.getHost() + ":" + uri.getPort()
-    + request.getContextPath();
-base = Text.encodeIllegalXMLCharacters(base);
-%><jsp:include page="header.jsp"/>
-<p>
-  The content repository within this web application is made available
-  to remote clients through
-  <a href="http://java.sun.com/javase/technologies/core/basic/rmi/">RMI</a>
-  and the <em>jackrabbit-jcr-rmi</em> component.
-<p>
-<p>
-  The remote repository stub is available both in the RMI registry
-  (one is started automatically by this web application if not already running)
-  and as a direct HTTP download. The default URLs for accessing the remote
-  repository are:
-</p>
-<ul>
-  <li>RMI registry: //localhost/jackrabbit.repository</li>
-  <li>HTTP download: <%= base %>/rmi</li>
-</ul>
-<p>
-  Note that the above URLs are the defaults. You can disable or change them
-  by modifying the /WEB-INF/web.xml deployment descriptor.
-</p>
-
-<h3>Accessing the remote repository</h3>
-<p>
-  To access the remote content repository you need to use the
-  <em>jackrabbit-jcr-rmi</em> component in your application. If you use
-  Maven 2, you can declare the JCR and jackrabbit-jcr-rmi dependencies
-  like this:
-</p>
-<pre>&lt;dependency&gt;
-  &lt;groupId&gt;javax.jcr&lt;/groupId&gt;
-  &lt;artifactId&gt;jcr&lt;/artifactId&gt;
-  &lt;version&gt;1.0&lt;/version&gt;
-&lt;/dependency&gt;
-&lt;dependency&gt;
-  &lt;groupId&gt;org.apache.jackrabbit&lt;/groupId&gt;
-  &lt;artifactId&gt;jackrabbit-jcr-rmi&lt;/artifactId&gt;
-  &lt;version&gt;1.4&lt;/version&gt;
-&lt;/dependency&gt;
-</pre>
-<p>
-  With that dependency in place, you can use either the RMI registry or
-  the direct HTTP download to access the repository.
-</p>
-<p>
-  The required code for accessing the repository using the RMI registry is:
-</p>
-<pre>
-<b>import</b> javax.jcr.Repository;
-<b>import</b> org.apache.jackrabbit.rmi.repository.RMIRemoteRepository;
-
-Repository repository =
-    <b>new</b> RMIRemoteRepository("<em>//localhost/jackrabbit.repository</em>");
-</pre>
-<p>
-  The required code for accessing the repository using the RMI registry is:
-</p>
-<pre>
-<b>import</b> javax.jcr.Repository;
-<b>import</b> org.apache.jackrabbit.rmi.repository.URLRemoteRepository;
-
-Repository repository =
-    <b>new</b> URLRemoteRepository("<em><%= base %>/rmi</em>");
-</pre>
-<p>
-  See the <a href="http://jcp.org/en/jsr/detail?id=170">JCR specification</a>
-  and the
-  <a href="http://www.day.com/maven/jsr170/javadocs/jcr-1.0/javax/jcr/Repository.html">Repository</a>
-  javadoc for details on what to do with the acquired Repository instance.
-</p>
-
-<h3>Remote access performance</h3>
-<p>
-  Note that the design goal of the current jackrabbit-jcr-rmi component
-  is correct and complete functionality instead of performance, so you should
-  not rely on remote access for performance-critical applications.
-</p>
-<p>
-  You may want to look at the Jackrabbit clustering feature for best
-  performance for concurrently accessing the repository on multiple separate
-  servers.
-</p>
-<jsp:include page="footer.jsp"/>
+<%@ page import="java.net.URI"%><%--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+--%><%@page import="org.apache.jackrabbit.util.Text"%><%
+request.setAttribute("title", "Remote Repository Access");
+
+URI uri = new URI(request.getRequestURL().toString());
+String base =
+    uri.getScheme() + "://" + uri.getHost() + ":" + uri.getPort()
+    + request.getContextPath();
+base = Text.encodeIllegalXMLCharacters(base);
+%><jsp:include page="header.jsp"/>
+<p>
+  The content repository within this web application is made available
+  to remote clients through
+  <a href="http://java.sun.com/javase/technologies/core/basic/rmi/">RMI</a>
+  and the <em>jackrabbit-jcr-rmi</em> component.
+<p>
+<p>
+  The remote repository stub is available both in the RMI registry
+  (one is started automatically by this web application if not already running)
+  and as a direct HTTP download. The default URLs for accessing the remote
+  repository are:
+</p>
+<ul>
+  <li>RMI registry: //localhost/jackrabbit.repository</li>
+  <li>HTTP download: <%= base %>/rmi</li>
+</ul>
+<p>
+  Note that the above URLs are the defaults. You can disable or change them
+  by modifying the /WEB-INF/web.xml deployment descriptor.
+</p>
+
+<h3>Accessing the remote repository</h3>
+<p>
+  To access the remote content repository you need to use the
+  <em>jackrabbit-jcr-rmi</em> component in your application. If you use
+  Maven 2, you can declare the JCR and jackrabbit-jcr-rmi dependencies
+  like this:
+</p>
+<pre>&lt;dependency&gt;
+  &lt;groupId&gt;javax.jcr&lt;/groupId&gt;
+  &lt;artifactId&gt;jcr&lt;/artifactId&gt;
+  &lt;version&gt;1.0&lt;/version&gt;
+&lt;/dependency&gt;
+&lt;dependency&gt;
+  &lt;groupId&gt;org.apache.jackrabbit&lt;/groupId&gt;
+  &lt;artifactId&gt;jackrabbit-jcr-rmi&lt;/artifactId&gt;
+  &lt;version&gt;1.4&lt;/version&gt;
+&lt;/dependency&gt;
+</pre>
+<p>
+  With that dependency in place, you can use either the RMI registry or
+  the direct HTTP download to access the repository.
+</p>
+<p>
+  The required code for accessing the repository using the RMI registry is:
+</p>
+<pre>
+<b>import</b> javax.jcr.Repository;
+<b>import</b> org.apache.jackrabbit.rmi.repository.RMIRemoteRepository;
+
+Repository repository =
+    <b>new</b> RMIRemoteRepository("<em>//localhost/jackrabbit.repository</em>");
+</pre>
+<p>
+  The required code for accessing the repository using the RMI registry is:
+</p>
+<pre>
+<b>import</b> javax.jcr.Repository;
+<b>import</b> org.apache.jackrabbit.rmi.repository.URLRemoteRepository;
+
+Repository repository =
+    <b>new</b> URLRemoteRepository("<em><%= base %>/rmi</em>");
+</pre>
+<p>
+  See the <a href="http://jcp.org/en/jsr/detail?id=170">JCR specification</a>
+  and the
+  <a href="http://www.day.com/maven/jsr170/javadocs/jcr-1.0/javax/jcr/Repository.html">Repository</a>
+  javadoc for details on what to do with the acquired Repository instance.
+</p>
+
+<h3>Remote access performance</h3>
+<p>
+  Note that the design goal of the current jackrabbit-jcr-rmi component
+  is correct and complete functionality instead of performance, so you should
+  not rely on remote access for performance-critical applications.
+</p>
+<p>
+  You may want to look at the Jackrabbit clustering feature for best
+  performance for concurrently accessing the repository on multiple separate
+  servers.
+</p>
+<jsp:include page="footer.jsp"/>

Propchange: jackrabbit/branches/2.4/jackrabbit-webapp/src/main/webapp/remote.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: jackrabbit/branches/2.4/jackrabbit-webapp/src/main/webapp/troubleshooting.jsp
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.4/jackrabbit-webapp/src/main/webapp/troubleshooting.jsp?rev=1297525&r1=1297524&r2=1297525&view=diff
==============================================================================
--- jackrabbit/branches/2.4/jackrabbit-webapp/src/main/webapp/troubleshooting.jsp (original)
+++ jackrabbit/branches/2.4/jackrabbit-webapp/src/main/webapp/troubleshooting.jsp Tue Mar  6 15:29:55 2012
@@ -1,105 +1,105 @@
-<%--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
---%><%@page import="org.apache.jackrabbit.util.Text,
-                    java.io.StringWriter,
-                    java.io.PrintWriter"%><%
-request.setAttribute("title", "Troubleshooting");
-%><jsp:include page="header.jsp"/>
-<p>
-  If you experience problems with the Jackrabbit JCR server, please
-  check the following:
-</p>
-<ol>
-  <li>
-    Did you encounter an exception? Copy the exception stack trace somewhere
-    so you don't loose it. The stack trace contains valuable information
-    for the Jackrabbit developers if you need to file a bug report for the
-    problem you encountered.
-  </li>
-  <li>
-    Is the repository up and running? Try browsing the
-    <a href="<%= Text.encodeIllegalXMLCharacters(request.getContextPath()) %>/repository/default/">default workspace</a>
-    to check if you can still see any content in the repository. You will
-    see an error message if the repository is not available.
-  </li>
-  <li>
-    What were you trying to do? Try to verify that your client code or
-    other manner of repository use is correct. Did it work before or are
-    you trying to do something new?
-  </li>
-  <li>
-    Are there any notable log entries? Check the log files for any related
-    warnings or errors. By default the Jackrabbit JCR Server writes log
-    entries to the standard output of the servlet container. You can customize
-    logging by editing the <code>/WEB-INF/log4j.xml</code> file and
-    redeploying this web application.
-  </li>
-</ol>
-<p>
-  If none of the above steps help you identify or resolve the problem,
-  you can contact the Jackrabbit users mailing list or report the problem
-  in the Jackrabbit issue tracker to get support from the Jackrabbit community.
-  When contacting the community, please include any relevant details related
-  to the above questions and the environment information shown at the end
-  of this page.
-</p>
-
-<h2>Jackrabbit mailing list</h2>
-<p>
-  The Jackrabbit user mailing list, users@jackrabbit.apache.org, is the
-  place to discuss any problems or other issues regarding the use of
-  Apache Jackrabbit (or JCR content repositories in general).
-</p>
-<p>
-  Feel free to subscribe the mailing list or browse the archives listed as
-  described in the
-  <a href="http://jackrabbit.apache.org/mail-lists.html">Jackrabbit mailing lists</a>
-  page.
-</p>
-
-<h2>Jackrabbit issue tracker</h2>
-<p>
-  If you think you've identified a defect in Jackrabbit, you're welcome
-  to file a bug report in the
-  <a href="https://issues.apache.org/jira/browse/JCR">Jackrabbit issue tracker</a>.
-  You can also use the issue tracker to request new features and other
-  improvements.
-</p>
-<p>
-  You need an account in the issue tracker to report new issues or to comment
-  on existing. Use the
-  <a href="https://issues.apache.org/jira/secure/Signup!default.jspa">registration form</a>
-  if you don't already have an account. No account is needed browsing
-  and searching existing issues.
-</p>
-
-<h2>Environment information</h2>
-<p>
-  This instance of the Jackrabbit JCR Server is running in
-  a <em><%= Text.encodeIllegalXMLCharacters(application.getServerInfo()) %></em> servlet container
-  that supports the Java Servlet API version
-  <%= application.getMajorVersion() %>.<%= application.getMinorVersion() %>.
-</p>
-<p>
-  Details of the Java and operating system environment are included in
-  the system properties shown below:
-</p>
-<%
-StringWriter buffer = new StringWriter();
-System.getProperties().list(new PrintWriter(buffer));
-%>
-<pre><%= Text.encodeIllegalXMLCharacters(buffer.toString()) %></pre>
-<jsp:include page="footer.jsp"/>
+<%--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+--%><%@page import="org.apache.jackrabbit.util.Text,
+                    java.io.StringWriter,
+                    java.io.PrintWriter"%><%
+request.setAttribute("title", "Troubleshooting");
+%><jsp:include page="header.jsp"/>
+<p>
+  If you experience problems with the Jackrabbit JCR server, please
+  check the following:
+</p>
+<ol>
+  <li>
+    Did you encounter an exception? Copy the exception stack trace somewhere
+    so you don't loose it. The stack trace contains valuable information
+    for the Jackrabbit developers if you need to file a bug report for the
+    problem you encountered.
+  </li>
+  <li>
+    Is the repository up and running? Try browsing the
+    <a href="<%= Text.encodeIllegalXMLCharacters(request.getContextPath()) %>/repository/default/">default workspace</a>
+    to check if you can still see any content in the repository. You will
+    see an error message if the repository is not available.
+  </li>
+  <li>
+    What were you trying to do? Try to verify that your client code or
+    other manner of repository use is correct. Did it work before or are
+    you trying to do something new?
+  </li>
+  <li>
+    Are there any notable log entries? Check the log files for any related
+    warnings or errors. By default the Jackrabbit JCR Server writes log
+    entries to the standard output of the servlet container. You can customize
+    logging by editing the <code>/WEB-INF/log4j.xml</code> file and
+    redeploying this web application.
+  </li>
+</ol>
+<p>
+  If none of the above steps help you identify or resolve the problem,
+  you can contact the Jackrabbit users mailing list or report the problem
+  in the Jackrabbit issue tracker to get support from the Jackrabbit community.
+  When contacting the community, please include any relevant details related
+  to the above questions and the environment information shown at the end
+  of this page.
+</p>
+
+<h2>Jackrabbit mailing list</h2>
+<p>
+  The Jackrabbit user mailing list, users@jackrabbit.apache.org, is the
+  place to discuss any problems or other issues regarding the use of
+  Apache Jackrabbit (or JCR content repositories in general).
+</p>
+<p>
+  Feel free to subscribe the mailing list or browse the archives listed as
+  described in the
+  <a href="http://jackrabbit.apache.org/mail-lists.html">Jackrabbit mailing lists</a>
+  page.
+</p>
+
+<h2>Jackrabbit issue tracker</h2>
+<p>
+  If you think you've identified a defect in Jackrabbit, you're welcome
+  to file a bug report in the
+  <a href="https://issues.apache.org/jira/browse/JCR">Jackrabbit issue tracker</a>.
+  You can also use the issue tracker to request new features and other
+  improvements.
+</p>
+<p>
+  You need an account in the issue tracker to report new issues or to comment
+  on existing. Use the
+  <a href="https://issues.apache.org/jira/secure/Signup!default.jspa">registration form</a>
+  if you don't already have an account. No account is needed browsing
+  and searching existing issues.
+</p>
+
+<h2>Environment information</h2>
+<p>
+  This instance of the Jackrabbit JCR Server is running in
+  a <em><%= Text.encodeIllegalXMLCharacters(application.getServerInfo()) %></em> servlet container
+  that supports the Java Servlet API version
+  <%= application.getMajorVersion() %>.<%= application.getMinorVersion() %>.
+</p>
+<p>
+  Details of the Java and operating system environment are included in
+  the system properties shown below:
+</p>
+<%
+StringWriter buffer = new StringWriter();
+System.getProperties().list(new PrintWriter(buffer));
+%>
+<pre><%= Text.encodeIllegalXMLCharacters(buffer.toString()) %></pre>
+<jsp:include page="footer.jsp"/>

Propchange: jackrabbit/branches/2.4/jackrabbit-webapp/src/main/webapp/troubleshooting.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: jackrabbit/branches/2.4/jackrabbit-webapp/src/main/webapp/webdav-jcr.jsp
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.4/jackrabbit-webapp/src/main/webapp/webdav-jcr.jsp?rev=1297525&r1=1297524&r2=1297525&view=diff
==============================================================================
--- jackrabbit/branches/2.4/jackrabbit-webapp/src/main/webapp/webdav-jcr.jsp (original)
+++ jackrabbit/branches/2.4/jackrabbit-webapp/src/main/webapp/webdav-jcr.jsp Tue Mar  6 15:29:55 2012
@@ -1,87 +1,87 @@
-<%@ page import="org.apache.jackrabbit.j2ee.JCRWebdavServerServlet,
-                 java.net.URI"
-%><%--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
---%><%@page import="org.apache.jackrabbit.util.Text"%><%
-request.setAttribute("title", "JCR Remoting Server");
-
-URI uri = new URI(request.getRequestURL().toString());
-String href =
-    uri.getScheme() + "://" + uri.getHost() + ":" + uri.getPort()
-    + request.getContextPath()
-    + JCRWebdavServerServlet.getPathPrefix(pageContext.getServletContext());
-href = Text.encodeIllegalXMLCharacters(href);
-String shref = href + "/default/jcr:root";
-%><jsp:include page="header.jsp"/>
-<p>
-  The JCR Remoting Server provides an item-based WebDAV view to the
-  JCR repository, mapping the functionality provided by JSR 170 to the
-  WebDAV protocol in order to allow remote content repository access
-  via WebDAV.
-</p>
-<p>
-  See the draft document
-  <a href="http://jackrabbit.apache.org/JCR_Webdav_Protocol.doc">JCR_Webdav_Protocol.zip</a>
-  for more details regarding this remoting protocol.
-</p>
-<p>
-  Batch read and write as well as the missing functionality (cross workspace
-  copy and clone) has been addressed with a <a href="webdav-remoting.jsp">extension</a>
-  to the remoting server.
-</p>
-
-<h3>Access the content repository</h3>
-<p>
-  Use the following URLs to access the content repository in your remoting client:
-</p>
-<dl>
-<dt><a href="<%= href %>"><%= href %></a></dt>
-<dd>to access all workspaces of your JCR repository</dd>
-<dt><a href="<%= shref %>"><%= shref %></a></dt>
-<dd>to access a single workspace (example with workspace named 'default')</dd>
-</dl>
-
-<h3>Supported WebDAV functionality</h3>
-<p>
-  This implementation focuses on replicating all JCR features for remote
-  access instead of providing standard WebDAV functionality or compatibility
-  with existing WebDAV clients.
-</p>
-<p>
-  The following RFCs are used to implement the remoting functionality:
-</p>
-<ul>
-  <li><a href="http://www.ietf.org/rfc/rfc2518.txt">RFC 2518</a> (WebDAV 1,2)</li>
-  <li><a href="http://www.ietf.org/rfc/rfc3253.txt">RFC 3253</a> (DeltaV)</li>
-  <li><a href="http://www.ietf.org/rfc/rfc3648.txt">RFC 3648</a> (Ordering)</li>
-  <li><a href="http://greenbytes.de/tech/webdav/draft-reschke-webdav-search-latest.html">Internet Draft WebDAV Search</a></li>
-</ul>
-
-<h3>JCR Remoting Client</h3>
-<p>
-  For the client counterpart of this WebDAV servlet please take a look at the
-  <a href="http://svn.apache.org/repos/asf/jackrabbit/trunk/jackrabbit-spi2dav">Jackrabbit SPI2DAV</a>
-  module.
-</p>
-
-<h3>Configuration</h3>
-<ul>
-  <li>Context Path: <%= Text.encodeIllegalXMLCharacters(request.getContextPath()) %></li>
-  <li>Resource Path Prefix: <%= Text.encodeIllegalXMLCharacters(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>
-<jsp:include page="footer.jsp"/>
+<%@ page import="org.apache.jackrabbit.j2ee.JCRWebdavServerServlet,
+                 java.net.URI"
+%><%--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+--%><%@page import="org.apache.jackrabbit.util.Text"%><%
+request.setAttribute("title", "JCR Remoting Server");
+
+URI uri = new URI(request.getRequestURL().toString());
+String href =
+    uri.getScheme() + "://" + uri.getHost() + ":" + uri.getPort()
+    + request.getContextPath()
+    + JCRWebdavServerServlet.getPathPrefix(pageContext.getServletContext());
+href = Text.encodeIllegalXMLCharacters(href);
+String shref = href + "/default/jcr:root";
+%><jsp:include page="header.jsp"/>
+<p>
+  The JCR Remoting Server provides an item-based WebDAV view to the
+  JCR repository, mapping the functionality provided by JSR 170 to the
+  WebDAV protocol in order to allow remote content repository access
+  via WebDAV.
+</p>
+<p>
+  See the draft document
+  <a href="http://jackrabbit.apache.org/JCR_Webdav_Protocol.doc">JCR_Webdav_Protocol.zip</a>
+  for more details regarding this remoting protocol.
+</p>
+<p>
+  Batch read and write as well as the missing functionality (cross workspace
+  copy and clone) has been addressed with a <a href="webdav-remoting.jsp">extension</a>
+  to the remoting server.
+</p>
+
+<h3>Access the content repository</h3>
+<p>
+  Use the following URLs to access the content repository in your remoting client:
+</p>
+<dl>
+<dt><a href="<%= href %>"><%= href %></a></dt>
+<dd>to access all workspaces of your JCR repository</dd>
+<dt><a href="<%= shref %>"><%= shref %></a></dt>
+<dd>to access a single workspace (example with workspace named 'default')</dd>
+</dl>
+
+<h3>Supported WebDAV functionality</h3>
+<p>
+  This implementation focuses on replicating all JCR features for remote
+  access instead of providing standard WebDAV functionality or compatibility
+  with existing WebDAV clients.
+</p>
+<p>
+  The following RFCs are used to implement the remoting functionality:
+</p>
+<ul>
+  <li><a href="http://www.ietf.org/rfc/rfc2518.txt">RFC 2518</a> (WebDAV 1,2)</li>
+  <li><a href="http://www.ietf.org/rfc/rfc3253.txt">RFC 3253</a> (DeltaV)</li>
+  <li><a href="http://www.ietf.org/rfc/rfc3648.txt">RFC 3648</a> (Ordering)</li>
+  <li><a href="http://greenbytes.de/tech/webdav/draft-reschke-webdav-search-latest.html">Internet Draft WebDAV Search</a></li>
+</ul>
+
+<h3>JCR Remoting Client</h3>
+<p>
+  For the client counterpart of this WebDAV servlet please take a look at the
+  <a href="http://svn.apache.org/repos/asf/jackrabbit/trunk/jackrabbit-spi2dav">Jackrabbit SPI2DAV</a>
+  module.
+</p>
+
+<h3>Configuration</h3>
+<ul>
+  <li>Context Path: <%= Text.encodeIllegalXMLCharacters(request.getContextPath()) %></li>
+  <li>Resource Path Prefix: <%= Text.encodeIllegalXMLCharacters(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>
+<jsp:include page="footer.jsp"/>

Propchange: jackrabbit/branches/2.4/jackrabbit-webapp/src/main/webapp/webdav-jcr.jsp
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message