Author: vmpn
Date: Fri May 25 15:12:56 2012
New Revision: 1342676
URL: http://svn.apache.org/viewvc?rev=1342676&view=rev
Log:
On the javahl-ra branch:
Brought RA implementation up to date with changes merged from trunk in r1329205
[in subversion/bindings/javahl/native]
* SVNReposAccess.cpp
(SVNReposAccess): Drop the global pool mutex as it is not necessary, as
per r1154119
(getDatedRev, getLocks, checkPath): Use getPool() instead of pool as per
r1154155
[in subversion/bindings/javahl/src/org/apache/subversion/javahl/]
* ISVNReposAccess.java, SVNReposAccess.java: Added imports for
org.apache.subversion.javahl.types.* because classes moved from the
org.apache.subversion.javahl package
[in subversion/bindings/javahl/test/org/apache/subversion/javahl/]
* SVNRATests.java: Added imports for org.apache.subversion.javahl.types.*
because classes moved from the org.apache.subversion.javahl package
Modified:
subversion/branches/javahl-ra/subversion/bindings/javahl/native/SVNReposAccess.cpp
subversion/branches/javahl-ra/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNReposAccess.java
subversion/branches/javahl-ra/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNReposAccess.java
subversion/branches/javahl-ra/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNRATests.java
Modified:
subversion/branches/javahl-ra/subversion/bindings/javahl/native/SVNReposAccess.cpp
URL:
http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/bindings/javahl/native/SVNReposAccess.cpp?rev=1342676&r1=1342675&r2=1342676&view=diff
==============================================================================
---
subversion/branches/javahl-ra/subversion/bindings/javahl/native/SVNReposAccess.cpp
(original)
+++
subversion/branches/javahl-ra/subversion/bindings/javahl/native/SVNReposAccess.cpp
Fri May 25 15:12:56 2012
@@ -36,7 +36,6 @@
SVNReposAccess::SVNReposAccess(const char *repos_url)
{
- JNICriticalSection criticalSection(*JNIUtil::getGlobalPoolMutex());
m_sess_pool = svn_pool_create(JNIUtil::getPool());
svn_ra_callbacks2_t *cbtable =
@@ -74,7 +73,7 @@ SVNReposAccess::getDatedRev(apr_time_t t
svn_revnum_t rev;
SVN_JNI_ERR(svn_ra_get_dated_revision(m_ra_session, &rev, tm,
- requestPool.pool()),
+ requestPool.getPool()),
SVN_INVALID_REVNUM);
return rev;
@@ -87,10 +86,10 @@ SVNReposAccess::getLocks(const char *pat
apr_hash_t *locks;
SVN_JNI_ERR(svn_ra_get_locks2(m_ra_session, &locks, path, depth,
- requestPool.pool()),
+ requestPool.getPool()),
NULL);
- return CreateJ::LockMap(locks, requestPool.pool());
+ return CreateJ::LockMap(locks, requestPool.getPool());
}
jobject
@@ -101,7 +100,7 @@ SVNReposAccess::checkPath(const char *pa
SVN_JNI_ERR(svn_ra_check_path(m_ra_session, path,
revision.revision()->value.number,
- &kind, requestPool.pool()),
+ &kind, requestPool.getPool()),
NULL);
return EnumMapper::mapNodeKind(kind);
Modified:
subversion/branches/javahl-ra/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNReposAccess.java
URL:
http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNReposAccess.java?rev=1342676&r1=1342675&r2=1342676&view=diff
==============================================================================
---
subversion/branches/javahl-ra/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNReposAccess.java
(original)
+++
subversion/branches/javahl-ra/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNReposAccess.java
Fri May 25 15:12:56 2012
@@ -26,6 +26,12 @@ package org.apache.subversion.javahl;
import java.util.Date;
import java.util.Map;
+import org.apache.subversion.javahl.types.Depth;
+import org.apache.subversion.javahl.types.Lock;
+import org.apache.subversion.javahl.types.NodeKind;
+import org.apache.subversion.javahl.types.Revision;
+import org.apache.subversion.javahl.types.Version;
+
/**
* This interface is an interface to interact with a remote Subversion
* repository via the repository access method.
Modified:
subversion/branches/javahl-ra/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNReposAccess.java
URL:
http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNReposAccess.java?rev=1342676&r1=1342675&r2=1342676&view=diff
==============================================================================
---
subversion/branches/javahl-ra/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNReposAccess.java
(original)
+++
subversion/branches/javahl-ra/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNReposAccess.java
Fri May 25 15:12:56 2012
@@ -27,6 +27,12 @@ import java.net.URI;
import java.util.Date;
import java.util.Map;
+import org.apache.subversion.javahl.types.Depth;
+import org.apache.subversion.javahl.types.Lock;
+import org.apache.subversion.javahl.types.NodeKind;
+import org.apache.subversion.javahl.types.Revision;
+import org.apache.subversion.javahl.types.Version;
+
/**
* This class allows direct access to remote repositories through a
* lower-level API.
Modified:
subversion/branches/javahl-ra/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNRATests.java
URL:
http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNRATests.java?rev=1342676&r1=1342675&r2=1342676&view=diff
==============================================================================
---
subversion/branches/javahl-ra/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNRATests.java
(original)
+++
subversion/branches/javahl-ra/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNRATests.java
Fri May 25 15:12:56 2012
@@ -31,6 +31,11 @@ import java.util.Map;
import java.util.HashSet;
import java.io.IOException;
+import org.apache.subversion.javahl.types.Depth;
+import org.apache.subversion.javahl.types.Lock;
+import org.apache.subversion.javahl.types.NodeKind;
+import org.apache.subversion.javahl.types.Revision;
+
/**
* This class is used for testing the SVNReposAccess class
*
