Return-Path: Delivered-To: apmail-jackrabbit-commits-archive@www.apache.org Received: (qmail 87766 invoked from network); 15 Jul 2006 22:21:54 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 15 Jul 2006 22:21:54 -0000 Received: (qmail 54089 invoked by uid 500); 15 Jul 2006 22:21:54 -0000 Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org Received: (qmail 54043 invoked by uid 500); 15 Jul 2006 22:21:54 -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 54033 invoked by uid 99); 15 Jul 2006 22:21:54 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 15 Jul 2006 15:21:54 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 15 Jul 2006 15:21:53 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 4903B1A981A; Sat, 15 Jul 2006 15:21:27 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r422303 - in /jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit: backup/ core/RepositoryImpl.java Date: Sat, 15 Jul 2006 22:21:26 -0000 To: commits@jackrabbit.apache.org From: jukka@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060715222127.4903B1A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: jukka Date: Sat Jul 15 15:21:25 2006 New Revision: 422303 URL: http://svn.apache.org/viewvc?rev=422303&view=rev Log: JCR-442: Applied Nicolas' patch (patch.txt [12336377]) to remove the backup classes from core. Removed: jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/backup/ Modified: jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/RepositoryImpl.java Modified: jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/RepositoryImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/RepositoryImpl.java?rev=422303&r1=422302&r2=422303&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/RepositoryImpl.java (original) +++ jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/RepositoryImpl.java Sat Jul 15 15:21:25 2006 @@ -21,9 +21,6 @@ import EDU.oswego.cs.dl.util.concurrent.ReentrantWriterPreferenceReadWriteLock; import org.apache.commons.collections.map.ReferenceMap; import org.apache.jackrabbit.api.JackrabbitRepository; -import org.apache.jackrabbit.backup.BackupIOHandler; -import org.apache.jackrabbit.backup.BackupConfig; -import org.apache.jackrabbit.backup.RepositoryBackup; import org.apache.jackrabbit.core.config.FileSystemConfig; import org.apache.jackrabbit.core.config.LoginModuleConfig; import org.apache.jackrabbit.core.config.PersistenceManagerConfig; @@ -1843,38 +1840,6 @@ } } } - } - - /** - * - * This method returns a RepositoryBackup object configured to save this repository. - * - * Some operations are needed to initiate the RepositoryBackup object properly before performing - * the backup or restore operation. - * - * @param conf BackupConfig object containing all the parameters. - * @return RepositoryBackup configured - * @throws RepositoryException - * @throws AccessDeniedException - * @throws IOException - */ - public RepositoryBackup getBackupRepository(BackupConfig conf, BackupIOHandler h) throws RepositoryException, IOException, AccessDeniedException { - conf.setRepo(this); - return (RepositoryBackup) conf.getBackup(); - } - - /** - * For restore operations since the - * @return RepositoryBackup to configure - * @param source is a pointer to the file to restore - * @throws RepositoryException - * @throws IOException - * @throws AccessDeniedException - */ - public RepositoryBackup getBackupRepository(BackupIOHandler source) throws RepositoryException, IOException, AccessDeniedException { - BackupConfig conf = new BackupConfig(); - conf.setRepo(this); - return (RepositoryBackup) conf.getBackup(); } }