jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ju...@apache.org
Subject svn commit: r1055129 - in /jackrabbit/branches/2.2: ./ jackrabbit-webapp/src/main/java/org/apache/jackrabbit/j2ee/DerbyShutdown.java jackrabbit-webapp/src/main/webapp/WEB-INF/web.xml jackrabbit-webapp/src/main/webapp/error/classpath.jsp
Date Tue, 04 Jan 2011 18:20:55 GMT
Author: jukka
Date: Tue Jan  4 18:20:54 2011
New Revision: 1055129

URL: http://svn.apache.org/viewvc?rev=1055129&view=rev
Log:
2.2: Merged revisions 1055116 and 1055127 (JCR-1301)

Added:
    jackrabbit/branches/2.2/jackrabbit-webapp/src/main/java/org/apache/jackrabbit/j2ee/DerbyShutdown.java
      - copied unchanged from r1055116, jackrabbit/trunk/jackrabbit-webapp/src/main/java/org/apache/jackrabbit/j2ee/DerbyShutdown.java
Modified:
    jackrabbit/branches/2.2/   (props changed)
    jackrabbit/branches/2.2/jackrabbit-webapp/src/main/webapp/WEB-INF/web.xml
    jackrabbit/branches/2.2/jackrabbit-webapp/src/main/webapp/error/classpath.jsp

Propchange: jackrabbit/branches/2.2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan  4 18:20:54 2011
@@ -2,4 +2,4 @@
 /jackrabbit/sandbox/JCR-1456:774917-886178
 /jackrabbit/sandbox/JCR-2170:812417-816332
 /jackrabbit/sandbox/tripod-JCR-2209:795441-795863
-/jackrabbit/trunk:1038201,1038203,1038205,1038657,1039064,1039347,1039408,1039422-1039423,1039888,1039946,1040033,1040090,1040459,1040601,1040606,1040661,1040958,1041379,1041439,1041761,1042643,1042647,1042978-1042982,1043084-1043086,1043088,1043343,1043357-1043358,1043430,1043554,1043616,1043618,1043637,1043656,1044312,1049473,1049491,1049520,1050346,1055068,1055070-1055071,1055117
+/jackrabbit/trunk:1038201,1038203,1038205,1038657,1039064,1039347,1039408,1039422-1039423,1039888,1039946,1040033,1040090,1040459,1040601,1040606,1040661,1040958,1041379,1041439,1041761,1042643,1042647,1042978-1042982,1043084-1043086,1043088,1043343,1043357-1043358,1043430,1043554,1043616,1043618,1043637,1043656,1044312,1049473,1049491,1049520,1050346,1055068,1055070-1055071,1055116-1055117,1055127

Modified: jackrabbit/branches/2.2/jackrabbit-webapp/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.2/jackrabbit-webapp/src/main/webapp/WEB-INF/web.xml?rev=1055129&r1=1055128&r2=1055129&view=diff
==============================================================================
--- jackrabbit/branches/2.2/jackrabbit-webapp/src/main/webapp/WEB-INF/web.xml (original)
+++ jackrabbit/branches/2.2/jackrabbit-webapp/src/main/webapp/WEB-INF/web.xml Tue Jan  4 18:20:54
2011
@@ -20,6 +20,17 @@
 <web-app>
     <display-name>Jackrabbit JCR Server</display-name>
 
+    <listener>
+        <!-- Releases all Derby resources when the webapp is undeployed.  -->
+        <!-- You should comment out this entry if you are not using Derby -->
+        <!-- for Jackrabbit persistence, or if you've deployed the Derby  -->
+        <!-- outside the Jackrabbit webapp.                               -->
+        <!-- See https://issues.apache.org/jira/browse/JCR-1301           -->
+        <listener-class>
+            org.apache.jackrabbit.j2ee.DerbyShutdown
+        </listener-class>
+    </listener>
+
     <!-- ====================================================================== -->
     <!-- R E P O S I T O R Y   S T A R T U P  S E R V L E T                     -->
     <!-- ====================================================================== -->

Modified: jackrabbit/branches/2.2/jackrabbit-webapp/src/main/webapp/error/classpath.jsp
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.2/jackrabbit-webapp/src/main/webapp/error/classpath.jsp?rev=1055129&r1=1055128&r2=1055129&view=diff
==============================================================================
--- jackrabbit/branches/2.2/jackrabbit-webapp/src/main/webapp/error/classpath.jsp (original)
+++ jackrabbit/branches/2.2/jackrabbit-webapp/src/main/webapp/error/classpath.jsp Tue Jan
 4 18:20:54 2011
@@ -18,7 +18,12 @@ request.setAttribute("title", "JCR API N
 %><jsp:include page="../header.jsp"/>
 <p>
 The <code>javax.jcr.Repository</code> interface from the JCR API could not
-be loaded. To resolve this issue, you need to make the jcr-1.0.jar available
-in the shared classpath of the servlet container.
+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.
 </p>
 <jsp:include page="../footer.jsp"/>



Mime
View raw message