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/04 20:31:15 UTC
svn commit: r906611 - in /subversion/trunk/subversion/bindings/javahl:
native/ src/org/tigris/subversion/javahl/
Author: hwright
Date: Thu Feb 4 19:31:14 2010
New Revision: 906611
URL: http://svn.apache.org/viewvc?rev=906611&view=rev
Log:
JavaHL: Wrap the o.t.s.j.Path class over the new o.a.s.j.Path class.
[ in subversion/bindings/javahl/ ]
* native/org_tigris_subversion_javahl_Path.cpp:
Remove, copied to...
* native/org_apache_subversion_javahl_Path.cpp:
...this, update to the new package name.
* native/org_apache_subversion_javahl_NativeResources.cpp:
New, copied from the o.t.s.j version.
* src/org/tigris/subversion/javahl/Path.java
(Path): Make this class extend the new class, and remove all the other
content.
Added:
subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_NativeResources.cpp
- copied, changed from r906594, subversion/trunk/subversion/bindings/javahl/native/org_tigris_subversion_javahl_NativeResources.cpp
subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_Path.cpp
- copied, changed from r906594, subversion/trunk/subversion/bindings/javahl/native/org_tigris_subversion_javahl_Path.cpp
Removed:
subversion/trunk/subversion/bindings/javahl/native/org_tigris_subversion_javahl_Path.cpp
Modified:
subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Path.java
Copied: subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_NativeResources.cpp (from r906594, subversion/trunk/subversion/bindings/javahl/native/org_tigris_subversion_javahl_NativeResources.cpp)
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_NativeResources.cpp?p2=subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_NativeResources.cpp&p1=subversion/trunk/subversion/bindings/javahl/native/org_tigris_subversion_javahl_NativeResources.cpp&r1=906594&r2=906611&rev=906611&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/org_tigris_subversion_javahl_NativeResources.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_NativeResources.cpp Thu Feb 4 19:31:14 2010
@@ -20,16 +20,16 @@
* ====================================================================
* @endcopyright
*
- * @file org_tigris_subversion_javahl_NativeResources.cpp
+ * @file org_apache_subversion_javahl_NativeResources.cpp
* @brief Implementation of the native methods in the Java class
* NativeResources.
*/
#include "JNIUtil.h"
-#include "../include/org_tigris_subversion_javahl_NativeResources.h"
+#include "../include/org_apache_subversion_javahl_NativeResources.h"
JNIEXPORT void JNICALL
-Java_org_tigris_subversion_javahl_NativeResources_initNativeLibrary
+Java_org_apache_subversion_javahl_NativeResources_initNativeLibrary
(JNIEnv *env, jclass jclazz)
{
// No usual JNIEntry here, as the prerequisite native library
Copied: subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_Path.cpp (from r906594, subversion/trunk/subversion/bindings/javahl/native/org_tigris_subversion_javahl_Path.cpp)
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_Path.cpp?p2=subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_Path.cpp&p1=subversion/trunk/subversion/bindings/javahl/native/org_tigris_subversion_javahl_Path.cpp&r1=906594&r2=906611&rev=906611&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/org_tigris_subversion_javahl_Path.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_Path.cpp Thu Feb 4 19:31:14 2010
@@ -20,19 +20,19 @@
* ====================================================================
* @endcopyright
*
- * @file org_tigris_subversion_javahl_Path.cpp
+ * @file org_apache_subversion_javahl_Path.cpp
* @brief Implementation of the native methods in the Java class Path
*/
#include <jni.h>
-#include "../include/org_tigris_subversion_javahl_Path.h"
+#include "../include/org_apache_subversion_javahl_Path.h"
#include "JNIUtil.h"
#include "JNIStackElement.h"
#include "JNIStringHolder.h"
#include "Path.h"
JNIEXPORT jboolean JNICALL
-Java_org_tigris_subversion_javahl_Path_isValid(JNIEnv *env,
+Java_org_apache_subversion_javahl_Path_isValid(JNIEnv *env,
jclass jthis,
jstring jpath)
{
Modified: subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Path.java
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Path.java?rev=906611&r1=906610&r2=906611&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Path.java (original)
+++ subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Path.java Thu Feb 4 19:31:14 2010
@@ -23,44 +23,13 @@
package org.tigris.subversion.javahl;
+import org.apache.subversion.javahl.*;
+
/**
* Subversion path validation and manipulation.
*
* @since 1.4.0
*/
-public class Path
+public class Path extends org.apache.subversion.javahl.Path
{
- /**
- * Load the required native library.
- */
- static
- {
- NativeResources.loadNativeLibrary();
- }
-
- /**
- * A valid path is a UTF-8 string without any control characters.
- *
- * @return Whether Subversion can store the path in a repository.
- */
- public static native boolean isValid(String path);
-
- /**
- * Whether a URL is valid. Implementation may behave differently
- * than <code>svn_path_is_url()</code>.
- *
- * @param path The Subversion "path" to inspect.
- * @return Whether <code>path</code> is a URL.
- * @throws IllegalArgumentException If <code>path</code> is
- * <code>null</code>.
- */
- public static boolean isURL(String path)
- {
- if (path == null)
- {
- throw new IllegalArgumentException();
- }
- // Require at least "s://".
- return (path.indexOf("://") > 0);
- }
}