Author: hwright
Date: Mon Oct 4 20:40:25 2010
New Revision: 1004418
URL: http://svn.apache.org/viewvc?rev=1004418&view=rev
Log:
JavaHL: Update the relocate API to reflect changes in the C API (namely, the
removal of the recurse parameter).
* subversion/bindings/javahl/native/SVNClient.h
(relocate): Drop the recurse parameter.
* subversion/bindings/javahl/native/SVNClient.cpp
(relocate): Update to svn_client_relocate2().
* subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp
(Java_org_apache_subversion_javahl_SVNClient_relocate):
Drop recurse parameter.
* subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java
(relocate): Same.
* subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java
(relocate): Same.
* subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java
(relocate): If 'relocate' is false in this wrapper, thrown an exception.
Modified:
subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp
subversion/trunk/subversion/bindings/javahl/native/SVNClient.h
subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java
subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java
Modified: subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp?rev=1004418&r1=1004417&r2=1004418&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp Mon Oct 4
20:40:25 2010
@@ -1151,8 +1151,7 @@ jbyteArray SVNClient::revProperty(const
return JNIUtil::makeJByteArray((const signed char *)propval->data,
propval->len);
}
-void SVNClient::relocate(const char *from, const char *to, const char *path,
- bool recurse)
+void SVNClient::relocate(const char *from, const char *to, const char *path)
{
SVN::Pool requestPool;
SVN_JNI_NULL_PTR_EX(path, "path", );
@@ -1171,9 +1170,9 @@ void SVNClient::relocate(const char *fro
if (ctx == NULL)
return;
- SVN_JNI_ERR(svn_client_relocate(intPath.c_str(), intFrom.c_str(),
- intTo.c_str(), recurse, ctx,
- requestPool.pool()), );
+ SVN_JNI_ERR(svn_client_relocate2(intPath.c_str(), intFrom.c_str(),
+ intTo.c_str(), ctx,
+ requestPool.pool()), );
}
void SVNClient::blame(const char *path, Revision &pegRevision,
Modified: subversion/trunk/subversion/bindings/javahl/native/SVNClient.h
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/SVNClient.h?rev=1004418&r1=1004417&r2=1004418&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/SVNClient.h (original)
+++ subversion/trunk/subversion/bindings/javahl/native/SVNClient.h Mon Oct 4
20:40:25 2010
@@ -74,8 +74,7 @@ class SVNClient :public SVNBase
Revision &revisionStart, Revision &revisionEnd,
bool ignoreMimeType, bool includeMergedRevisions,
BlameCallback *callback);
- void relocate(const char *from, const char *to, const char *path,
- bool recurse);
+ void relocate(const char *from, const char *to, const char *path);
void streamFileContent(const char *path, Revision &revision,
Revision &pegRevision, OutputStream &outputStream);
void propertySet(const char *path, const char *name, const char *value,
Modified:
subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp?rev=1004418&r1=1004417&r2=1004418&view=diff
==============================================================================
---
subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp
(original)
+++
subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp
Mon Oct 4 20:40:25 2010
@@ -1422,8 +1422,7 @@ Java_org_apache_subversion_javahl_SVNCli
JNIEXPORT void JNICALL
Java_org_apache_subversion_javahl_SVNClient_relocate
-(JNIEnv *env, jobject jthis, jstring jfrom, jstring jto, jstring jpath,
- jboolean jrecurse)
+(JNIEnv *env, jobject jthis, jstring jfrom, jstring jto, jstring jpath)
{
JNIEntry(SVNClient, relocate);
SVNClient *cl = SVNClient::getCppObject(jthis);
@@ -1444,7 +1443,7 @@ Java_org_apache_subversion_javahl_SVNCli
if (JNIUtil::isExceptionThrown())
return;
- cl->relocate(from, to, path, jrecurse ? true: false);
+ cl->relocate(from, to, path);
return;
}
Modified:
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java?rev=1004418&r1=1004417&r2=1004418&view=diff
==============================================================================
---
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java
(original)
+++
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java
Mon Oct 4 20:40:25 2010
@@ -798,11 +798,10 @@ public interface ISVNClient
* @param from old url
* @param to new url
* @param path working copy path
- * @param recurse recurse into subdirectories
* @throws ClientException
* @since 1.0
*/
- void relocate(String from, String to, String path, boolean recurse)
+ void relocate(String from, String to, String path)
throws ClientException;
/**
Modified:
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java?rev=1004418&r1=1004417&r2=1004418&view=diff
==============================================================================
---
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java
(original)
+++
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java
Mon Oct 4 20:40:25 2010
@@ -495,8 +495,7 @@ public class SVNClient implements ISVNCl
/**
* @since 1.0
*/
- public native void relocate(String from, String to, String path,
- boolean recurse)
+ public native void relocate(String from, String to, String path)
throws ClientException;
/**
Modified:
subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java?rev=1004418&r1=1004417&r2=1004418&view=diff
==============================================================================
---
subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java
(original)
+++
subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java
Mon Oct 4 20:40:25 2010
@@ -2119,9 +2119,13 @@ public class SVNClient implements SVNCli
public void relocate(String from, String to, String path, boolean recurse)
throws ClientException
{
+ if (recurse == false)
+ throw new ClientException("relocate only support full recursion",
+ null, -1);
+
try
{
- aSVNClient.relocate(from, to, path, recurse);
+ aSVNClient.relocate(from, to, path);
}
catch (org.apache.subversion.javahl.ClientException ex)
{
