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 2011/08/16 21:05:44 UTC
svn commit: r1158421 - in /subversion/trunk/subversion/bindings/javahl:
native/ src/org/apache/subversion/javahl/ src/org/tigris/subversion/javahl/
Author: hwright
Date: Tue Aug 16 19:05:44 2011
New Revision: 1158421
URL: http://svn.apache.org/viewvc?rev=1158421&view=rev
Log:
JavaHL: Allow callers to provide a commit message when setting a remote
property.
[ in subversion/bindings/javahl/ ]
* native/SVNClient.h
(propertySetRemote): Add CommitMessage param.
* native/org_apache_subversion_javahl_SVNClient.cpp
(Java_org_apache_subversion_javahl_SVNClient_propertyRemoteSet): Convert
the Java commit message handler to a C++ one and pass it down the stack.
* native/SVNClient.cpp
(propertySetRemote): Accept and use a commit message handler.
* src/org/apache/subversion/javahl/SVNClient.java,
src/org/apache/subversion/javahl/ISVNClient.java
(propertySetRemote): Add a CommitMessageCallback param.
* src/org/tigris/subversion/javahl/SVNClient.java
(propertySet): Provide a commit message handler to the org.apache API.
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=1158421&r1=1158420&r2=1158421&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp Tue Aug 16 19:05:44 2011
@@ -899,6 +899,7 @@ void SVNClient::propertySetLocal(Targets
}
void SVNClient::propertySetRemote(const char *path, const char *name,
+ CommitMessage *message,
JNIByteArray &value, bool force,
RevpropTable &revprops,
CommitCallback *callback)
@@ -916,7 +917,7 @@ void SVNClient::propertySetRemote(const
Path intPath(path, subPool);
SVN_JNI_ERR(intPath.error_occured(), );
- svn_client_ctx_t *ctx = context.getContext(NULL, subPool);
+ svn_client_ctx_t *ctx = context.getContext(message, subPool);
if (ctx == NULL)
return;
Modified: subversion/trunk/subversion/bindings/javahl/native/SVNClient.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/SVNClient.h?rev=1158421&r1=1158420&r2=1158421&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/SVNClient.h (original)
+++ subversion/trunk/subversion/bindings/javahl/native/SVNClient.h Tue Aug 16 19:05:44 2011
@@ -82,6 +82,7 @@ class SVNClient :public SVNBase
svn_depth_t depth, StringArray &changelists,
bool force);
void propertySetRemote(const char *path, const char *name,
+ CommitMessage *message,
JNIByteArray &value, bool force,
RevpropTable &revprops, CommitCallback *callback);
void properties(const char *path, Revision &revision,
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=1158421&r1=1158420&r2=1158421&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 Tue Aug 16 19:05:44 2011
@@ -922,8 +922,8 @@ Java_org_apache_subversion_javahl_SVNCli
JNIEXPORT void JNICALL
Java_org_apache_subversion_javahl_SVNClient_propertySetRemote
-(JNIEnv *env, jobject jthis, jstring jpath, jstring jname,
- jbyteArray jvalue, jboolean jforce, jobject jrevpropTable, jobject jcallback)
+(JNIEnv *env, jobject jthis, jstring jpath, jstring jname, jbyteArray jvalue,
+ jobject jmessage, jboolean jforce, jobject jrevpropTable, jobject jcallback)
{
JNIEntry(SVNClient, propertySet);
SVNClient *cl = SVNClient::getCppObject(jthis);
@@ -940,6 +940,10 @@ Java_org_apache_subversion_javahl_SVNCli
if (JNIUtil::isExceptionThrown())
return;
+ CommitMessage message(jmessage);
+ if (JNIUtil::isExceptionThrown())
+ return;
+
JNIByteArray value(jvalue);
if (JNIUtil::isExceptionThrown())
return;
@@ -949,8 +953,8 @@ Java_org_apache_subversion_javahl_SVNCli
return;
CommitCallback callback(jcallback);
- cl->propertySetRemote(path, name, value, jforce ? true:false, revprops,
- jcallback ? &callback : NULL);
+ cl->propertySetRemote(path, name, &message, value, jforce ? true:false,
+ revprops, jcallback ? &callback : NULL);
}
JNIEXPORT void JNICALL
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=1158421&r1=1158420&r2=1158421&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 Tue Aug 16 19:05:44 2011
@@ -650,6 +650,7 @@ public interface ISVNClient
throws ClientException;
void propertySetRemote(String path, String name, byte[] value,
+ CommitMessageCallback handler,
boolean force, Map<String, String> revpropTable,
CommitCallback callback)
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=1158421&r1=1158420&r2=1158421&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 Tue Aug 16 19:05:44 2011
@@ -308,6 +308,7 @@ public class SVNClient implements ISVNCl
throws ClientException;
public native void propertySetRemote(String path, String name, byte[] value,
+ CommitMessageCallback handler,
boolean force,
Map<String, String> revpropTable,
CommitCallback callback)
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=1158421&r1=1158420&r2=1158421&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 Tue Aug 16 19:05:44 2011
@@ -1880,6 +1880,7 @@ public class SVNClient implements SVNCli
{
aSVNClient.propertySetRemote(path, name,
value == null ? null : value.getBytes(),
+ cachedHandler,
force, revpropTable, null);
}
else