logo       

svn commit: r13146 - in trunk/subversion/bindings/java/javahl: native src/o: msg#00324

version-control.subversion.svn

Subject: svn commit: r13146 - in trunk/subversion/bindings/java/javahl: native src/org/tigris/subversion/javahl

Author: pmayweg
Date: Fri Feb 25 01:06:23 2005
New Revision: 13146

Modified:
trunk/subversion/bindings/java/javahl/native/SVNClient.cpp
trunk/subversion/bindings/java/javahl/native/SVNClient.h

trunk/subversion/bindings/java/javahl/native/org_tigris_subversion_javahl_SVNClient.cpp

trunk/subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/SVNClient.java

trunk/subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/SVNClientInterface.java

trunk/subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/SVNClientSynchronized.java
Log:
The function svn_client_export3 received a new parameter (recurse) which is made
available to javahl clients by adding the new parameter to
SVNClientInterface.doExport.

[in subversion/bindings/java/javahl]

* src/org/tigris/subversion/javahl/SVNClientInterface.java
(SVNClientInterface.doExport):
New parameter recurse added.

* src/org/tigris/subversion/javahl/SVNClientSynchronized.java,
src/org/tigris/subversion/javahl/SVNClient.java:
Implementation of the new method signature

* native/org_tigris_subversion_javahl_SVNClient.cpp,
native/SVNClient.h, native/SVNClient.cpp:
Native (C++) implementation of the new method signature.



Modified: trunk/subversion/bindings/java/javahl/native/SVNClient.cpp
Url:
http://svn.collab.net/viewcvs/svn/trunk/subversion/bindings/java/javahl/native/SVNClient.cpp?view=diff&rev=13146&p1=trunk/subversion/bindings/java/javahl/native/SVNClient.cpp&r1=13145&p2=trunk/subversion/bindings/java/javahl/native/SVNClient.cpp&r2=13146
==============================================================================
--- trunk/subversion/bindings/java/javahl/native/SVNClient.cpp (original)
+++ trunk/subversion/bindings/java/javahl/native/SVNClient.cpp Fri Feb 25
01:06:23 2005
@@ -921,7 +921,8 @@

jlong SVNClient::doExport(const char *srcPath, const char *destPath,
Revision &revision, Revision &pegRevision, bool
force,
- bool ignoreExternals, const char *nativeEOL)
+ bool ignoreExternals, bool recurse,
+ const char *nativeEOL)
{
Pool requestPool;
apr_pool_t * apr_pool = requestPool.pool ();
@@ -961,6 +962,7 @@
revision.revision (),
force,
ignoreExternals,
+ recurse,
nativeEOL,
ctx,
apr_pool);

Modified: trunk/subversion/bindings/java/javahl/native/SVNClient.h
Url:
http://svn.collab.net/viewcvs/svn/trunk/subversion/bindings/java/javahl/native/SVNClient.h?view=diff&rev=13146&p1=trunk/subversion/bindings/java/javahl/native/SVNClient.h&r1=13145&p2=trunk/subversion/bindings/java/javahl/native/SVNClient.h&r2=13146
==============================================================================
--- trunk/subversion/bindings/java/javahl/native/SVNClient.h (original)
+++ trunk/subversion/bindings/java/javahl/native/SVNClient.h Fri Feb 25
01:06:23 2005
@@ -79,7 +79,8 @@
bool recurse);
jlong doExport(const char *srcPath, const char *destPath,
Revision &revision, Revision &pegRevision, bool force,
- bool ignoreExternals, const char *nativeEOL);
+ bool ignoreExternals, bool recurse,
+ const char *nativeEOL);
void resolved(const char *path, bool recurse);
void cleanup(const char *path);
void mkdir(Targets &targets, const char *message);

Modified:
trunk/subversion/bindings/java/javahl/native/org_tigris_subversion_javahl_SVNClient.cpp
Url:
http://svn.collab.net/viewcvs/svn/trunk/subversion/bindings/java/javahl/native/org_tigris_subversion_javahl_SVNClient.cpp?view=diff&rev=13146&p1=trunk/subversion/bindings/java/javahl/native/org_tigris_subversion_javahl_SVNClient.cpp&r1=13145&p2=trunk/subversion/bindings/java/javahl/native/org_tigris_subversion_javahl_SVNClient.cpp&r2=13146
==============================================================================
---
trunk/subversion/bindings/java/javahl/native/org_tigris_subversion_javahl_SVNClient.cpp
(original)
+++
trunk/subversion/bindings/java/javahl/native/org_tigris_subversion_javahl_SVNClient.cpp
Fri Feb 25 01:06:23 2005
@@ -655,12 +655,12 @@
* Method: doExport
* Signature: (Ljava/lang/String;Ljava/lang/String;
* Lorg/tigris/subversion/javahl/Revision;
- * Lorg/tigris/subversion/javahl/Revision;ZZLjava/lang/String;)J
+ * Lorg/tigris/subversion/javahl/Revision;ZZZLjava/lang/String;)J
*/
JNIEXPORT jlong JNICALL Java_org_tigris_subversion_javahl_SVNClient_doExport
(JNIEnv* env, jobject jthis, jstring jsrcPath, jstring jdestPath,
jobject jrevision, jobject jpegRevision, jboolean jforce,
- jboolean jignoreExternals, jstring jnativeEOL)
+ jboolean jignoreExternals, jboolean jrecurse, jstring jnativeEOL)
{
JNIEntry(SVNClient, doExport);
SVNClient *cl = SVNClient::getCppObject(jthis);
@@ -695,7 +695,8 @@
return -1;
}
return cl->doExport(srcPath, destPath, revision, pegRevision,
- jforce ? true : false, jignoreExternals ? true : false, nativeEOL);
+ jforce ? true : false, jignoreExternals ? true : false,
+ jrecurse ? true: false, nativeEOL);
}

/*

Modified:
trunk/subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/SVNClient.java
Url:
http://svn.collab.net/viewcvs/svn/trunk/subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/SVNClient.java?view=diff&rev=13146&p1=trunk/subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/SVNClient.java&r1=13145&p2=trunk/subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/SVNClient.java&r2=13146
==============================================================================
---
trunk/subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/SVNClient.java
(original)
+++
trunk/subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/SVNClient.java
Fri Feb 25 01:06:23 2005
@@ -444,7 +444,7 @@
throws ClientException
{
return doExport(srcPath, destPath, revision, revision, force,
- false, null);
+ false, true, null);
}

/**
@@ -458,6 +458,7 @@
* @param pegRevision the revision to interpret srcPath
* @param force set if it is ok to overwrite local files
* @param ignoreExternals ignore external during export
+ * @param recurse recurse to subdirectories
* @param nativeEOL which EOL characters to use during export
* @throws ClientException
*
@@ -465,7 +466,8 @@
public native long doExport(String srcPath, String destPath,
Revision revision, Revision pegRevision,
boolean force, boolean ignoreExternals,
- String nativeEOL) throws ClientException;
+ boolean recurse, String nativeEOL)
+ throws ClientException;

/**
* Update local copy to mirror a new url.

Modified:
trunk/subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/SVNClientInterface.java
Url:
http://svn.collab.net/viewcvs/svn/trunk/subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/SVNClientInterface.java?view=diff&rev=13146&p1=trunk/subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/SVNClientInterface.java&r1=13145&p2=trunk/subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/SVNClientInterface.java&r2=13146
==============================================================================
---
trunk/subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/SVNClientInterface.java
(original)
+++
trunk/subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/SVNClientInterface.java
Fri Feb 25 01:06:23 2005
@@ -342,12 +342,13 @@
* @param pegRevision the revision to interpret srcPath
* @param force set if it is ok to overwrite local files
* @param ignoreExternals ignore external during export
+ * @param recurse recurse to subdirectories
* @param nativeEOL which EOL characters to use during export
* @exception ClientException
*/
long doExport(String srcPath, String destPath, Revision revision,
Revision pegRevision, boolean force, boolean ignoreExternals,
- String nativeEOL) throws ClientException;
+ boolean recurse, String nativeEOL) throws ClientException;
/**
* Update local copy to mirror a new url.
* @param path the working copy path

Modified:
trunk/subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/SVNClientSynchronized.java
Url:
http://svn.collab.net/viewcvs/svn/trunk/subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/SVNClientSynchronized.java?view=diff&rev=13146&p1=trunk/subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/SVNClientSynchronized.java&r1=13145&p2=trunk/subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/SVNClientSynchronized.java&r2=13146
==============================================================================
---
trunk/subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/SVNClientSynchronized.java
(original)
+++
trunk/subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/SVNClientSynchronized.java
Fri Feb 25 01:06:23 2005
@@ -579,19 +579,21 @@
* @param pegRevision the revision to interpret srcPath
* @param force set if it is ok to overwrite local files
* @param ignoreExternals ignore external during export
+ * @param recurse recurse to subdirectories
* @param nativeEOL which EOL characters to use during export
* @throws ClientException
*
*/
public long doExport(String srcPath, String destPath, Revision revision,
Revision pegRevision, boolean force,
- boolean ignoreExternals, String nativeEOL)
+ boolean ignoreExternals, boolean recurse,
+ String nativeEOL)
throws ClientException
{
synchronized(clazz)
{
return worker.doExport(srcPath, destPath, revision, pegRevision,
- force, ignoreExternals, nativeEOL);
+ force, ignoreExternals, recurse, nativeEOL);
}
}


<Prev in Thread] Current Thread [Next in Thread>
Google Custom Search

News | FAQ | advertise