Return-Path: Delivered-To: apmail-jackrabbit-commits-archive@www.apache.org Received: (qmail 89071 invoked from network); 22 Apr 2008 14:09:54 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 22 Apr 2008 14:09:54 -0000 Received: (qmail 8968 invoked by uid 500); 22 Apr 2008 14:09:56 -0000 Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org Received: (qmail 8939 invoked by uid 500); 22 Apr 2008 14:09:55 -0000 Mailing-List: contact commits-help@jackrabbit.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@jackrabbit.apache.org Delivered-To: mailing list commits@jackrabbit.apache.org Received: (qmail 8928 invoked by uid 99); 22 Apr 2008 14:09:55 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 22 Apr 2008 07:09:55 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 22 Apr 2008 14:09:11 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 3A6B11A9832; Tue, 22 Apr 2008 07:09:31 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r650526 - /jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/H2PersistenceManager.java Date: Tue, 22 Apr 2008 14:09:29 -0000 To: commits@jackrabbit.apache.org From: jukka@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080422140931.3A6B11A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jukka Date: Tue Apr 22 07:09:21 2008 New Revision: 650526 URL: http://svn.apache.org/viewvc?rev=650526&view=rev Log: 1.4: Merged revision 650142 (JCR-1546) Modified: jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/H2PersistenceManager.java Modified: jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/H2PersistenceManager.java URL: http://svn.apache.org/viewvc/jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/H2PersistenceManager.java?rev=650526&r1=650525&r2=650526&view=diff ============================================================================== --- jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/H2PersistenceManager.java (original) +++ jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/H2PersistenceManager.java Tue Apr 22 07:09:21 2008 @@ -26,20 +26,22 @@ /** * Extends the {@link BundleDbPersistenceManager} by H2 specific code. *

- * Configuration:
- *

    - *
  • <param name="{@link #setBundleCacheSize(String) bundleCacheSize}" value="8"/> - *
  • <param name="{@link #setConsistencyCheck(String) consistencyCheck}" value="false"/> - *
  • <param name="{@link #setMinBlobSize(String) minBlobSize}" value="16384"/> - *
  • <param name="{@link #setDriver(String) driver}" value="org.hsqldb.jdbcDriver"/> - *
  • <param name="{@link #setUrl(String) url}" value="jdbc:hsqldb:file:${wsp.home}/db/itemState"/> - *
  • <param name="{@link #setUser(String) user}" value="sa"/> - *
  • <param name="{@link #setPassword(String) password}" value=""/> - *
  • <param name="{@link #setSchema(String) schema}" value="native"/> - *
  • <param name="{@link #setSchemaObjectPrefix(String) schemaObjectPrefix}" value=""/> - *
  • <param name="{@link #setErrorHandling(String) errorHandling}" value=""/> - *
  • <param name="{@link #setLockTimeout(String)} (String) lockTimeout}" value="10000"/> - *
+ * Configuration: + * 
+ * <PersistenceManager class="org.apache.jackrabbit.core.persistence.bundle.H2PersistenceManager">
+ *     <param name="{@link #setBundleCacheSize(String) bundleCacheSize}" value="8"/>
+ *     <param name="{@link #setConsistencyCheck(String) consistencyCheck}" value="false"/>
+ *     <param name="{@link #setMinBlobSize(String) minBlobSize}" value="16384"/>
+ *     <param name="{@link #setDriver(String) driver}" value="org.h2.Driver"/>
+ *     <param name="{@link #setUrl(String) url}" value="jdbc:h2:file:${wsp.home}/db/itemState"/>
+ *     <param name="{@link #setUser(String) user}" value="sa"/>
+ *     <param name="{@link #setPassword(String) password}" value="sa"/>
+ *     <param name="{@link #setSchema(String) schema}" value="h2"/>
+ *     <param name="{@link #setSchemaObjectPrefix(String) schemaObjectPrefix}" value=""/>
+ *     <param name="{@link #setErrorHandling(String) errorHandling}" value=""/>
+ *     <param name="{@link #setLockTimeout(String) lockTimeout}" value="10000"/>
+ * </PersistenceManager>
+ * 
  */
 public class H2PersistenceManager extends BundleDbPersistenceManager {
 
@@ -66,7 +68,7 @@
     }
 
     /**
-     * Creates a new h2 persistence manager.
+     * Creates a new H2 persistence manager.
      */
     public H2PersistenceManager() {
     }
@@ -109,23 +111,6 @@
             stmt.close();
         }
         super.checkSchema();
-    }
-
-    /**
-     * @see PersistenceManager#close
-     */
-    public synchronized void close() throws Exception {
-        if (!initialized) {
-            throw new IllegalStateException("not initialized");
-        }
-        if (getUrl().startsWith("jdbc:h2:file:")) {
-            // have to explicitly shutdown in-proc h2
-            Statement stmt = connectionManager.getConnection().createStatement();
-            stmt.execute("shutdown");
-            stmt.close();
-        }
-        // call base class implementation
-        super.close();
     }
 
 }