You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by hw...@apache.org on 2010/05/28 03:57:25 UTC

svn commit: r949066 - in /subversion/trunk/subversion/bindings/javahl: src/org/apache/subversion/javahl/ tests/org/apache/subversion/javahl/

Author: hwright
Date: Fri May 28 01:57:25 2010
New Revision: 949066

URL: http://svn.apache.org/viewvc?rev=949066&view=rev
Log:
Remove another deprecated API from the JavaHL SVNAdmin interface.

[ in subversion/bindings/javahl/ ]
* src/org/apache/subversion/javahl/ISVNAdmin.java
  (load): Remove.

* src/org/apache/subversion/javahl/SVNAdmin.java
  (load): Remove.

* tests/org/apache/subversion/javahl/SVNAdminTests.java
  (testLoadRepo): Update to use the latest API.

* tests/org/apache/subversion/javahl/SVNTests.java
  (createInitialRepository): Save.

Modified:
    subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNAdmin.java
    subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNAdmin.java
    subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNAdminTests.java
    subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNTests.java

Modified: subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNAdmin.java
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNAdmin.java?rev=949066&r1=949065&r2=949066&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNAdmin.java (original)
+++ subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNAdmin.java Fri May 28 01:57:25 2010
@@ -125,22 +125,6 @@ public interface ISVNAdmin {
 	 * @param ignoreUUID        ignore any UUID found in the input stream
 	 * @param forceUUID         set the repository UUID to any found in the
 	 *                          stream
-	 * @param relativePath      the directory in the repository, where the data
-	 *                          in put optional.
-	 * @throws ClientException  throw in case of problem
-	 */
-	public abstract void load(String path, IInput dataInput,
-			IOutput messageOutput, boolean ignoreUUID, boolean forceUUID,
-			String relativePath) throws ClientException;
-
-	/**
-	 * load the data of a dump into a repository,
-	 * @param path              the path to the repository
-	 * @param dataInput         the data input source
-	 * @param messageOutput     the target for processing messages
-	 * @param ignoreUUID        ignore any UUID found in the input stream
-	 * @param forceUUID         set the repository UUID to any found in the
-	 *                          stream
 	 * @param usePreCommitHook  use the pre-commit hook when processing commits
 	 * @param usePostCommitHook use the post-commit hook when processing commits
 	 * @param relativePath      the directory in the repository, where the data

Modified: subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNAdmin.java
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNAdmin.java?rev=949066&r1=949065&r2=949066&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNAdmin.java (original)
+++ subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNAdmin.java Fri May 28 01:57:25 2010
@@ -177,27 +177,6 @@ public class SVNAdmin implements ISVNAdm
      * @param ignoreUUID        ignore any UUID found in the input stream
      * @param forceUUID         set the repository UUID to any found in the
      *                          stream
-     * @param relativePath      the directory in the repository, where the data
-     *                          in put optional.
-     * @throws ClientException  throw in case of problem
-     */
-    public void load(String path, IInput dataInput,
-                     IOutput messageOutput, boolean ignoreUUID,
-                     boolean forceUUID, String relativePath)
-            throws ClientException
-    {
-        load(path, dataInput, messageOutput, ignoreUUID, forceUUID,
-             false, false, relativePath);
-    }
-
-    /**
-     * load the data of a dump into a repository,
-     * @param path              the path to the repository
-     * @param dataInput         the data input source
-     * @param messageOutput     the target for processing messages
-     * @param ignoreUUID        ignore any UUID found in the input stream
-     * @param forceUUID         set the repository UUID to any found in the
-     *                          stream
      * @param usePreCommitHook  use the pre-commit hook when processing commits
      * @param usePostCommitHook use the post-commit hook when processing commits
      * @param relativePath      the directory in the repository, where the data

Modified: subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNAdminTests.java
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNAdminTests.java?rev=949066&r1=949065&r2=949066&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNAdminTests.java (original)
+++ subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNAdminTests.java Fri May 28 01:57:25 2010
@@ -100,7 +100,7 @@ public class SVNAdminTests extends SVNTe
         IInput input = new FileInputer(dump);
         IOutput loadLog = new IgnoreOutputer();
         admin.load(thisTest.getRepositoryPath(),
-                   input, loadLog, true, true, null);
+                   input, loadLog, true, true, false, false, null);
         // should have two revs after the load
         infoHolder[0] = null;
         client.info2(repoUrl, Revision.HEAD, Revision.HEAD,

Modified: subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNTests.java
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNTests.java?rev=949066&r1=949065&r2=949066&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNTests.java (original)
+++ subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNTests.java Fri May 28 01:57:25 2010
@@ -757,7 +757,8 @@ class SVNTests extends TestCase
             if (loadGreek)
             {
                 admin.load(repos.getAbsolutePath(), new FileInputer(greekDump),
-                           new IgnoreOutputer(), false, false, null);
+                           new IgnoreOutputer(), false, false, false, false,
+                           null);
             }
             return repos;
         }