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/02/09 05:36:56 UTC
svn commit: r907931 [1/2] - in /subversion/trunk: ./
subversion/bindings/javahl/native/
subversion/bindings/javahl/src/org/apache/subversion/javahl/
subversion/bindings/javahl/src/org/tigris/subversion/javahl/
Author: hwright
Date: Tue Feb 9 04:36:52 2010
New Revision: 907931
URL: http://svn.apache.org/viewvc?rev=907931&view=rev
Log:
JavaHL: Migrate the JavaHL client class to be a wrapper around the class
in the apache package.
Note: 'make check-javahl' still works, though 'make check-javahl-compat'
crashes the jvm.
(And sorry 'bout the power plant of a patch. There really wasn't a way to
chop this sucker up :( )
* Makefile.in:
(javahl): Depend on the javahl-compat targets.
* build.conf
(libsvnjavahl): Depend on the javahl-compat headers.
[ in subversion/bindings/javahl/ ]
* native/ChangelistCallback.cpp,
native/DiffSummaryReceiver.cpp,
native/CreateJ.cpp,
native/ProplistCallback.cpp,
native/LogMessageCallback.cpp,
native/StatusCallback.cpp,
native/InfoCallback.cpp,
native/ListCallback.cpp,
native/BlameCallback.cpp,
native/ConflictResolverCallback.cpp:
Update package location for the new package.
* native/Notify2.h:
Move from this...
* native/NotifyCallback.h:
...to this.
* native/org_tigris_subversion_javahl_SVNClient.cpp:
Move from this...
* native/org_apache_subversion_javahl_SVNClient.cpp:
...to this.
* native/Notify2.cpp:
Move this...
* native/NotifyCallback.cpp:
...to this.
* native/SVNClient.h,
native/SVNClient.cpp:
Change Notify2 to NotifyCallback.
* native/org_tigris_subversion_javahl_NativeResources.cpp:
Remove.
* native/Outputer.cpp,
native/Inputer.cpp:
Use the new Interface name throughout.
* native/JNIUtil.h
(JAVA_PACKAGE): Redefine to use the new package name.
* src/org/tigris/subversion/javahl/ConflictVersion.java,
src/org/tigris/subversion/javahl/Version.java,
src/org/tigris/subversion/javahl/ChangePath.java,
src/org/tigris/subversion/javahl/CommitItem.java,
src/org/tigris/subversion/javahl/DirEntry.java,
src/org/tigris/subversion/javahl/Info2.java,
src/org/tigris/subversion/javahl/Info.java,
src/org/tigris/subversion/javahl/PropertyData.java,
src/org/tigris/subversion/javahl/CopySource.java,
src/org/tigris/subversion/javahl/RevisionRange.java,
src/org/tigris/subversion/javahl/ProgressEvent.java,
src/org/tigris/subversion/javahl/ConflictDescriptor.java,
src/org/tigris/subversion/javahl/DiffSummary.java,
src/org/tigris/subversion/javahl/ConflictResult.java,
src/org/tigris/subversion/javahl/Status.java,
src/org/tigris/subversion/javahl/NotifyInformation.java,
src/org/tigris/subversion/javahl/Mergeinfo.java:
Add a backward compat constructor.
* src/org/tigris/subversion/javahl/Revision.java
(createFromApache): A new backward-compat wrapper.
* src/org/tigris/subversion/javahl/SVNClient.java:
The power plant. Implement this class as a wrapper around a surrogate
object from the apache package.
* src/org/tigris/subversion/javahl/SVNAdmin.java
(getVersion): Use the NativeResources class from the new package.
* src/org/tigris/subversion/javahl/NativeResources.java:
Remove.
* src/org/tigris/subversion/javahl/Lock.java:
Only duplicate fields which are non-null.
* src/org/tigris/subversion/javahl/PromptUserPassword.java,
src/org/tigris/subversion/javahl/ProplistCallback.java,
src/org/tigris/subversion/javahl/ChangelistCallback.java,
src/org/tigris/subversion/javahl/Notify.java:
Implement this wrapper by extending the apache-packaged class.
* src/org/apache/subversion/javahl/NotifyStatus.java,
src/org/apache/subversion/javahl/Info.java,
src/org/apache/subversion/javahl/Notify.java:
New, copied from the old package.
* src/org/apache/subversion/javahl/SVNClient.java
(getCppAddr): New function, useful for backward-compat.
(finalize): Make public for backward-compat.
(getLastPath, notification, info): Needed functions for backward compat.
* src/org/apache/subversion/javahl/NativeResources.java:
Publicize for backward-compat.
* src/org/apache/subversion/javahl/ClientException.java
(fromException): Make public for backward compat.
Added:
subversion/trunk/subversion/bindings/javahl/native/NotifyCallback.cpp
- copied, changed from r907792, subversion/trunk/subversion/bindings/javahl/native/Notify2.cpp
subversion/trunk/subversion/bindings/javahl/native/NotifyCallback.h
- copied, changed from r907792, subversion/trunk/subversion/bindings/javahl/native/Notify2.h
subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp
- copied, changed from r906643, subversion/trunk/subversion/bindings/javahl/native/org_tigris_subversion_javahl_SVNClient.cpp
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/Info.java
- copied, changed from r907792, subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Info.java
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/Notify.java
- copied, changed from r907682, subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Notify.java
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/NotifyStatus.java
- copied, changed from r907792, subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/NotifyStatus.java
Removed:
subversion/trunk/subversion/bindings/javahl/native/Notify2.cpp
subversion/trunk/subversion/bindings/javahl/native/Notify2.h
subversion/trunk/subversion/bindings/javahl/native/org_tigris_subversion_javahl_NativeResources.cpp
subversion/trunk/subversion/bindings/javahl/native/org_tigris_subversion_javahl_SVNClient.cpp
subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/NativeResources.java
Modified:
subversion/trunk/Makefile.in
subversion/trunk/build.conf
subversion/trunk/subversion/bindings/javahl/native/BlameCallback.cpp
subversion/trunk/subversion/bindings/javahl/native/ChangelistCallback.cpp
subversion/trunk/subversion/bindings/javahl/native/ConflictResolverCallback.cpp
subversion/trunk/subversion/bindings/javahl/native/CreateJ.cpp
subversion/trunk/subversion/bindings/javahl/native/DiffSummaryReceiver.cpp
subversion/trunk/subversion/bindings/javahl/native/InfoCallback.cpp
subversion/trunk/subversion/bindings/javahl/native/Inputer.cpp
subversion/trunk/subversion/bindings/javahl/native/JNIUtil.h
subversion/trunk/subversion/bindings/javahl/native/ListCallback.cpp
subversion/trunk/subversion/bindings/javahl/native/LogMessageCallback.cpp
subversion/trunk/subversion/bindings/javahl/native/Outputer.cpp
subversion/trunk/subversion/bindings/javahl/native/ProplistCallback.cpp
subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp
subversion/trunk/subversion/bindings/javahl/native/SVNClient.h
subversion/trunk/subversion/bindings/javahl/native/StatusCallback.cpp
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ClientException.java
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/NativeResources.java
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java
subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ChangePath.java
subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ChangelistCallback.java
subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/CommitItem.java
subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ConflictDescriptor.java
subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ConflictResult.java
subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ConflictVersion.java
subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/CopySource.java
subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/DiffSummary.java
subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/DirEntry.java
subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Info.java
subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Info2.java
subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Lock.java
subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Mergeinfo.java
subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Notify.java
subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/NotifyInformation.java
subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ProgressEvent.java
subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/PromptUserPassword.java
subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/PropertyData.java
subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ProplistCallback.java
subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Revision.java
subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/RevisionRange.java
subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNAdmin.java
subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java
subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Status.java
subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Version.java
Modified: subversion/trunk/Makefile.in
URL: http://svn.apache.org/viewvc/subversion/trunk/Makefile.in?rev=907931&r1=907930&r2=907931&view=diff
==============================================================================
--- subversion/trunk/Makefile.in (original)
+++ subversion/trunk/Makefile.in Tue Feb 9 04:36:52 2010
@@ -424,7 +424,7 @@
install-static: @INSTALL_STATIC_RULES@
# JavaHL target aliases
-javahl: mkdir-init javahl-java javahl-javah javahl-lib @JAVAHL_TESTS_TARGET@
+javahl: mkdir-init javahl-java javahl-javah javahl-compat-javah javahl-lib @JAVAHL_TESTS_TARGET@
install-javahl: javahl install-javahl-java install-javahl-javah install-javahl-lib
javahl-compat: mkdir-init javahl-compat-java javahl-compat-javah javahl-lib @JAVAHL_TESTS_TARGET@ javahl-compat-tests
Modified: subversion/trunk/build.conf
URL: http://svn.apache.org/viewvc/subversion/trunk/build.conf?rev=907931&r1=907930&r2=907931&view=diff
==============================================================================
--- subversion/trunk/build.conf (original)
+++ subversion/trunk/build.conf Tue Feb 9 04:36:52 2010
@@ -594,7 +594,7 @@
libs = libsvn_repos libsvn_client libsvn_wc libsvn_ra libsvn_delta libsvn_diff
libsvn_subr libsvn_fs aprutil apriconv apr neon
sources = *.cpp *.c
-add-deps = $(javahl_javah_DEPS) $(javahl_java_DEPS)
+add-deps = $(javahl_javah_DEPS) $(javahl_java_DEPS) $(javahl_javah_compat_DEPS)
install = javahl-lib
# need special build rule to include -I$(JDK)/include/jni.h
compile-cmd = $(COMPILE_JAVAHL_CXX)
Modified: subversion/trunk/subversion/bindings/javahl/native/BlameCallback.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/BlameCallback.cpp?rev=907931&r1=907930&r2=907931&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/BlameCallback.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/BlameCallback.cpp Tue Feb 9 04:36:52 2010
@@ -84,7 +84,7 @@
static jmethodID mid = 0;
if (mid == 0)
{
- jclass clazz = env->FindClass(JAVA_PACKAGE"/BlameCallback3");
+ jclass clazz = env->FindClass(JAVA_PACKAGE"/callback/BlameCallback3");
if (JNIUtil::isJavaExceptionThrown())
return SVN_NO_ERROR;
Modified: subversion/trunk/subversion/bindings/javahl/native/ChangelistCallback.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/ChangelistCallback.cpp?rev=907931&r1=907930&r2=907931&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/ChangelistCallback.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/ChangelistCallback.cpp Tue Feb 9 04:36:52 2010
@@ -72,7 +72,7 @@
// it can be cached.
if (mid == 0)
{
- jclass clazz = env->FindClass(JAVA_PACKAGE"/ChangelistCallback");
+ jclass clazz = env->FindClass(JAVA_PACKAGE"/callback/ChangelistCallback");
if (JNIUtil::isJavaExceptionThrown())
return;
Modified: subversion/trunk/subversion/bindings/javahl/native/ConflictResolverCallback.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/ConflictResolverCallback.cpp?rev=907931&r1=907930&r2=907931&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/ConflictResolverCallback.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/ConflictResolverCallback.cpp Tue Feb 9 04:36:52 2010
@@ -57,7 +57,7 @@
// Sanity check that the object implements the ConflictResolverCallback
// Java interface.
- jclass clazz = env->FindClass(JAVA_PACKAGE "/ConflictResolverCallback");
+ jclass clazz = env->FindClass(JAVA_PACKAGE "/callback/ConflictResolverCallback");
if (JNIUtil::isJavaExceptionThrown())
return NULL;
@@ -105,7 +105,7 @@
if (mid == 0)
{
// Initialize the callback method ID.
- jclass clazz = env->FindClass(JAVA_PACKAGE "/ConflictResolverCallback");
+ jclass clazz = env->FindClass(JAVA_PACKAGE "/callback/ConflictResolverCallback");
if (JNIUtil::isJavaExceptionThrown())
return SVN_NO_ERROR;
Modified: subversion/trunk/subversion/bindings/javahl/native/CreateJ.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/CreateJ.cpp?rev=907931&r1=907930&r2=907931&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/CreateJ.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/CreateJ.cpp Tue Feb 9 04:36:52 2010
@@ -366,7 +366,7 @@
if (mid == 0)
{
mid = env->GetMethodID(clazz, "<init>",
- "(L"JAVA_PACKAGE"/SVNClientInterface;"
+ "(L"JAVA_PACKAGE"/ISVNClient;"
"Ljava/lang/String;Ljava/lang/String;"
"Ljava/lang/String;[B)V");
if (JNIUtil::isJavaExceptionThrown())
Modified: subversion/trunk/subversion/bindings/javahl/native/DiffSummaryReceiver.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/DiffSummaryReceiver.cpp?rev=907931&r1=907930&r2=907931&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/DiffSummaryReceiver.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/DiffSummaryReceiver.cpp Tue Feb 9 04:36:52 2010
@@ -64,7 +64,7 @@
if (callback == 0)
{
// Initialize the method ID.
- clazz = env->FindClass(JAVA_PACKAGE "/DiffSummaryReceiver");
+ clazz = env->FindClass(JAVA_PACKAGE "/callback/DiffSummaryCallback");
if (JNIUtil::isJavaExceptionThrown())
return SVN_NO_ERROR;
Modified: subversion/trunk/subversion/bindings/javahl/native/InfoCallback.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/InfoCallback.cpp?rev=907931&r1=907930&r2=907931&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/InfoCallback.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/InfoCallback.cpp Tue Feb 9 04:36:52 2010
@@ -75,7 +75,7 @@
static jmethodID mid = 0;
if (mid == 0)
{
- jclass clazz = env->FindClass(JAVA_PACKAGE"/InfoCallback");
+ jclass clazz = env->FindClass(JAVA_PACKAGE"/callback/InfoCallback");
if (JNIUtil::isJavaExceptionThrown())
return SVN_NO_ERROR;
Modified: subversion/trunk/subversion/bindings/javahl/native/Inputer.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/Inputer.cpp?rev=907931&r1=907930&r2=907931&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/Inputer.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/Inputer.cpp Tue Feb 9 04:36:52 2010
@@ -77,7 +77,7 @@
static jmethodID mid = 0;
if (mid == 0)
{
- jclass clazz = env->FindClass(JAVA_PACKAGE"/InputInterface");
+ jclass clazz = env->FindClass(JAVA_PACKAGE"/IInput");
if (JNIUtil::isJavaExceptionThrown())
return SVN_NO_ERROR;
@@ -139,7 +139,7 @@
static jmethodID mid = 0;
if (mid == 0)
{
- jclass clazz = env->FindClass(JAVA_PACKAGE"/InputInterface");
+ jclass clazz = env->FindClass(JAVA_PACKAGE"/IInput");
if (JNIUtil::isJavaExceptionThrown())
return SVN_NO_ERROR;
Modified: subversion/trunk/subversion/bindings/javahl/native/JNIUtil.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/JNIUtil.h?rev=907931&r1=907930&r2=907931&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/JNIUtil.h (original)
+++ subversion/trunk/subversion/bindings/javahl/native/JNIUtil.h Tue Feb 9 04:36:52 2010
@@ -39,7 +39,7 @@
#include <string>
struct svn_error_t;
-#define JAVA_PACKAGE "org/tigris/subversion/javahl"
+#define JAVA_PACKAGE "org/apache/subversion/javahl"
/**
* Class to hold a number of JNI related utility methods. No Objects
Modified: subversion/trunk/subversion/bindings/javahl/native/ListCallback.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/ListCallback.cpp?rev=907931&r1=907930&r2=907931&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/ListCallback.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/ListCallback.cpp Tue Feb 9 04:36:52 2010
@@ -80,7 +80,7 @@
static jmethodID mid = 0;
if (mid == 0)
{
- jclass clazz = env->FindClass(JAVA_PACKAGE"/ListCallback");
+ jclass clazz = env->FindClass(JAVA_PACKAGE"/callback/ListCallback");
if (JNIUtil::isJavaExceptionThrown())
return SVN_NO_ERROR;
Modified: subversion/trunk/subversion/bindings/javahl/native/LogMessageCallback.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/LogMessageCallback.cpp?rev=907931&r1=907930&r2=907931&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/LogMessageCallback.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/LogMessageCallback.cpp Tue Feb 9 04:36:52 2010
@@ -75,7 +75,7 @@
static jmethodID sm_mid = 0;
if (sm_mid == 0)
{
- jclass clazz = env->FindClass(JAVA_PACKAGE"/LogMessageCallback");
+ jclass clazz = env->FindClass(JAVA_PACKAGE"/callback/LogMessageCallback");
if (JNIUtil::isJavaExceptionThrown())
return SVN_NO_ERROR;
Copied: subversion/trunk/subversion/bindings/javahl/native/NotifyCallback.cpp (from r907792, subversion/trunk/subversion/bindings/javahl/native/Notify2.cpp)
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/NotifyCallback.cpp?p2=subversion/trunk/subversion/bindings/javahl/native/NotifyCallback.cpp&p1=subversion/trunk/subversion/bindings/javahl/native/Notify2.cpp&r1=907792&r2=907931&rev=907931&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/Notify2.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/NotifyCallback.cpp Tue Feb 9 04:36:52 2010
@@ -20,11 +20,11 @@
* ====================================================================
* @endcopyright
*
- * @file Notify2.cpp
- * @brief Implementation of the class Notify2
+ * @file NotifyCallback.cpp
+ * @brief Implementation of the class NotifyCallback
*/
-#include "Notify2.h"
+#include "NotifyCallback.h"
#include "JNIUtil.h"
#include "CreateJ.h"
#include "EnumMapper.h"
@@ -34,7 +34,7 @@
* Create a new object and store the Java object.
* @param notify global reference to the Java object
*/
-Notify2::Notify2(jobject p_notify)
+NotifyCallback::NotifyCallback(jobject p_notify)
{
m_notify = p_notify;
}
@@ -43,7 +43,7 @@
* Destroy the object and delete the global reference to the Java
* object.
*/
-Notify2::~Notify2()
+NotifyCallback::~NotifyCallback()
{
if (m_notify != NULL)
{
@@ -56,7 +56,7 @@
* Create a C++ peer object for the Java object.
* @param notify a local reference to the Java object
*/
-Notify2 *Notify2::makeCNotify(jobject notify)
+NotifyCallback *NotifyCallback::makeCNotify(jobject notify)
{
// If the Java object is null -> no C++ peer needed.
if (notify == NULL)
@@ -64,7 +64,7 @@
JNIEnv *env = JNIUtil::getEnv();
// Sanity check, that the object implements Notify.
- jclass clazz = env->FindClass(JAVA_PACKAGE"/Notify2");
+ jclass clazz = env->FindClass(JAVA_PACKAGE"/callback/NotifyCallback");
if (JNIUtil::isJavaExceptionThrown())
return NULL;
@@ -84,7 +84,7 @@
return NULL;
// Create the peer.
- return new Notify2(myNotify);
+ return new NotifyCallback(myNotify);
}
/**
@@ -94,10 +94,10 @@
* @param pool an apr pool to allocated memory
*/
void
-Notify2::notify(void *baton, const svn_wc_notify_t *notify, apr_pool_t *pool)
+NotifyCallback::notify(void *baton, const svn_wc_notify_t *notify, apr_pool_t *pool)
{
// A Notify object is used as the baton.
- Notify2 *that = (Notify2 *) baton;
+ NotifyCallback *that = (NotifyCallback *) baton;
if (that) // sanity check
{
// Call our method.
@@ -112,7 +112,7 @@
* @param pool an apr pool to allocated memory
*/
void
-Notify2::onNotify(const svn_wc_notify_t *wcNotify, apr_pool_t *pool)
+NotifyCallback::onNotify(const svn_wc_notify_t *wcNotify, apr_pool_t *pool)
{
JNIEnv *env = JNIUtil::getEnv();
@@ -121,12 +121,12 @@
static jmethodID mid = 0;
if (mid == 0)
{
- jclass clazz = env->FindClass(JAVA_PACKAGE"/Notify2");
+ jclass clazz = env->FindClass(JAVA_PACKAGE"/callback/NotifyCallback");
if (JNIUtil::isJavaExceptionThrown())
return;
mid = env->GetMethodID(clazz, "onNotify",
- "(Lorg/tigris/subversion/javahl/NotifyInformation;)V");
+ "(L"JAVA_PACKAGE"/NotifyInformation;)V");
if (JNIUtil::isJavaExceptionThrown() || mid == 0)
return;
@@ -144,9 +144,9 @@
{
midCT = env->GetMethodID(clazz, "<init>",
"(Ljava/lang/String;IILjava/lang/String;"
- "Lorg/tigris/subversion/javahl/Lock;"
+ "L"JAVA_PACKAGE"/Lock;"
"Ljava/lang/String;IIIJLjava/lang/String;"
- "L" JAVA_PACKAGE "/RevisionRange;"
+ "L"JAVA_PACKAGE"/RevisionRange;"
"Ljava/lang/String;)V");
if (JNIUtil::isJavaExceptionThrown() || midCT == 0)
return;
Copied: subversion/trunk/subversion/bindings/javahl/native/NotifyCallback.h (from r907792, subversion/trunk/subversion/bindings/javahl/native/Notify2.h)
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/NotifyCallback.h?p2=subversion/trunk/subversion/bindings/javahl/native/NotifyCallback.h&p1=subversion/trunk/subversion/bindings/javahl/native/Notify2.h&r1=907792&r2=907931&rev=907931&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/Notify2.h (original)
+++ subversion/trunk/subversion/bindings/javahl/native/NotifyCallback.h Tue Feb 9 04:36:52 2010
@@ -20,8 +20,8 @@
* ====================================================================
* @endcopyright
*
- * @file Notify2.h
- * @brief Interface of the class Notify2
+ * @file NotifyCallback.h
+ * @brief Interface of the class NotifyCallback
*/
#ifndef NOTIFY2_H
@@ -34,7 +34,7 @@
* This class passes notification from subversion to a Java object
* (1.2 version).
*/
-class Notify2
+class NotifyCallback
{
private:
/**
@@ -43,11 +43,11 @@
* SVNClient.notification call.
*/
jobject m_notify;
- Notify2(jobject p_notify);
+ NotifyCallback(jobject p_notify);
public:
- static Notify2 *makeCNotify(jobject notify);
- ~Notify2();
+ static NotifyCallback *makeCNotify(jobject notify);
+ ~NotifyCallback();
/**
* Implementation of the svn_wc_notify_func_t API.
Modified: subversion/trunk/subversion/bindings/javahl/native/Outputer.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/Outputer.cpp?rev=907931&r1=907930&r2=907931&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/Outputer.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/Outputer.cpp Tue Feb 9 04:36:52 2010
@@ -82,7 +82,7 @@
static jmethodID mid = 0;
if (mid == 0)
{
- jclass clazz = env->FindClass(JAVA_PACKAGE"/OutputInterface");
+ jclass clazz = env->FindClass(JAVA_PACKAGE"/IOutput");
if (JNIUtil::isJavaExceptionThrown())
return SVN_NO_ERROR;
@@ -129,7 +129,7 @@
static jmethodID mid = 0;
if (mid == 0)
{
- jclass clazz = env->FindClass(JAVA_PACKAGE"/OutputInterface");
+ jclass clazz = env->FindClass(JAVA_PACKAGE"/IOutput");
if (JNIUtil::isJavaExceptionThrown())
return SVN_NO_ERROR;
Modified: subversion/trunk/subversion/bindings/javahl/native/ProplistCallback.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/ProplistCallback.cpp?rev=907931&r1=907930&r2=907931&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/ProplistCallback.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/ProplistCallback.cpp Tue Feb 9 04:36:52 2010
@@ -75,7 +75,7 @@
static jmethodID mid = 0;
if (mid == 0)
{
- jclass clazz = env->FindClass(JAVA_PACKAGE"/ProplistCallback");
+ jclass clazz = env->FindClass(JAVA_PACKAGE"/callback/ProplistCallback");
if (JNIUtil::isJavaExceptionThrown())
return SVN_NO_ERROR;
Modified: subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp?rev=907931&r1=907930&r2=907931&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp Tue Feb 9 04:36:52 2010
@@ -27,7 +27,7 @@
#include "SVNClient.h"
#include "JNIUtil.h"
#include "Notify.h"
-#include "Notify2.h"
+#include "NotifyCallback.h"
#include "CopySources.h"
#include "DiffSummaryReceiver.h"
#include "ConflictResolverCallback.h"
@@ -302,7 +302,7 @@
m_notify = notify;
}
-void SVNClient::notification2(Notify2 *notify2)
+void SVNClient::notification2(NotifyCallback *notify2)
{
delete m_notify2;
m_notify2 = notify2;
@@ -1262,7 +1262,7 @@
ctx->cancel_func = checkCancel;
m_cancelOperation = false;
ctx->cancel_baton = this;
- ctx->notify_func2= Notify2::notify;
+ ctx->notify_func2= NotifyCallback::notify;
ctx->notify_baton2 = m_notify2;
ctx->progress_func = ProgressListener::progress;
Modified: subversion/trunk/subversion/bindings/javahl/native/SVNClient.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/SVNClient.h?rev=907931&r1=907930&r2=907931&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/SVNClient.h (original)
+++ subversion/trunk/subversion/bindings/javahl/native/SVNClient.h Tue Feb 9 04:36:52 2010
@@ -35,7 +35,7 @@
class Revision;
class RevisionRange;
class Notify;
-class Notify2;
+class NotifyCallback;
class ConflictResolverCallback;
class ProgressListener;
class Targets;
@@ -146,7 +146,7 @@
void remove(Targets &targets, const char *message, bool force,
bool keep_local, RevpropTable &revprops);
void notification(Notify *notify);
- void notification2(Notify2 *notify2);
+ void notification2(NotifyCallback *notify2);
void setConflictResolver(ConflictResolverCallback *conflictResolver);
void setProgressListener(ProgressListener *progressListener);
jlong checkout(const char *moduleName, const char *destPath,
@@ -230,7 +230,7 @@
bool showCopiesAsAdds);
Notify *m_notify;
- Notify2 *m_notify2;
+ NotifyCallback *m_notify2;
ConflictResolverCallback *m_conflictResolver;
ProgressListener *m_progressListener;
Prompter *m_prompter;
Modified: subversion/trunk/subversion/bindings/javahl/native/StatusCallback.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/StatusCallback.cpp?rev=907931&r1=907930&r2=907931&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/StatusCallback.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/StatusCallback.cpp Tue Feb 9 04:36:52 2010
@@ -77,7 +77,7 @@
// it can be cached.
if (mid == 0)
{
- jclass clazz = env->FindClass(JAVA_PACKAGE"/StatusCallback");
+ jclass clazz = env->FindClass(JAVA_PACKAGE"/callback/StatusCallback");
if (JNIUtil::isJavaExceptionThrown())
return SVN_NO_ERROR;
Copied: subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp (from r906643, subversion/trunk/subversion/bindings/javahl/native/org_tigris_subversion_javahl_SVNClient.cpp)
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp?p2=subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp&p1=subversion/trunk/subversion/bindings/javahl/native/org_tigris_subversion_javahl_SVNClient.cpp&r1=906643&r2=907931&rev=907931&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/org_tigris_subversion_javahl_SVNClient.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp Tue Feb 9 04:36:52 2010
@@ -20,12 +20,12 @@
* ====================================================================
* @endcopyright
*
- * @file org_tigris_subversion_javahl_SVNClient.cpp
+ * @file org_apache_subversion_javahl_SVNClient.cpp
* @brief Implementation of the native methods in the Java class SVNClient
*/
-#include "../include/org_tigris_subversion_javahl_SVNClient.h"
-#include "../include/org_tigris_subversion_javahl_SVNClientLogLevel.h"
+#include "../include/org_apache_subversion_javahl_SVNClient.h"
+#include "../include/org_apache_subversion_javahl_ClientLogLevel.h"
#include "JNIUtil.h"
#include "JNIStackElement.h"
#include "JNIStringHolder.h"
@@ -34,7 +34,7 @@
#include "Revision.h"
#include "RevisionRange.h"
#include "Notify.h"
-#include "Notify2.h"
+#include "NotifyCallback.h"
#include "ConflictResolverCallback.h"
#include "ProgressListener.h"
#include "CommitMessage.h"
@@ -58,7 +58,7 @@
#include <iostream>
JNIEXPORT jlong JNICALL
-Java_org_tigris_subversion_javahl_SVNClient_ctNative
+Java_org_apache_subversion_javahl_SVNClient_ctNative
(JNIEnv *env, jobject jthis)
{
JNIEntry(SVNClient, ctNative);
@@ -67,7 +67,7 @@
}
JNIEXPORT void JNICALL
-Java_org_tigris_subversion_javahl_SVNClient_dispose
+Java_org_apache_subversion_javahl_SVNClient_dispose
(JNIEnv *env, jobject jthis)
{
JNIEntry(SVNClient, dispose);
@@ -81,7 +81,7 @@
}
JNIEXPORT void JNICALL
-Java_org_tigris_subversion_javahl_SVNClient_finalize
+Java_org_apache_subversion_javahl_SVNClient_finalize
(JNIEnv *env, jobject jthis)
{
JNIEntry(SVNClient, finalize);
@@ -91,7 +91,7 @@
}
JNIEXPORT jstring JNICALL
-Java_org_tigris_subversion_javahl_SVNClient_getAdminDirectoryName
+Java_org_apache_subversion_javahl_SVNClient_getAdminDirectoryName
(JNIEnv *env, jobject jthis)
{
JNIEntry(SVNClient, getAdminDirectoryName);
@@ -105,7 +105,7 @@
}
JNIEXPORT jboolean JNICALL
-Java_org_tigris_subversion_javahl_SVNClient_isAdminDirectory
+Java_org_apache_subversion_javahl_SVNClient_isAdminDirectory
(JNIEnv *env, jobject jthis, jstring jname)
{
JNIEntry(SVNClient, isAdminDirectory);
@@ -123,7 +123,7 @@
}
JNIEXPORT jstring JNICALL
-Java_org_tigris_subversion_javahl_SVNClient_getLastPath
+Java_org_apache_subversion_javahl_SVNClient_getLastPath
(JNIEnv *env, jobject jthis)
{
JNIEntry(SVNClient, getLastPath);
@@ -138,7 +138,7 @@
}
JNIEXPORT void JNICALL
-Java_org_tigris_subversion_javahl_SVNClient_list
+Java_org_apache_subversion_javahl_SVNClient_list
(JNIEnv *env, jobject jthis, jstring jurl, jobject jrevision,
jobject jpegRevision, jint jdepth, jint jdirentFields,
jboolean jfetchLocks, jobject jcallback)
@@ -166,7 +166,7 @@
}
JNIEXPORT void JNICALL
-Java_org_tigris_subversion_javahl_SVNClient_status
+Java_org_apache_subversion_javahl_SVNClient_status
(JNIEnv *env, jobject jthis, jstring jpath, jint jdepth,
jboolean jonServer, jboolean jgetAll, jboolean jnoIgnore,
jboolean jignoreExternals, jobjectArray jchangelists,
@@ -193,7 +193,7 @@
}
JNIEXPORT void JNICALL
-Java_org_tigris_subversion_javahl_SVNClient_username
+Java_org_apache_subversion_javahl_SVNClient_username
(JNIEnv *env, jobject jthis, jstring jusername)
{
JNIEntry(SVNClient, username);
@@ -217,7 +217,7 @@
}
JNIEXPORT void JNICALL
-Java_org_tigris_subversion_javahl_SVNClient_password
+Java_org_apache_subversion_javahl_SVNClient_password
(JNIEnv *env, jobject jthis, jstring jpassword)
{
JNIEntry(SVNClient, password);
@@ -241,7 +241,7 @@
}
JNIEXPORT void JNICALL
-Java_org_tigris_subversion_javahl_SVNClient_setPrompt
+Java_org_apache_subversion_javahl_SVNClient_setPrompt
(JNIEnv *env, jobject jthis, jobject jprompter)
{
JNIEntry(SVNClient, setPrompt);
@@ -259,7 +259,7 @@
}
JNIEXPORT void JNICALL
-Java_org_tigris_subversion_javahl_SVNClient_logMessages
+Java_org_apache_subversion_javahl_SVNClient_logMessages
(JNIEnv *env, jobject jthis, jstring jpath, jobject jpegRevision,
jobjectArray jranges, jboolean jstopOnCopy,
jboolean jdisoverPaths, jboolean jincludeMergedRevisions,
@@ -316,7 +316,7 @@
}
JNIEXPORT jlong JNICALL
-Java_org_tigris_subversion_javahl_SVNClient_checkout
+Java_org_apache_subversion_javahl_SVNClient_checkout
(JNIEnv *env, jobject jthis, jstring jmoduleName, jstring jdestPath,
jobject jrevision, jobject jpegRevision, jint jdepth,
jboolean jignoreExternals, jboolean jallowUnverObstructions)
@@ -351,7 +351,7 @@
}
JNIEXPORT void JNICALL
-Java_org_tigris_subversion_javahl_SVNClient_notification
+Java_org_apache_subversion_javahl_SVNClient_notification
(JNIEnv *env, jobject jthis, jobject jnotify)
{
JNIEntry(SVNClient, notification);
@@ -369,7 +369,7 @@
}
JNIEXPORT void JNICALL
-Java_org_tigris_subversion_javahl_SVNClient_notification2
+Java_org_apache_subversion_javahl_SVNClient_notification2
(JNIEnv *env, jobject jthis, jobject jnotify2)
{
JNIEntry(SVNClient, notification2);
@@ -379,7 +379,7 @@
JNIUtil::throwError(_("bad C++ this"));
return;
}
- Notify2 *notify2 = Notify2::makeCNotify(jnotify2);
+ NotifyCallback *notify2 = NotifyCallback::makeCNotify(jnotify2);
if (JNIUtil::isExceptionThrown())
return;
@@ -387,7 +387,7 @@
}
JNIEXPORT void JNICALL
-Java_org_tigris_subversion_javahl_SVNClient_setConflictResolver
+Java_org_apache_subversion_javahl_SVNClient_setConflictResolver
(JNIEnv *env, jobject jthis, jobject jconflictResolver)
{
JNIEntry(SVNClient, setConflictResolver);
@@ -406,7 +406,7 @@
}
JNIEXPORT void JNICALL
-Java_org_tigris_subversion_javahl_SVNClient_setProgressListener
+Java_org_apache_subversion_javahl_SVNClient_setProgressListener
(JNIEnv *env, jobject jthis, jobject jprogressListener)
{
JNIEntry(SVNClient, setProgressListener);
@@ -425,7 +425,7 @@
}
JNIEXPORT void JNICALL
-Java_org_tigris_subversion_javahl_SVNClient_commitMessageHandler
+Java_org_apache_subversion_javahl_SVNClient_commitMessageHandler
(JNIEnv *env, jobject jthis, jobject jcommitMessage)
{
JNIEntry(SVNClient, commitMessageHandler);
@@ -444,7 +444,7 @@
}
JNIEXPORT void JNICALL
-Java_org_tigris_subversion_javahl_SVNClient_remove
+Java_org_apache_subversion_javahl_SVNClient_remove
(JNIEnv *env, jobject jthis, jobjectArray jtargets, jstring jmessage,
jboolean jforce, jboolean keepLocal, jobject jrevpropTable)
{
@@ -469,7 +469,7 @@
}
JNIEXPORT void JNICALL
-Java_org_tigris_subversion_javahl_SVNClient_revert
+Java_org_apache_subversion_javahl_SVNClient_revert
(JNIEnv *env, jobject jthis, jstring jpath, jint jdepth,
jobjectArray jchangelists)
{
@@ -492,7 +492,7 @@
}
JNIEXPORT void JNICALL
-Java_org_tigris_subversion_javahl_SVNClient_add
+Java_org_apache_subversion_javahl_SVNClient_add
(JNIEnv *env, jobject jthis, jstring jpath, jint jdepth,
jboolean jforce, jboolean jnoIgnore, jboolean jaddParents)
{
@@ -512,7 +512,7 @@
}
JNIEXPORT jlongArray JNICALL
-Java_org_tigris_subversion_javahl_SVNClient_update
+Java_org_apache_subversion_javahl_SVNClient_update
(JNIEnv *env, jobject jthis, jobjectArray jpath, jobject jrevision,
jint jdepth, jboolean jdepthIsSticky, jboolean jignoreExternals,
jboolean jallowUnverObstructions)
@@ -539,7 +539,7 @@
}
JNIEXPORT jlong JNICALL
-Java_org_tigris_subversion_javahl_SVNClient_commit
+Java_org_apache_subversion_javahl_SVNClient_commit
(JNIEnv *env, jobject jthis, jobjectArray jtargets, jstring jmessage,
jint jdepth, jboolean jnoUnlock, jboolean jkeepChangelist,
jobjectArray jchangelists, jobject jrevpropTable)
@@ -571,7 +571,7 @@
}
JNIEXPORT void JNICALL
-Java_org_tigris_subversion_javahl_SVNClient_copy
+Java_org_apache_subversion_javahl_SVNClient_copy
(JNIEnv *env, jobject jthis, jobjectArray jcopySources, jstring jdestPath,
jstring jmessage, jboolean jcopyAsChild, jboolean jmakeParents,
jboolean jignoreExternals, jobject jrevpropTable)
@@ -604,7 +604,7 @@
}
JNIEXPORT void JNICALL
-Java_org_tigris_subversion_javahl_SVNClient_move
+Java_org_apache_subversion_javahl_SVNClient_move
(JNIEnv *env, jobject jthis, jobjectArray jsrcPaths, jstring jdestPath,
jstring jmessage, jboolean jforce, jboolean jmoveAsChild,
jboolean jmakeParents, jobject jrevpropTable)
@@ -637,7 +637,7 @@
}
JNIEXPORT void JNICALL
-Java_org_tigris_subversion_javahl_SVNClient_mkdir
+Java_org_apache_subversion_javahl_SVNClient_mkdir
(JNIEnv *env, jobject jthis, jobjectArray jtargets, jstring jmessage,
jboolean jmakeParents, jobject jrevpropTable)
{
@@ -661,7 +661,7 @@
}
JNIEXPORT void JNICALL
-Java_org_tigris_subversion_javahl_SVNClient_cleanup
+Java_org_apache_subversion_javahl_SVNClient_cleanup
(JNIEnv *env, jobject jthis, jstring jpath)
{
JNIEntry(SVNClient, cleanup);
@@ -679,7 +679,7 @@
}
JNIEXPORT void JNICALL
-Java_org_tigris_subversion_javahl_SVNClient_resolve
+Java_org_apache_subversion_javahl_SVNClient_resolve
(JNIEnv *env, jobject jthis, jstring jpath, jint jdepth, jint jchoice)
{
JNIEntry(SVNClient, resolve);
@@ -697,7 +697,7 @@
}
JNIEXPORT jlong JNICALL
-Java_org_tigris_subversion_javahl_SVNClient_doExport
+Java_org_apache_subversion_javahl_SVNClient_doExport
(JNIEnv *env, jobject jthis, jstring jsrcPath, jstring jdestPath,
jobject jrevision, jobject jpegRevision, jboolean jforce,
jboolean jignoreExternals, jint jdepth, jstring jnativeEOL)
@@ -735,7 +735,7 @@
}
JNIEXPORT jlong JNICALL
-Java_org_tigris_subversion_javahl_SVNClient_doSwitch
+Java_org_apache_subversion_javahl_SVNClient_doSwitch
(JNIEnv *env, jobject jthis, jstring jpath, jstring jurl, jobject jrevision,
jobject jPegRevision, jint jdepth, jboolean jdepthIsSticky,
jboolean jignoreExternals, jboolean jallowUnverObstructions)
@@ -770,7 +770,7 @@
}
JNIEXPORT void JNICALL
-Java_org_tigris_subversion_javahl_SVNClient_doImport
+Java_org_apache_subversion_javahl_SVNClient_doImport
(JNIEnv *env, jobject jthis, jstring jpath, jstring jurl, jstring jmessage,
jint jdepth, jboolean jnoIgnore, jboolean jignoreUnknownNodeTypes,
jobject jrevpropTable)
@@ -804,7 +804,7 @@
}
JNIEXPORT jobjectArray JNICALL
-Java_org_tigris_subversion_javahl_SVNClient_suggestMergeSources
+Java_org_apache_subversion_javahl_SVNClient_suggestMergeSources
(JNIEnv *env, jobject jthis, jstring jpath, jobject jpegRevision)
{
JNIEntry(SVNClient, suggestMergeSources);
@@ -827,7 +827,7 @@
}
JNIEXPORT void JNICALL
-Java_org_tigris_subversion_javahl_SVNClient_merge__Ljava_lang_String_2Lorg_tigris_subversion_javahl_Revision_2Ljava_lang_String_2Lorg_tigris_subversion_javahl_Revision_2Ljava_lang_String_2ZIZZZ
+Java_org_apache_subversion_javahl_SVNClient_merge__Ljava_lang_String_2Lorg_apache_subversion_javahl_Revision_2Ljava_lang_String_2Lorg_apache_subversion_javahl_Revision_2Ljava_lang_String_2ZIZZZ
(JNIEnv *env, jobject jthis, jstring jpath1, jobject jrevision1,
jstring jpath2, jobject jrevision2, jstring jlocalPath, jboolean jforce,
jint jdepth, jboolean jignoreAncestry, jboolean jdryRun, jboolean jrecordOnly)
@@ -866,7 +866,7 @@
}
JNIEXPORT void JNICALL
-Java_org_tigris_subversion_javahl_SVNClient_merge__Ljava_lang_String_2Lorg_tigris_subversion_javahl_Revision_2_3Lorg_tigris_subversion_javahl_RevisionRange_2Ljava_lang_String_2ZIZZZ
+Java_org_apache_subversion_javahl_SVNClient_merge__Ljava_lang_String_2Lorg_apache_subversion_javahl_Revision_2_3Lorg_apache_subversion_javahl_RevisionRange_2Ljava_lang_String_2ZIZZZ
(JNIEnv *env, jobject jthis, jstring jpath, jobject jpegRevision,
jobjectArray jranges, jstring jlocalPath, jboolean jforce,
jint jdepth, jboolean jignoreAncestry, jboolean jdryRun, jboolean jrecordOnly)
@@ -921,7 +921,7 @@
}
JNIEXPORT void JNICALL
-Java_org_tigris_subversion_javahl_SVNClient_mergeReintegrate
+Java_org_apache_subversion_javahl_SVNClient_mergeReintegrate
(JNIEnv *env, jobject jthis, jstring jpath, jobject jpegRevision,
jstring jlocalPath, jboolean jdryRun)
{
@@ -950,7 +950,7 @@
}
JNIEXPORT void JNICALL
-Java_org_tigris_subversion_javahl_SVNClient_properties
+Java_org_apache_subversion_javahl_SVNClient_properties
(JNIEnv *env, jobject jthis, jstring jpath, jobject jrevision,
jobject jpegRevision, jint jdepth, jobjectArray jchangelists,
jobject jproplistCallback)
@@ -984,7 +984,7 @@
}
JNIEXPORT void JNICALL
-Java_org_tigris_subversion_javahl_SVNClient_propertySet
+Java_org_apache_subversion_javahl_SVNClient_propertySet
(JNIEnv *env, jobject jthis, jstring jpath, jstring jname, jstring jvalue,
jint jdepth, jobjectArray jchangelists, jboolean jforce,
jobject jrevpropTable)
@@ -1021,7 +1021,7 @@
}
JNIEXPORT jobject JNICALL
-Java_org_tigris_subversion_javahl_SVNClient_revProperty
+Java_org_apache_subversion_javahl_SVNClient_revProperty
(JNIEnv *env, jobject jthis, jstring jpath, jstring jname, jobject jrevision)
{
JNIEntry(SVNClient, revProperty);
@@ -1047,7 +1047,7 @@
}
JNIEXPORT jobjectArray JNICALL
-Java_org_tigris_subversion_javahl_SVNClient_revProperties
+Java_org_apache_subversion_javahl_SVNClient_revProperties
(JNIEnv *env, jobject jthis, jstring jpath, jobject jrevision)
{
JNIEntry(SVNClient, revProperty);
@@ -1069,7 +1069,7 @@
}
JNIEXPORT void JNICALL
-Java_org_tigris_subversion_javahl_SVNClient_setRevProperty
+Java_org_apache_subversion_javahl_SVNClient_setRevProperty
(JNIEnv *env, jobject jthis, jstring jpath, jstring jname, jobject jrevision,
jstring jvalue, jstring joriginalValue, jboolean jforce)
{
@@ -1105,7 +1105,7 @@
}
JNIEXPORT jobject JNICALL
-Java_org_tigris_subversion_javahl_SVNClient_propertyGet
+Java_org_apache_subversion_javahl_SVNClient_propertyGet
(JNIEnv *env, jobject jthis, jstring jpath, jstring jname, jobject jrevision,
jobject jpegRevision)
{
@@ -1136,7 +1136,7 @@
}
JNIEXPORT jobject JNICALL
-Java_org_tigris_subversion_javahl_SVNClient_getMergeinfo
+Java_org_apache_subversion_javahl_SVNClient_getMergeinfo
(JNIEnv *env, jobject jthis, jstring jtarget, jobject jpegRevision)
{
JNIEntry(SVNClient, getMergeinfo);
@@ -1155,7 +1155,7 @@
return cl->getMergeinfo(target, pegRevision);
}
-JNIEXPORT void JNICALL Java_org_tigris_subversion_javahl_SVNClient_getMergeinfoLog
+JNIEXPORT void JNICALL Java_org_apache_subversion_javahl_SVNClient_getMergeinfoLog
(JNIEnv *env, jobject jthis, jint jkind, jstring jpathOrUrl,
jobject jpegRevision, jstring jmergeSourceUrl, jobject jsrcPegRevision,
jboolean jdiscoverChangedPaths, jint jdepth, jobjectArray jrevProps,
@@ -1197,7 +1197,7 @@
}
JNIEXPORT void JNICALL
-Java_org_tigris_subversion_javahl_SVNClient_diff__Ljava_lang_String_2Lorg_tigris_subversion_javahl_Revision_2Ljava_lang_String_2Lorg_tigris_subversion_javahl_Revision_2Ljava_lang_String_2Ljava_lang_String_2I_3Ljava_lang_String_2ZZZZ
+Java_org_apache_subversion_javahl_SVNClient_diff__Ljava_lang_String_2Lorg_apache_subversion_javahl_Revision_2Ljava_lang_String_2Lorg_apache_subversion_javahl_Revision_2Ljava_lang_String_2Ljava_lang_String_2I_3Ljava_lang_String_2ZZZZ
(JNIEnv *env, jobject jthis, jstring jtarget1, jobject jrevision1,
jstring jtarget2, jobject jrevision2, jstring jrelativeToDir,
jstring joutfileName, jint jdepth, jobjectArray jchangelists,
@@ -1247,7 +1247,7 @@
}
JNIEXPORT void JNICALL
-Java_org_tigris_subversion_javahl_SVNClient_diff__Ljava_lang_String_2Lorg_tigris_subversion_javahl_Revision_2Lorg_tigris_subversion_javahl_Revision_2Lorg_tigris_subversion_javahl_Revision_2Ljava_lang_String_2Ljava_lang_String_2I_3Ljava_lang_String_2ZZZZ
+Java_org_apache_subversion_javahl_SVNClient_diff__Ljava_lang_String_2Lorg_apache_subversion_javahl_Revision_2Lorg_apache_subversion_javahl_Revision_2Lorg_apache_subversion_javahl_Revision_2Ljava_lang_String_2Ljava_lang_String_2I_3Ljava_lang_String_2ZZZZ
(JNIEnv *env, jobject jthis, jstring jtarget, jobject jpegRevision,
jobject jstartRevision, jobject jendRevision, jstring jrelativeToDir,
jstring joutfileName, jint jdepth, jobjectArray jchangelists,
@@ -1297,7 +1297,7 @@
}
JNIEXPORT void JNICALL
-Java_org_tigris_subversion_javahl_SVNClient_diffSummarize__Ljava_lang_String_2Lorg_tigris_subversion_javahl_Revision_2Ljava_lang_String_2Lorg_tigris_subversion_javahl_Revision_2I_3Ljava_lang_String_2ZLorg_tigris_subversion_javahl_DiffSummaryReceiver_2
+Java_org_apache_subversion_javahl_SVNClient_diffSummarize__Ljava_lang_String_2Lorg_apache_subversion_javahl_Revision_2Ljava_lang_String_2Lorg_apache_subversion_javahl_Revision_2I_3Ljava_lang_String_2ZLorg_apache_subversion_javahl_callback_DiffSummaryCallback_2
(JNIEnv *env, jobject jthis, jstring jtarget1, jobject jrevision1,
jstring jtarget2, jobject jrevision2, jint jdepth, jobjectArray jchangelists,
jboolean jignoreAncestry, jobject jdiffSummaryReceiver)
@@ -1340,7 +1340,7 @@
}
JNIEXPORT void JNICALL
-Java_org_tigris_subversion_javahl_SVNClient_diffSummarize__Ljava_lang_String_2Lorg_tigris_subversion_javahl_Revision_2Lorg_tigris_subversion_javahl_Revision_2Lorg_tigris_subversion_javahl_Revision_2I_3Ljava_lang_String_2ZLorg_tigris_subversion_javahl_DiffSummaryReceiver_2
+Java_org_apache_subversion_javahl_SVNClient_diffSummarize__Ljava_lang_String_2Lorg_apache_subversion_javahl_Revision_2Lorg_apache_subversion_javahl_Revision_2Lorg_apache_subversion_javahl_Revision_2I_3Ljava_lang_String_2ZLorg_apache_subversion_javahl_callback_DiffSummaryCallback_2
(JNIEnv *env, jobject jthis, jstring jtarget, jobject jPegRevision,
jobject jStartRevision, jobject jEndRevision, jint jdepth,
jobjectArray jchangelists, jboolean jignoreAncestry,
@@ -1380,7 +1380,7 @@
}
JNIEXPORT jbyteArray JNICALL
-Java_org_tigris_subversion_javahl_SVNClient_fileContent
+Java_org_apache_subversion_javahl_SVNClient_fileContent
(JNIEnv *env, jobject jthis, jstring jpath, jobject jrevision,
jobject jpegRevision)
{
@@ -1407,7 +1407,7 @@
}
JNIEXPORT void JNICALL
-Java_org_tigris_subversion_javahl_SVNClient_streamFileContent
+Java_org_apache_subversion_javahl_SVNClient_streamFileContent
(JNIEnv *env, jobject jthis, jstring jpath, jobject jrevision,
jobject jpegRevision, jint bufSize, jobject jstream)
{
@@ -1434,7 +1434,7 @@
}
JNIEXPORT jstring JNICALL
-Java_org_tigris_subversion_javahl_SVNClient_getVersionInfo
+Java_org_apache_subversion_javahl_SVNClient_getVersionInfo
(JNIEnv *env, jobject jthis, jstring jpath, jstring jtrailUrl,
jboolean jlastChanged)
{
@@ -1453,7 +1453,7 @@
return cl->getVersionInfo(path, trailUrl, jlastChanged ? true:false);
}
-JNIEXPORT void JNICALL Java_org_tigris_subversion_javahl_SVNClient_upgrade
+JNIEXPORT void JNICALL Java_org_apache_subversion_javahl_SVNClient_upgrade
(JNIEnv *env, jobject jthis, jstring jpath)
{
JNIEntry(SVNClient, upgrade);
@@ -1471,23 +1471,23 @@
}
JNIEXPORT void JNICALL
-Java_org_tigris_subversion_javahl_SVNClient_enableLogging
+Java_org_apache_subversion_javahl_SVNClient_enableLogging
(JNIEnv *env, jclass jclazz, jint jlogLevel, jstring jpath)
{
JNIEntryStatic(SVNClient, enableLogging);
int cLevel = JNIUtil::noLog;
switch(jlogLevel)
{
- case org_tigris_subversion_javahl_SVNClientLogLevel_NoLog:
+ case org_apache_subversion_javahl_ClientLogLevel_NoLog:
cLevel = JNIUtil::noLog;
break;
- case org_tigris_subversion_javahl_SVNClientLogLevel_ErrorLog:
+ case org_apache_subversion_javahl_ClientLogLevel_ErrorLog:
cLevel = JNIUtil::errorLog;
break;
- case org_tigris_subversion_javahl_SVNClientLogLevel_ExceptionLog:
+ case org_apache_subversion_javahl_ClientLogLevel_ExceptionLog:
cLevel = JNIUtil::exceptionLog;
break;
- case org_tigris_subversion_javahl_SVNClientLogLevel_EntryLog:
+ case org_apache_subversion_javahl_ClientLogLevel_EntryLog:
cLevel = JNIUtil::entryLog;
break;
}
@@ -1496,7 +1496,7 @@
}
JNIEXPORT jstring JNICALL
-Java_org_tigris_subversion_javahl_SVNClient_version
+Java_org_apache_subversion_javahl_SVNClient_version
(JNIEnv *env, jclass jclazz)
{
JNIEntryStatic(SVNClient, version);
@@ -1505,7 +1505,7 @@
}
JNIEXPORT jint JNICALL
-Java_org_tigris_subversion_javahl_SVNClient_versionMajor
+Java_org_apache_subversion_javahl_SVNClient_versionMajor
(JNIEnv *env, jclass jclazz)
{
JNIEntryStatic(SVNClient, versionMajor);
@@ -1513,7 +1513,7 @@
}
JNIEXPORT jint JNICALL
-Java_org_tigris_subversion_javahl_SVNClient_versionMinor
+Java_org_apache_subversion_javahl_SVNClient_versionMinor
(JNIEnv *env, jclass jclazz)
{
JNIEntryStatic(SVNClient, versionMinor);
@@ -1521,7 +1521,7 @@
}
JNIEXPORT jint JNICALL
-Java_org_tigris_subversion_javahl_SVNClient_versionMicro
+Java_org_apache_subversion_javahl_SVNClient_versionMicro
(JNIEnv *env, jclass jclazz)
{
JNIEntryStatic(SVNClient, versionMicro);
@@ -1529,7 +1529,7 @@
}
JNIEXPORT void JNICALL
-Java_org_tigris_subversion_javahl_SVNClient_relocate
+Java_org_apache_subversion_javahl_SVNClient_relocate
(JNIEnv *env, jobject jthis, jstring jfrom, jstring jto, jstring jpath,
jboolean jrecurse)
{
@@ -1557,7 +1557,7 @@
}
JNIEXPORT void JNICALL
-Java_org_tigris_subversion_javahl_SVNClient_blame
+Java_org_apache_subversion_javahl_SVNClient_blame
(JNIEnv *env, jobject jthis, jstring jpath, jobject jpegRevision,
jobject jrevisionStart, jobject jrevisionEnd, jboolean jignoreMimeType,
jboolean jincludeMergedRevisions, jobject jblameCallback)
@@ -1592,7 +1592,7 @@
}
JNIEXPORT void JNICALL
-Java_org_tigris_subversion_javahl_SVNClient_setConfigDirectory
+Java_org_apache_subversion_javahl_SVNClient_setConfigDirectory
(JNIEnv *env, jobject jthis, jstring jconfigDir)
{
JNIEntry(SVNClient, setConfigDirectory);
@@ -1611,7 +1611,7 @@
}
JNIEXPORT jstring JNICALL
-Java_org_tigris_subversion_javahl_SVNClient_getConfigDirectory
+Java_org_apache_subversion_javahl_SVNClient_getConfigDirectory
(JNIEnv *env, jobject jthis)
{
JNIEntry(SVNClient, getConfigDirectory);
@@ -1627,7 +1627,7 @@
}
JNIEXPORT void JNICALL
-Java_org_tigris_subversion_javahl_SVNClient_cancelOperation
+Java_org_apache_subversion_javahl_SVNClient_cancelOperation
(JNIEnv *env, jobject jthis)
{
JNIEntry(SVNClient, cancelOperation);
@@ -1641,7 +1641,7 @@
}
JNIEXPORT jobject JNICALL
-Java_org_tigris_subversion_javahl_SVNClient_info
+Java_org_apache_subversion_javahl_SVNClient_info
(JNIEnv *env, jobject jthis, jstring jpath)
{
JNIEntry(SVNClient, info);
@@ -1660,7 +1660,7 @@
}
JNIEXPORT void JNICALL
-Java_org_tigris_subversion_javahl_SVNClient_addToChangelist
+Java_org_apache_subversion_javahl_SVNClient_addToChangelist
(JNIEnv *env, jobject jthis, jobjectArray jtargets, jstring jchangelist,
jint jdepth, jobjectArray jchangelists)
{
@@ -1688,7 +1688,7 @@
}
JNIEXPORT void JNICALL
-Java_org_tigris_subversion_javahl_SVNClient_removeFromChangelists
+Java_org_apache_subversion_javahl_SVNClient_removeFromChangelists
(JNIEnv *env, jobject jthis, jobjectArray jtargets, jint jdepth,
jobjectArray jchangelists)
{
@@ -1711,7 +1711,7 @@
}
JNIEXPORT void JNICALL
-Java_org_tigris_subversion_javahl_SVNClient_getChangelists
+Java_org_apache_subversion_javahl_SVNClient_getChangelists
(JNIEnv *env, jobject jthis, jstring jroot_path, jobjectArray jchangelists,
jint jdepth, jobject jchangelistCallback)
{
@@ -1736,7 +1736,7 @@
}
JNIEXPORT void JNICALL
-Java_org_tigris_subversion_javahl_SVNClient_lock
+Java_org_apache_subversion_javahl_SVNClient_lock
(JNIEnv *env, jobject jthis, jobjectArray jtargets, jstring jcomment,
jboolean jforce)
{
@@ -1759,7 +1759,7 @@
}
JNIEXPORT void JNICALL
-Java_org_tigris_subversion_javahl_SVNClient_unlock
+Java_org_apache_subversion_javahl_SVNClient_unlock
(JNIEnv *env, jobject jthis, jobjectArray jtargets, jboolean jforce)
{
JNIEntry(SVNClient, unlock);
@@ -1779,7 +1779,7 @@
}
JNIEXPORT void JNICALL
-Java_org_tigris_subversion_javahl_SVNClient_info2
+Java_org_apache_subversion_javahl_SVNClient_info2
(JNIEnv *env, jobject jthis, jstring jpath, jobject jrevision,
jobject jpegRevision, jint jdepth, jobjectArray jchangelists,
jobject jinfoCallback)
Modified: subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ClientException.java
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ClientException.java?rev=907931&r1=907930&r2=907931&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ClientException.java (original)
+++ subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ClientException.java Tue Feb 9 04:36:52 2010
@@ -57,7 +57,7 @@
* @return <code>t</code> coerced or converted into a
* <code>ClientException</code>.
*/
- static ClientException fromException(Throwable t)
+ static public ClientException fromException(Throwable t)
{
if (t instanceof ClientException)
{
Copied: subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/Info.java (from r907792, subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Info.java)
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/Info.java?p2=subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/Info.java&p1=subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Info.java&r1=907792&r2=907931&rev=907931&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Info.java (original)
+++ subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/Info.java Tue Feb 9 04:36:52 2010
@@ -21,7 +21,7 @@
* @endcopyright
*/
-package org.tigris.subversion.javahl;
+package org.apache.subversion.javahl;
import java.util.Date;
Modified: subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/NativeResources.java
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/NativeResources.java?rev=907931&r1=907930&r2=907931&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/NativeResources.java (original)
+++ subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/NativeResources.java Tue Feb 9 04:36:52 2010
@@ -26,13 +26,16 @@
/**
* Handles activities related to management of native resouces
* (e.g. loading of native libraries).
+ *
+ * Public for backward compat. This class may disappear in future versions
+ * of the API. You've been warned.
*/
-class NativeResources
+public class NativeResources
{
/**
* Version information about the underlying native libraries.
*/
- static Version version;
+ static public Version version;
/**
* Load the required native library whose path is specified by the
Copied: subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/Notify.java (from r907682, subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Notify.java)
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/Notify.java?p2=subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/Notify.java&p1=subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Notify.java&r1=907682&r2=907931&rev=907931&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Notify.java (original)
+++ subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/Notify.java Tue Feb 9 04:36:52 2010
@@ -21,7 +21,7 @@
* @endcopyright
*/
-package org.tigris.subversion.javahl;
+package org.apache.subversion.javahl;
/**
* Subversion notification interface.
Copied: subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/NotifyStatus.java (from r907792, subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/NotifyStatus.java)
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/NotifyStatus.java?p2=subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/NotifyStatus.java&p1=subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/NotifyStatus.java&r1=907792&r2=907931&rev=907931&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/NotifyStatus.java (original)
+++ subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/NotifyStatus.java Tue Feb 9 04:36:52 2010
@@ -21,7 +21,7 @@
* @endcopyright
*/
-package org.tigris.subversion.javahl;
+package org.apache.subversion.javahl;
/**
* Status of the text or the property of the item triggering the
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=907931&r1=907930&r2=907931&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 Feb 9 04:36:52 2010
@@ -62,6 +62,13 @@
}
}
+ /** Don't call this function! Public fucntion for backward compat reasons
+ */
+ public long getCppAddr()
+ {
+ return cppAddr;
+ }
+
/**
* Build the native peer
* @return the adress of the peer
@@ -76,7 +83,7 @@
/**
* release the native peer (should use dispose instead)
*/
- protected native void finalize();
+ public native void finalize();
/**
* slot for the adress of the native peer. The JNI code is the only user
@@ -103,6 +110,12 @@
public native boolean isAdminDirectory(String name);
/**
+ * @deprecated
+ * @since 1.0
+ */
+ public native String getLastPath();
+
+ /**
* @since 1.5
*/
public native void status(String path, int depth, boolean onServer,
@@ -158,6 +171,12 @@
throws ClientException;
/**
+ * @since 1.0
+ * @deprecated
+ */
+ public native void notification(Notify notify);
+
+ /**
* @since 1.2
*/
public native void notification2(NotifyCallback notify);
@@ -511,6 +530,14 @@
throws ClientException;
/**
+ * @deprecated Use {@link #info2(String, Revision, Revision, int, String[],
+ * InfoCallback)} instead.
+ * @since 1.0
+ */
+ public native Info info(String path)
+ throws ClientException;
+
+ /**
* @since 1.5
*/
public native void addToChangelist(String[] paths, String changelist,
Modified: subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ChangePath.java
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ChangePath.java?rev=907931&r1=907930&r2=907931&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ChangePath.java (original)
+++ subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ChangePath.java Tue Feb 9 04:36:52 2010
@@ -52,6 +52,16 @@
this.nodeKind = nodeKind;
}
+ /**
+ * A backward-compat constructor.
+ */
+ public ChangePath(org.apache.subversion.javahl.ChangePath aChangePath)
+ {
+ this(aChangePath.getPath(), aChangePath.getCopySrcRevision(),
+ aChangePath.getCopySrcPath(), aChangePath.getAction(),
+ aChangePath.getNodeKind());
+ }
+
/** Path of commited item */
private String path;
Modified: subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ChangelistCallback.java
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ChangelistCallback.java?rev=907931&r1=907930&r2=907931&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ChangelistCallback.java (original)
+++ subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ChangelistCallback.java Tue Feb 9 04:36:52 2010
@@ -23,16 +23,13 @@
package org.tigris.subversion.javahl;
+import org.apache.subversion.javahl.callback.*;
+
/**
* This interface is used to receive every status item for
* the SVNClientInterface.status call.
*/
public interface ChangelistCallback
+ extends org.apache.subversion.javahl.callback.ChangelistCallback
{
- /**
- * the method will be called for each status item
- * @param path the path of the object
- * @param changelist the changelist it belongs to
- */
- public void doChangelist(String path, String changelist);
}
Modified: subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/CommitItem.java
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/CommitItem.java?rev=907931&r1=907930&r2=907931&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/CommitItem.java (original)
+++ subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/CommitItem.java Tue Feb 9 04:36:52 2010
@@ -87,6 +87,15 @@
}
/**
+ * A backward-compat constructor.
+ */
+ public CommitItem(org.apache.subversion.javahl.CommitItem aItem)
+ {
+ this(aItem.getPath(), aItem.getNodeKind(), aItem.getStateFlags(),
+ aItem.getUrl(), aItem.getCopyUrl(), aItem.getRevision());
+ }
+
+ /**
* retrieve the path of the commit item
* @return the path
*/
Modified: subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ConflictDescriptor.java
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ConflictDescriptor.java?rev=907931&r1=907930&r2=907931&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ConflictDescriptor.java (original)
+++ subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ConflictDescriptor.java Tue Feb 9 04:36:52 2010
@@ -116,6 +116,18 @@
this.srcRightVersion = srcRight;
}
+ public ConflictDescriptor(org.apache.subversion.javahl.ConflictDescriptor
+ aDesc)
+ {
+ this(aDesc.getPath(), aDesc.getKind(), aDesc.getNodeKind(),
+ aDesc.getPropertyName(), aDesc.isBinary(), aDesc.getMIMEType(),
+ aDesc.getAction(), aDesc.getReason(), aDesc.getOperation(),
+ aDesc.getBasePath(), aDesc.getTheirPath(), aDesc.getMyPath(),
+ aDesc.getMergedPath(),
+ new ConflictVersion(aDesc.getSrcLeftVersion()),
+ new ConflictVersion(aDesc.getSrcRightVersion()));
+ }
+
public String getPath()
{
return path;
Modified: subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ConflictResult.java
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ConflictResult.java?rev=907931&r1=907930&r2=907931&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ConflictResult.java (original)
+++ subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ConflictResult.java Tue Feb 9 04:36:52 2010
@@ -92,6 +92,12 @@
this.mergedPath = mergedPath;
}
+ public org.apache.subversion.javahl.ConflictResult toApache()
+ {
+ return new org.apache.subversion.javahl.ConflictResult(choice,
+ mergedPath);
+ }
+
/**
* @return A value corresponding to the
* <code>svn_wc_conflict_choice_t</code> enum.
Modified: subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ConflictVersion.java
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ConflictVersion.java?rev=907931&r1=907930&r2=907931&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ConflictVersion.java (original)
+++ subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ConflictVersion.java Tue Feb 9 04:36:52 2010
@@ -50,6 +50,15 @@
this.nodeKind = nodeKind;
}
+ /**
+ * A backward-compat constructor.
+ */
+ public ConflictVersion(org.apache.subversion.javahl.ConflictVersion aVer)
+ {
+ this(aVer.getReposURL(), aVer.getPegRevision(), aVer.getPathInRepos(),
+ aVer.getNodeKind());
+ }
+
public String getReposURL()
{
return reposURL;
Modified: subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/CopySource.java
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/CopySource.java?rev=907931&r1=907930&r2=907931&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/CopySource.java (original)
+++ subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/CopySource.java Tue Feb 9 04:36:52 2010
@@ -68,6 +68,13 @@
this.pegRevision = pegRevision;
}
+ public org.apache.subversion.javahl.CopySource toApache()
+ {
+ return new org.apache.subversion.javahl.CopySource(path,
+ revision == null ? null : revision.toApache(),
+ pegRevision == null ? null : pegRevision.toApache());
+ }
+
/**
* @return The source path or URL.
*/
Modified: subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/DiffSummary.java
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/DiffSummary.java?rev=907931&r1=907930&r2=907931&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/DiffSummary.java (original)
+++ subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/DiffSummary.java Tue Feb 9 04:36:52 2010
@@ -66,6 +66,15 @@
}
/**
+ * This constructor is for backward compat.
+ */
+ DiffSummary(org.apache.subversion.javahl.DiffSummary aSummary)
+ {
+ this(aSummary.getPath(), aSummary.getDiffKind().hashCode(),
+ aSummary.propsChanged(), aSummary.getNodeKind());
+ }
+
+ /**
* @return The path we have a diff for.
*/
public String getPath()
@@ -148,6 +157,13 @@
}
}
+ public static DiffKind fromApache(
+ org.apache.subversion.javahl.DiffSummary.DiffKind aKind)
+ {
+ /* This is cheating... */
+ return getInstance(aKind.hashCode());
+ }
+
/**
* @param diffKind A DiffKind for comparison.
* @return Whether both DiffKinds are of the same type.
Modified: subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/DirEntry.java
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/DirEntry.java?rev=907931&r1=907930&r2=907931&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/DirEntry.java (original)
+++ subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/DirEntry.java Tue Feb 9 04:36:52 2010
@@ -148,6 +148,18 @@
}
/**
+ * A backward-compat constructor
+ */
+ DirEntry(org.apache.subversion.javahl.DirEntry aEntry)
+ {
+ this(aEntry.getPath(), aEntry.getAbsPath(), aEntry.getNodeKind(),
+ aEntry.getSize(), aEntry.getHasProps(),
+ aEntry.getLastChangedRevisionNumber(),
+ aEntry.getLastChanged().getTime() * 1000,
+ aEntry.getLastAuthor());
+ }
+
+ /**
* Returns the path of the entry.
* @return the path of the entry.
*/
Modified: subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Info.java
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Info.java?rev=907931&r1=907930&r2=907931&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Info.java (original)
+++ subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Info.java Tue Feb 9 04:36:52 2010
@@ -141,6 +141,20 @@
}
/**
+ * A backward-compat constructor
+ */
+ public Info(org.apache.subversion.javahl.Info aInfo)
+ {
+ this(aInfo.getName(), aInfo.getUrl(), aInfo.getUuid(),
+ aInfo.getRepository(), aInfo.getSchedule(), aInfo.getNodeKind(),
+ aInfo.getAuthor(), aInfo.getRevision(),
+ aInfo.getLastChangedRevision(), aInfo.getLastChangedDate(),
+ aInfo.getLastDateTextUpdate(), aInfo.getLastDatePropsUpdate(),
+ aInfo.isCopied(), aInfo.isDeleted(), aInfo.isAbsent(),
+ aInfo.isIncomplete(), aInfo.getCopyRev(), aInfo.getCopyUrl());
+ }
+
+ /**
* Retrieves the name of the item
* @return name of the item
*/
Modified: subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Info2.java
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Info2.java?rev=907931&r1=907930&r2=907931&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Info2.java (original)
+++ subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Info2.java Tue Feb 9 04:36:52 2010
@@ -248,6 +248,32 @@
}
/**
+ * A backward-compat constructor.
+ */
+ public Info2(org.apache.subversion.javahl.Info2 aInfo)
+ {
+ this(aInfo.getPath(), aInfo.getUrl(), aInfo.getRev(), aInfo.getKind(),
+ aInfo.getReposRootUrl(), aInfo.getReposUUID(),
+ aInfo.getLastChangedRev(),
+ aInfo.getLastChangedDate() == null ? 0
+ : aInfo.getLastChangedDate().getTime() * 1000,
+ aInfo.getLastChangedAuthor(),
+ aInfo.getLock() == null ? null : new Lock(aInfo.getLock()),
+ aInfo.isHasWcInfo(), aInfo.getSchedule(), aInfo.getCopyFromUrl(),
+ aInfo.getCopyFromRev(),
+ aInfo.getTextTime() == null ? 0
+ : aInfo.getTextTime().getTime() * 1000,
+ aInfo.getPropTime() == null ? 0
+ : aInfo.getPropTime().getTime() * 1000, aInfo.getChecksum(),
+ aInfo.getConflictOld(), aInfo.getConflictNew(),
+ aInfo.getConflictWrk(), aInfo.getPrejfile(),
+ aInfo.getChangelistName(), aInfo.getWorkingSize(),
+ aInfo.getReposSize(), aInfo.getDepth(),
+ aInfo.getConflictDescriptor() == null ? null
+ : new ConflictDescriptor(aInfo.getConflictDescriptor()));
+ }
+
+ /**
* return the path of the item
*/
public String getPath()
Modified: subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Lock.java
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Lock.java?rev=907931&r1=907930&r2=907931&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Lock.java (original)
+++ subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Lock.java Tue Feb 9 04:36:52 2010
@@ -96,8 +96,11 @@
Lock(org.apache.subversion.javahl.Lock aLock)
{
this(aLock.getOwner(), aLock.getPath(), aLock.getToken(),
- aLock.getComment(), aLock.getCreationDate().getTime() * 1000,
- aLock.getExpirationDate().getTime() * 1000);
+ aLock.getComment(),
+ aLock.getCreationDate() == null ? 0
+ : aLock.getCreationDate().getTime() * 1000,
+ aLock.getExpirationDate() == null ? 0
+ : aLock.getExpirationDate().getTime() * 1000);
}
/**
Modified: subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Mergeinfo.java
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Mergeinfo.java?rev=907931&r1=907930&r2=907931&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Mergeinfo.java (original)
+++ subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Mergeinfo.java Tue Feb 9 04:36:52 2010
@@ -69,6 +69,28 @@
}
/**
+ * A constructor for backward compat.
+ */
+ public Mergeinfo(org.apache.subversion.javahl.Mergeinfo aMergeinfo)
+ {
+ this();
+ String[] srcPaths = aMergeinfo.getPaths();
+
+ for (int i = 0; i < srcPaths.length; i++)
+ {
+ org.apache.subversion.javahl.RevisionRange[] aRange =
+ aMergeinfo.getRevisionRange(srcPaths[i]);
+ List list = new ArrayList();
+
+ for (int j = 0; j < aRange.length; j++)
+ {
+ list.add(new RevisionRange(aRange[j]));
+ }
+ mergeSources.put(srcPaths[i], list);
+ }
+ }
+
+ /**
* Add one or more RevisionRange objects to merge info. If the
* merge source is already stored, the list of revisions is
* replaced.
Modified: subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Notify.java
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Notify.java?rev=907931&r1=907930&r2=907931&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Notify.java (original)
+++ subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Notify.java Tue Feb 9 04:36:52 2010
@@ -34,54 +34,6 @@
* @deprecated Use Notify2 instead
*/
public interface Notify
+ extends org.apache.subversion.javahl.Notify
{
- /**
- * Handler for Subversion notifications.
- *
- * Override this function to allow Subversion to
- * send notifications
- * @param path on which action happen
- * @param action subversion action, see svn_wc_notify_action_t
- * @param kind node kind of path after action occurred
- * @param mimeType mime type of path after action occurred
- * @param contentState state of content after action occurred
- * @param propState state of properties after action occurred
- * @param revision revision number after action occurred
- */
- public void onNotify(String path, int action, int kind, String mimeType,
- int contentState, int propState, long revision);
-
- /**
- * The type of action occuring. The values are defined in the
- * interface NotifyAction for building reasons.
- */
- public static final class Action implements NotifyAction
- {
- /**
- * Returns the textual representation for the action kind
- * @param action kind of action
- * @return english text
- */
- public static final String getActionName(int action)
- {
- return NotifyAction.actionNames[action];
- }
-
- }
- /**
- * The type of notification that is occuring. The values are
- * defined in the interface NotifyStatus for building reasons.
- */
- public static final class Status implements NotifyStatus
- {
- /**
- * Returns the textual representation for the notification type
- * @param status type of the notification
- * @return english text
- */
- public static final String getStatusName(int status)
- {
- return NotifyStatus.statusNames[status];
- }
- }
}
Modified: subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/NotifyInformation.java
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/NotifyInformation.java?rev=907931&r1=907930&r2=907931&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/NotifyInformation.java (original)
+++ subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/NotifyInformation.java Tue Feb 9 04:36:52 2010
@@ -146,6 +146,23 @@
}
/**
+ * A backward-compat callback.
+ */
+ public NotifyInformation(
+ org.apache.subversion.javahl.NotifyInformation aInfo)
+ {
+ this(aInfo.getPath(), aInfo.getAction(), aInfo.getKind(),
+ aInfo.getMimeType(),
+ aInfo.getLock() == null ? null : new Lock(aInfo.getLock()),
+ aInfo.getErrMsg(), aInfo.getContentState(), aInfo.getPropState(),
+ aInfo.getLockState(), aInfo.getRevision(),
+ aInfo.getChangelistName(),
+ aInfo.getMergeRange() == null ? null
+ : new RevisionRange(aInfo.getMergeRange()),
+ aInfo.getPathPrefix());
+ }
+
+ /**
* @return The path of the item, which is the source of the event.
*/
public String getPath()
Modified: subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ProgressEvent.java
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ProgressEvent.java?rev=907931&r1=907930&r2=907931&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ProgressEvent.java (original)
+++ subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ProgressEvent.java Tue Feb 9 04:36:52 2010
@@ -65,6 +65,14 @@
}
/**
+ * A backward-compat constructor.
+ */
+ public ProgressEvent(org.apache.subversion.javahl.ProgressEvent aEvent)
+ {
+ this(aEvent.getProgress(), aEvent.getTotal());
+ }
+
+ /**
* @return The number of bytes already transferred.
*/
public long getProgress()
Modified: subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/PromptUserPassword.java
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/PromptUserPassword.java?rev=907931&r1=907930&r2=907931&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/PromptUserPassword.java (original)
+++ subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/PromptUserPassword.java Tue Feb 9 04:36:52 2010
@@ -29,51 +29,6 @@
* PromptUserPassword3 instead.
*/
public interface PromptUserPassword
+ extends org.apache.subversion.javahl.callback.UserPasswordCallback
{
- /**
- * Ask the user for username and password
- * The entered username/password is retrieved by the getUsername
- * getPasswort methods.
- *
- * @param realm for which server realm this information is requested.
- * @param username the default username
- * @return Whether the prompt for authentication credentials was
- * successful (e.g. in a GUI application whether the dialog box
- * was canceled).
- */
- public boolean prompt(String realm, String username);
-
- /**
- * ask the user a yes/no question
- * @param realm for which server realm this information is
- * requested.
- * @param question question to be asked
- * @param yesIsDefault if yes should be the default
- * @return the answer
- */
- public boolean askYesNo(String realm, String question,
- boolean yesIsDefault);
-
- /**
- * ask the user a question where she answers with a text.
- * @param realm for which server realm this information is
- * requested.
- * @param question question to be asked
- * @param showAnswer if the answer is shown or hidden
- * @return the entered text or null if canceled
- */
- public String askQuestion(String realm, String question,
- boolean showAnswer);
-
- /**
- * retrieve the username entered during the prompt call
- * @return the username
- */
- public String getUsername();
-
- /**
- * retrieve the password entered during the prompt call
- * @return the password
- */
- public String getPassword();
}
Modified: subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/PropertyData.java
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/PropertyData.java?rev=907931&r1=907930&r2=907931&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/PropertyData.java (original)
+++ subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/PropertyData.java Tue Feb 9 04:36:52 2010
@@ -154,6 +154,15 @@
}
/**
+ * this constructor is used for backward compat
+ */
+ PropertyData(org.apache.subversion.javahl.PropertyData aPropertyData)
+ {
+ this(aPropertyData.getPath(), aPropertyData.getName(),
+ aPropertyData.getValue());
+ }
+
+ /**
* Returns the name of the property
* @return the name
*/
Modified: subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ProplistCallback.java
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ProplistCallback.java?rev=907931&r1=907930&r2=907931&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ProplistCallback.java (original)
+++ subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ProplistCallback.java Tue Feb 9 04:36:52 2010
@@ -23,6 +23,8 @@
package org.tigris.subversion.javahl;
+import org.apache.subversion.javahl.callback.*;
+
import java.util.Map;
/**
@@ -30,11 +32,6 @@
* SVNClientInterface.properties call.
*/
public interface ProplistCallback
+ extends org.apache.subversion.javahl.callback.ProplistCallback
{
- /**
- * the method will be called for every line in a file.
- * @param path the path.
- * @param properties the properties on the path.
- */
- public void singlePath(String path, Map properties);
}
Modified: subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Revision.java
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Revision.java?rev=907931&r1=907930&r2=907931&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Revision.java (original)
+++ subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Revision.java Tue Feb 9 04:36:52 2010
@@ -162,6 +162,22 @@
return new org.apache.subversion.javahl.Revision(revKind);
}
+ public static Revision createFromApache(
+ org.apache.subversion.javahl.Revision aRev)
+ {
+ int kind = aRev.getKind();
+
+ switch (kind)
+ {
+ case org.apache.subversion.javahl.Revision.Kind.number:
+ return getInstance(((org.apache.subversion.javahl.Revision.Number) aRev).getNumber());
+ case org.apache.subversion.javahl.Revision.Kind.date:
+ return getInstance(((org.apache.subversion.javahl.Revision.DateSpec) aRev).getDate());
+ default:
+ return getInstance(kind);
+ }
+ }
+
/**
* last commited revision
*/