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/09/16 19:25:28 UTC
svn commit: r997855 - /subversion/branches/object-model/subversion/bindings/javahl/native/

Author: hwright
Date: Thu Sep 16 17:25:27 2010
New Revision: 997855

URL: http://svn.apache.org/viewvc?rev=997855&view=rev
Log:
On the object-model branch:
In the same vein as r997712, rename another JavaHL header file to not conflict
with one in the C++ bindings.

* subversion/bindings/javahl/native/CopySources.cpp,
  subversion/bindings/javahl/native/Revision.cpp,
  subversion/bindings/javahl/native/SVNClient.cpp,
  subversion/bindings/javahl/native/RevisionRange.cpp,
  subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNRepos.cpp,
  subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp,
  subversion/bindings/javahl/native/SVNRepos.h:
    Update references.

* subversion/bindings/javahl/native/Revision.h:
  Rename from this...

* subversion/bindings/javahl/native/JNIRevision.h:
  ...to this.

Added:
    subversion/branches/object-model/subversion/bindings/javahl/native/JNIRevision.h
      - copied unchanged from r997844, subversion/branches/object-model/subversion/bindings/javahl/native/Revision.h
Removed:
    subversion/branches/object-model/subversion/bindings/javahl/native/Revision.h
Modified:
    subversion/branches/object-model/subversion/bindings/javahl/native/CopySources.cpp
    subversion/branches/object-model/subversion/bindings/javahl/native/Revision.cpp
    subversion/branches/object-model/subversion/bindings/javahl/native/RevisionRange.cpp
    subversion/branches/object-model/subversion/bindings/javahl/native/SVNClient.cpp
    subversion/branches/object-model/subversion/bindings/javahl/native/SVNRepos.h
    subversion/branches/object-model/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp
    subversion/branches/object-model/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNRepos.cpp

Modified: subversion/branches/object-model/subversion/bindings/javahl/native/CopySources.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/object-model/subversion/bindings/javahl/native/CopySources.cpp?rev=997855&r1=997854&r2=997855&view=diff
==============================================================================
--- subversion/branches/object-model/subversion/bindings/javahl/native/CopySources.cpp (original)
+++ subversion/branches/object-model/subversion/bindings/javahl/native/CopySources.cpp Thu Sep 16 17:25:27 2010
@@ -30,7 +30,7 @@
 #include "JNIPool.h"
 #include "JNIUtil.h"
 #include "JNIStringHolder.h"
-#include "Revision.h"
+#include "JNIRevision.h"
 #include "CopySources.h"
 
 CopySources::CopySources(Array &copySources)

Modified: subversion/branches/object-model/subversion/bindings/javahl/native/Revision.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/object-model/subversion/bindings/javahl/native/Revision.cpp?rev=997855&r1=997854&r2=997855&view=diff
==============================================================================
--- subversion/branches/object-model/subversion/bindings/javahl/native/Revision.cpp (original)
+++ subversion/branches/object-model/subversion/bindings/javahl/native/Revision.cpp Thu Sep 16 17:25:27 2010
@@ -24,7 +24,7 @@
  * @brief Implementation of the class Revision
  */
 
-#include "Revision.h"
+#include "JNIRevision.h"
 #include "JNIUtil.h"
 #include "EnumMapper.h"
 

Modified: subversion/branches/object-model/subversion/bindings/javahl/native/RevisionRange.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/object-model/subversion/bindings/javahl/native/RevisionRange.cpp?rev=997855&r1=997854&r2=997855&view=diff
==============================================================================
--- subversion/branches/object-model/subversion/bindings/javahl/native/RevisionRange.cpp (original)
+++ subversion/branches/object-model/subversion/bindings/javahl/native/RevisionRange.cpp Thu Sep 16 17:25:27 2010
@@ -30,7 +30,7 @@
 
 #include "JNIUtil.h"
 #include "RevisionRange.h"
-#include "Revision.h"
+#include "JNIRevision.h"
 #include "JNIPool.h"
 
 RevisionRange::RevisionRange(jobject jrevisionRange)

Modified: subversion/branches/object-model/subversion/bindings/javahl/native/SVNClient.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/object-model/subversion/bindings/javahl/native/SVNClient.cpp?rev=997855&r1=997854&r2=997855&view=diff
==============================================================================
--- subversion/branches/object-model/subversion/bindings/javahl/native/SVNClient.cpp (original)
+++ subversion/branches/object-model/subversion/bindings/javahl/native/SVNClient.cpp Thu Sep 16 17:25:27 2010
@@ -32,7 +32,7 @@
 #include "Prompter.h"
 #include "JNIPool.h"
 #include "Targets.h"
-#include "Revision.h"
+#include "JNIRevision.h"
 #include "RevisionRange.h"
 #include "BlameCallback.h"
 #include "ProplistCallback.h"

Modified: subversion/branches/object-model/subversion/bindings/javahl/native/SVNRepos.h
URL: http://svn.apache.org/viewvc/subversion/branches/object-model/subversion/bindings/javahl/native/SVNRepos.h?rev=997855&r1=997854&r2=997855&view=diff
==============================================================================
--- subversion/branches/object-model/subversion/bindings/javahl/native/SVNRepos.h (original)
+++ subversion/branches/object-model/subversion/bindings/javahl/native/SVNRepos.h Thu Sep 16 17:25:27 2010
@@ -30,7 +30,7 @@
 #include <jni.h>
 #include "svn_repos.h"
 #include "SVNBase.h"
-#include "Revision.h"
+#include "JNIRevision.h"
 #include "OutputStream.h"
 #include "InputStream.h"
 #include "MessageReceiver.h"

Modified: subversion/branches/object-model/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/object-model/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp?rev=997855&r1=997854&r2=997855&view=diff
==============================================================================
--- subversion/branches/object-model/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp (original)
+++ subversion/branches/object-model/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp Thu Sep 16 17:25:27 2010
@@ -30,7 +30,7 @@
 #include "JNIStringHolder.h"
 #include "JNIByteArray.h"
 #include "SVNClient.h"
-#include "Revision.h"
+#include "JNIRevision.h"
 #include "RevisionRange.h"
 #include "EnumMapper.h"
 #include "CommitMessage.h"

Modified: subversion/branches/object-model/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNRepos.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/object-model/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNRepos.cpp?rev=997855&r1=997854&r2=997855&view=diff
==============================================================================
--- subversion/branches/object-model/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNRepos.cpp (original)
+++ subversion/branches/object-model/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNRepos.cpp Thu Sep 16 17:25:27 2010
@@ -31,7 +31,7 @@
 #include "JNIByteArray.h"
 #include "SVNRepos.h"
 #include "EnumMapper.h"
-#include "Revision.h"
+#include "JNIRevision.h"
 #include "InputStream.h"
 #include "OutputStream.h"
 #include "MessageReceiver.h"