You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by ju...@apache.org on 2008/01/10 13:17:54 UTC

svn commit: r610769 - in /jackrabbit/branches/1.4: ./ jackrabbit-webapp/src/main/webapp/ jackrabbit-webapp/src/main/webapp/WEB-INF/ jackrabbit-webapp/src/main/webapp/css/ jackrabbit-webapp/src/main/webapp/error/

Author: jukka
Date: Thu Jan 10 04:17:48 2008
New Revision: 610769

URL: http://svn.apache.org/viewvc?rev=610769&view=rev
Log:
1.4: Merged revision 610765 (JCR-1289)

Added:
    jackrabbit/branches/1.4/jackrabbit-webapp/src/main/webapp/error/repository.jsp
      - copied unchanged from r610765, jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/error/repository.jsp
    jackrabbit/branches/1.4/jackrabbit-webapp/src/main/webapp/troubleshooting.jsp
      - copied unchanged from r610765, jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/troubleshooting.jsp
Modified:
    jackrabbit/branches/1.4/RELEASE-NOTES.txt
    jackrabbit/branches/1.4/jackrabbit-webapp/src/main/webapp/WEB-INF/web.xml
    jackrabbit/branches/1.4/jackrabbit-webapp/src/main/webapp/css/default.css
    jackrabbit/branches/1.4/jackrabbit-webapp/src/main/webapp/header.jsp

Modified: jackrabbit/branches/1.4/RELEASE-NOTES.txt
URL: http://svn.apache.org/viewvc/jackrabbit/branches/1.4/RELEASE-NOTES.txt?rev=610769&r1=610768&r2=610769&view=diff
==============================================================================
--- jackrabbit/branches/1.4/RELEASE-NOTES.txt (original)
+++ jackrabbit/branches/1.4/RELEASE-NOTES.txt Thu Jan 10 04:17:48 2008
@@ -629,6 +629,7 @@
   [JCR-961]  Add workspace population tool
   [JCR-1184] Introduce spellchecker functionality based on content in ...
   [JCR-1188] WebDAV: Allow for Extensions of MimeResolver in the ...
+  [JCR-1289] Error reporting page for jackrabbit-webapp
 
   Improvements
   [JCR-924]  Use the Jackrabbit RMI extensions by default in jackrabbit-webapp

Modified: jackrabbit/branches/1.4/jackrabbit-webapp/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/jackrabbit/branches/1.4/jackrabbit-webapp/src/main/webapp/WEB-INF/web.xml?rev=610769&r1=610768&r2=610769&view=diff
==============================================================================
--- jackrabbit/branches/1.4/jackrabbit-webapp/src/main/webapp/WEB-INF/web.xml (original)
+++ jackrabbit/branches/1.4/jackrabbit-webapp/src/main/webapp/WEB-INF/web.xml Thu Jan 10 04:17:48 2008
@@ -335,5 +335,9 @@
         <exception-type>org.apache.jackrabbit.j2ee.JcrApiNotFoundException</exception-type>
         <location>/error/classpath.jsp</location>
     </error-page>
+    <error-page>
+        <exception-type>javax.jcr.RepositoryException</exception-type>
+        <location>/error/repository.jsp</location>
+    </error-page>
 
 </web-app>

Modified: jackrabbit/branches/1.4/jackrabbit-webapp/src/main/webapp/css/default.css
URL: http://svn.apache.org/viewvc/jackrabbit/branches/1.4/jackrabbit-webapp/src/main/webapp/css/default.css?rev=610769&r1=610768&r2=610769&view=diff
==============================================================================
--- jackrabbit/branches/1.4/jackrabbit-webapp/src/main/webapp/css/default.css (original)
+++ jackrabbit/branches/1.4/jackrabbit-webapp/src/main/webapp/css/default.css Thu Jan 10 04:17:48 2008
@@ -70,10 +70,9 @@
 h1, h2, h3  { color: #869900; }
 
 pre         { background: #E0E0E0;
-              margin-left: 2em;
-              margin-right: 2em;
               padding: 1em;
-              border: 1px dotted black; }
+              border: 1px dotted black;
+              overflow: auto; }
 
 td          { font-size: small; }
 

Modified: jackrabbit/branches/1.4/jackrabbit-webapp/src/main/webapp/header.jsp
URL: http://svn.apache.org/viewvc/jackrabbit/branches/1.4/jackrabbit-webapp/src/main/webapp/header.jsp?rev=610769&r1=610768&r2=610769&view=diff
==============================================================================
--- jackrabbit/branches/1.4/jackrabbit-webapp/src/main/webapp/header.jsp (original)
+++ jackrabbit/branches/1.4/jackrabbit-webapp/src/main/webapp/header.jsp Thu Jan 10 04:17:48 2008
@@ -44,11 +44,12 @@
       </div>
       <div id="navigation">
         <ul>
-          <li>WebDAV Server
+          <li>Jackrabbit JCR Server
             <ul>
               <li><a href="<%= request.getContextPath() %>/">Welcome</a></li>
               <li><a href="<%= request.getContextPath() %>/webdav-simple.jsp">Standard WebDAV</a></li>
               <li><a href="<%= request.getContextPath() %>/webdav-jcr.jsp">JCR WebDAV</a></li>
+              <li><a href="<%= request.getContextPath() %>/troubleshooting.jsp">Troubleshooting</a></li>
             </ul>
           </li>
           <li>Default workspace