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/11/16 23:05:19 UTC
svn commit: r1035831 - in /subversion/trunk: ./
subversion/bindings/javahl/native/
subversion/bindings/javahl/src/org/apache/subversion/javahl/
subversion/bindings/javahl/src/org/apache/subversion/javahl/type/
subversion/bindings/javahl/src/org/apache/...
Author: hwright
Date: Tue Nov 16 22:05:17 2010
New Revision: 1035831
URL: http://svn.apache.org/viewvc?rev=1035831&view=rev
Log:
Change the name of the JavaHL "type" package to "types".
Suggested by: blair
* build.conf,
Makefile.in:
Update build system to reflect package name changes.
[ in subversion/bindings/javahl/ ]
* native/org_apache_subversion_javahl_types_Version.cpp:
Move from here...
native/org_apache_subversion_javahl_type_Version.cpp:
...to here.
* tests/org/apache/subversion/javahl/BasicTests.java,
tests/org/apache/subversion/javahl/SVNTests.java,
tests/org/apache/subversion/javahl/WC.java,
native/DiffSummaryReceiver.cpp,
native/CreateJ.cpp,
native/EnumMapper.cpp,
native/ListCallback.cpp:
Update references to the type package.
* src/org/apache/subversion/javahl/ConflictDescriptor.java,
src/org/apache/subversion/javahl/ConflictVersion.java,
src/org/apache/subversion/javahl/ClientNotifyInformation.java,
src/org/apache/subversion/javahl/ISVNRepos.java,
src/org/apache/subversion/javahl/DirEntry.java,
src/org/apache/subversion/javahl/ChangePath.java,
src/org/apache/subversion/javahl/SVNClient.java,
src/org/apache/subversion/javahl/CommitItem.java,
src/org/apache/subversion/javahl/ISVNClient.java,
src/org/apache/subversion/javahl/SVNRepos.java,
src/org/apache/subversion/javahl/NativeResources.java,
src/org/apache/subversion/javahl/Status.java,
src/org/apache/subversion/javahl/DiffSummary.java,
src/org/apache/subversion/javahl/Info.java,
src/org/tigris/subversion/javahl/Version.java,
src/org/tigris/subversion/javahl/NodeKind.java:
Update references.
* src/org/apache/subversion/javahl/type:
Move this directory (and contents) from here...
src/org/apache/subversion/javahl/types:
...to here (with contents).
Added:
subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_types_Version.cpp
- copied, changed from r1035786, subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_type_Version.cpp
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/
- copied from r1035786, subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/type/
Removed:
subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_type_Version.cpp
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/type/
Modified:
subversion/trunk/Makefile.in
subversion/trunk/build.conf
subversion/trunk/subversion/bindings/javahl/native/CreateJ.cpp
subversion/trunk/subversion/bindings/javahl/native/DiffSummaryReceiver.cpp
subversion/trunk/subversion/bindings/javahl/native/EnumMapper.cpp
subversion/trunk/subversion/bindings/javahl/native/ListCallback.cpp
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ChangePath.java
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ClientNotifyInformation.java
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/CommitItem.java
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ConflictDescriptor.java
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ConflictVersion.java
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/DiffSummary.java
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/DirEntry.java
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNRepos.java
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/Info.java
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/NativeResources.java
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNRepos.java
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/Status.java
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/NodeKind.java
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Tristate.java
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Version.java
subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/NodeKind.java
subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Version.java
subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNTests.java
subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/WC.java
Modified: subversion/trunk/Makefile.in
URL: http://svn.apache.org/viewvc/subversion/trunk/Makefile.in?rev=1035831&r1=1035830&r2=1035831&view=diff
==============================================================================
--- subversion/trunk/Makefile.in (original)
+++ subversion/trunk/Makefile.in Tue Nov 16 22:05:17 2010
@@ -419,7 +419,7 @@ revision-install:
install-static: @INSTALL_STATIC_RULES@
# JavaHL target aliases
-javahl: mkdir-init javahl-java javahl-javah javahl-callback-javah javahl-type-javah javahl-lib @JAVAHL_TESTS_TARGET@ javahl-compat
+javahl: mkdir-init javahl-java javahl-javah javahl-callback-javah javahl-types-javah javahl-lib @JAVAHL_TESTS_TARGET@ javahl-compat
install-javahl: javahl install-javahl-java install-javahl-javah install-javahl-lib
javahl-compat: javahl-compat-java @JAVAHL_COMPAT_TESTS_TARGET@
@@ -601,7 +601,7 @@ doc-javahl:
org.tigris.subversion.javahl \
org.apache.subversion.javahl \
org.apache.subversion.javahl.callback \
- org.apache.subversion.javahl.type
+ org.apache.subversion.javahl.types
doc-clean:
rm -rf $(top_srcdir)/doc/doxygen
Modified: subversion/trunk/build.conf
URL: http://svn.apache.org/viewvc/subversion/trunk/build.conf?rev=1035831&r1=1035830&r2=1035831&view=diff
==============================================================================
--- subversion/trunk/build.conf (original)
+++ subversion/trunk/build.conf Tue Nov 16 22:05:17 2010
@@ -56,7 +56,7 @@ private-built-includes =
subversion/bindings/javahl/include/org_apache_subversion_javahl_Revision.h
subversion/bindings/javahl/include/org_apache_subversion_javahl_SVNRepos.h
subversion/bindings/javahl/include/org_apache_subversion_javahl_SVNClient.h
- subversion/bindings/javahl/include/org_apache_subversion_javahl_type_Version.h
+ subversion/bindings/javahl/include/org_apache_subversion_javahl_types_Version.h
subversion/bindings/javahl/include/org_apache_subversion_javahl_callback_UserPasswordCallback.h
@@ -526,7 +526,7 @@ msvc-static = no
type = java
path = subversion/bindings/javahl/src/org/apache/subversion/javahl
subversion/bindings/javahl/src/org/apache/subversion/javahl/callback
- subversion/bindings/javahl/src/org/apache/subversion/javahl/type
+ subversion/bindings/javahl/src/org/apache/subversion/javahl/types
src-root = subversion/bindings/javahl/src
sources = *.java
install = javahl-java
@@ -570,12 +570,12 @@ package-roots = org
#add-deps = javahl-compat-java
add-deps = $(javahl_compat_java_DEPS)
-[javahl-type-javah]
+[javahl-types-javah]
type = javah
-path = subversion/bindings/javahl/src/org/apache/subversion/javahl/type
+path = subversion/bindings/javahl/src/org/apache/subversion/javahl/types
classes = subversion/bindings/javahl/classes
headers = subversion/bindings/javahl/include
-package = org.apache.subversion.javahl.type
+package = org.apache.subversion.javahl.types
sources = *.java
add-deps = $(javahl_java_DEPS)
install = javahl-javah
@@ -610,7 +610,7 @@ path = subversion/bindings/javahl/native
libs = libsvn_repos libsvn_client libsvn_wc libsvn_ra libsvn_delta libsvn_diff
libsvn_subr libsvn_fs aprutil apriconv apr neon
sources = *.cpp *.c
-add-deps = $(javahl_javah_DEPS) $(javahl_java_DEPS) $(javahl_callback_javah_DEPS) $(javahl_type_javah_DEPS)
+add-deps = $(javahl_javah_DEPS) $(javahl_java_DEPS) $(javahl_callback_javah_DEPS) $(javahl_types_javah_DEPS)
install = javahl-lib
# need special build rule to include -I$(JDK)/include/jni.h
compile-cmd = $(COMPILE_JAVAHL_CXX)
Modified: subversion/trunk/subversion/bindings/javahl/native/CreateJ.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/CreateJ.cpp?rev=1035831&r1=1035830&r2=1035831&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/CreateJ.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/CreateJ.cpp Tue Nov 16 22:05:17 2010
@@ -60,7 +60,7 @@ CreateJ::ConflictDescriptor(const svn_wc
{
ctor = env->GetMethodID(clazz, "<init>", "(Ljava/lang/String;"
"L"JAVA_PACKAGE"/ConflictDescriptor$Kind;"
- "L"JAVA_PACKAGE"/type/NodeKind;"
+ "L"JAVA_PACKAGE"/types/NodeKind;"
"Ljava/lang/String;ZLjava/lang/String;"
"L"JAVA_PACKAGE"/ConflictDescriptor$Action;"
"L"JAVA_PACKAGE"/ConflictDescriptor$Reason;"
@@ -152,7 +152,7 @@ CreateJ::ConflictVersion(const svn_wc_co
{
ctor = env->GetMethodID(clazz, "<init>", "(Ljava/lang/String;J"
"Ljava/lang/String;"
- "L"JAVA_PACKAGE"/type/NodeKind;"
+ "L"JAVA_PACKAGE"/types/NodeKind;"
")V");
if (JNIUtil::isJavaExceptionThrown() || ctor == 0)
POP_AND_RETURN_NULL;
@@ -197,7 +197,7 @@ 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"/type/NodeKind;"
+ "L"JAVA_PACKAGE"/types/NodeKind;"
"Ljava/lang/String;Ljava/lang/String;"
"JJLjava/lang/String;"
"L"JAVA_PACKAGE"/Lock;Z"
@@ -377,9 +377,9 @@ CreateJ::ChangedPath(const char *path, s
"<init>",
"(Ljava/lang/String;JLjava/lang/String;"
"L"JAVA_PACKAGE"/ChangePath$Action;"
- "L"JAVA_PACKAGE"/type/NodeKind;"
- "L"JAVA_PACKAGE"/type/Tristate;"
- "L"JAVA_PACKAGE"/type/Tristate;)V");
+ "L"JAVA_PACKAGE"/types/NodeKind;"
+ "L"JAVA_PACKAGE"/types/Tristate;"
+ "L"JAVA_PACKAGE"/types/Tristate;)V");
if (JNIUtil::isJavaExceptionThrown())
POP_AND_RETURN(SVN_NO_ERROR);
}
@@ -432,7 +432,7 @@ CreateJ::Status(svn_wc_context_t *wc_ctx
{
mid = env->GetMethodID(clazz, "<init>",
"(Ljava/lang/String;Ljava/lang/String;"
- "L"JAVA_PACKAGE"/type/NodeKind;"
+ "L"JAVA_PACKAGE"/types/NodeKind;"
"JJJLjava/lang/String;"
"L"JAVA_PACKAGE"/Status$Kind;"
"L"JAVA_PACKAGE"/Status$Kind;"
@@ -444,7 +444,7 @@ CreateJ::Status(svn_wc_context_t *wc_ctx
"JZZLjava/lang/String;Ljava/lang/String;"
"Ljava/lang/String;"
"JL"JAVA_PACKAGE"/Lock;"
- "JJL"JAVA_PACKAGE"/type/NodeKind;"
+ "JJL"JAVA_PACKAGE"/types/NodeKind;"
"Ljava/lang/String;Ljava/lang/String;)V");
if (JNIUtil::isJavaExceptionThrown())
POP_AND_RETURN_NULL;
@@ -697,7 +697,7 @@ CreateJ::ClientNotifyInformation(const s
midCT = env->GetMethodID(clazz, "<init>",
"(Ljava/lang/String;"
"L"JAVA_PACKAGE"/ClientNotifyInformation$Action;"
- "L"JAVA_PACKAGE"/type/NodeKind;"
+ "L"JAVA_PACKAGE"/types/NodeKind;"
"Ljava/lang/String;"
"L"JAVA_PACKAGE"/Lock;"
"Ljava/lang/String;"
@@ -876,7 +876,7 @@ CreateJ::CommitItem(svn_client_commit_it
{
midConstructor = env->GetMethodID(clazz, "<init>",
"(Ljava/lang/String;"
- "L"JAVA_PACKAGE"/type/NodeKind;"
+ "L"JAVA_PACKAGE"/types/NodeKind;"
"ILjava/lang/String;"
"Ljava/lang/String;J)V");
if (JNIUtil::isExceptionThrown())
Modified: subversion/trunk/subversion/bindings/javahl/native/DiffSummaryReceiver.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/DiffSummaryReceiver.cpp?rev=1035831&r1=1035830&r2=1035831&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/DiffSummaryReceiver.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/DiffSummaryReceiver.cpp Tue Nov 16 22:05:17 2010
@@ -91,7 +91,7 @@ DiffSummaryReceiver::onSummary(const svn
ctor = env->GetMethodID(clazz, "<init>",
"(Ljava/lang/String;"
"L"JAVA_PACKAGE"/DiffSummary$DiffKind;Z"
- "L"JAVA_PACKAGE"/type/NodeKind;)V");
+ "L"JAVA_PACKAGE"/types/NodeKind;)V");
if (JNIUtil::isJavaExceptionThrown() || ctor == 0)
POP_AND_RETURN(SVN_NO_ERROR);
}
Modified: subversion/trunk/subversion/bindings/javahl/native/EnumMapper.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/EnumMapper.cpp?rev=1035831&r1=1035830&r2=1035831&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/EnumMapper.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/EnumMapper.cpp Tue Nov 16 22:05:17 2010
@@ -114,7 +114,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"/type/NodeKind", (int) nodeKind);
+ return mapEnum(JAVA_PACKAGE"/types/NodeKind", (int) nodeKind);
}
/**
@@ -195,7 +195,7 @@ jobject EnumMapper::mapOperation(svn_wc_
jobject EnumMapper::mapTristate(svn_tristate_t tristate)
{
// We're assuming a valid value for the C enum above
- return mapEnum(JAVA_PACKAGE"/type/Tristate",
+ return mapEnum(JAVA_PACKAGE"/types/Tristate",
(int) (tristate - svn_tristate_false));
}
Modified: subversion/trunk/subversion/bindings/javahl/native/ListCallback.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/ListCallback.cpp?rev=1035831&r1=1035830&r2=1035831&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/ListCallback.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/ListCallback.cpp Tue Nov 16 22:05:17 2010
@@ -140,7 +140,7 @@ ListCallback::createJavaDirEntry(const c
{
mid = env->GetMethodID(clazz, "<init>",
"(Ljava/lang/String;Ljava/lang/String;"
- "L"JAVA_PACKAGE"/type/NodeKind;"
+ "L"JAVA_PACKAGE"/types/NodeKind;"
"JZJJLjava/lang/String;)V");
if (JNIUtil::isJavaExceptionThrown())
POP_AND_RETURN_NULL;
Copied: subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_types_Version.cpp (from r1035786, subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_type_Version.cpp)
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_types_Version.cpp?p2=subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_types_Version.cpp&p1=subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_type_Version.cpp&r1=1035786&r2=1035831&rev=1035831&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_type_Version.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_types_Version.cpp Tue Nov 16 22:05:17 2010
@@ -20,16 +20,16 @@
* ====================================================================
* @endcopyright
*
- * @file org_apache_subversion_javahl_type_Version.cpp
+ * @file org_apache_subversion_javahl_types_Version.cpp
* @brief Implementation of the native methods in the Java class Version.
*/
-#include "../include/org_apache_subversion_javahl_type_Version.h"
+#include "../include/org_apache_subversion_javahl_types_Version.h"
#include "JNIStackElement.h"
#include "svn_version.h"
JNIEXPORT jint JNICALL
-Java_org_apache_subversion_javahl_type_Version_getMajor(JNIEnv *env,
+Java_org_apache_subversion_javahl_types_Version_getMajor(JNIEnv *env,
jobject jthis)
{
JNIEntry(Version, getMajor);
@@ -37,7 +37,7 @@ Java_org_apache_subversion_javahl_type_V
}
JNIEXPORT jint JNICALL
-Java_org_apache_subversion_javahl_type_Version_getMinor(JNIEnv *env,
+Java_org_apache_subversion_javahl_types_Version_getMinor(JNIEnv *env,
jobject jthis)
{
JNIEntry(Version, getMinor);
@@ -45,7 +45,7 @@ Java_org_apache_subversion_javahl_type_V
}
JNIEXPORT jint JNICALL
-Java_org_apache_subversion_javahl_type_Version_getPatch(JNIEnv *env,
+Java_org_apache_subversion_javahl_types_Version_getPatch(JNIEnv *env,
jobject jthis)
{
JNIEntry(Version, getPatch);
@@ -53,7 +53,7 @@ Java_org_apache_subversion_javahl_type_V
}
JNIEXPORT jstring JNICALL
-Java_org_apache_subversion_javahl_type_Version_getTag(JNIEnv *env,
+Java_org_apache_subversion_javahl_types_Version_getTag(JNIEnv *env,
jobject jthis)
{
JNIEntry(Version, getTag);
@@ -65,7 +65,7 @@ Java_org_apache_subversion_javahl_type_V
}
JNIEXPORT jstring JNICALL
-Java_org_apache_subversion_javahl_type_Version_getNumberTag(JNIEnv *env,
+Java_org_apache_subversion_javahl_types_Version_getNumberTag(JNIEnv *env,
jobject jthis)
{
JNIEntry(Version, getNumberTag);
Modified: subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ChangePath.java
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ChangePath.java?rev=1035831&r1=1035830&r2=1035831&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ChangePath.java (original)
+++ subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ChangePath.java Tue Nov 16 22:05:17 2010
@@ -23,7 +23,7 @@
package org.apache.subversion.javahl;
-import org.apache.subversion.javahl.type.*;
+import org.apache.subversion.javahl.types.*;
public class ChangePath implements java.io.Serializable
{
Modified: subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ClientNotifyInformation.java
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ClientNotifyInformation.java?rev=1035831&r1=1035830&r2=1035831&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ClientNotifyInformation.java (original)
+++ subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ClientNotifyInformation.java Tue Nov 16 22:05:17 2010
@@ -26,7 +26,7 @@ package org.apache.subversion.javahl;
import java.util.Map;
import java.util.EventObject;
import org.apache.subversion.javahl.callback.ClientNotifyCallback;
-import org.apache.subversion.javahl.type.NodeKind;
+import org.apache.subversion.javahl.types.NodeKind;
/**
* The event passed to the {@link ClientNotifyCallback#onNotify}
Modified: subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/CommitItem.java
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/CommitItem.java?rev=1035831&r1=1035830&r2=1035831&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/CommitItem.java (original)
+++ subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/CommitItem.java Tue Nov 16 22:05:17 2010
@@ -23,7 +23,7 @@
package org.apache.subversion.javahl;
-import org.apache.subversion.javahl.type.NodeKind;
+import org.apache.subversion.javahl.types.NodeKind;
/**
* This class describes a item which will be commited.
Modified: subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ConflictDescriptor.java
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ConflictDescriptor.java?rev=1035831&r1=1035830&r2=1035831&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ConflictDescriptor.java (original)
+++ subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ConflictDescriptor.java Tue Nov 16 22:05:17 2010
@@ -23,7 +23,7 @@
package org.apache.subversion.javahl;
-import org.apache.subversion.javahl.type.NodeKind;
+import org.apache.subversion.javahl.types.NodeKind;
/**
* The description of a merge conflict, encountered during
Modified: subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ConflictVersion.java
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ConflictVersion.java?rev=1035831&r1=1035830&r2=1035831&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ConflictVersion.java (original)
+++ subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ConflictVersion.java Tue Nov 16 22:05:17 2010
@@ -23,7 +23,7 @@
package org.apache.subversion.javahl;
-import org.apache.subversion.javahl.type.NodeKind;
+import org.apache.subversion.javahl.types.NodeKind;
/**
* The description of a merge conflict, encountered during
Modified: subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/DiffSummary.java
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/DiffSummary.java?rev=1035831&r1=1035830&r2=1035831&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/DiffSummary.java (original)
+++ subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/DiffSummary.java Tue Nov 16 22:05:17 2010
@@ -25,7 +25,7 @@ package org.apache.subversion.javahl;
import java.util.EventObject;
import org.apache.subversion.javahl.callback.DiffSummaryCallback;
-import org.apache.subversion.javahl.type.NodeKind;
+import org.apache.subversion.javahl.types.NodeKind;
/**
* The event passed to the {@link DiffSummaryCallback#onSummary} API
Modified: subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/DirEntry.java
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/DirEntry.java?rev=1035831&r1=1035830&r2=1035831&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/DirEntry.java (original)
+++ subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/DirEntry.java Tue Nov 16 22:05:17 2010
@@ -25,7 +25,7 @@ package org.apache.subversion.javahl;
import java.util.Date;
-import org.apache.subversion.javahl.type.NodeKind;
+import org.apache.subversion.javahl.types.NodeKind;
/**
* A general subversion directory entry. Used for {@link ISVNClient#list}.
Modified: subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java?rev=1035831&r1=1035830&r2=1035831&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java (original)
+++ subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java Tue Nov 16 22:05:17 2010
@@ -24,7 +24,7 @@
package org.apache.subversion.javahl;
import org.apache.subversion.javahl.callback.*;
-import org.apache.subversion.javahl.type.*;
+import org.apache.subversion.javahl.types.*;
import java.io.OutputStream;
import java.util.Collection;
Modified: subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNRepos.java
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNRepos.java?rev=1035831&r1=1035830&r2=1035831&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNRepos.java (original)
+++ subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNRepos.java Tue Nov 16 22:05:17 2010
@@ -29,7 +29,7 @@ import java.io.InputStream;
import java.io.File;
import org.apache.subversion.javahl.callback.ReposNotifyCallback;
-import org.apache.subversion.javahl.type.*;
+import org.apache.subversion.javahl.types.*;
public interface ISVNRepos {
Modified: subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/Info.java
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/Info.java?rev=1035831&r1=1035830&r2=1035831&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/Info.java (original)
+++ subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/Info.java Tue Nov 16 22:05:17 2010
@@ -25,7 +25,7 @@ package org.apache.subversion.javahl;
import java.util.Date;
-import org.apache.subversion.javahl.type.NodeKind;
+import org.apache.subversion.javahl.types.NodeKind;
/**
* this class is returned by {@link ISVNClient#info2} and contains information
Modified: subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/NativeResources.java
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/NativeResources.java?rev=1035831&r1=1035830&r2=1035831&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/NativeResources.java (original)
+++ subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/NativeResources.java Tue Nov 16 22:05:17 2010
@@ -23,7 +23,7 @@
package org.apache.subversion.javahl;
-import org.apache.subversion.javahl.type.Version;
+import org.apache.subversion.javahl.types.Version;
/**
* Handles activities related to management of native resouces
Modified: subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java?rev=1035831&r1=1035830&r2=1035831&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java (original)
+++ subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java Tue Nov 16 22:05:17 2010
@@ -24,7 +24,7 @@
package org.apache.subversion.javahl;
import org.apache.subversion.javahl.callback.*;
-import org.apache.subversion.javahl.type.*;
+import org.apache.subversion.javahl.types.*;
import java.io.OutputStream;
import java.io.ByteArrayOutputStream;
Modified: subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNRepos.java
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNRepos.java?rev=1035831&r1=1035830&r2=1035831&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNRepos.java (original)
+++ subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNRepos.java Tue Nov 16 22:05:17 2010
@@ -29,7 +29,7 @@ import java.io.InputStream;
import java.io.File;
import org.apache.subversion.javahl.callback.ReposNotifyCallback;
-import org.apache.subversion.javahl.type.*;
+import org.apache.subversion.javahl.types.*;
/**
* This class offers the same commands as the svnadmin commandline
Modified: subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/Status.java
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/Status.java?rev=1035831&r1=1035830&r2=1035831&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/Status.java (original)
+++ subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/Status.java Tue Nov 16 22:05:17 2010
@@ -25,7 +25,7 @@ package org.apache.subversion.javahl;
import java.util.Date;
-import org.apache.subversion.javahl.type.NodeKind;
+import org.apache.subversion.javahl.types.NodeKind;
/**
* Subversion status API.
Modified: subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/NodeKind.java
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/NodeKind.java?rev=1035831&r1=1035786&r2=1035831&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/NodeKind.java (original)
+++ subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/NodeKind.java Tue Nov 16 22:05:17 2010
@@ -21,7 +21,7 @@
* @endcopyright
*/
-package org.apache.subversion.javahl.type;
+package org.apache.subversion.javahl.types;
/**
* Rich man's enum for svn_node_kind_t
Modified: subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Tristate.java
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Tristate.java?rev=1035831&r1=1035786&r2=1035831&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Tristate.java (original)
+++ subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Tristate.java Tue Nov 16 22:05:17 2010
@@ -21,7 +21,7 @@
* @endcopyright
*/
-package org.apache.subversion.javahl.type;
+package org.apache.subversion.javahl.types;
public enum Tristate
{
Modified: subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Version.java
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Version.java?rev=1035831&r1=1035786&r2=1035831&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Version.java (original)
+++ subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Version.java Tue Nov 16 22:05:17 2010
@@ -21,7 +21,7 @@
* @endcopyright
*/
-package org.apache.subversion.javahl.type;
+package org.apache.subversion.javahl.types;
/**
* Encapsulates version information about the underlying native
Modified: subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/NodeKind.java
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/NodeKind.java?rev=1035831&r1=1035830&r2=1035831&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/NodeKind.java (original)
+++ subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/NodeKind.java Tue Nov 16 22:05:17 2010
@@ -61,7 +61,7 @@ public final class NodeKind
return statusNames[kind];
}
- public static int fromApache(org.apache.subversion.javahl.type.NodeKind aKind)
+ public static int fromApache(org.apache.subversion.javahl.types.NodeKind aKind)
{
switch(aKind)
{
Modified: subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Version.java
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Version.java?rev=1035831&r1=1035830&r2=1035831&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Version.java (original)
+++ subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Version.java Tue Nov 16 22:05:17 2010
@@ -30,14 +30,14 @@ package org.tigris.subversion.javahl;
*/
public class Version
{
- private org.apache.subversion.javahl.type.Version aVersion;
+ private org.apache.subversion.javahl.types.Version aVersion;
public Version()
{
- aVersion = new org.apache.subversion.javahl.type.Version();
+ aVersion = new org.apache.subversion.javahl.types.Version();
}
- public Version(org.apache.subversion.javahl.type.Version aVersion)
+ public Version(org.apache.subversion.javahl.types.Version aVersion)
{
this.aVersion = aVersion;
}
Modified: subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java?rev=1035831&r1=1035830&r2=1035831&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java (original)
+++ subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java Tue Nov 16 22:05:17 2010
@@ -23,7 +23,7 @@
package org.apache.subversion.javahl;
import org.apache.subversion.javahl.callback.*;
-import org.apache.subversion.javahl.type.*;
+import org.apache.subversion.javahl.types.*;
import java.io.File;
import java.io.FileOutputStream;
Modified: subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNTests.java
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNTests.java?rev=1035831&r1=1035830&r2=1035831&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNTests.java (original)
+++ subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNTests.java Tue Nov 16 22:05:17 2010
@@ -23,7 +23,7 @@
package org.apache.subversion.javahl;
import org.apache.subversion.javahl.callback.*;
-import org.apache.subversion.javahl.type.NodeKind;
+import org.apache.subversion.javahl.types.NodeKind;
import java.io.File;
import java.io.FileInputStream;
Modified: subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/WC.java
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/WC.java?rev=1035831&r1=1035830&r2=1035831&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/WC.java (original)
+++ subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/WC.java Tue Nov 16 22:05:17 2010
@@ -32,7 +32,7 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Date;
-import org.apache.subversion.javahl.type.NodeKind;
+import org.apache.subversion.javahl.types.NodeKind;
import junit.framework.Assert;
/**
Re: svn commit: r1035831 - in /subversion/trunk: ./ subversion/bindings/javahl/native/
subversion/bindings/javahl/src/org/apache/subversion/javahl/ subversion/bindings/javahl/src/org/apache/subversion/javahl/type/
subversion/bindings/javahl/src/org/apache/...
Posted by Blair Zajac <bl...@orcaware.com>.
On 11/16/10 2:05 PM, hwright@apache.org wrote:
> Author: hwright
> Date: Tue Nov 16 22:05:17 2010
> New Revision: 1035831
>
> URL: http://svn.apache.org/viewvc?rev=1035831&view=rev
> Log:
> Change the name of the JavaHL "type" package to "types".
>
> Suggested by: blair
Thanks!
Blair