Author: svn-role
Date: Wed Jun 10 04:00:29 2015
New Revision: 1684558
URL: http://svn.apache.org/r1684558
Log:
Merge r1684412 from trunk:
* r1684412
Make JavaHL native code compile with a C++11 compiler.
Justification:
The upcoming MSVC14, part of Visual Studio 2015,
supports user-defined literals, which means that
trying to build JavaHL with VS2015 will fail.
Note:
To test this change with gcc/clang on *ix, edit the file
build/ac-macros/compiler.m4 to replace '-std=c++98' with
'-std=c++11', then autogen, configure, build and run
the JavaHL tests.
Votes:
+1: brane, rhuijben
Modified:
subversion/branches/1.9.x/ (props changed)
subversion/branches/1.9.x/STATUS
subversion/branches/1.9.x/subversion/bindings/javahl/native/AuthnCallback.cpp
subversion/branches/1.9.x/subversion/bindings/javahl/native/BlameCallback.cpp
subversion/branches/1.9.x/subversion/bindings/javahl/native/ChangelistCallback.cpp
subversion/branches/1.9.x/subversion/bindings/javahl/native/ClientContext.cpp
subversion/branches/1.9.x/subversion/bindings/javahl/native/CommitCallback.cpp
subversion/branches/1.9.x/subversion/bindings/javahl/native/CommitEditor.cpp
subversion/branches/1.9.x/subversion/bindings/javahl/native/CommitMessage.cpp
subversion/branches/1.9.x/subversion/bindings/javahl/native/CopySources.cpp
subversion/branches/1.9.x/subversion/bindings/javahl/native/CreateJ.cpp
subversion/branches/1.9.x/subversion/bindings/javahl/native/Credential.cpp
subversion/branches/1.9.x/subversion/bindings/javahl/native/DiffSummaryReceiver.cpp
subversion/branches/1.9.x/subversion/bindings/javahl/native/EditorCallbacks.cpp
subversion/branches/1.9.x/subversion/bindings/javahl/native/EditorProxy.cpp
subversion/branches/1.9.x/subversion/bindings/javahl/native/EnumMapper.cpp
subversion/branches/1.9.x/subversion/bindings/javahl/native/ExternalItem.cpp
subversion/branches/1.9.x/subversion/bindings/javahl/native/ImportFilterCallback.cpp
subversion/branches/1.9.x/subversion/bindings/javahl/native/InfoCallback.cpp
subversion/branches/1.9.x/subversion/bindings/javahl/native/JNIUtil.cpp
subversion/branches/1.9.x/subversion/bindings/javahl/native/JNIUtil.h
subversion/branches/1.9.x/subversion/bindings/javahl/native/ListCallback.cpp
subversion/branches/1.9.x/subversion/bindings/javahl/native/LockTokenTable.cpp
subversion/branches/1.9.x/subversion/bindings/javahl/native/LogMessageCallback.cpp
subversion/branches/1.9.x/subversion/bindings/javahl/native/MessageReceiver.cpp
subversion/branches/1.9.x/subversion/bindings/javahl/native/NativeStream.cpp
subversion/branches/1.9.x/subversion/bindings/javahl/native/OperationContext.cpp
subversion/branches/1.9.x/subversion/bindings/javahl/native/PatchCallback.cpp
subversion/branches/1.9.x/subversion/bindings/javahl/native/PropertyTable.cpp
subversion/branches/1.9.x/subversion/bindings/javahl/native/ProplistCallback.cpp
subversion/branches/1.9.x/subversion/bindings/javahl/native/RemoteSession.cpp
subversion/branches/1.9.x/subversion/bindings/javahl/native/RemoteSessionContext.cpp
subversion/branches/1.9.x/subversion/bindings/javahl/native/ReposFreezeAction.cpp
subversion/branches/1.9.x/subversion/bindings/javahl/native/ReposNotifyCallback.cpp
subversion/branches/1.9.x/subversion/bindings/javahl/native/Revision.cpp
subversion/branches/1.9.x/subversion/bindings/javahl/native/RevisionRange.cpp
subversion/branches/1.9.x/subversion/bindings/javahl/native/RevisionRangeList.cpp
subversion/branches/1.9.x/subversion/bindings/javahl/native/SVNClient.cpp
subversion/branches/1.9.x/subversion/bindings/javahl/native/SVNRepos.cpp
subversion/branches/1.9.x/subversion/bindings/javahl/native/StateReporter.cpp
subversion/branches/1.9.x/subversion/bindings/javahl/native/StatusCallback.cpp
subversion/branches/1.9.x/subversion/bindings/javahl/native/SubversionException.cpp
subversion/branches/1.9.x/subversion/bindings/javahl/native/VersionExtended.cpp
subversion/branches/1.9.x/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_ConfigImpl_Category.cpp
subversion/branches/1.9.x/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_SubstLib.cpp
Propchange: subversion/branches/1.9.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jun 10 04:00:29 2015
@@ -93,4 +93,4 @@
/subversion/branches/verify-at-commit:1462039-1462408
/subversion/branches/verify-keep-going:1439280-1546110
/subversion/branches/wc-collate-path:1402685-1480384
-/subversion/trunk:1660545-1660547,1660549-1662901,1663003,1663183-1663184,1663338,1663347,1663355,1663374,1663450,1663530,1663671,1663697,1663706,1663738,1663749,1663791,1663991,1664035,1664078,1664080,1664084-1664085,1664187,1664191,1664193,1664200,1664344,1664476,1664480-1664481,1664483,1664489-1664490,1664507,1664520-1664521,1664523,1664526-1664527,1664531-1664532,1664588,1664593-1664594,1664596,1664653,1664664,1664672,1664674,1664684,1664927,1664938-1664940,1664978,1664984,1664997,1665164,1665195,1665213,1665259,1665318,1665437-1665438,1665609,1665611-1665612,1665845,1665850,1665852,1665886,1665894,1665896,1666096,1666258,1666270,1666272,1666379,1666449,1666690,1666832,1666851,1666965,1667101,1667106-1667107,1667120,1667228,1667233-1667235,1667249-1667250,1667258,1667290,1667301,1667471,1667691-1667693,1667699-1667700,1667715,1667941,1667976,1668320,1668598-1668600,1668602-1668603,1668607-1668608,1668618,1669743,1669746,1669749,1669945,1670139,1670149,1670152,1670329,1670337,167
0347,1670353,1671164,1671388,1672295,1672311,1672372,1672404,1672511-1672512,1672578,1672728,1673044,1673062-1673063,1673065,1673153,1673170,1673172,1673197,1673202,1673204,1673228,1673282,1673445,1673691-1673692,1673746,1673785,1673803,1674015,1674032,1674170,1674301,1674305,1674308,1674339-1674340,1674406,1674415,1674455-1674456,1674475,1674487,1674522,1674580,1674627,1674891,1675771,1675774,1676526,1676535,1676538,1676555,1676564,1676570,1676665,1676667,1676769,1677003,1677191,1677267,1677440,1678147,1678149,1678494,1678571,1678734,1678742,1678745-1678746,1678839,1678846,1678894,1678950,1678963,1679166,1679169,1679228,1679230,1679287,1679864,1679866,1679909,1680242,1680264,1680495,1680705,1680819,1681317,1683071,1683311,1683387,1684034,1684077,1684322
+/subversion/trunk:1660545-1660547,1660549-1662901,1663003,1663183-1663184,1663338,1663347,1663355,1663374,1663450,1663530,1663671,1663697,1663706,1663738,1663749,1663791,1663991,1664035,1664078,1664080,1664084-1664085,1664187,1664191,1664193,1664200,1664344,1664476,1664480-1664481,1664483,1664489-1664490,1664507,1664520-1664521,1664523,1664526-1664527,1664531-1664532,1664588,1664593-1664594,1664596,1664653,1664664,1664672,1664674,1664684,1664927,1664938-1664940,1664978,1664984,1664997,1665164,1665195,1665213,1665259,1665318,1665437-1665438,1665609,1665611-1665612,1665845,1665850,1665852,1665886,1665894,1665896,1666096,1666258,1666270,1666272,1666379,1666449,1666690,1666832,1666851,1666965,1667101,1667106-1667107,1667120,1667228,1667233-1667235,1667249-1667250,1667258,1667290,1667301,1667471,1667691-1667693,1667699-1667700,1667715,1667941,1667976,1668320,1668598-1668600,1668602-1668603,1668607-1668608,1668618,1669743,1669746,1669749,1669945,1670139,1670149,1670152,1670329,1670337,167
0347,1670353,1671164,1671388,1672295,1672311,1672372,1672404,1672511-1672512,1672578,1672728,1673044,1673062-1673063,1673065,1673153,1673170,1673172,1673197,1673202,1673204,1673228,1673282,1673445,1673691-1673692,1673746,1673785,1673803,1674015,1674032,1674170,1674301,1674305,1674308,1674339-1674340,1674406,1674415,1674455-1674456,1674475,1674487,1674522,1674580,1674627,1674891,1675771,1675774,1676526,1676535,1676538,1676555,1676564,1676570,1676665,1676667,1676769,1677003,1677191,1677267,1677440,1678147,1678149,1678494,1678571,1678734,1678742,1678745-1678746,1678839,1678846,1678894,1678950,1678963,1679166,1679169,1679228,1679230,1679287,1679864,1679866,1679909,1680242,1680264,1680495,1680705,1680819,1681317,1683071,1683311,1683387,1684034,1684077,1684322,1684412
Modified: subversion/branches/1.9.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.9.x/STATUS?rev=1684558&r1=1684557&r2=1684558&view=diff
==============================================================================
--- subversion/branches/1.9.x/STATUS (original)
+++ subversion/branches/1.9.x/STATUS Wed Jun 10 04:00:29 2015
@@ -69,17 +69,3 @@ Veto-blocked changes:
Approved changes:
=================
-
- * r1684412
- Make JavaHL native code compile with a C++11 compiler.
- Justification:
- The upcoming MSVC14, part of Visual Studio 2015,
- supports user-defined literals, which means that
- trying to build JavaHL with VS2015 will fail.
- Note:
- To test this change with gcc/clang on *ix, edit the file
- build/ac-macros/compiler.m4 to replace '-std=c++98' with
- '-std=c++11', then autogen, configure, build and run
- the JavaHL tests.
- Votes:
- +1: brane, rhuijben
Modified:
subversion/branches/1.9.x/subversion/bindings/javahl/native/AuthnCallback.cpp
URL:
http://svn.apache.org/viewvc/subversion/branches/1.9.x/subversion/bindings/javahl/native/AuthnCallback.cpp?rev=1684558&r1=1684557&r2=1684558&view=diff
==============================================================================
---
subversion/branches/1.9.x/subversion/bindings/javahl/native/AuthnCallback.cpp
(original)
+++
subversion/branches/1.9.x/subversion/bindings/javahl/native/AuthnCallback.cpp
Wed Jun 10 04:00:29 2015
@@ -38,39 +38,39 @@ namespace JavaHL {
// Class JavaHL::AuthnCallback
const char* const AuthnCallback::m_class_name =
- JAVA_PACKAGE"/callback/AuthnCallback";
+ JAVAHL_CLASS("/callback/AuthnCallback");
AuthnCallback::ClassImpl::ClassImpl(::Java::Env env, jclass cls)
: ::Java::Object::ClassImpl(env, cls),
m_mid_username_prompt(
env.GetMethodID(cls, "usernamePrompt",
"(Ljava/lang/String;Z)"
- "L"JAVA_PACKAGE"/callback/AuthnCallback"
+ JAVAHL_ARG("/callback/AuthnCallback")
"$UsernameResult;")),
m_mid_user_password_prompt(
env.GetMethodID(cls, "userPasswordPrompt",
"(Ljava/lang/String;Ljava/lang/String;Z)"
- "L"JAVA_PACKAGE"/callback/AuthnCallback"
+ JAVAHL_ARG("/callback/AuthnCallback")
"$UserPasswordResult;")),
m_mid_ssl_server_trust_prompt(
env.GetMethodID(cls, "sslServerTrustPrompt",
"(Ljava/lang/String;"
- "L"JAVA_PACKAGE"/callback/AuthnCallback"
+ JAVAHL_ARG("/callback/AuthnCallback")
"$SSLServerCertFailures;"
- "L"JAVA_PACKAGE"/callback/AuthnCallback"
+ JAVAHL_ARG("/callback/AuthnCallback")
"$SSLServerCertInfo;"
"Z)"
- "L"JAVA_PACKAGE"/callback/AuthnCallback"
+ JAVAHL_ARG("/callback/AuthnCallback")
"$SSLServerTrustResult;")),
m_mid_ssl_client_cert_prompt(
env.GetMethodID(cls, "sslClientCertPrompt",
"(Ljava/lang/String;Z)"
- "L"JAVA_PACKAGE"/callback/AuthnCallback"
+ JAVAHL_ARG("/callback/AuthnCallback")
"$SSLClientCertResult;")),
m_mid_ssl_client_cert_passphrase_prompt(
env.GetMethodID(cls, "sslClientCertPassphrasePrompt",
"(Ljava/lang/String;Z)"
- "L"JAVA_PACKAGE"/callback/AuthnCallback"
+ JAVAHL_ARG("/callback/AuthnCallback")
"$SSLClientCertPassphraseResult;")),
m_mid_allow_store_plaintext_password(
env.GetMethodID(cls, "allowStorePlaintextPassword",
@@ -143,7 +143,7 @@ bool AuthnCallback::allow_store_plaintex
// Class JavaHL::AuthnCallback::AuthnResult
const char* const AuthnCallback::AuthnResult::m_class_name =
- JAVA_PACKAGE"/callback/AuthnCallback$AuthnResult";
+ JAVAHL_CLASS("/callback/AuthnCallback$AuthnResult");
AuthnCallback::AuthnResult::ClassImpl::ClassImpl(::Java::Env env, jclass cls)
: ::Java::Object::ClassImpl(env, cls),
@@ -157,7 +157,7 @@ AuthnCallback::AuthnResult::ClassImpl::~
// Class JavaHL::AuthnCallback::SSLServerCertFailures
const char* const AuthnCallback::SSLServerCertFailures::m_class_name =
- JAVA_PACKAGE"/callback/AuthnCallback$SSLServerCertFailures";
+ JAVAHL_CLASS("/callback/AuthnCallback$SSLServerCertFailures");
AuthnCallback::SSLServerCertFailures::ClassImpl::ClassImpl(
::Java::Env env, jclass cls)
@@ -178,7 +178,7 @@ AuthnCallback::SSLServerCertFailures::SS
// Class JavaHL::AuthnCallback::SSLServerCertInfo
const char* const AuthnCallback::SSLServerCertInfo::m_class_name =
- JAVA_PACKAGE"/callback/AuthnCallback$SSLServerCertInfo";
+ JAVAHL_CLASS("/callback/AuthnCallback$SSLServerCertInfo");
AuthnCallback::SSLServerCertInfo::ClassImpl::ClassImpl(
::Java::Env env, jclass cls)
@@ -259,7 +259,7 @@ AuthnCallback::SSLServerCertInfo::SSLSer
// Class JavaHL::UserPasswordCallback
const char* const UserPasswordCallback::m_class_name =
- JAVA_PACKAGE"/callback/UserPasswordCallback";
+ JAVAHL_CLASS("/callback/UserPasswordCallback");
UserPasswordCallback::ClassImpl::ClassImpl(::Java::Env env, jclass cls)
: ::Java::Object::ClassImpl(env, cls),
Modified:
subversion/branches/1.9.x/subversion/bindings/javahl/native/BlameCallback.cpp
URL:
http://svn.apache.org/viewvc/subversion/branches/1.9.x/subversion/bindings/javahl/native/BlameCallback.cpp?rev=1684558&r1=1684557&r2=1684558&view=diff
==============================================================================
---
subversion/branches/1.9.x/subversion/bindings/javahl/native/BlameCallback.cpp
(original)
+++
subversion/branches/1.9.x/subversion/bindings/javahl/native/BlameCallback.cpp
Wed Jun 10 04:00:29 2015
@@ -92,7 +92,7 @@ BlameCallback::singleLine(svn_revnum_t s
static jmethodID mid = 0;
if (mid == 0)
{
- jclass clazz = env->FindClass(JAVA_PACKAGE"/callback/BlameCallback");
+ jclass clazz = env->FindClass(JAVAHL_CLASS("/callback/BlameCallback"));
if (JNIUtil::isJavaExceptionThrown())
POP_AND_RETURN(SVN_NO_ERROR);
Modified:
subversion/branches/1.9.x/subversion/bindings/javahl/native/ChangelistCallback.cpp
URL:
http://svn.apache.org/viewvc/subversion/branches/1.9.x/subversion/bindings/javahl/native/ChangelistCallback.cpp?rev=1684558&r1=1684557&r2=1684558&view=diff
==============================================================================
---
subversion/branches/1.9.x/subversion/bindings/javahl/native/ChangelistCallback.cpp
(original)
+++
subversion/branches/1.9.x/subversion/bindings/javahl/native/ChangelistCallback.cpp
Wed Jun 10 04:00:29 2015
@@ -78,7 +78,7 @@ ChangelistCallback::doChangelist(const c
// it can be cached.
if (mid == 0)
{
- jclass clazz =
env->FindClass(JAVA_PACKAGE"/callback/ChangelistCallback");
+ jclass clazz =
env->FindClass(JAVAHL_CLASS("/callback/ChangelistCallback"));
if (JNIUtil::isJavaExceptionThrown())
POP_AND_RETURN_NOTHING();
Modified:
subversion/branches/1.9.x/subversion/bindings/javahl/native/ClientContext.cpp
URL:
http://svn.apache.org/viewvc/subversion/branches/1.9.x/subversion/bindings/javahl/native/ClientContext.cpp?rev=1684558&r1=1684557&r2=1684558&view=diff
==============================================================================
---
subversion/branches/1.9.x/subversion/bindings/javahl/native/ClientContext.cpp
(original)
+++
subversion/branches/1.9.x/subversion/bindings/javahl/native/ClientContext.cpp
Wed Jun 10 04:00:29 2015
@@ -42,7 +42,7 @@ ClientContext::ClientContext(jobject jsv
: OperationContext(pool)
{
static jfieldID ctxFieldID = 0;
- attachJavaObject(jsvnclient, "L"JAVA_PACKAGE"/SVNClient$ClientContext;",
"clientContext", &ctxFieldID);
+ attachJavaObject(jsvnclient, JAVAHL_ARG("/SVNClient$ClientContext;"),
"clientContext", &ctxFieldID);
SVN_JNI_ERR(svn_client_create_context2(&m_context, NULL,
pool.getPool()),
@@ -182,7 +182,7 @@ ClientContext::notify(void *baton,
return;
mid = env->GetMethodID(clazz, "onNotify",
- "(L"JAVA_PACKAGE"/ClientNotifyInformation;)V");
+ "(" JAVAHL_ARG("/ClientNotifyInformation;") ")V");
if (JNIUtil::isJavaExceptionThrown() || mid == 0)
return;
@@ -223,8 +223,8 @@ ClientContext::resolve(svn_wc_conflict_r
POP_AND_RETURN(SVN_NO_ERROR);
mid = env->GetMethodID(clazz, "resolve",
- "(L"JAVA_PACKAGE"/ConflictDescriptor;)"
- "L"JAVA_PACKAGE"/ConflictResult;");
+ "(" JAVAHL_ARG("/ConflictDescriptor;") ")"
+ JAVAHL_ARG("/ConflictResult;"));
if (JNIUtil::isJavaExceptionThrown() || mid == 0)
POP_AND_RETURN(SVN_NO_ERROR);
}
@@ -276,7 +276,7 @@ ClientContext::javaResultToC(jobject jre
jclass clazz = NULL;
if (getChoice == 0 || getMergedPath == 0)
{
- clazz = env->FindClass(JAVA_PACKAGE "/ConflictResult");
+ clazz = env->FindClass(JAVAHL_CLASS("/ConflictResult"));
if (JNIUtil::isJavaExceptionThrown())
POP_AND_RETURN_NULL;
}
@@ -284,7 +284,7 @@ ClientContext::javaResultToC(jobject jre
if (getChoice == 0)
{
getChoice = env->GetMethodID(clazz, "getChoice",
- "()L"JAVA_PACKAGE"/ConflictResult$Choice;");
+ "()" JAVAHL_ARG("/ConflictResult$Choice;"));
if (JNIUtil::isJavaExceptionThrown() || getChoice == 0)
POP_AND_RETURN_NULL;
}
Modified:
subversion/branches/1.9.x/subversion/bindings/javahl/native/CommitCallback.cpp
URL:
http://svn.apache.org/viewvc/subversion/branches/1.9.x/subversion/bindings/javahl/native/CommitCallback.cpp?rev=1684558&r1=1684557&r2=1684558&view=diff
==============================================================================
---
subversion/branches/1.9.x/subversion/bindings/javahl/native/CommitCallback.cpp
(original)
+++
subversion/branches/1.9.x/subversion/bindings/javahl/native/CommitCallback.cpp
Wed Jun 10 04:00:29 2015
@@ -80,13 +80,13 @@ CommitCallback::commitInfo(const svn_com
static jmethodID sm_mid = 0;
if (sm_mid == 0)
{
- jclass clazz = env->FindClass(JAVA_PACKAGE"/callback/CommitCallback");
+ jclass clazz = env->FindClass(JAVAHL_CLASS("/callback/CommitCallback"));
if (JNIUtil::isJavaExceptionThrown())
POP_AND_RETURN(SVN_NO_ERROR);
sm_mid = env->GetMethodID(clazz,
"commitInfo",
- "(L"JAVA_PACKAGE"/CommitInfo;)V");
+ "(" JAVAHL_ARG("/CommitInfo;") ")V");
if (JNIUtil::isJavaExceptionThrown())
POP_AND_RETURN(SVN_NO_ERROR);
}
Modified:
subversion/branches/1.9.x/subversion/bindings/javahl/native/CommitEditor.cpp
URL:
http://svn.apache.org/viewvc/subversion/branches/1.9.x/subversion/bindings/javahl/native/CommitEditor.cpp?rev=1684558&r1=1684557&r2=1684558&view=diff
==============================================================================
---
subversion/branches/1.9.x/subversion/bindings/javahl/native/CommitEditor.cpp
(original)
+++
subversion/branches/1.9.x/subversion/bindings/javahl/native/CommitEditor.cpp
Wed Jun 10 04:00:29 2015
@@ -48,7 +48,7 @@ CommitEditor::getCppObject(jobject jthis
{
static jfieldID fid = 0;
jlong cppAddr = SVNBase::findCppAddrForJObject(
- jthis, &fid, JAVA_PACKAGE"/remote/CommitEditor");
+ jthis, &fid, JAVAHL_CLASS("/remote/CommitEditor"));
return (cppAddr == 0 ? NULL : reinterpret_cast<CommitEditor*>(cppAddr));
}
@@ -136,7 +136,7 @@ void CommitEditor::dispose(jobject jthis
abort();
static jfieldID fid = 0;
- SVNBase::dispose(jthis, &fid, JAVA_PACKAGE"/remote/CommitEditor");
+ SVNBase::dispose(jthis, &fid, JAVAHL_CLASS("/remote/CommitEditor"));
}
namespace {
@@ -184,7 +184,7 @@ build_checksum(jobject jchecksum, SVN::P
if (0 == digest_mid || 0 == kind_mid)
{
- jclass cls = env->FindClass(JAVA_PACKAGE"/types/Checksum");
+ jclass cls = env->FindClass(JAVAHL_CLASS("/types/Checksum"));
if (JNIUtil::isJavaExceptionThrown())
return checksum;
@@ -192,7 +192,7 @@ build_checksum(jobject jchecksum, SVN::P
if (JNIUtil::isJavaExceptionThrown())
return checksum;
kind_mid = env->GetMethodID(cls, "getKind", "()L"
- JAVA_PACKAGE"/types/Checksum$Kind;");
+ JAVAHL_CLASS("/types/Checksum$Kind;"));
if (JNIUtil::isJavaExceptionThrown())
return checksum;
}
Modified:
subversion/branches/1.9.x/subversion/bindings/javahl/native/CommitMessage.cpp
URL:
http://svn.apache.org/viewvc/subversion/branches/1.9.x/subversion/bindings/javahl/native/CommitMessage.cpp?rev=1684558&r1=1684557&r2=1684558&view=diff
==============================================================================
---
subversion/branches/1.9.x/subversion/bindings/javahl/native/CommitMessage.cpp
(original)
+++
subversion/branches/1.9.x/subversion/bindings/javahl/native/CommitMessage.cpp
Wed Jun 10 04:00:29 2015
@@ -73,7 +73,7 @@ CommitMessage::getCommitMessage(const ch
static jmethodID midCallback = 0;
if (midCallback == 0)
{
- jclass clazz2 =
env->FindClass(JAVA_PACKAGE"/callback/CommitMessageCallback");
+ jclass clazz2 =
env->FindClass(JAVAHL_CLASS("/callback/CommitMessageCallback"));
if (JNIUtil::isJavaExceptionThrown())
return SVN_NO_ERROR;
Modified:
subversion/branches/1.9.x/subversion/bindings/javahl/native/CopySources.cpp
URL:
http://svn.apache.org/viewvc/subversion/branches/1.9.x/subversion/bindings/javahl/native/CopySources.cpp?rev=1684558&r1=1684557&r2=1684558&view=diff
==============================================================================
--- subversion/branches/1.9.x/subversion/bindings/javahl/native/CopySources.cpp
(original)
+++ subversion/branches/1.9.x/subversion/bindings/javahl/native/CopySources.cpp
Wed Jun 10 04:00:29 2015
@@ -60,7 +60,7 @@ CopySources::makeJCopySource(const char
if (JNIUtil::isJavaExceptionThrown())
POP_AND_RETURN_NULL;
- jclass clazz = env->FindClass(JAVA_PACKAGE "/types/CopySource");
+ jclass clazz = env->FindClass(JAVAHL_CLASS("/types/CopySource"));
if (JNIUtil::isJavaExceptionThrown())
POP_AND_RETURN_NULL;
@@ -69,8 +69,8 @@ CopySources::makeJCopySource(const char
{
ctor = env->GetMethodID(clazz, "<init>",
"(Ljava/lang/String;"
- "L" JAVA_PACKAGE "/types/Revision;"
- "L" JAVA_PACKAGE "/types/Revision;)V");
+ JAVAHL_ARG("/types/Revision;")
+ JAVAHL_ARG("/types/Revision;") ")V");
if (JNIUtil::isExceptionThrown())
POP_AND_RETURN_NULL;
}
@@ -88,7 +88,7 @@ CopySources::array(SVN::Pool &pool)
apr_pool_t *p = pool.getPool();
JNIEnv *env = JNIUtil::getEnv();
- jclass clazz = env->FindClass(JAVA_PACKAGE "/types/CopySource");
+ jclass clazz = env->FindClass(JAVAHL_CLASS("/types/CopySource"));
if (JNIUtil::isJavaExceptionThrown())
return NULL;
@@ -132,7 +132,7 @@ CopySources::array(SVN::Pool &pool)
if (getRevision == 0)
{
getRevision = env->GetMethodID(clazz, "getRevision",
- "()L"JAVA_PACKAGE"/types/Revision;");
+ "()" JAVAHL_ARG("/types/Revision;"));
if (JNIUtil::isJavaExceptionThrown() || getRevision == 0)
return NULL;
}
@@ -151,7 +151,7 @@ CopySources::array(SVN::Pool &pool)
if (getPegRevision == 0)
{
getPegRevision = env->GetMethodID(clazz, "getPegRevision",
-
"()L"JAVA_PACKAGE"/types/Revision;");
+ "()"
JAVAHL_ARG("/types/Revision;"));
if (JNIUtil::isJavaExceptionThrown() || getPegRevision == 0)
return NULL;
}
Modified:
subversion/branches/1.9.x/subversion/bindings/javahl/native/CreateJ.cpp
URL:
http://svn.apache.org/viewvc/subversion/branches/1.9.x/subversion/bindings/javahl/native/CreateJ.cpp?rev=1684558&r1=1684557&r2=1684558&view=diff
==============================================================================
--- subversion/branches/1.9.x/subversion/bindings/javahl/native/CreateJ.cpp
(original)
+++ subversion/branches/1.9.x/subversion/bindings/javahl/native/CreateJ.cpp Wed
Jun 10 04:00:29 2015
@@ -54,7 +54,7 @@ CreateJ::ConflictDescriptor(const svn_wc
return NULL;
// Create an instance of the conflict descriptor.
- jclass clazz = env->FindClass(JAVA_PACKAGE "/ConflictDescriptor");
+ jclass clazz = env->FindClass(JAVAHL_CLASS("/ConflictDescriptor"));
if (JNIUtil::isJavaExceptionThrown())
POP_AND_RETURN_NULL;
@@ -62,16 +62,16 @@ CreateJ::ConflictDescriptor(const svn_wc
if (ctor == 0)
{
ctor = env->GetMethodID(clazz, "<init>", "(Ljava/lang/String;"
- "L"JAVA_PACKAGE"/ConflictDescriptor$Kind;"
- "L"JAVA_PACKAGE"/types/NodeKind;"
+ JAVAHL_ARG("/ConflictDescriptor$Kind;")
+ JAVAHL_ARG("/types/NodeKind;")
"Ljava/lang/String;ZLjava/lang/String;"
- "L"JAVA_PACKAGE"/ConflictDescriptor$Action;"
- "L"JAVA_PACKAGE"/ConflictDescriptor$Reason;"
- "L"JAVA_PACKAGE"/ConflictDescriptor$Operation;"
+ JAVAHL_ARG("/ConflictDescriptor$Action;")
+ JAVAHL_ARG("/ConflictDescriptor$Reason;")
+ JAVAHL_ARG("/ConflictDescriptor$Operation;")
"Ljava/lang/String;Ljava/lang/String;"
"Ljava/lang/String;Ljava/lang/String;"
- "L"JAVA_PACKAGE"/types/ConflictVersion;"
- "L"JAVA_PACKAGE"/types/ConflictVersion;"
+ JAVAHL_ARG("/types/ConflictVersion;")
+ JAVAHL_ARG("/types/ConflictVersion;")
"Ljava/lang/String;[B[B[B[B)V");
if (JNIUtil::isJavaExceptionThrown() || ctor == 0)
POP_AND_RETURN_NULL;
@@ -177,7 +177,7 @@ CreateJ::ConflictVersion(const svn_wc_co
return NULL;
// Create an instance of the conflict version.
- jclass clazz = env->FindClass(JAVA_PACKAGE "/types/ConflictVersion");
+ jclass clazz = env->FindClass(JAVAHL_CLASS("/types/ConflictVersion"));
if (JNIUtil::isJavaExceptionThrown())
POP_AND_RETURN_NULL;
@@ -187,7 +187,7 @@ CreateJ::ConflictVersion(const svn_wc_co
ctor = env->GetMethodID(clazz, "<init>", "(Ljava/lang/String;"
"Ljava/lang/String;J"
"Ljava/lang/String;"
-
"L"JAVA_PACKAGE"/types/NodeKind;"
+ JAVAHL_ARG("/types/NodeKind;")
")V");
if (JNIUtil::isJavaExceptionThrown() || ctor == 0)
POP_AND_RETURN_NULL;
@@ -228,7 +228,7 @@ CreateJ::Checksum(const svn_checksum_t *
if (JNIUtil::isJavaExceptionThrown())
return NULL;
- jclass clazz = env->FindClass(JAVA_PACKAGE"/types/Checksum");
+ jclass clazz = env->FindClass(JAVAHL_CLASS("/types/Checksum"));
if (JNIUtil::isExceptionThrown())
POP_AND_RETURN_NULL;
@@ -238,7 +238,7 @@ CreateJ::Checksum(const svn_checksum_t *
{
midConstructor = env->GetMethodID(clazz, "<init>",
"([B"
- "L"JAVA_PACKAGE"/types/Checksum$Kind;"
+ JAVAHL_ARG("/types/Checksum$Kind;")
")V");
if (JNIUtil::isExceptionThrown())
POP_AND_RETURN_NULL;
@@ -273,7 +273,7 @@ CreateJ::DirEntry(const char *path, cons
if (JNIUtil::isJavaExceptionThrown())
return SVN_NO_ERROR;
- jclass clazz = env->FindClass(JAVA_PACKAGE"/types/DirEntry");
+ jclass clazz = env->FindClass(JAVAHL_CLASS("/types/DirEntry"));
if (JNIUtil::isJavaExceptionThrown())
POP_AND_RETURN_NULL;
@@ -282,7 +282,7 @@ CreateJ::DirEntry(const char *path, cons
{
mid = env->GetMethodID(clazz, "<init>",
"(Ljava/lang/String;Ljava/lang/String;"
- "L"JAVA_PACKAGE"/types/NodeKind;"
+ JAVAHL_ARG("/types/NodeKind;")
"JZJJLjava/lang/String;)V");
if (JNIUtil::isJavaExceptionThrown())
POP_AND_RETURN_NULL;
@@ -327,7 +327,7 @@ CreateJ::Info(const char *path, const sv
if (JNIUtil::isJavaExceptionThrown())
return NULL;
- jclass clazz = env->FindClass(JAVA_PACKAGE "/types/Info");
+ jclass clazz = env->FindClass(JAVAHL_CLASS("/types/Info"));
if (JNIUtil::isJavaExceptionThrown())
POP_AND_RETURN_NULL;
@@ -337,15 +337,16 @@ CreateJ::Info(const char *path, const sv
mid = env->GetMethodID(clazz, "<init>",
"(Ljava/lang/String;Ljava/lang/String;"
"Ljava/lang/String;J"
- "L"JAVA_PACKAGE"/types/NodeKind;"
+ JAVAHL_ARG("/types/NodeKind;")
"Ljava/lang/String;Ljava/lang/String;"
"JJLjava/lang/String;"
- "L"JAVA_PACKAGE"/types/Lock;Z"
- "L"JAVA_PACKAGE"/types/Info$ScheduleKind;"
+ JAVAHL_ARG("/types/Lock;Z")
+ JAVAHL_ARG("/types/Info$ScheduleKind;")
"Ljava/lang/String;JJ"
- "L"JAVA_PACKAGE"/types/Checksum;"
+ JAVAHL_ARG("/types/Checksum;")
"Ljava/lang/String;JJ"
- "L"JAVA_PACKAGE"/types/Depth;Ljava/util/Set;)V");
+ JAVAHL_ARG("/types/Depth;Ljava/util/Set;")
+ ")V");
if (mid == 0 || JNIUtil::isJavaExceptionThrown())
POP_AND_RETURN_NULL;
}
@@ -472,7 +473,7 @@ CreateJ::Lock(const svn_lock_t *lock)
if (JNIUtil::isJavaExceptionThrown())
return NULL;
- jclass clazz = env->FindClass(JAVA_PACKAGE"/types/Lock");
+ jclass clazz = env->FindClass(JAVAHL_CLASS("/types/Lock"));
if (JNIUtil::isJavaExceptionThrown())
POP_AND_RETURN_NULL;
@@ -586,7 +587,7 @@ CreateJ::ChangedPath(const char *path, s
if (JNIUtil::isJavaExceptionThrown())
return NULL;
- jclass clazzCP = env->FindClass(JAVA_PACKAGE"/types/ChangePath");
+ jclass clazzCP = env->FindClass(JAVAHL_CLASS("/types/ChangePath"));
if (JNIUtil::isJavaExceptionThrown())
POP_AND_RETURN_NULL;
@@ -596,10 +597,11 @@ CreateJ::ChangedPath(const char *path, s
midCP = env->GetMethodID(clazzCP,
"<init>",
"(Ljava/lang/String;JLjava/lang/String;"
- "L"JAVA_PACKAGE"/types/ChangePath$Action;"
- "L"JAVA_PACKAGE"/types/NodeKind;"
- "L"JAVA_PACKAGE"/types/Tristate;"
- "L"JAVA_PACKAGE"/types/Tristate;)V");
+ JAVAHL_ARG("/types/ChangePath$Action;")
+ JAVAHL_ARG("/types/NodeKind;")
+ JAVAHL_ARG("/types/Tristate;")
+ JAVAHL_ARG("/types/Tristate;")
+ ")V");
if (JNIUtil::isJavaExceptionThrown())
POP_AND_RETURN_NULL;
}
@@ -647,7 +649,7 @@ CreateJ::Status(svn_wc_context_t *wc_ctx
if (JNIUtil::isJavaExceptionThrown())
return NULL;
- jclass clazz = env->FindClass(JAVA_PACKAGE"/types/Status");
+ jclass clazz = env->FindClass(JAVAHL_CLASS("/types/Status"));
if (JNIUtil::isJavaExceptionThrown())
POP_AND_RETURN_NULL;
@@ -656,18 +658,18 @@ CreateJ::Status(svn_wc_context_t *wc_ctx
{
mid = env->GetMethodID(clazz, "<init>",
"(Ljava/lang/String;Ljava/lang/String;"
- "L"JAVA_PACKAGE"/types/NodeKind;"
+ JAVAHL_ARG("/types/NodeKind;")
"JJJLjava/lang/String;"
- "L"JAVA_PACKAGE"/types/Status$Kind;"
- "L"JAVA_PACKAGE"/types/Status$Kind;"
- "L"JAVA_PACKAGE"/types/Status$Kind;"
- "L"JAVA_PACKAGE"/types/Status$Kind;"
- "L"JAVA_PACKAGE"/types/Status$Kind;"
- "L"JAVA_PACKAGE"/types/Status$Kind;"
- "ZZL"JAVA_PACKAGE"/types/Depth;"
- "ZZZL"JAVA_PACKAGE"/types/Lock;"
- "L"JAVA_PACKAGE"/types/Lock;"
- "JJL"JAVA_PACKAGE"/types/NodeKind;"
+ JAVAHL_ARG("/types/Status$Kind;")
+ JAVAHL_ARG("/types/Status$Kind;")
+ JAVAHL_ARG("/types/Status$Kind;")
+ JAVAHL_ARG("/types/Status$Kind;")
+ JAVAHL_ARG("/types/Status$Kind;")
+ JAVAHL_ARG("/types/Status$Kind;")
+ "ZZ" JAVAHL_ARG("/types/Depth;")
+ "ZZZ" JAVAHL_ARG("/types/Lock;")
+ JAVAHL_ARG("/types/Lock;")
+ "JJ" JAVAHL_ARG("/types/NodeKind;")
"Ljava/lang/String;Ljava/lang/String;"
"Ljava/lang/String;Ljava/lang/String;)V");
if (JNIUtil::isJavaExceptionThrown())
@@ -790,7 +792,7 @@ CreateJ::ClientNotifyInformation(const s
return NULL;
static jmethodID midCT = 0;
- jclass clazz = env->FindClass(JAVA_PACKAGE"/ClientNotifyInformation");
+ jclass clazz = env->FindClass(JAVAHL_CLASS("/ClientNotifyInformation"));
if (JNIUtil::isJavaExceptionThrown())
POP_AND_RETURN_NULL;
@@ -798,16 +800,16 @@ CreateJ::ClientNotifyInformation(const s
{
midCT = env->GetMethodID(clazz, "<init>",
"(Ljava/lang/String;"
-
"L"JAVA_PACKAGE"/ClientNotifyInformation$Action;"
- "L"JAVA_PACKAGE"/types/NodeKind;"
+ JAVAHL_ARG("/ClientNotifyInformation$Action;")
+ JAVAHL_ARG("/types/NodeKind;")
"Ljava/lang/String;"
- "L"JAVA_PACKAGE"/types/Lock;"
+ JAVAHL_ARG("/types/Lock;")
"Ljava/lang/String;Ljava/util/List;"
-
"L"JAVA_PACKAGE"/ClientNotifyInformation$Status;"
-
"L"JAVA_PACKAGE"/ClientNotifyInformation$Status;"
-
"L"JAVA_PACKAGE"/ClientNotifyInformation$LockStatus;"
+ JAVAHL_ARG("/ClientNotifyInformation$Status;")
+ JAVAHL_ARG("/ClientNotifyInformation$Status;")
+
JAVAHL_ARG("/ClientNotifyInformation$LockStatus;")
"JLjava/lang/String;"
- "L"JAVA_PACKAGE"/types/RevisionRange;"
+ JAVAHL_ARG("/types/RevisionRange;")
"Ljava/lang/String;"
"Ljava/lang/String;Ljava/lang/String;"
"Ljava/util/Map;JJJJJJI)V");
@@ -923,16 +925,16 @@ CreateJ::ReposNotifyInformation(const sv
return NULL;
static jmethodID midCT = 0;
- jclass clazz = env->FindClass(JAVA_PACKAGE"/ReposNotifyInformation");
+ jclass clazz = env->FindClass(JAVAHL_CLASS("/ReposNotifyInformation"));
if (JNIUtil::isJavaExceptionThrown())
POP_AND_RETURN_NULL;
if (midCT == 0)
{
midCT = env->GetMethodID(clazz, "<init>",
-
"(L"JAVA_PACKAGE"/ReposNotifyInformation$Action;"
+ "("
JAVAHL_ARG("/ReposNotifyInformation$Action;")
"JLjava/lang/String;JJJ"
-
"L"JAVA_PACKAGE"/ReposNotifyInformation$NodeAction;"
+
JAVAHL_ARG("/ReposNotifyInformation$NodeAction;")
"Ljava/lang/String;)V");
if (JNIUtil::isJavaExceptionThrown() || midCT == 0)
POP_AND_RETURN_NULL;
@@ -981,7 +983,7 @@ CreateJ::CommitItem(svn_client_commit_it
if (JNIUtil::isJavaExceptionThrown())
return NULL;
- jclass clazz = env->FindClass(JAVA_PACKAGE"/CommitItem");
+ jclass clazz = env->FindClass(JAVAHL_CLASS("/CommitItem"));
if (JNIUtil::isExceptionThrown())
POP_AND_RETURN_NULL;
@@ -991,7 +993,7 @@ CreateJ::CommitItem(svn_client_commit_it
{
midConstructor = env->GetMethodID(clazz, "<init>",
"(Ljava/lang/String;"
- "L"JAVA_PACKAGE"/types/NodeKind;"
+ JAVAHL_ARG("/types/NodeKind;")
"ILjava/lang/String;"
"Ljava/lang/String;J"
"Ljava/lang/String;)V");
@@ -1063,7 +1065,7 @@ CreateJ::CommitInfo(const svn_commit_inf
return NULL;
static jmethodID midCT = 0;
- jclass clazz = env->FindClass(JAVA_PACKAGE"/CommitInfo");
+ jclass clazz = env->FindClass(JAVAHL_CLASS("/CommitInfo"));
if (JNIUtil::isJavaExceptionThrown())
POP_AND_RETURN_NULL;
@@ -1324,7 +1326,7 @@ jobject CreateJ::InheritedProps(apr_arra
}
jclass item_cls = env->FindClass(
- JAVA_PACKAGE"/callback/InheritedProplistCallback$InheritedItem");
+ JAVAHL_CLASS("/callback/InheritedProplistCallback$InheritedItem"));
if (JNIUtil::isJavaExceptionThrown())
POP_AND_RETURN_NULL;
@@ -1377,7 +1379,7 @@ jobject CreateJ::Mergeinfo(svn_mergeinfo
// Transform mergeinfo into Java Mergeinfo object.
JNIEnv *env = JNIUtil::getEnv();
- jclass clazz = env->FindClass(JAVA_PACKAGE "/types/Mergeinfo");
+ jclass clazz = env->FindClass(JAVAHL_CLASS("/types/Mergeinfo"));
if (JNIUtil::isJavaExceptionThrown())
return NULL;
Modified:
subversion/branches/1.9.x/subversion/bindings/javahl/native/Credential.cpp
URL:
http://svn.apache.org/viewvc/subversion/branches/1.9.x/subversion/bindings/javahl/native/Credential.cpp?rev=1684558&r1=1684557&r2=1684558&view=diff
==============================================================================
--- subversion/branches/1.9.x/subversion/bindings/javahl/native/Credential.cpp
(original)
+++ subversion/branches/1.9.x/subversion/bindings/javahl/native/Credential.cpp
Wed Jun 10 04:00:29 2015
@@ -29,17 +29,17 @@ namespace JavaHL {
// Class JavaHL::Credential
const char* const Credential::m_class_name =
- JAVA_PACKAGE"/SVNUtil$Credential";
+ JAVAHL_CLASS("/SVNUtil$Credential");
Credential::ClassImpl::ClassImpl(::Java::Env env, jclass cls)
: ::Java::Object::ClassImpl(env, cls),
m_mid_ctor(
env.GetMethodID(cls, "<init>",
- "(L"JAVA_PACKAGE"/SVNUtil$Credential$Kind;"
+ "(" JAVAHL_ARG("/SVNUtil$Credential$Kind;")
"Ljava/lang/String;Ljava/lang/String;"
"Ljava/lang/String;Ljava/lang/String;"
-
"L"JAVA_PACKAGE"/callback/AuthnCallback$SSLServerCertInfo;"
-
"L"JAVA_PACKAGE"/callback/AuthnCallback$SSLServerCertFailures;"
+
JAVAHL_ARG("/callback/AuthnCallback$SSLServerCertInfo;")
+
JAVAHL_ARG("/callback/AuthnCallback$SSLServerCertFailures;")
"Ljava/lang/String;)V"))
{}
@@ -62,14 +62,14 @@ Credential::Credential(::Java::Env env,
// Enum JavaHL::Credential::Kind
const char* const Credential::Kind::m_class_name =
- JAVA_PACKAGE"/SVNUtil$Credential$Kind";
+ JAVAHL_CLASS("/SVNUtil$Credential$Kind");
Credential::Kind::ClassImpl::ClassImpl(::Java::Env env, jclass cls)
: ::Java::Object::ClassImpl(env, cls),
m_static_mid_from_string(
env.GetStaticMethodID(cls, "fromString",
"(Ljava/lang/String;)"
- "L"JAVA_PACKAGE"/SVNUtil$Credential$Kind;"))
+ JAVAHL_ARG("/SVNUtil$Credential$Kind;")))
{}
Credential::Kind::ClassImpl::~ClassImpl() {}
Modified:
subversion/branches/1.9.x/subversion/bindings/javahl/native/DiffSummaryReceiver.cpp
URL:
http://svn.apache.org/viewvc/subversion/branches/1.9.x/subversion/bindings/javahl/native/DiffSummaryReceiver.cpp?rev=1684558&r1=1684557&r2=1684558&view=diff
==============================================================================
---
subversion/branches/1.9.x/subversion/bindings/javahl/native/DiffSummaryReceiver.cpp
(original)
+++
subversion/branches/1.9.x/subversion/bindings/javahl/native/DiffSummaryReceiver.cpp
Wed Jun 10 04:00:29 2015
@@ -69,12 +69,12 @@ DiffSummaryReceiver::onSummary(const svn
if (callback == 0)
{
// Initialize the method ID.
- clazz = env->FindClass(JAVA_PACKAGE "/callback/DiffSummaryCallback");
+ clazz = env->FindClass(JAVAHL_CLASS("/callback/DiffSummaryCallback"));
if (JNIUtil::isJavaExceptionThrown())
POP_AND_RETURN(SVN_NO_ERROR);
callback = env->GetMethodID(clazz, "onSummary",
- "(L"JAVA_PACKAGE"/DiffSummary;)V");
+ "(" JAVAHL_ARG("/DiffSummary;") ")V");
if (JNIUtil::isJavaExceptionThrown() || callback == 0)
POP_AND_RETURN(SVN_NO_ERROR);
}
@@ -82,7 +82,7 @@ DiffSummaryReceiver::onSummary(const svn
// Do some prep work for tranforming the DIFF parameter into a
// Java equivalent.
static jmethodID ctor = 0;
- clazz = env->FindClass(JAVA_PACKAGE "/DiffSummary");
+ clazz = env->FindClass(JAVAHL_CLASS("/DiffSummary"));
if (JNIUtil::isJavaExceptionThrown())
POP_AND_RETURN(SVN_NO_ERROR);
@@ -90,8 +90,8 @@ DiffSummaryReceiver::onSummary(const svn
{
ctor = env->GetMethodID(clazz, "<init>",
"(Ljava/lang/String;"
- "L"JAVA_PACKAGE"/DiffSummary$DiffKind;Z"
- "L"JAVA_PACKAGE"/types/NodeKind;)V");
+ JAVAHL_ARG("/DiffSummary$DiffKind;") "Z"
+ JAVAHL_ARG("/types/NodeKind;") ")V");
if (JNIUtil::isJavaExceptionThrown() || ctor == 0)
POP_AND_RETURN(SVN_NO_ERROR);
}
Modified:
subversion/branches/1.9.x/subversion/bindings/javahl/native/EditorCallbacks.cpp
URL:
http://svn.apache.org/viewvc/subversion/branches/1.9.x/subversion/bindings/javahl/native/EditorCallbacks.cpp?rev=1684558&r1=1684557&r2=1684558&view=diff
==============================================================================
---
subversion/branches/1.9.x/subversion/bindings/javahl/native/EditorCallbacks.cpp
(original)
+++
subversion/branches/1.9.x/subversion/bindings/javahl/native/EditorCallbacks.cpp
Wed Jun 10 04:00:29 2015
@@ -34,23 +34,22 @@ namespace JavaHL {
// class JavaHL::ProvideBaseCallback
const char* const ProvideBaseCallback::m_class_name =
- JAVA_PACKAGE"/ISVNEditor$ProvideBaseCallback";
+ JAVAHL_CLASS("/ISVNEditor$ProvideBaseCallback");
ProvideBaseCallback::ClassImpl::ClassImpl(::Java::Env env, jclass cls)
: ::Java::Object::ClassImpl(env, cls),
m_mid_get_contents(
- env.GetMethodID(cls,
- "getContents",
- "(Ljava/lang/String;)"
- "L"JAVA_PACKAGE
- "/ISVNEditor$ProvideBaseCallback$ReturnValue;"))
+ env.GetMethodID(
+ cls, "getContents",
+ "(Ljava/lang/String;)"
+ JAVAHL_ARG("/ISVNEditor$ProvideBaseCallback$ReturnValue;")))
{}
ProvideBaseCallback::ClassImpl::~ClassImpl() {}
const char* const ProvideBaseCallback::ReturnValue::m_class_name =
- JAVA_PACKAGE"/ISVNEditor$ProvideBaseCallback$ReturnValue";
+ JAVAHL_CLASS("/ISVNEditor$ProvideBaseCallback$ReturnValue");
ProvideBaseCallback::ReturnValue::ClassImpl::ClassImpl(
::Java::Env env, jclass cls)
@@ -73,23 +72,22 @@ ProvideBaseCallback::ReturnValue::get_gl
// class JavaHL::ProvidePropsCallback
const char* const ProvidePropsCallback::m_class_name =
- JAVA_PACKAGE"/ISVNEditor$ProvidePropsCallback";
+ JAVAHL_CLASS("/ISVNEditor$ProvidePropsCallback");
ProvidePropsCallback::ClassImpl::ClassImpl(::Java::Env env, jclass cls)
: ::Java::Object::ClassImpl(env, cls),
m_mid_get_props(
- env.GetMethodID(cls,
- "getProperties",
- "(Ljava/lang/String;)"
- "L"JAVA_PACKAGE
- "/ISVNEditor$ProvidePropsCallback$ReturnValue;"))
+ env.GetMethodID(
+ cls, "getProperties",
+ "(Ljava/lang/String;)"
+ JAVAHL_ARG("/ISVNEditor$ProvidePropsCallback$ReturnValue;")))
{}
ProvidePropsCallback::ClassImpl::~ClassImpl() {}
const char* const ProvidePropsCallback::ReturnValue::m_class_name =
- JAVA_PACKAGE"/ISVNEditor$ProvidePropsCallback$ReturnValue";
+ JAVAHL_CLASS("/ISVNEditor$ProvidePropsCallback$ReturnValue");
ProvidePropsCallback::ReturnValue::ClassImpl::ClassImpl(
::Java::Env env, jclass cls)
@@ -111,7 +109,7 @@ ProvidePropsCallback::ReturnValue::get_p
// class JavaHL::GetNodeKindCallback
const char* const GetNodeKindCallback::m_class_name =
- JAVA_PACKAGE"/ISVNEditor$GetNodeKindCallback";
+ JAVAHL_CLASS("/ISVNEditor$GetNodeKindCallback");
GetNodeKindCallback::ClassImpl::ClassImpl(::Java::Env env, jclass cls)
: ::Java::Object::ClassImpl(env, cls),
@@ -119,7 +117,7 @@ GetNodeKindCallback::ClassImpl::ClassImp
env.GetMethodID(cls,
"getKind",
"(Ljava/lang/String;J)"
- "L"JAVA_PACKAGE"/types/NodeKind;"))
+ JAVAHL_ARG("/types/NodeKind;")))
{}
GetNodeKindCallback::ClassImpl::~ClassImpl() {}
Modified:
subversion/branches/1.9.x/subversion/bindings/javahl/native/EditorProxy.cpp
URL:
http://svn.apache.org/viewvc/subversion/branches/1.9.x/subversion/bindings/javahl/native/EditorProxy.cpp?rev=1684558&r1=1684557&r2=1684558&view=diff
==============================================================================
--- subversion/branches/1.9.x/subversion/bindings/javahl/native/EditorProxy.cpp
(original)
+++ subversion/branches/1.9.x/subversion/bindings/javahl/native/EditorProxy.cpp
Wed Jun 10 04:00:29 2015
@@ -123,7 +123,7 @@ get_editor_method(jmethodID& mid, const
return SVN_NO_ERROR; // Already known.
JNIEnv* env = JNIUtil::getEnv();
- jclass cls = env->FindClass(JAVA_PACKAGE"/ISVNEditor");
+ jclass cls = env->FindClass(JAVAHL_CLASS("/ISVNEditor"));
SVN_JNI_CATCH(,SVN_ERR_RA_SVN_EDIT_ABORTED);
SVN_JNI_CATCH(mid = env->GetMethodID(cls, name, sig),
SVN_ERR_RA_SVN_EDIT_ABORTED);
@@ -202,7 +202,7 @@ EditorProxy::cb_add_file(void *baton,
static jmethodID mid = 0;
SVN_ERR(get_editor_method(mid, "addFile",
"(Ljava/lang/String;"
- "L"JAVA_PACKAGE"/types/Checksum;"
+ JAVAHL_ARG("/types/Checksum;")
"Ljava/io/InputStream;"
"Ljava/util/Map;J)V"));
@@ -282,7 +282,7 @@ EditorProxy::cb_add_absent(void *baton,
static jmethodID mid = 0;
SVN_ERR(get_editor_method(mid, "addAbsent",
"(Ljava/lang/String;"
- "L"JAVA_PACKAGE"/types/NodeKind;"
+ JAVAHL_ARG("/types/NodeKind;")
"J)V"));
jstring jrelpath = JNIUtil::makeJString(relpath);
@@ -359,7 +359,7 @@ EditorProxy::cb_alter_file(void *baton,
static jmethodID mid = 0;
SVN_ERR(get_editor_method(mid, "alterFile",
"(Ljava/lang/String;J"
- "L"JAVA_PACKAGE"/types/Checksum;"
+ JAVAHL_ARG("/types/Checksum;")
"Ljava/io/InputStream;"
"Ljava/util/Map;)V"));
Modified:
subversion/branches/1.9.x/subversion/bindings/javahl/native/EnumMapper.cpp
URL:
http://svn.apache.org/viewvc/subversion/branches/1.9.x/subversion/bindings/javahl/native/EnumMapper.cpp?rev=1684558&r1=1684557&r2=1684558&view=diff
==============================================================================
--- subversion/branches/1.9.x/subversion/bindings/javahl/native/EnumMapper.cpp
(original)
+++ subversion/branches/1.9.x/subversion/bindings/javahl/native/EnumMapper.cpp
Wed Jun 10 04:00:29 2015
@@ -37,13 +37,13 @@ jobject EnumMapper::mapChangePathAction(
switch (action)
{
case 'A':
- return mapEnum(JAVA_PACKAGE"/types/ChangePath$Action", 0);
+ return mapEnum(JAVAHL_CLASS("/types/ChangePath$Action"), 0);
case 'D':
- return mapEnum(JAVA_PACKAGE"/types/ChangePath$Action", 1);
+ return mapEnum(JAVAHL_CLASS("/types/ChangePath$Action"), 1);
case 'R':
- return mapEnum(JAVA_PACKAGE"/types/ChangePath$Action", 2);
+ return mapEnum(JAVAHL_CLASS("/types/ChangePath$Action"), 2);
case 'M':
- return mapEnum(JAVA_PACKAGE"/types/ChangePath$Action", 3);
+ return mapEnum(JAVAHL_CLASS("/types/ChangePath$Action"), 3);
default:
return NULL;
}
@@ -55,7 +55,7 @@ jobject EnumMapper::mapChangePathAction(
jobject EnumMapper::mapNotifyState(svn_wc_notify_state_t state)
{
// We're assuming a valid value for the C enum above
- return mapEnum(JAVA_PACKAGE"/ClientNotifyInformation$Status",
+ return mapEnum(JAVAHL_CLASS("/ClientNotifyInformation$Status"),
static_cast<int>(state));
}
@@ -65,14 +65,14 @@ jobject EnumMapper::mapNotifyState(svn_w
jobject EnumMapper::mapNotifyAction(svn_wc_notify_action_t action)
{
// We're assuming a valid value for the C enum above
- return mapEnum(JAVA_PACKAGE"/ClientNotifyInformation$Action",
+ return mapEnum(JAVAHL_CLASS("/ClientNotifyInformation$Action"),
static_cast<int>(action));
}
jobject EnumMapper::mapReposNotifyNodeAction(svn_node_action action)
{
// We're assuming a valid value for the C enum above
- return mapEnum(JAVA_PACKAGE"/ReposNotifyInformation$NodeAction",
+ return mapEnum(JAVAHL_CLASS("/ReposNotifyInformation$NodeAction"),
static_cast<int>(action));
}
@@ -82,7 +82,7 @@ jobject EnumMapper::mapReposNotifyNodeAc
jobject EnumMapper::mapReposNotifyAction(svn_repos_notify_action_t action)
{
// We're assuming a valid value for the C enum above
- return mapEnum(JAVA_PACKAGE"/ReposNotifyInformation$Action",
+ return mapEnum(JAVAHL_CLASS("/ReposNotifyInformation$Action"),
static_cast<int>(action));
}
@@ -92,7 +92,7 @@ jobject EnumMapper::mapReposNotifyAction
jobject EnumMapper::mapNodeKind(svn_node_kind_t nodeKind)
{
// We're assuming a valid value for the C enum above
- return mapEnum(JAVA_PACKAGE"/types/NodeKind",
+ return mapEnum(JAVAHL_CLASS("/types/NodeKind"),
static_cast<int>(nodeKind));
}
@@ -102,7 +102,7 @@ jobject EnumMapper::mapNodeKind(svn_node
jobject EnumMapper::mapNotifyLockState(svn_wc_notify_lock_state_t state)
{
// We're assuming a valid value for the C enum above
- return mapEnum(JAVA_PACKAGE"/ClientNotifyInformation$LockStatus",
+ return mapEnum(JAVAHL_CLASS("/ClientNotifyInformation$LockStatus"),
static_cast<int>(state));
}
@@ -112,7 +112,7 @@ jobject EnumMapper::mapNotifyLockState(s
jobject EnumMapper::mapScheduleKind(svn_wc_schedule_t schedule)
{
// We're assuming a valid value for the C enum above
- return mapEnum(JAVA_PACKAGE"/types/Info$ScheduleKind",
+ return mapEnum(JAVAHL_CLASS("/types/Info$ScheduleKind"),
static_cast<int>(schedule));
}
@@ -123,63 +123,63 @@ jobject EnumMapper::mapStatusKind(svn_wc
{
// We're assuming a valid value for the C enum above
// The offset here is +1
- return mapEnum(JAVA_PACKAGE"/types/Status$Kind",
+ return mapEnum(JAVAHL_CLASS("/types/Status$Kind"),
static_cast<int>(svnKind) - 1);
}
jobject EnumMapper::mapChecksumKind(svn_checksum_kind_t kind)
{
// We're assuming a valid value for the C enum above
- return mapEnum(JAVA_PACKAGE"/types/Checksum$Kind",
+ return mapEnum(JAVAHL_CLASS("/types/Checksum$Kind"),
static_cast<int>(kind));
}
jobject EnumMapper::mapConflictKind(svn_wc_conflict_kind_t kind)
{
// We're assuming a valid value for the C enum above
- return mapEnum(JAVA_PACKAGE"/ConflictDescriptor$Kind",
+ return mapEnum(JAVAHL_CLASS("/ConflictDescriptor$Kind"),
static_cast<int>(kind));
}
jobject EnumMapper::mapConflictAction(svn_wc_conflict_action_t action)
{
// We're assuming a valid value for the C enum above
- return mapEnum(JAVA_PACKAGE"/ConflictDescriptor$Action",
+ return mapEnum(JAVAHL_CLASS("/ConflictDescriptor$Action"),
static_cast<int>(action));
}
jobject EnumMapper::mapConflictReason(svn_wc_conflict_reason_t reason)
{
// We're assuming a valid value for the C enum above
- return mapEnum(JAVA_PACKAGE"/ConflictDescriptor$Reason",
+ return mapEnum(JAVAHL_CLASS("/ConflictDescriptor$Reason"),
static_cast<int>(reason));
}
int EnumMapper::toMergeinfoLogKind(jobject jLogKind)
{
- return getOrdinal(JAVA_PACKAGE"/types/Mergeinfo$LogKind", jLogKind);
+ return getOrdinal(JAVAHL_CLASS("/types/Mergeinfo$LogKind"), jLogKind);
}
int EnumMapper::toLogLevel(jobject jLogLevel)
{
- return getOrdinal(JAVA_PACKAGE"/SVNClient$ClientLogLevel", jLogLevel);
+ return getOrdinal(JAVAHL_CLASS("/SVNClient$ClientLogLevel"), jLogLevel);
}
svn_node_kind_t EnumMapper::toNodeKind(jobject jNodeKind)
{
return svn_node_kind_t(
- getOrdinal(JAVA_PACKAGE"/types/NodeKind", jNodeKind));
+ getOrdinal(JAVAHL_CLASS("/types/NodeKind"), jNodeKind));
}
svn_checksum_kind_t EnumMapper::toChecksumKind(jobject jChecksumKind)
{
return svn_checksum_kind_t(
- getOrdinal(JAVA_PACKAGE"/types/Checksum$Kind", jChecksumKind));
+ getOrdinal(JAVAHL_CLASS("/types/Checksum$Kind"), jChecksumKind));
}
svn_tristate_t EnumMapper::toTristate(jobject jTristate)
{
- switch (getOrdinal(JAVA_PACKAGE"/types/Tristate", jTristate))
+ switch (getOrdinal(JAVAHL_CLASS("/types/Tristate"), jTristate))
{
case 1: return svn_tristate_false;
case 2: return svn_tristate_true;
@@ -190,14 +190,14 @@ svn_tristate_t EnumMapper::toTristate(jo
svn_depth_t EnumMapper::toDepth(jobject jdepth)
{
// The offset for depths is -2
- return static_cast<svn_depth_t>(getOrdinal(JAVA_PACKAGE"/types/Depth",
jdepth) - 2);
+ return static_cast<svn_depth_t>(getOrdinal(JAVAHL_CLASS("/types/Depth"),
jdepth) - 2);
}
svn_mergeinfo_inheritance_t
EnumMapper::toMergeinfoInheritance(jobject jInheritance)
{
return static_cast<svn_mergeinfo_inheritance_t>(
- getOrdinal(JAVA_PACKAGE"/types/Mergeinfo$Inheritance", jInheritance));
+ getOrdinal(JAVAHL_CLASS("/types/Mergeinfo$Inheritance"), jInheritance));
}
@@ -205,39 +205,39 @@ jobject EnumMapper::mapDepth(svn_depth_t
{
// We're assuming a valid value for the C enum above
// The offset for depths is -2
- return mapEnum(JAVA_PACKAGE"/types/Depth", static_cast<int>(depth) + 2);
+ return mapEnum(JAVAHL_CLASS("/types/Depth"), static_cast<int>(depth) + 2);
}
jobject EnumMapper::mapOperation(svn_wc_operation_t operation)
{
// We're assuming a valid value for the C enum above
- return mapEnum(JAVA_PACKAGE"/ConflictDescriptor$Operation",
+ return mapEnum(JAVAHL_CLASS("/ConflictDescriptor$Operation"),
static_cast<int>(operation));
}
jobject EnumMapper::mapTristate(svn_tristate_t tristate)
{
// We're assuming a valid value for the C enum above
- return mapEnum(JAVA_PACKAGE"/types/Tristate",
+ return mapEnum(JAVAHL_CLASS("/types/Tristate"),
static_cast<int>(tristate - svn_tristate_false));
}
svn_wc_conflict_choice_t EnumMapper::toConflictChoice(jobject jchoice)
{
return static_cast<svn_wc_conflict_choice_t>
- (getOrdinal(JAVA_PACKAGE"/ConflictResult$Choice", jchoice));
+ (getOrdinal(JAVAHL_CLASS("/ConflictResult$Choice"), jchoice));
}
svn_opt_revision_kind EnumMapper::toRevisionKind(jobject jkind)
{
return static_cast<svn_opt_revision_kind>
- (getOrdinal(JAVA_PACKAGE"/types/Revision$Kind", jkind));
+ (getOrdinal(JAVAHL_CLASS("/types/Revision$Kind"), jkind));
}
jobject EnumMapper::mapSummarizeKind(svn_client_diff_summarize_kind_t sKind)
{
// We're assuming a valid value for the C enum above
- return mapEnum(JAVA_PACKAGE"/DiffSummary$DiffKind",
+ return mapEnum(JAVAHL_CLASS("/DiffSummary$DiffKind"),
static_cast<int>(sKind));
}
Modified:
subversion/branches/1.9.x/subversion/bindings/javahl/native/ExternalItem.cpp
URL:
http://svn.apache.org/viewvc/subversion/branches/1.9.x/subversion/bindings/javahl/native/ExternalItem.cpp?rev=1684558&r1=1684557&r2=1684558&view=diff
==============================================================================
---
subversion/branches/1.9.x/subversion/bindings/javahl/native/ExternalItem.cpp
(original)
+++
subversion/branches/1.9.x/subversion/bindings/javahl/native/ExternalItem.cpp
Wed Jun 10 04:00:29 2015
@@ -29,21 +29,22 @@
namespace JavaHL {
const char* const ExternalItem::m_class_name =
- JAVA_PACKAGE"/types/ExternalItem";
+ JAVAHL_CLASS("/types/ExternalItem");
ExternalItem::ClassImpl::ClassImpl(::Java::Env env, jclass cls)
: ::Java::Object::ClassImpl(env, cls),
m_mid_ctor(
env.GetMethodID(cls, "<init>",
"(ZLjava/lang/String;Ljava/lang/String;"
- "L"JAVA_PACKAGE"/types/Revision;"
- "L"JAVA_PACKAGE"/types/Revision;)V")),
+ JAVAHL_ARG("/types/Revision;")
+ JAVAHL_ARG("/types/Revision;")
+ ")V")),
m_fid_target_dir(env.GetFieldID(cls, "targetDir", "Ljava/lang/String;")),
m_fid_url(env.GetFieldID(cls, "url", "Ljava/lang/String;")),
m_fid_revision(env.GetFieldID(cls, "revision",
- "L"JAVA_PACKAGE"/types/Revision;")),
+ JAVAHL_ARG("/types/Revision;"))),
m_fid_peg_revision(env.GetFieldID(cls, "pegRevision",
- "L"JAVA_PACKAGE"/types/Revision;"))
+ JAVAHL_ARG("/types/Revision;")))
{}
ExternalItem::ClassImpl::~ClassImpl() {}
@@ -131,7 +132,7 @@ inline jobject get_static_revision(::Jav
{
return env.GetStaticObjectField(
cls, env.GetStaticFieldID(cls, field_name,
- "L"JAVA_PACKAGE"/types/Revision;"));
+ JAVAHL_ARG("/types/Revision;")));
}
} // anonymous namespace
@@ -145,12 +146,12 @@ jobject Revision::makeJRevision(const sv
if (rev.kind == svn_opt_revision_date)
{
const jclass cls = env.FindClass(
- JAVA_PACKAGE"/types/Revision$DateSpec");
+ JAVAHL_CLASS("/types/Revision$DateSpec"));
return env.NewObject(cls, env.GetMethodID(cls, "<init>", "(J)V"),
jlong(rev.value.date / 1000));
}
- const jclass cls = env.FindClass(JAVA_PACKAGE"/types/Revision");
+ const jclass cls = env.FindClass(JAVAHL_CLASS("/types/Revision"));
switch (rev.kind)
{
case svn_opt_revision_committed:
Modified:
subversion/branches/1.9.x/subversion/bindings/javahl/native/ImportFilterCallback.cpp
URL:
http://svn.apache.org/viewvc/subversion/branches/1.9.x/subversion/bindings/javahl/native/ImportFilterCallback.cpp?rev=1684558&r1=1684557&r2=1684558&view=diff
==============================================================================
---
subversion/branches/1.9.x/subversion/bindings/javahl/native/ImportFilterCallback.cpp
(original)
+++
subversion/branches/1.9.x/subversion/bindings/javahl/native/ImportFilterCallback.cpp
Wed Jun 10 04:00:29 2015
@@ -83,13 +83,14 @@ ImportFilterCallback::doImportFilter(svn
static jmethodID mid = 0;
if (mid == 0)
{
- jclass clazz =
env->FindClass(JAVA_PACKAGE"/callback/ImportFilterCallback");
+ jclass clazz =
env->FindClass(JAVAHL_CLASS("/callback/ImportFilterCallback"));
if (JNIUtil::isJavaExceptionThrown())
POP_AND_RETURN(SVN_NO_ERROR);
mid = env->GetMethodID(clazz, "filter",
"(Ljava/lang/String;"
- "L"JAVA_PACKAGE"/types/NodeKind;Z)Z");
+ JAVAHL_ARG("/types/NodeKind;")
+ "Z)Z");
if (JNIUtil::isJavaExceptionThrown() || mid == 0)
POP_AND_RETURN(SVN_NO_ERROR);
}
Modified:
subversion/branches/1.9.x/subversion/bindings/javahl/native/InfoCallback.cpp
URL:
http://svn.apache.org/viewvc/subversion/branches/1.9.x/subversion/bindings/javahl/native/InfoCallback.cpp?rev=1684558&r1=1684557&r2=1684558&view=diff
==============================================================================
---
subversion/branches/1.9.x/subversion/bindings/javahl/native/InfoCallback.cpp
(original)
+++
subversion/branches/1.9.x/subversion/bindings/javahl/native/InfoCallback.cpp
Wed Jun 10 04:00:29 2015
@@ -80,12 +80,12 @@ InfoCallback::singleInfo(const char *pat
static jmethodID mid = 0;
if (mid == 0)
{
- jclass clazz = env->FindClass(JAVA_PACKAGE"/callback/InfoCallback");
+ jclass clazz = env->FindClass(JAVAHL_CLASS("/callback/InfoCallback"));
if (JNIUtil::isJavaExceptionThrown())
POP_AND_RETURN(SVN_NO_ERROR);
mid = env->GetMethodID(clazz, "singleInfo",
- "(L"JAVA_PACKAGE"/types/Info;)V");
+ "(" JAVAHL_ARG("/types/Info;") ")V");
if (JNIUtil::isJavaExceptionThrown() || mid == 0)
POP_AND_RETURN(SVN_NO_ERROR);
}
Modified:
subversion/branches/1.9.x/subversion/bindings/javahl/native/JNIUtil.cpp
URL:
http://svn.apache.org/viewvc/subversion/branches/1.9.x/subversion/bindings/javahl/native/JNIUtil.cpp?rev=1684558&r1=1684557&r2=1684558&view=diff
==============================================================================
--- subversion/branches/1.9.x/subversion/bindings/javahl/native/JNIUtil.cpp
(original)
+++ subversion/branches/1.9.x/subversion/bindings/javahl/native/JNIUtil.cpp Wed
Jun 10 04:00:29 2015
@@ -517,7 +517,7 @@ jobject construct_Jmessage_stack(const E
if (JNIUtil::isJavaExceptionThrown())
POP_AND_RETURN_NULL;
- jclass clazz = env->FindClass(JAVA_PACKAGE"/ClientException$ErrorMessage");
+ jclass clazz = env->FindClass(JAVAHL_CLASS("/ClientException$ErrorMessage"));
if (JNIUtil::isJavaExceptionThrown())
POP_AND_RETURN_NULL;
mid = env->GetMethodID(clazz, "<init>",
@@ -606,7 +606,7 @@ void JNIUtil::wrappedHandleSVNError(svn_
if (JNIUtil::isJavaExceptionThrown())
return;
- jclass clazz = env->FindClass(JAVA_PACKAGE "/ClientException");
+ jclass clazz = env->FindClass(JAVAHL_CLASS("/ClientException"));
if (isJavaExceptionThrown())
POP_AND_RETURN_NOTHING();
Modified: subversion/branches/1.9.x/subversion/bindings/javahl/native/JNIUtil.h
URL:
http://svn.apache.org/viewvc/subversion/branches/1.9.x/subversion/bindings/javahl/native/JNIUtil.h?rev=1684558&r1=1684557&r2=1684558&view=diff
==============================================================================
--- subversion/branches/1.9.x/subversion/bindings/javahl/native/JNIUtil.h
(original)
+++ subversion/branches/1.9.x/subversion/bindings/javahl/native/JNIUtil.h Wed
Jun 10 04:00:29 2015
@@ -38,13 +38,28 @@ class SVNBase;
#include <apr_time.h>
#include <string>
#include <vector>
+
struct svn_error_t;
+struct svn_string_t;
#include "svn_error.h"
-#define JAVA_PACKAGE "org/apache/subversion/javahl"
-struct svn_string_t;
+/**
+ * The name of the package in which the JavaHL classes are defined.
+ */
+#define JAVAHL_PACKAGE "org/apache/subversion/javahl"
+
+/**
+ * Construct a JavaHL class name for JNIEnv::FindClass.
+ */
+#define JAVAHL_CLASS(name) JAVAHL_PACKAGE name
+
+/**
+ * Construct a JavaHL class parameter name for JNIEnv::GetMethodID & co.
+ */
+#define JAVAHL_ARG(name) "L" JAVAHL_PACKAGE name
+
/**
* Class to hold a number of JNI related utility methods. No Objects
@@ -146,7 +161,7 @@ class JNIUtil
*/
static void throwError(const char *message)
{
- raiseThrowable(JAVA_PACKAGE"/JNIError", message);
+ raiseThrowable(JAVAHL_CLASS("/JNIError"), message);
}
static apr_pool_t *getPool();
Modified:
subversion/branches/1.9.x/subversion/bindings/javahl/native/ListCallback.cpp
URL:
http://svn.apache.org/viewvc/subversion/branches/1.9.x/subversion/bindings/javahl/native/ListCallback.cpp?rev=1684558&r1=1684557&r2=1684558&view=diff
==============================================================================
---
subversion/branches/1.9.x/subversion/bindings/javahl/native/ListCallback.cpp
(original)
+++
subversion/branches/1.9.x/subversion/bindings/javahl/native/ListCallback.cpp
Wed Jun 10 04:00:29 2015
@@ -87,13 +87,13 @@ ListCallback::doList(const char *path,
static jmethodID mid = 0;
if (mid == 0)
{
- jclass clazz = env->FindClass(JAVA_PACKAGE"/callback/ListCallback");
+ jclass clazz = env->FindClass(JAVAHL_CLASS("/callback/ListCallback"));
if (JNIUtil::isJavaExceptionThrown())
POP_AND_RETURN(SVN_NO_ERROR);
mid = env->GetMethodID(clazz, "doEntry",
- "(L"JAVA_PACKAGE"/types/DirEntry;"
- "L"JAVA_PACKAGE"/types/Lock;)V");
+ "(" JAVAHL_ARG("/types/DirEntry;")
+ JAVAHL_ARG("/types/Lock;") ")V");
if (JNIUtil::isJavaExceptionThrown() || mid == 0)
POP_AND_RETURN(SVN_NO_ERROR);
}
Modified:
subversion/branches/1.9.x/subversion/bindings/javahl/native/LockTokenTable.cpp
URL:
http://svn.apache.org/viewvc/subversion/branches/1.9.x/subversion/bindings/javahl/native/LockTokenTable.cpp?rev=1684558&r1=1684557&r2=1684558&view=diff
==============================================================================
---
subversion/branches/1.9.x/subversion/bindings/javahl/native/LockTokenTable.cpp
(original)
+++
subversion/branches/1.9.x/subversion/bindings/javahl/native/LockTokenTable.cpp
Wed Jun 10 04:00:29 2015
@@ -64,7 +64,7 @@ LockTokenTable::LockTokenTable(jobject j
{
JNIEnv *env = JNIUtil::getEnv();
- jclass lock_cls = env->FindClass(JAVA_PACKAGE"/types/Lock");
+ jclass lock_cls = env->FindClass(JAVAHL_CLASS("/types/Lock"));
if (JNIUtil::isExceptionThrown())
return;
Modified:
subversion/branches/1.9.x/subversion/bindings/javahl/native/LogMessageCallback.cpp
URL:
http://svn.apache.org/viewvc/subversion/branches/1.9.x/subversion/bindings/javahl/native/LogMessageCallback.cpp?rev=1684558&r1=1684557&r2=1684558&view=diff
==============================================================================
---
subversion/branches/1.9.x/subversion/bindings/javahl/native/LogMessageCallback.cpp
(original)
+++
subversion/branches/1.9.x/subversion/bindings/javahl/native/LogMessageCallback.cpp
Wed Jun 10 04:00:29 2015
@@ -81,7 +81,7 @@ LogMessageCallback::singleMessage(svn_lo
static jmethodID sm_mid = 0;
if (sm_mid == 0)
{
- jclass clazz =
env->FindClass(JAVA_PACKAGE"/callback/LogMessageCallback");
+ jclass clazz =
env->FindClass(JAVAHL_CLASS("/callback/LogMessageCallback"));
if (JNIUtil::isJavaExceptionThrown())
POP_AND_RETURN(SVN_NO_ERROR);
Modified:
subversion/branches/1.9.x/subversion/bindings/javahl/native/MessageReceiver.cpp
URL:
http://svn.apache.org/viewvc/subversion/branches/1.9.x/subversion/bindings/javahl/native/MessageReceiver.cpp?rev=1684558&r1=1684557&r2=1684558&view=diff
==============================================================================
---
subversion/branches/1.9.x/subversion/bindings/javahl/native/MessageReceiver.cpp
(original)
+++
subversion/branches/1.9.x/subversion/bindings/javahl/native/MessageReceiver.cpp
Wed Jun 10 04:00:29 2015
@@ -58,7 +58,7 @@ void MessageReceiver::receiveMessage(con
static jmethodID mid = 0;
if (mid == 0)
{
- jclass clazz = env->FindClass(JAVA_PACKAGE"/ISVNAdmin$MessageReceiver");
+ jclass clazz =
env->FindClass(JAVAHL_CLASS("/ISVNAdmin$MessageReceiver"));
if (JNIUtil::isJavaExceptionThrown())
return;
Modified:
subversion/branches/1.9.x/subversion/bindings/javahl/native/NativeStream.cpp
URL:
http://svn.apache.org/viewvc/subversion/branches/1.9.x/subversion/bindings/javahl/native/NativeStream.cpp?rev=1684558&r1=1684557&r2=1684558&view=diff
==============================================================================
---
subversion/branches/1.9.x/subversion/bindings/javahl/native/NativeStream.cpp
(original)
+++
subversion/branches/1.9.x/subversion/bindings/javahl/native/NativeStream.cpp
Wed Jun 10 04:00:29 2015
@@ -33,7 +33,7 @@ namespace JavaHL {
// Class JavaHL::NativeInputStream
const char* const NativeInputStream::m_class_name =
- JAVA_PACKAGE "/types/NativeInputStream";
+ JAVAHL_CLASS("/types/NativeInputStream");
NativeInputStream::~NativeInputStream() {}
@@ -144,7 +144,7 @@ void NativeInputStream::dispose(jobject
// Class JavaHL::NativeOutputStream
const char* const NativeOutputStream::m_class_name =
- JAVA_PACKAGE "/types/NativeOutputStream";
+ JAVAHL_CLASS("/types/NativeOutputStream");
NativeOutputStream::~NativeOutputStream() {}
Modified:
subversion/branches/1.9.x/subversion/bindings/javahl/native/OperationContext.cpp
URL:
http://svn.apache.org/viewvc/subversion/branches/1.9.x/subversion/bindings/javahl/native/OperationContext.cpp?rev=1684558&r1=1684557&r2=1684558&view=diff
==============================================================================
---
subversion/branches/1.9.x/subversion/bindings/javahl/native/OperationContext.cpp
(original)
+++
subversion/branches/1.9.x/subversion/bindings/javahl/native/OperationContext.cpp
Wed Jun 10 04:00:29 2015
@@ -388,13 +388,13 @@ OperationContext::progress(apr_off_t pro
POP_AND_RETURN_NOTHING();
mid = env->GetMethodID(clazz, "onProgress",
- "(L"JAVA_PACKAGE"/ProgressEvent;)V");
+ "(" JAVAHL_ARG("/ProgressEvent;") ")V");
if (JNIUtil::isJavaExceptionThrown() || mid == 0)
POP_AND_RETURN_NOTHING();
}
static jmethodID midCT = 0;
- jclass clazz = env->FindClass(JAVA_PACKAGE"/ProgressEvent");
+ jclass clazz = env->FindClass(JAVAHL_CLASS("/ProgressEvent"));
if (JNIUtil::isJavaExceptionThrown())
POP_AND_RETURN_NOTHING();
@@ -443,16 +443,16 @@ OperationContext::notifyConfigLoad()
static jmethodID onload_mid = 0;
if (0 == onload_mid)
{
- jclass cls = env->FindClass(JAVA_PACKAGE"/callback/ConfigEvent");
+ jclass cls = env->FindClass(JAVAHL_CLASS("/callback/ConfigEvent"));
if (JNIUtil::isJavaExceptionThrown())
return;
onload_mid = env->GetMethodID(cls, "onLoad",
- "(L"JAVA_PACKAGE"/ISVNConfig;)V");
+ "(" JAVAHL_ARG("/ISVNConfig;") ")V");
if (JNIUtil::isJavaExceptionThrown())
return;
}
- jclass cfg_cls = env->FindClass(JAVA_PACKAGE"/util/ConfigImpl");
+ jclass cfg_cls = env->FindClass(JAVAHL_CLASS("/util/ConfigImpl"));
if (JNIUtil::isJavaExceptionThrown())
return;
@@ -528,11 +528,11 @@ jobject create_Channel(const char *class
jobject create_RequestChannel(JNIEnv *env, apr_file_t *fd)
{
- return create_Channel(JAVA_PACKAGE"/util/RequestChannel", env, fd);
+ return create_Channel(JAVAHL_CLASS("/util/RequestChannel"), env, fd);
}
jobject create_ResponseChannel(JNIEnv *env, apr_file_t *fd)
{
- return create_Channel(JAVA_PACKAGE"/util/ResponseChannel", env, fd);
+ return create_Channel(JAVAHL_CLASS("/util/ResponseChannel"), env, fd);
}
} // anonymous namespace
@@ -548,7 +548,7 @@ OperationContext::checkTunnel(void *tunn
static jmethodID mid = 0;
if (0 == mid)
{
- jclass cls = env->FindClass(JAVA_PACKAGE"/callback/TunnelAgent");
+ jclass cls = env->FindClass(JAVAHL_CLASS("/callback/TunnelAgent"));
if (JNIUtil::isJavaExceptionThrown())
return false;
mid = env->GetMethodID(cls, "checkTunnel",
@@ -608,7 +608,7 @@ OperationContext::openTunnel(svn_stream_
static jmethodID mid = 0;
if (0 == mid)
{
- jclass cls = env->FindClass(JAVA_PACKAGE"/callback/TunnelAgent");
+ jclass cls = env->FindClass(JAVAHL_CLASS("/callback/TunnelAgent"));
SVN_JNI_CATCH(, SVN_ERR_BASE);
SVN_JNI_CATCH(
mid = env->GetMethodID(
@@ -618,7 +618,7 @@ OperationContext::openTunnel(svn_stream_
"Ljava/lang/String;"
"Ljava/lang/String;"
"Ljava/lang/String;I)"
- "L"JAVA_PACKAGE"/callback/TunnelAgent$CloseTunnelCallback;"),
+ JAVAHL_ARG("/callback/TunnelAgent$CloseTunnelCallback;")),
SVN_ERR_BASE);
}
@@ -650,7 +650,7 @@ OperationContext::closeTunnel(void *tunn
jclass cls;
SVN_JNI_CATCH_VOID(
cls= env->FindClass(
- JAVA_PACKAGE"/callback/TunnelAgent$CloseTunnelCallback"));
+ JAVAHL_CLASS("/callback/TunnelAgent$CloseTunnelCallback")));
SVN_JNI_CATCH_VOID(mid = env->GetMethodID(cls, "closeTunnel", "()V"));
}
SVN_JNI_CATCH_VOID(env->CallVoidMethod(jclosecb, mid));
Modified:
subversion/branches/1.9.x/subversion/bindings/javahl/native/PatchCallback.cpp
URL:
http://svn.apache.org/viewvc/subversion/branches/1.9.x/subversion/bindings/javahl/native/PatchCallback.cpp?rev=1684558&r1=1684557&r2=1684558&view=diff
==============================================================================
---
subversion/branches/1.9.x/subversion/bindings/javahl/native/PatchCallback.cpp
(original)
+++
subversion/branches/1.9.x/subversion/bindings/javahl/native/PatchCallback.cpp
Wed Jun 10 04:00:29 2015
@@ -80,7 +80,7 @@ PatchCallback::singlePatch(svn_boolean_t
static jmethodID mid = 0;
if (mid == 0)
{
- jclass clazz = env->FindClass(JAVA_PACKAGE"/callback/PatchCallback");
+ jclass clazz = env->FindClass(JAVAHL_CLASS("/callback/PatchCallback"));
if (JNIUtil::isJavaExceptionThrown())
POP_AND_RETURN(SVN_NO_ERROR);
Modified:
subversion/branches/1.9.x/subversion/bindings/javahl/native/PropertyTable.cpp
URL:
http://svn.apache.org/viewvc/subversion/branches/1.9.x/subversion/bindings/javahl/native/PropertyTable.cpp?rev=1684558&r1=1684557&r2=1684558&view=diff
==============================================================================
---
subversion/branches/1.9.x/subversion/bindings/javahl/native/PropertyTable.cpp
(original)
+++
subversion/branches/1.9.x/subversion/bindings/javahl/native/PropertyTable.cpp
Wed Jun 10 04:00:29 2015
@@ -58,7 +58,7 @@ apr_hash_t *PropertyTable::hash(const SV
const char *msg = apr_psprintf(pool.getPool(),
"Invalid property name: '%s'",
propname);
- JNIUtil::throwNativeException(JAVA_PACKAGE "/ClientException", msg,
+ JNIUtil::throwNativeException(JAVAHL_CLASS("/ClientException"), msg,
NULL, SVN_ERR_CLIENT_PROPERTY_NAME);
return NULL;
}
Modified:
subversion/branches/1.9.x/subversion/bindings/javahl/native/ProplistCallback.cpp
URL:
http://svn.apache.org/viewvc/subversion/branches/1.9.x/subversion/bindings/javahl/native/ProplistCallback.cpp?rev=1684558&r1=1684557&r2=1684558&view=diff
==============================================================================
---
subversion/branches/1.9.x/subversion/bindings/javahl/native/ProplistCallback.cpp
(original)
+++
subversion/branches/1.9.x/subversion/bindings/javahl/native/ProplistCallback.cpp
Wed Jun 10 04:00:29 2015
@@ -89,7 +89,7 @@ svn_error_t *ProplistCallback::singlePat
static volatile jmethodID mid = 0;
if (mid == 0)
{
- jclass clazz = env->FindClass(JAVA_PACKAGE"/callback/ProplistCallback");
+ jclass clazz =
env->FindClass(JAVAHL_CLASS("/callback/ProplistCallback"));
if (JNIUtil::isJavaExceptionThrown())
return SVN_NO_ERROR;
@@ -142,7 +142,7 @@ svn_error_t *ProplistCallback::singlePat
static jmethodID mid = 0;
if (mid == 0)
{
- jclass clazz =
env->FindClass(JAVA_PACKAGE"/callback/InheritedProplistCallback");
+ jclass clazz =
env->FindClass(JAVAHL_CLASS("/callback/InheritedProplistCallback"));
if (JNIUtil::isJavaExceptionThrown())
return SVN_NO_ERROR;
Modified:
subversion/branches/1.9.x/subversion/bindings/javahl/native/RemoteSession.cpp
URL:
http://svn.apache.org/viewvc/subversion/branches/1.9.x/subversion/bindings/javahl/native/RemoteSession.cpp?rev=1684558&r1=1684557&r2=1684558&view=diff
==============================================================================
---
subversion/branches/1.9.x/subversion/bindings/javahl/native/RemoteSession.cpp
(original)
+++
subversion/branches/1.9.x/subversion/bindings/javahl/native/RemoteSession.cpp
Wed Jun 10 04:00:29 2015
@@ -52,7 +52,7 @@
#include <apr_strings.h>
#include "svn_private_config.h"
-#define JAVA_CLASS_REMOTE_SESSION JAVA_PACKAGE "/remote/RemoteSession"
+#define JAVA_CLASS_REMOTE_SESSION JAVAHL_CLASS("/remote/RemoteSession")
RemoteSession *
RemoteSession::getCppObject(jobject jthis)
@@ -226,7 +226,7 @@ RemoteSession::RemoteSession(int retryAt
corrected_url));
jclass excls = env->FindClass(
- JAVA_PACKAGE "/SubversionException");
+ JAVAHL_CLASS("/SubversionException"));
if (JNIUtil::isJavaExceptionThrown())
return;
@@ -256,7 +256,7 @@ RemoteSession::RemoteSession(int retryAt
return;
jclass excls = env->FindClass(
- JAVA_PACKAGE "/remote/RetryOpenSession");
+ JAVAHL_CLASS("/remote/RetryOpenSession"));
if (JNIUtil::isJavaExceptionThrown())
return;
@@ -542,7 +542,7 @@ void fill_dirents(const char* base_url,
static jfieldID path_fid = 0;
if (path_fid == 0)
{
- jclass clazz = env->FindClass(JAVA_PACKAGE "/types/DirEntry");
+ jclass clazz = env->FindClass(JAVAHL_CLASS("/types/DirEntry"));
if (JNIUtil::isJavaExceptionThrown())
POP_AND_RETURN_NOTHING();
@@ -1089,7 +1089,7 @@ public:
return;
m_call_mid = env->GetMethodID(
- cls, "doSegment", "(L"JAVA_PACKAGE"/ISVNRemote$LocationSegment;)V");
+ cls, "doSegment", "(" JAVAHL_ARG("/ISVNRemote$LocationSegment;")
")V");
if (JNIUtil::isJavaExceptionThrown())
return;
}
@@ -1098,7 +1098,7 @@ private:
void call(svn_location_segment_t* segment)
{
JNIEnv* env = JNIUtil::getEnv();
- jclass cls = env->FindClass(JAVA_PACKAGE"/ISVNRemote$LocationSegment");
+ jclass cls = env->FindClass(JAVAHL_CLASS("/ISVNRemote$LocationSegment"));
if (JNIUtil::isJavaExceptionThrown())
return;
@@ -1193,7 +1193,7 @@ public:
return;
m_call_mid = env->GetMethodID(
- cls, "doRevision", "(L"JAVA_PACKAGE"/ISVNRemote$FileRevision;)V");
+ cls, "doRevision", "(" JAVAHL_ARG("/ISVNRemote$FileRevision;") ")V");
if (JNIUtil::isJavaExceptionThrown())
return;
}
@@ -1207,7 +1207,7 @@ private:
apr_pool_t* scratch_pool)
{
JNIEnv* env = JNIUtil::getEnv();
- jclass cls = env->FindClass(JAVA_PACKAGE"/ISVNRemote$FileRevision");
+ jclass cls = env->FindClass(JAVAHL_CLASS("/ISVNRemote$FileRevision"));
if (JNIUtil::isJavaExceptionThrown())
return;
Modified:
subversion/branches/1.9.x/subversion/bindings/javahl/native/RemoteSessionContext.cpp
URL:
http://svn.apache.org/viewvc/subversion/branches/1.9.x/subversion/bindings/javahl/native/RemoteSessionContext.cpp?rev=1684558&r1=1684557&r2=1684558&view=diff
==============================================================================
---
subversion/branches/1.9.x/subversion/bindings/javahl/native/RemoteSessionContext.cpp
(original)
+++
subversion/branches/1.9.x/subversion/bindings/javahl/native/RemoteSessionContext.cpp
Wed Jun 10 04:00:29 2015
@@ -90,7 +90,7 @@ void RemoteSessionContext::activate(jobj
*/
static jfieldID ctxFieldID = 0;
attachJavaObject(jremoteSession,
- "L"JAVA_PACKAGE"/remote/RemoteSession$RemoteSessionContext;",
+ JAVAHL_ARG("/remote/RemoteSession$RemoteSessionContext;"),
"sessionContext", &ctxFieldID);
/*
@@ -104,7 +104,7 @@ void RemoteSessionContext::activate(jobj
jmethodID mid = env->GetMethodID(
clazz, "setProgressCallback",
- "(L"JAVA_PACKAGE"/callback/ProgressCallback;)V");
+ "(" JAVAHL_ARG("/callback/ProgressCallback;") ")V");
if (JNIUtil::isJavaExceptionThrown() || mid == 0)
return;
Modified:
subversion/branches/1.9.x/subversion/bindings/javahl/native/ReposFreezeAction.cpp
URL:
http://svn.apache.org/viewvc/subversion/branches/1.9.x/subversion/bindings/javahl/native/ReposFreezeAction.cpp?rev=1684558&r1=1684557&r2=1684558&view=diff
==============================================================================
---
subversion/branches/1.9.x/subversion/bindings/javahl/native/ReposFreezeAction.cpp
(original)
+++
subversion/branches/1.9.x/subversion/bindings/javahl/native/ReposFreezeAction.cpp
Wed Jun 10 04:00:29 2015
@@ -39,7 +39,7 @@ svn_error_t* ReposFreezeAction::invoke()
static volatile jmethodID mid = 0;
if (!mid)
{
- jclass cls = env->FindClass(JAVA_PACKAGE"/callback/ReposFreezeAction");
+ jclass cls = env->FindClass(JAVAHL_CLASS("/callback/ReposFreezeAction"));
if (!JNIUtil::isJavaExceptionThrown())
mid = env->GetMethodID(cls, "invoke", "()V");
}
Modified:
subversion/branches/1.9.x/subversion/bindings/javahl/native/ReposNotifyCallback.cpp
URL:
http://svn.apache.org/viewvc/subversion/branches/1.9.x/subversion/bindings/javahl/native/ReposNotifyCallback.cpp?rev=1684558&r1=1684557&r2=1684558&view=diff
==============================================================================
---
subversion/branches/1.9.x/subversion/bindings/javahl/native/ReposNotifyCallback.cpp
(original)
+++
subversion/branches/1.9.x/subversion/bindings/javahl/native/ReposNotifyCallback.cpp
Wed Jun 10 04:00:29 2015
@@ -69,12 +69,12 @@ ReposNotifyCallback::onNotify(const svn_
static jmethodID mid = 0;
if (mid == 0)
{
- jclass clazz =
env->FindClass(JAVA_PACKAGE"/callback/ReposNotifyCallback");
+ jclass clazz =
env->FindClass(JAVAHL_CLASS("/callback/ReposNotifyCallback"));
if (JNIUtil::isJavaExceptionThrown())
return;
mid = env->GetMethodID(clazz, "onNotify",
- "(L"JAVA_PACKAGE"/ReposNotifyInformation;)V");
+ "(" JAVAHL_ARG("/ReposNotifyInformation;") ")V");
if (JNIUtil::isJavaExceptionThrown() || mid == 0)
return;
Modified:
subversion/branches/1.9.x/subversion/bindings/javahl/native/Revision.cpp
URL:
http://svn.apache.org/viewvc/subversion/branches/1.9.x/subversion/bindings/javahl/native/Revision.cpp?rev=1684558&r1=1684557&r2=1684558&view=diff
==============================================================================
--- subversion/branches/1.9.x/subversion/bindings/javahl/native/Revision.cpp
(original)
+++ subversion/branches/1.9.x/subversion/bindings/javahl/native/Revision.cpp
Wed Jun 10 04:00:29 2015
@@ -57,12 +57,12 @@ Revision::Revision(jobject jthis, bool h
static jfieldID fid = 0;
if (fid == 0)
{
- jclass clazz = env->FindClass(JAVA_PACKAGE"/types/Revision");
+ jclass clazz = env->FindClass(JAVAHL_CLASS("/types/Revision"));
if (JNIUtil::isJavaExceptionThrown())
POP_AND_RETURN_NOTHING();
fid = env->GetFieldID(clazz, "revKind",
- "L"JAVA_PACKAGE"/types/Revision$Kind;");
+ JAVAHL_ARG("/types/Revision$Kind;"));
if (JNIUtil::isJavaExceptionThrown())
POP_AND_RETURN_NOTHING();
}
@@ -81,7 +81,7 @@ Revision::Revision(jobject jthis, bool h
if (fidNum == 0)
{
jclass clazz =
- env->FindClass(JAVA_PACKAGE"/types/Revision$Number");
+ env->FindClass(JAVAHL_CLASS("/types/Revision$Number"));
if (JNIUtil::isJavaExceptionThrown())
POP_AND_RETURN_NOTHING();
@@ -99,7 +99,7 @@ Revision::Revision(jobject jthis, bool h
if (fidDate == 0)
{
jclass clazz =
- env->FindClass(JAVA_PACKAGE"/types/Revision$DateSpec");
+ env->FindClass(JAVAHL_CLASS("/types/Revision$DateSpec"));
if (JNIUtil::isJavaExceptionThrown())
POP_AND_RETURN_NOTHING();
@@ -158,7 +158,7 @@ jobject
Revision::makeJRevision(svn_revnum_t rev)
{
JNIEnv *env = JNIUtil::getEnv();
- jclass clazz = env->FindClass(JAVA_PACKAGE "/types/Revision");
+ jclass clazz = env->FindClass(JAVAHL_CLASS("/types/Revision"));
if (JNIUtil::isJavaExceptionThrown())
return NULL;
@@ -166,7 +166,7 @@ Revision::makeJRevision(svn_revnum_t rev
if (getInstance == 0)
{
getInstance = env->GetStaticMethodID(clazz, "getInstance",
- "(J)L" JAVA_PACKAGE
"/types/Revision;");
+ "(J)"
JAVAHL_ARG("/types/Revision;"));
if (JNIUtil::isExceptionThrown())
return NULL;
}
Modified:
subversion/branches/1.9.x/subversion/bindings/javahl/native/RevisionRange.cpp
URL:
http://svn.apache.org/viewvc/subversion/branches/1.9.x/subversion/bindings/javahl/native/RevisionRange.cpp?rev=1684558&r1=1684557&r2=1684558&view=diff
==============================================================================
---
subversion/branches/1.9.x/subversion/bindings/javahl/native/RevisionRange.cpp
(original)
+++
subversion/branches/1.9.x/subversion/bindings/javahl/native/RevisionRange.cpp
Wed Jun 10 04:00:29 2015
@@ -52,7 +52,7 @@ void get_range_info(jobject jrange,
{
JNIEnv *env = JNIUtil::getEnv();
- jclass clazz = env->FindClass(JAVA_PACKAGE"/types/RevisionRange");
+ jclass clazz = env->FindClass(JAVAHL_CLASS("/types/RevisionRange"));
if (JNIUtil::isExceptionThrown())
return;
@@ -63,7 +63,7 @@ void get_range_info(jobject jrange,
if (fmid == 0)
{
fmid = env->GetMethodID(clazz, "getFromRevision",
- "()L"JAVA_PACKAGE"/types/Revision;");
+ "()" JAVAHL_ARG("/types/Revision;"));
if (JNIUtil::isJavaExceptionThrown())
return;
}
@@ -87,7 +87,7 @@ void get_range_info(jobject jrange,
if (tmid == 0)
{
tmid = env->GetMethodID(clazz, "getToRevision",
- "()L"JAVA_PACKAGE"/types/Revision;");
+ "()" JAVAHL_ARG("/types/Revision;"));
if (JNIUtil::isJavaExceptionThrown())
return;
}
@@ -163,7 +163,7 @@ RevisionRange::makeJRevisionRange(svn_me
{
JNIEnv *env = JNIUtil::getEnv();
- jclass rangeClazz = env->FindClass(JAVA_PACKAGE "/types/RevisionRange");
+ jclass rangeClazz = env->FindClass(JAVAHL_CLASS("/types/RevisionRange"));
if (JNIUtil::isJavaExceptionThrown())
return NULL;
static jmethodID rangeCtor = 0;
