Return-Path: X-Original-To: apmail-subversion-commits-archive@minotaur.apache.org Delivered-To: apmail-subversion-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id EEB8FDB75 for ; Wed, 17 Oct 2012 01:20:10 +0000 (UTC) Received: (qmail 4029 invoked by uid 500); 17 Oct 2012 01:20:10 -0000 Delivered-To: apmail-subversion-commits-archive@subversion.apache.org Received: (qmail 3988 invoked by uid 500); 17 Oct 2012 01:20:10 -0000 Mailing-List: contact commits-help@subversion.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@subversion.apache.org Delivered-To: mailing list commits@subversion.apache.org Received: (qmail 3972 invoked by uid 99); 17 Oct 2012 01:20:10 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 17 Oct 2012 01:20:10 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 17 Oct 2012 01:20:07 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id E3C9A23888CD; Wed, 17 Oct 2012 01:19:22 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1399064 - in /subversion/trunk/subversion/bindings/javahl: native/ src/org/apache/subversion/javahl/ Date: Wed, 17 Oct 2012 01:19:22 -0000 To: commits@subversion.apache.org From: hwright@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121017011922.E3C9A23888CD@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: hwright Date: Wed Oct 17 01:19:21 2012 New Revision: 1399064 URL: http://svn.apache.org/viewvc?rev=1399064&view=rev Log: JavaHL: Punch additional changelist parameter for property fetching to the Java layer. [ in subversion/bindings/javahl/ ] * native/SVNClient.cpp, native/SVNClient.h (SVNClient::propertyGet): Add changelists param. * native/org_apache_subversion_javahl_SVNClient.cpp (Java_org_apache_subversion_javahl_SVNClient_propertyGet): Add changelists param, pass to C++ layer. * src/org/apache/subversion/javahl/ISVNClient.java, src/org/apache/subversion/javahl/SVNClient.java (propertyGet): Add overload to accept changelists param. 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 Modified: subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp?rev=1399064&r1=1399063&r2=1399064&view=diff ============================================================================== --- subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp (original) +++ subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp Wed Oct 17 01:19:21 2012 @@ -816,7 +816,8 @@ void SVNClient::getMergeinfoLog(int type * Get a property. */ jbyteArray SVNClient::propertyGet(const char *path, const char *name, - Revision &revision, Revision &pegRevision) + Revision &revision, Revision &pegRevision, + StringArray &changelists) { SVN::Pool subPool(pool); SVN_JNI_NULL_PTR_EX(path, "path", NULL); @@ -829,11 +830,11 @@ jbyteArray SVNClient::propertyGet(const return NULL; apr_hash_t *props; - SVN_JNI_ERR(svn_client_propget4(&props, name, + SVN_JNI_ERR(svn_client_propget5(&props, NULL, name, intPath.c_str(), pegRevision.revision(), revision.revision(), NULL, svn_depth_empty, - NULL, ctx, subPool.getPool(), - subPool.getPool()), + changelists.array(subPool), ctx, + subPool.getPool(), subPool.getPool()), NULL); apr_hash_index_t *hi; Modified: subversion/trunk/subversion/bindings/javahl/native/SVNClient.h URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/SVNClient.h?rev=1399064&r1=1399063&r2=1399064&view=diff ============================================================================== --- subversion/trunk/subversion/bindings/javahl/native/SVNClient.h (original) +++ subversion/trunk/subversion/bindings/javahl/native/SVNClient.h Wed Oct 17 01:19:21 2012 @@ -171,7 +171,8 @@ class SVNClient :public SVNBase bool lastChanged); void upgrade(const char *path); jbyteArray propertyGet(const char *path, const char *name, - Revision &revision, Revision &pegRevision); + Revision &revision, Revision &pegRevision, + StringArray &changelists); void diff(const char *target1, Revision &revision1, const char *target2, Revision &revision2, const char *relativeToDir, OutputStream &outputStream, 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=1399064&r1=1399063&r2=1399064&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 Wed Oct 17 01:19:21 2012 @@ -1080,7 +1080,7 @@ Java_org_apache_subversion_javahl_SVNCli JNIEXPORT jbyteArray JNICALL Java_org_apache_subversion_javahl_SVNClient_propertyGet (JNIEnv *env, jobject jthis, jstring jpath, jstring jname, jobject jrevision, - jobject jpegRevision) + jobject jpegRevision, jobject jchangelists) { JNIEntry(SVNClient, propertyGet); SVNClient *cl = SVNClient::getCppObject(jthis); @@ -1105,7 +1105,11 @@ Java_org_apache_subversion_javahl_SVNCli if (JNIUtil::isExceptionThrown()) return NULL; - return cl->propertyGet(path, name, revision, pegRevision); + StringArray changelists(jchangelists); + if (JNIUtil::isExceptionThrown()) + return NULL; + + return cl->propertyGet(path, name, revision, pegRevision, changelists); } JNIEXPORT jobject 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=1399064&r1=1399063&r2=1399064&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 Wed Oct 17 01:19:21 2012 @@ -719,6 +719,10 @@ public interface ISVNClient * @throws ClientException */ byte[] propertyGet(String path, String name, Revision revision, + Revision pegRevision, Collection changelists) + throws ClientException; + + byte[] propertyGet(String path, String name, Revision revision, Revision pegRevision) 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=1399064&r1=1399063&r2=1399064&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 Wed Oct 17 01:19:21 2012 @@ -366,8 +366,16 @@ public class SVNClient implements ISVNCl boolean force) throws ClientException; + public byte[] propertyGet(String path, String name, + Revision revision, Revision pegRevision) + throws ClientException + { + return propertyGet(path, name, revision, pegRevision, null); + } + public native byte[] propertyGet(String path, String name, - Revision revision, Revision pegRevision) + Revision revision, Revision pegRevision, + Collection changelists) throws ClientException; public byte[] fileContent(String path, Revision revision,