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:38:27 UTC
svn commit: r949064 - in /subversion/trunk/subversion/bindings/javahl:
native/ src/org/apache/subversion/javahl/ src/org/tigris/subversion/javahl/
Author: hwright
Date: Fri May 28 01:38:26 2010
New Revision: 949064
URL: http://svn.apache.org/viewvc?rev=949064&view=rev
Log:
Remove a deprecated API from the SVNAdmin interface in the new Apache package.
[ in subversion/bindings/javahl/ ]
* native/org_apache_subversion_javahl_SVNAdmin.cpp
(setRevProp): Remove.
(Java_org_apache_subversion_javahl_SVNAdmin_setLog): Remove.
(Java_org_apache_subversion_javahl_SVNAdmin_setRevProp): Implement.
* src/org/apache/subversion/javahl/ISVNAdmin.java
(setLog): Remove.
* src/org/apache/subversion/javahl/SVNAdmin.java
(setLog): Remove.
* src/org/tigris/subversion/javahl/SVNAdmin.java
(setLog): Use the non-deprecated API in the wrapper.
Modified:
subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNAdmin.cpp
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/src/org/tigris/subversion/javahl/SVNAdmin.java
Modified: subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNAdmin.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNAdmin.cpp?rev=949064&r1=949063&r2=949064&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNAdmin.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNAdmin.cpp Fri May 28 01:38:26 2010
@@ -336,13 +336,13 @@ Java_org_apache_subversion_javahl_SVNAdm
cl->rmtxns(path, transactions);
}
-/* A helper function for setRevProp() and setLog(). */
-static void
-setRevProp(jobject jthis, jstring jpath, jobject jrevision,
- jstring jpropName, jstring jpropValue,
- jboolean jusePreRevPropChangeHook,
- jboolean jusePostRevPropChangeHook)
+JNIEXPORT void JNICALL
+Java_org_apache_subversion_javahl_SVNAdmin_setRevProp
+(JNIEnv *env, jobject jthis, jstring jpath, jobject jrevision,
+ jstring jpropName, jstring jpropValue, jboolean jusePreRevPropChangeHook,
+ jboolean jusePostRevPropChangeHook)
{
+ JNIEntry(SVNAdmin, setRevProp);
SVNAdmin *cl = SVNAdmin::getCppObject(jthis);
if (cl == NULL)
{
@@ -372,29 +372,6 @@ setRevProp(jobject jthis, jstring jpath,
}
JNIEXPORT void JNICALL
-Java_org_apache_subversion_javahl_SVNAdmin_setLog
-(JNIEnv *env, jobject jthis, jstring jpath, jobject jrevision,
- jstring jmessage, jboolean jbypassHooks)
-{
- JNIEntry(SVNAdmin, setLog);
- jstring jlogPropName = env->NewStringUTF(SVN_PROP_REVISION_LOG);
- setRevProp(jthis, jpath, jrevision, jlogPropName, jmessage,
- !jbypassHooks, !jbypassHooks);
- env->DeleteLocalRef(jlogPropName);
-}
-
-JNIEXPORT void JNICALL
-Java_org_apache_subversion_javahl_SVNAdmin_setRevProp
-(JNIEnv *env, jobject jthis, jstring jpath, jobject jrevision,
- jstring jpropName, jstring jpropValue, jboolean jusePreRevPropChangeHook,
- jboolean jusePostRevPropChangeHook)
-{
- JNIEntry(SVNAdmin, setRevProp);
- setRevProp(jthis, jpath, jrevision, jpropName, jpropValue,
- jusePreRevPropChangeHook, jusePostRevPropChangeHook);
-}
-
-JNIEXPORT void JNICALL
Java_org_apache_subversion_javahl_SVNAdmin_verify
(JNIEnv *env, jobject jthis, jstring jpath, jobject jmessageout,
jobject jrevisionStart, jobject jrevisionEnd)
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=949064&r1=949063&r2=949064&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:38:26 2010
@@ -193,18 +193,6 @@ public interface ISVNAdmin {
throws ClientException;
/**
- * set the log message of a revision
- * @param path the path to the repository
- * @param rev the revision to be changed
- * @param message the message to be set
- * @param bypassHooks if to bypass all repository hooks
- * @throws ClientException throw in case of problem
- * @deprecated Use setRevProp() instead.
- */
- public abstract void setLog(String path, Revision rev, String message,
- boolean bypassHooks) throws ClientException;
-
- /**
* Change the value of the revision property <code>propName</code>
* to <code>propValue</code>. By default, does not run
* pre-/post-revprop-change hook scripts.
@@ -255,4 +243,4 @@ public interface ISVNAdmin {
public abstract void rmlocks(String path, String[] locks)
throws ClientException;
-}
\ No newline at end of file
+}
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=949064&r1=949063&r2=949064&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:38:26 2010
@@ -255,19 +255,6 @@ public class SVNAdmin implements ISVNAdm
throws ClientException;
/**
- * set the log message of a revision
- * @param path the path to the repository
- * @param rev the revision to be changed
- * @param message the message to be set
- * @param bypassHooks if to bypass all repository hooks
- * @throws ClientException throw in case of problem
- * @deprecated Use setRevProp() instead.
- */
- public native void setLog(String path, Revision rev, String message,
- boolean bypassHooks)
- throws ClientException;
-
- /**
* Change the value of the revision property <code>propName</code>
* to <code>propValue</code>. By default, does not run
* pre-/post-revprop-change hook scripts.
Modified: subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNAdmin.java
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNAdmin.java?rev=949064&r1=949063&r2=949064&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNAdmin.java (original)
+++ subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNAdmin.java Fri May 28 01:38:26 2010
@@ -367,13 +367,14 @@ public class SVNAdmin
{
try
{
- aSVNAdmin.setLog(path,
- rev == null ? null : rev.toApache(),
- message, bypassHooks);
+ aSVNAdmin.setRevProp(path,
+ rev == null ? null : rev.toApache(),
+ "svn:log", message,
+ !bypassHooks, !bypassHooks);
}
- catch (org.apache.subversion.javahl.ClientException ex)
+ catch (org.apache.subversion.javahl.SubversionException ex)
{
- throw new ClientException(ex);
+ throw ClientException.fromException(ex);
}
}