subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hwri...@apache.org
Subject svn commit: r908296 - in /subversion/trunk: ./ subversion/bindings/javahl/native/ subversion/bindings/javahl/src/org/apache/subversion/javahl/ subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/
Date Wed, 10 Feb 2010 00:40:49 GMT
Author: hwright
Date: Wed Feb 10 00:40:48 2010
New Revision: 908296

URL: http://svn.apache.org/viewvc?rev=908296&view=rev
Log:
JavaHL: Stop generating header files from the obsolute tigris package, and
update references to the Java constants in the cpp source.

* Makefile.in
  (javahl, javahl-compat): Update dependencies to reflect the header target
    name changes.

* build.conf
  (javahl-javah): Remove.
  (javahl-callback-javah): New.

[ in subversion/bindings/javahl/ ]
* native/ConflictResolverCallback.cpp,
  native/CommitMessage.cpp,
  native/Revision.cpp,
  native/SVNClient.cpp,
  native/Prompter.cpp,
  native/EnumMapper.cpp,
  native/StatusCallback.cpp:
    Update header file references and constant names to reflect the package
    name change.

* src/org/apache/subversion/javahl/Operation.java:
  Copied from the tigris package.

* src/org/apache/subversion/javahl/callback/UserPasswordCallback.java
  (Reject, AcceptTemporary, AccecptTemporary, AcceptPermanently,
   askTrustSSLServer): New.

* src/org/apache/subversion/javahl/LockStatus.java:
  New, copied from the tigris package.

Added:
    subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/LockStatus.java
      - copied, changed from r907931, subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/LockStatus.java
    subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/Operation.java
      - copied, changed from r907931, subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Operation.java
Modified:
    subversion/trunk/Makefile.in
    subversion/trunk/build.conf
    subversion/trunk/subversion/bindings/javahl/native/CommitMessage.cpp
    subversion/trunk/subversion/bindings/javahl/native/ConflictResolverCallback.cpp
    subversion/trunk/subversion/bindings/javahl/native/EnumMapper.cpp
    subversion/trunk/subversion/bindings/javahl/native/Prompter.cpp
    subversion/trunk/subversion/bindings/javahl/native/Revision.cpp
    subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp
    subversion/trunk/subversion/bindings/javahl/native/StatusCallback.cpp
    subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/UserPasswordCallback.java

Modified: subversion/trunk/Makefile.in
URL: http://svn.apache.org/viewvc/subversion/trunk/Makefile.in?rev=908296&r1=908295&r2=908296&view=diff
==============================================================================
--- subversion/trunk/Makefile.in (original)
+++ subversion/trunk/Makefile.in Wed Feb 10 00:40:48 2010
@@ -424,9 +424,9 @@
 install-static: @INSTALL_STATIC_RULES@
 
 # JavaHL target aliases
-javahl: mkdir-init javahl-java javahl-javah javahl-compat-javah javahl-lib @JAVAHL_TESTS_TARGET@
+javahl: mkdir-init javahl-java javahl-javah javahl-callback-javah javahl-lib @JAVAHL_TESTS_TARGET@
 install-javahl: javahl install-javahl-java install-javahl-javah install-javahl-lib
-javahl-compat: mkdir-init javahl-compat-java javahl-compat-javah javahl-lib @JAVAHL_TESTS_TARGET@
javahl-compat-tests
+javahl-compat: mkdir-init javahl-compat-java javahl-javah javahl-lib @JAVAHL_TESTS_TARGET@
javahl-compat-tests
 
 clean-javahl:
 	rm -rf $(javahl_java_PATH) $(javahl_javah_PATH) @JAVAHL_OBJDIR@

Modified: subversion/trunk/build.conf
URL: http://svn.apache.org/viewvc/subversion/trunk/build.conf?rev=908296&r1=908295&r2=908296&view=diff
==============================================================================
--- subversion/trunk/build.conf (original)
+++ subversion/trunk/build.conf Wed Feb 10 00:40:48 2010
@@ -565,18 +565,18 @@
 ### Java targets don't do up-to-date checks yet.
 #add-deps = javahl-java
 
-[javahl-javah]
+[javahl-callback-javah]
 type = javah 
-path = subversion/bindings/javahl/src/org/tigris/subversion/javahl
+path = subversion/bindings/javahl/src/org/apache/subversion/javahl/callback
 classes = subversion/bindings/javahl/classes
 headers = subversion/bindings/javahl/include
-package = org.tigris.subversion.javahl
+package = org.apache.subversion.javahl.callback
 sources = *.java
 add-deps = $(javahl_java_DEPS)
 install = javahl-javah
 link-cmd = $(COMPILE_JAVAHL_JAVAH) -force
 
-[javahl-compat-javah]
+[javahl-javah]
 type = javah 
 path = subversion/bindings/javahl/src/org/apache/subversion/javahl
 classes = subversion/bindings/javahl/classes

Modified: subversion/trunk/subversion/bindings/javahl/native/CommitMessage.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/CommitMessage.cpp?rev=908296&r1=908295&r2=908296&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/CommitMessage.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/CommitMessage.cpp Wed Feb 10 00:40:48
2010
@@ -28,7 +28,7 @@
 #include "JNIUtil.h"
 #include <apr_tables.h>
 #include "svn_client.h"
-#include "../include/org_tigris_subversion_javahl_CommitItemStateFlags.h"
+#include "../include/org_apache_subversion_javahl_CommitItemStateFlags.h"
 
 CommitMessage::CommitMessage(jobject jcommitMessage)
 {
@@ -148,19 +148,19 @@
       jint jstateFlags = 0;
       if (item->state_flags & SVN_CLIENT_COMMIT_ITEM_ADD)
         jstateFlags |=
-          org_tigris_subversion_javahl_CommitItemStateFlags_Add;
+          org_apache_subversion_javahl_CommitItemStateFlags_Add;
       if (item->state_flags & SVN_CLIENT_COMMIT_ITEM_DELETE)
         jstateFlags |=
-          org_tigris_subversion_javahl_CommitItemStateFlags_Delete;
+          org_apache_subversion_javahl_CommitItemStateFlags_Delete;
       if (item->state_flags & SVN_CLIENT_COMMIT_ITEM_TEXT_MODS)
         jstateFlags |=
-          org_tigris_subversion_javahl_CommitItemStateFlags_TextMods;
+          org_apache_subversion_javahl_CommitItemStateFlags_TextMods;
       if (item->state_flags & SVN_CLIENT_COMMIT_ITEM_PROP_MODS)
         jstateFlags |=
-          org_tigris_subversion_javahl_CommitItemStateFlags_PropMods;
+          org_apache_subversion_javahl_CommitItemStateFlags_PropMods;
       if (item->state_flags & SVN_CLIENT_COMMIT_ITEM_IS_COPY)
         jstateFlags |=
-          org_tigris_subversion_javahl_CommitItemStateFlags_IsCopy;
+          org_apache_subversion_javahl_CommitItemStateFlags_IsCopy;
 
       jstring jurl = JNIUtil::makeJString(item->url);
 

Modified: subversion/trunk/subversion/bindings/javahl/native/ConflictResolverCallback.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/ConflictResolverCallback.cpp?rev=908296&r1=908295&r2=908296&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/ConflictResolverCallback.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/ConflictResolverCallback.cpp Wed Feb
10 00:40:48 2010
@@ -26,7 +26,7 @@
 
 #include "svn_error.h"
 
-#include "../include/org_tigris_subversion_javahl_ConflictResult.h"
+#include "../include/org_apache_subversion_javahl_ConflictResult.h"
 #include "JNIUtil.h"
 #include "JNIStringHolder.h"
 #include "EnumMapper.h"
@@ -201,20 +201,20 @@
 {
   switch (jchoice)
     {
-    case org_tigris_subversion_javahl_ConflictResult_postpone:
+    case org_apache_subversion_javahl_ConflictResult_postpone:
     default:
       return svn_wc_conflict_choose_postpone;
-    case org_tigris_subversion_javahl_ConflictResult_chooseBase:
+    case org_apache_subversion_javahl_ConflictResult_chooseBase:
       return svn_wc_conflict_choose_base;
-    case org_tigris_subversion_javahl_ConflictResult_chooseTheirsFull:
+    case org_apache_subversion_javahl_ConflictResult_chooseTheirsFull:
       return svn_wc_conflict_choose_theirs_full;
-    case org_tigris_subversion_javahl_ConflictResult_chooseMineFull:
+    case org_apache_subversion_javahl_ConflictResult_chooseMineFull:
       return svn_wc_conflict_choose_mine_full;
-    case org_tigris_subversion_javahl_ConflictResult_chooseTheirsConflict:
+    case org_apache_subversion_javahl_ConflictResult_chooseTheirsConflict:
       return svn_wc_conflict_choose_theirs_conflict;
-    case org_tigris_subversion_javahl_ConflictResult_chooseMineConflict:
+    case org_apache_subversion_javahl_ConflictResult_chooseMineConflict:
       return svn_wc_conflict_choose_mine_conflict;
-    case org_tigris_subversion_javahl_ConflictResult_chooseMerged:
+    case org_apache_subversion_javahl_ConflictResult_chooseMerged:
       return svn_wc_conflict_choose_merged;
     }
 }

Modified: subversion/trunk/subversion/bindings/javahl/native/EnumMapper.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/EnumMapper.cpp?rev=908296&r1=908295&r2=908296&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/EnumMapper.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/EnumMapper.cpp Wed Feb 10 00:40:48
2010
@@ -28,19 +28,19 @@
 #include "svn_wc.h"
 #include "svn_client.h"
 #include "EnumMapper.h"
-#include "../include/org_tigris_subversion_javahl_CommitItemStateFlags.h"
-#include "../include/org_tigris_subversion_javahl_NotifyAction.h"
-#include "../include/org_tigris_subversion_javahl_NotifyStatus.h"
-#include "../include/org_tigris_subversion_javahl_NodeKind.h"
-#include "../include/org_tigris_subversion_javahl_Operation.h"
-#include "../include/org_tigris_subversion_javahl_LockStatus.h"
-#include "../include/org_tigris_subversion_javahl_StatusKind.h"
-#include "../include/org_tigris_subversion_javahl_Revision.h"
-#include "../include/org_tigris_subversion_javahl_ScheduleKind.h"
-#include "../include/org_tigris_subversion_javahl_ConflictDescriptor_Kind.h"
-#include "../include/org_tigris_subversion_javahl_ConflictDescriptor_Action.h"
-#include "../include/org_tigris_subversion_javahl_ConflictDescriptor_Reason.h"
-#include "../include/org_tigris_subversion_javahl_Depth.h"
+#include "../include/org_apache_subversion_javahl_CommitItemStateFlags.h"
+#include "../include/org_apache_subversion_javahl_NotifyAction.h"
+#include "../include/org_apache_subversion_javahl_NotifyStatus.h"
+#include "../include/org_apache_subversion_javahl_NodeKind.h"
+#include "../include/org_apache_subversion_javahl_Operation.h"
+#include "../include/org_apache_subversion_javahl_LockStatus.h"
+#include "../include/org_apache_subversion_javahl_StatusKind.h"
+#include "../include/org_apache_subversion_javahl_Revision.h"
+#include "../include/org_apache_subversion_javahl_ScheduleKind.h"
+#include "../include/org_apache_subversion_javahl_ConflictDescriptor_Kind.h"
+#include "../include/org_apache_subversion_javahl_ConflictDescriptor_Action.h"
+#include "../include/org_apache_subversion_javahl_ConflictDescriptor_Reason.h"
+#include "../include/org_apache_subversion_javahl_Depth.h"
 
 /**
  * Map a C commit state flag constant to the Java constant.
@@ -52,19 +52,19 @@
   jint jstateFlags = 0;
   if (flags & SVN_CLIENT_COMMIT_ITEM_ADD)
     jstateFlags |=
-      org_tigris_subversion_javahl_CommitItemStateFlags_Add;
+      org_apache_subversion_javahl_CommitItemStateFlags_Add;
   if (flags & SVN_CLIENT_COMMIT_ITEM_DELETE)
     jstateFlags |=
-      org_tigris_subversion_javahl_CommitItemStateFlags_Delete;
+      org_apache_subversion_javahl_CommitItemStateFlags_Delete;
   if (flags & SVN_CLIENT_COMMIT_ITEM_TEXT_MODS)
     jstateFlags |=
-      org_tigris_subversion_javahl_CommitItemStateFlags_TextMods;
+      org_apache_subversion_javahl_CommitItemStateFlags_TextMods;
   if (flags & SVN_CLIENT_COMMIT_ITEM_PROP_MODS)
     jstateFlags |=
-      org_tigris_subversion_javahl_CommitItemStateFlags_PropMods;
+      org_apache_subversion_javahl_CommitItemStateFlags_PropMods;
   if (flags & SVN_CLIENT_COMMIT_ITEM_IS_COPY)
     jstateFlags |=
-      org_tigris_subversion_javahl_CommitItemStateFlags_IsCopy;
+      org_apache_subversion_javahl_CommitItemStateFlags_IsCopy;
   return jstateFlags;
 }
 
@@ -79,28 +79,28 @@
     {
     default:
     case svn_wc_notify_state_inapplicable:
-      return org_tigris_subversion_javahl_NotifyStatus_inapplicable;
+      return org_apache_subversion_javahl_NotifyStatus_inapplicable;
 
     case svn_wc_notify_state_unknown:
-      return org_tigris_subversion_javahl_NotifyStatus_unknown;
+      return org_apache_subversion_javahl_NotifyStatus_unknown;
 
     case svn_wc_notify_state_unchanged:
-      return org_tigris_subversion_javahl_NotifyStatus_unchanged;
+      return org_apache_subversion_javahl_NotifyStatus_unchanged;
 
     case svn_wc_notify_state_missing:
-      return org_tigris_subversion_javahl_NotifyStatus_missing;
+      return org_apache_subversion_javahl_NotifyStatus_missing;
 
     case svn_wc_notify_state_obstructed:
-      return org_tigris_subversion_javahl_NotifyStatus_obstructed;
+      return org_apache_subversion_javahl_NotifyStatus_obstructed;
 
     case svn_wc_notify_state_changed:
-      return org_tigris_subversion_javahl_NotifyStatus_changed;
+      return org_apache_subversion_javahl_NotifyStatus_changed;
 
     case svn_wc_notify_state_merged:
-      return org_tigris_subversion_javahl_NotifyStatus_merged;
+      return org_apache_subversion_javahl_NotifyStatus_merged;
 
     case svn_wc_notify_state_conflicted:
-      return org_tigris_subversion_javahl_NotifyStatus_conflicted;
+      return org_apache_subversion_javahl_NotifyStatus_conflicted;
     }
 
 }
@@ -118,161 +118,161 @@
     {
     case svn_wc_notify_add:
       /* Adding a path to revision control. */
-      return org_tigris_subversion_javahl_NotifyAction_add;
+      return org_apache_subversion_javahl_NotifyAction_add;
 
     case svn_wc_notify_copy:
       /* Copying a versioned path. */
-      return org_tigris_subversion_javahl_NotifyAction_copy;
+      return org_apache_subversion_javahl_NotifyAction_copy;
 
     case svn_wc_notify_delete:
       /* Deleting a versioned path. */
-      return org_tigris_subversion_javahl_NotifyAction_delete;
+      return org_apache_subversion_javahl_NotifyAction_delete;
 
     case svn_wc_notify_restore:
       /* Restoring a missing path from the pristine text-base. */
-      return org_tigris_subversion_javahl_NotifyAction_restore;
+      return org_apache_subversion_javahl_NotifyAction_restore;
 
     case svn_wc_notify_revert:
       /* Reverting a modified path. */
-      return org_tigris_subversion_javahl_NotifyAction_revert;
+      return org_apache_subversion_javahl_NotifyAction_revert;
 
     case svn_wc_notify_failed_revert:
       /* A revert operation has failed. */
-      return org_tigris_subversion_javahl_NotifyAction_failed_revert;
+      return org_apache_subversion_javahl_NotifyAction_failed_revert;
 
     case svn_wc_notify_resolved:
       /* Resolving a conflict. */
-      return org_tigris_subversion_javahl_NotifyAction_resolved;
+      return org_apache_subversion_javahl_NotifyAction_resolved;
 
     case svn_wc_notify_status_completed:
       /* The last notification in a status (including status on
        * externals). */
-      return org_tigris_subversion_javahl_NotifyAction_status_completed;
+      return org_apache_subversion_javahl_NotifyAction_status_completed;
 
     case svn_wc_notify_status_external:
       /* Running status on an external module. */
-      return org_tigris_subversion_javahl_NotifyAction_status_external;
+      return org_apache_subversion_javahl_NotifyAction_status_external;
 
     case svn_wc_notify_skip:
       /* Skipping a path. */
-      return org_tigris_subversion_javahl_NotifyAction_skip;
+      return org_apache_subversion_javahl_NotifyAction_skip;
 
     case svn_wc_notify_update_delete:
       /* Got a delete in an update. */
-      return org_tigris_subversion_javahl_NotifyAction_update_delete;
+      return org_apache_subversion_javahl_NotifyAction_update_delete;
 
     case svn_wc_notify_update_add:
       /* Got an add in an update. */
-      return org_tigris_subversion_javahl_NotifyAction_update_add;
+      return org_apache_subversion_javahl_NotifyAction_update_add;
 
     case svn_wc_notify_update_replace:
       /* Got a replaced in an update. */
-      return org_tigris_subversion_javahl_NotifyAction_update_replaced;
+      return org_apache_subversion_javahl_NotifyAction_update_replaced;
 
     case svn_wc_notify_update_update:
       /* Got any other action in an update. */
-      return org_tigris_subversion_javahl_NotifyAction_update_update;
+      return org_apache_subversion_javahl_NotifyAction_update_update;
 
     case svn_wc_notify_update_completed:
       /* The last notification in an update (including updates of
        * externals). */
-      return org_tigris_subversion_javahl_NotifyAction_update_completed;
+      return org_apache_subversion_javahl_NotifyAction_update_completed;
 
     case svn_wc_notify_update_external:
       /* Updating an external module. */
-      return org_tigris_subversion_javahl_NotifyAction_update_external;
+      return org_apache_subversion_javahl_NotifyAction_update_external;
 
     case svn_wc_notify_commit_modified:
       /* Committing a modification. */
-      return org_tigris_subversion_javahl_NotifyAction_commit_modified;
+      return org_apache_subversion_javahl_NotifyAction_commit_modified;
 
     case svn_wc_notify_commit_added:
       /* Committing an addition. */
-      return org_tigris_subversion_javahl_NotifyAction_commit_added;
+      return org_apache_subversion_javahl_NotifyAction_commit_added;
 
     case svn_wc_notify_commit_deleted:
       /* Committing a deletion. */
-      return org_tigris_subversion_javahl_NotifyAction_commit_deleted;
+      return org_apache_subversion_javahl_NotifyAction_commit_deleted;
 
     case svn_wc_notify_commit_replaced:
       /* Committing a replacement. */
-      return org_tigris_subversion_javahl_NotifyAction_commit_replaced;
+      return org_apache_subversion_javahl_NotifyAction_commit_replaced;
 
     case svn_wc_notify_commit_postfix_txdelta:
       /* Transmitting post-fix text-delta data for a file. */
-      return org_tigris_subversion_javahl_NotifyAction_commit_postfix_txdelta;
+      return org_apache_subversion_javahl_NotifyAction_commit_postfix_txdelta;
 
     case svn_wc_notify_blame_revision:
       /* Processed a single revision's blame. */
-      return org_tigris_subversion_javahl_NotifyAction_blame_revision;
+      return org_apache_subversion_javahl_NotifyAction_blame_revision;
 
     case svn_wc_notify_locked:
       /* Lock a path */
-      return org_tigris_subversion_javahl_NotifyAction_locked;
+      return org_apache_subversion_javahl_NotifyAction_locked;
 
     case svn_wc_notify_unlocked:
       /* Unlock a path */
-      return org_tigris_subversion_javahl_NotifyAction_unlocked;
+      return org_apache_subversion_javahl_NotifyAction_unlocked;
 
     case svn_wc_notify_failed_lock:
       /* Lock failed */
-      return org_tigris_subversion_javahl_NotifyAction_failed_lock;
+      return org_apache_subversion_javahl_NotifyAction_failed_lock;
 
     case svn_wc_notify_failed_unlock:
       /* Unlock failed */
-      return org_tigris_subversion_javahl_NotifyAction_failed_unlock;
+      return org_apache_subversion_javahl_NotifyAction_failed_unlock;
 
     case svn_wc_notify_exists:
       /* Tried adding a path that already exists. */
-      return org_tigris_subversion_javahl_NotifyAction_exists;
+      return org_apache_subversion_javahl_NotifyAction_exists;
 
     case svn_wc_notify_changelist_set:
       /* Changelist name set. */
-      return org_tigris_subversion_javahl_NotifyAction_changelist_set;
+      return org_apache_subversion_javahl_NotifyAction_changelist_set;
 
     case svn_wc_notify_changelist_clear:
       /* Changelist name cleared. */
-      return org_tigris_subversion_javahl_NotifyAction_changelist_clear;
+      return org_apache_subversion_javahl_NotifyAction_changelist_clear;
 
     case svn_wc_notify_merge_begin:
       /* A merge operation has begun. */
-      return org_tigris_subversion_javahl_NotifyAction_merge_begin;
+      return org_apache_subversion_javahl_NotifyAction_merge_begin;
 
     case svn_wc_notify_foreign_merge_begin:
       /* A merge operation from a foreign repository has begun. */
-      return org_tigris_subversion_javahl_NotifyAction_foreign_merge_begin;
+      return org_apache_subversion_javahl_NotifyAction_foreign_merge_begin;
 
     case svn_wc_notify_property_added:
       /* Property added */
-      return org_tigris_subversion_javahl_NotifyAction_property_added;
+      return org_apache_subversion_javahl_NotifyAction_property_added;
 
     case svn_wc_notify_property_modified:
       /* Property modified */
-      return org_tigris_subversion_javahl_NotifyAction_property_modified;
+      return org_apache_subversion_javahl_NotifyAction_property_modified;
 
     case svn_wc_notify_property_deleted:
       /* Property deleted */
-      return org_tigris_subversion_javahl_NotifyAction_property_deleted;
+      return org_apache_subversion_javahl_NotifyAction_property_deleted;
 
     case svn_wc_notify_property_deleted_nonexistent:
       /* Property deleted nonexistent */
-      return org_tigris_subversion_javahl_NotifyAction_property_deleted_nonexistent;
+      return org_apache_subversion_javahl_NotifyAction_property_deleted_nonexistent;
 
     case svn_wc_notify_revprop_set:
       /* Revision property set */
-      return org_tigris_subversion_javahl_NotifyAction_revprop_set;
+      return org_apache_subversion_javahl_NotifyAction_revprop_set;
 
     case svn_wc_notify_revprop_deleted:
       /* Revision property deleted */
-      return org_tigris_subversion_javahl_NotifyAction_revprop_deleted;
+      return org_apache_subversion_javahl_NotifyAction_revprop_deleted;
 
     case svn_wc_notify_merge_completed:
       /* Final notification in a merge */
-      return org_tigris_subversion_javahl_NotifyAction_merge_completed;
+      return org_apache_subversion_javahl_NotifyAction_merge_completed;
 
     case svn_wc_notify_tree_conflict:
       /* The path is a tree-conflict victim of the intended action */
-      return org_tigris_subversion_javahl_NotifyAction_tree_conflict;
+      return org_apache_subversion_javahl_NotifyAction_tree_conflict;
 
     default:
       return -1;
@@ -289,19 +289,19 @@
   switch(nodeKind)
     {
     case svn_node_none:
-      return org_tigris_subversion_javahl_NodeKind_none;
+      return org_apache_subversion_javahl_NodeKind_none;
 
     case svn_node_file:
-      return org_tigris_subversion_javahl_NodeKind_file;
+      return org_apache_subversion_javahl_NodeKind_file;
 
     case svn_node_dir:
-      return org_tigris_subversion_javahl_NodeKind_dir;
+      return org_apache_subversion_javahl_NodeKind_dir;
 
     case svn_node_unknown:
-      return org_tigris_subversion_javahl_NodeKind_unknown;
+      return org_apache_subversion_javahl_NodeKind_unknown;
 
     default:
-      return org_tigris_subversion_javahl_NodeKind_unknown;
+      return org_apache_subversion_javahl_NodeKind_unknown;
     }
 }
 
@@ -315,22 +315,22 @@
   switch(state)
     {
     case svn_wc_notify_lock_state_inapplicable:
-      return org_tigris_subversion_javahl_LockStatus_inapplicable;
+      return org_apache_subversion_javahl_LockStatus_inapplicable;
 
     case svn_wc_notify_lock_state_unknown:
-      return org_tigris_subversion_javahl_LockStatus_unknown;
+      return org_apache_subversion_javahl_LockStatus_unknown;
 
     case svn_wc_notify_lock_state_unchanged:
-      return org_tigris_subversion_javahl_LockStatus_unchanged;
+      return org_apache_subversion_javahl_LockStatus_unchanged;
 
     case svn_wc_notify_lock_state_locked:
-      return org_tigris_subversion_javahl_LockStatus_locked;
+      return org_apache_subversion_javahl_LockStatus_locked;
 
     case svn_wc_notify_lock_state_unlocked:
-      return org_tigris_subversion_javahl_LockStatus_unlocked;
+      return org_apache_subversion_javahl_LockStatus_unlocked;
 
     default:
-      return org_tigris_subversion_javahl_LockStatus_inapplicable;
+      return org_apache_subversion_javahl_LockStatus_inapplicable;
     }
 }
 
@@ -345,22 +345,22 @@
     {
       /** Nothing special here */
     case svn_wc_schedule_normal:
-      return org_tigris_subversion_javahl_ScheduleKind_normal;
+      return org_apache_subversion_javahl_ScheduleKind_normal;
 
       /** Slated for addition */
     case svn_wc_schedule_add:
-      return org_tigris_subversion_javahl_ScheduleKind_add;
+      return org_apache_subversion_javahl_ScheduleKind_add;
 
       /** Slated for deletion */
     case svn_wc_schedule_delete:
-      return org_tigris_subversion_javahl_ScheduleKind_delete;
+      return org_apache_subversion_javahl_ScheduleKind_delete;
 
       /** Slated for replacement (delete + add) */
     case svn_wc_schedule_replace:
-      return org_tigris_subversion_javahl_ScheduleKind_replace;
+      return org_apache_subversion_javahl_ScheduleKind_replace;
 
     default:
-      return org_tigris_subversion_javahl_ScheduleKind_normal;
+      return org_apache_subversion_javahl_ScheduleKind_normal;
     }
 }
 
@@ -375,46 +375,46 @@
     {
     case svn_wc_status_none:
     default:
-      return org_tigris_subversion_javahl_StatusKind_none;
+      return org_apache_subversion_javahl_StatusKind_none;
 
     case svn_wc_status_unversioned:
-      return org_tigris_subversion_javahl_StatusKind_unversioned;
+      return org_apache_subversion_javahl_StatusKind_unversioned;
 
     case svn_wc_status_normal:
-      return org_tigris_subversion_javahl_StatusKind_normal;
+      return org_apache_subversion_javahl_StatusKind_normal;
 
     case svn_wc_status_added:
-      return org_tigris_subversion_javahl_StatusKind_added;
+      return org_apache_subversion_javahl_StatusKind_added;
 
     case svn_wc_status_missing:
-      return org_tigris_subversion_javahl_StatusKind_missing;
+      return org_apache_subversion_javahl_StatusKind_missing;
 
     case svn_wc_status_deleted:
-      return org_tigris_subversion_javahl_StatusKind_deleted;
+      return org_apache_subversion_javahl_StatusKind_deleted;
 
     case svn_wc_status_replaced:
-      return org_tigris_subversion_javahl_StatusKind_replaced;
+      return org_apache_subversion_javahl_StatusKind_replaced;
 
     case svn_wc_status_modified:
-      return org_tigris_subversion_javahl_StatusKind_modified;
+      return org_apache_subversion_javahl_StatusKind_modified;
 
     case svn_wc_status_merged:
-      return org_tigris_subversion_javahl_StatusKind_merged;
+      return org_apache_subversion_javahl_StatusKind_merged;
 
     case svn_wc_status_conflicted:
-      return org_tigris_subversion_javahl_StatusKind_conflicted;
+      return org_apache_subversion_javahl_StatusKind_conflicted;
 
     case svn_wc_status_ignored:
-      return org_tigris_subversion_javahl_StatusKind_ignored;
+      return org_apache_subversion_javahl_StatusKind_ignored;
 
     case svn_wc_status_obstructed:
-      return org_tigris_subversion_javahl_StatusKind_obstructed;
+      return org_apache_subversion_javahl_StatusKind_obstructed;
 
     case svn_wc_status_external:
-      return org_tigris_subversion_javahl_StatusKind_external;
+      return org_apache_subversion_javahl_StatusKind_external;
 
     case svn_wc_status_incomplete:
-      return org_tigris_subversion_javahl_StatusKind_incomplete;
+      return org_apache_subversion_javahl_StatusKind_incomplete;
     }
 }
 
@@ -424,10 +424,10 @@
     {
     case svn_wc_conflict_kind_text:
     default:
-      return org_tigris_subversion_javahl_ConflictDescriptor_Kind_text;
+      return org_apache_subversion_javahl_ConflictDescriptor_Kind_text;
 
     case svn_wc_conflict_kind_property:
-      return org_tigris_subversion_javahl_ConflictDescriptor_Kind_property;
+      return org_apache_subversion_javahl_ConflictDescriptor_Kind_property;
     }
 }
 
@@ -437,13 +437,13 @@
     {
     case svn_wc_conflict_action_edit:
     default:
-      return org_tigris_subversion_javahl_ConflictDescriptor_Action_edit;
+      return org_apache_subversion_javahl_ConflictDescriptor_Action_edit;
 
     case svn_wc_conflict_action_add:
-      return org_tigris_subversion_javahl_ConflictDescriptor_Action_add;
+      return org_apache_subversion_javahl_ConflictDescriptor_Action_add;
 
     case svn_wc_conflict_action_delete:
-      return org_tigris_subversion_javahl_ConflictDescriptor_Action_delete;
+      return org_apache_subversion_javahl_ConflictDescriptor_Action_delete;
     }
 }
 
@@ -453,22 +453,22 @@
     {
     case svn_wc_conflict_reason_edited:
     default:
-      return org_tigris_subversion_javahl_ConflictDescriptor_Reason_edited;
+      return org_apache_subversion_javahl_ConflictDescriptor_Reason_edited;
 
     case svn_wc_conflict_reason_obstructed:
-      return org_tigris_subversion_javahl_ConflictDescriptor_Reason_obstructed;
+      return org_apache_subversion_javahl_ConflictDescriptor_Reason_obstructed;
 
     case svn_wc_conflict_reason_deleted:
-      return org_tigris_subversion_javahl_ConflictDescriptor_Reason_deleted;
+      return org_apache_subversion_javahl_ConflictDescriptor_Reason_deleted;
 
     case svn_wc_conflict_reason_missing:
-      return org_tigris_subversion_javahl_ConflictDescriptor_Reason_missing;
+      return org_apache_subversion_javahl_ConflictDescriptor_Reason_missing;
 
     case svn_wc_conflict_reason_unversioned:
-      return org_tigris_subversion_javahl_ConflictDescriptor_Reason_unversioned;
+      return org_apache_subversion_javahl_ConflictDescriptor_Reason_unversioned;
 
     case svn_wc_conflict_reason_added:
-      return org_tigris_subversion_javahl_ConflictDescriptor_Reason_added;
+      return org_apache_subversion_javahl_ConflictDescriptor_Reason_added;
     }
 }
 
@@ -478,22 +478,22 @@
     {
     case svn_depth_unknown:
     default:
-      return org_tigris_subversion_javahl_Depth_unknown;
+      return org_apache_subversion_javahl_Depth_unknown;
 
     case svn_depth_exclude:
-      return org_tigris_subversion_javahl_Depth_exclude;
+      return org_apache_subversion_javahl_Depth_exclude;
 
     case svn_depth_empty:
-      return org_tigris_subversion_javahl_Depth_empty;
+      return org_apache_subversion_javahl_Depth_empty;
 
     case svn_depth_files:
-      return org_tigris_subversion_javahl_Depth_files;
+      return org_apache_subversion_javahl_Depth_files;
 
     case svn_depth_immediates:
-      return org_tigris_subversion_javahl_Depth_immediates;
+      return org_apache_subversion_javahl_Depth_immediates;
 
     case svn_depth_infinity:
-      return org_tigris_subversion_javahl_Depth_infinity;
+      return org_apache_subversion_javahl_Depth_infinity;
     }
 }
 
@@ -503,12 +503,12 @@
     {
     case svn_wc_operation_none:
     default:
-      return org_tigris_subversion_javahl_Operation_none;
+      return org_apache_subversion_javahl_Operation_none;
     case svn_wc_operation_update:
-      return org_tigris_subversion_javahl_Operation_update;
+      return org_apache_subversion_javahl_Operation_update;
     case svn_wc_operation_switch:
-      return org_tigris_subversion_javahl_Operation_switched;
+      return org_apache_subversion_javahl_Operation_switched;
     case svn_wc_operation_merge:
-      return org_tigris_subversion_javahl_Operation_merge;
+      return org_apache_subversion_javahl_Operation_merge;
     }
 }

Modified: subversion/trunk/subversion/bindings/javahl/native/Prompter.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/Prompter.cpp?rev=908296&r1=908295&r2=908296&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/Prompter.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/Prompter.cpp Wed Feb 10 00:40:48 2010
@@ -28,7 +28,7 @@
 #include "Pool.h"
 #include "JNIUtil.h"
 #include "JNIStringHolder.h"
-#include "../include/org_tigris_subversion_javahl_PromptUserPassword2.h"
+#include "../include/org_apache_subversion_javahl_callback_UserPasswordCallback.h"
 #include <apr_strings.h>
 #include "svn_auth.h"
 #include "svn_error.h"
@@ -425,12 +425,12 @@
       const char *answer = askQuestion(NULL, q.c_str(), true, false);
       if (*answer == 't' || *answer == 'T')
         return
-          org_tigris_subversion_javahl_PromptUserPassword2_AcceptTemporary;
+          org_apache_subversion_javahl_callback_UserPasswordCallback_AcceptTemporary;
       else if (maySave && (*answer == 'p' || *answer == 'P'))
         return
-          org_tigris_subversion_javahl_PromptUserPassword2_AcceptPermanently;
+          org_apache_subversion_javahl_callback_UserPasswordCallback_AcceptPermanently;
       else
-        return org_tigris_subversion_javahl_PromptUserPassword2_Reject;
+        return org_apache_subversion_javahl_callback_UserPasswordCallback_Reject;
     }
   return -1;
 }
@@ -706,11 +706,11 @@
 
   switch(that->askTrust(question.c_str(), may_save ? true : false))
     {
-    case org_tigris_subversion_javahl_PromptUserPassword2_AcceptTemporary:
+    case org_apache_subversion_javahl_callback_UserPasswordCallback_AcceptTemporary:
       *cred_p = ret;
       ret->may_save = FALSE;
       break;
-    case org_tigris_subversion_javahl_PromptUserPassword2_AcceptPermanently:
+    case org_apache_subversion_javahl_callback_UserPasswordCallback_AcceptPermanently:
       *cred_p = ret;
       ret->may_save = TRUE;
       ret->accepted_failures = failures;

Modified: subversion/trunk/subversion/bindings/javahl/native/Revision.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/Revision.cpp?rev=908296&r1=908295&r2=908296&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/Revision.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/Revision.cpp Wed Feb 10 00:40:48 2010
@@ -25,7 +25,7 @@
  */
 
 #include "Revision.h"
-#include "../include/org_tigris_subversion_javahl_RevisionKind.h"
+#include "../include/org_apache_subversion_javahl_RevisionKind.h"
 #include "JNIUtil.h"
 
 const svn_opt_revision_kind Revision::START = svn_opt_revision_unspecified;
@@ -71,10 +71,10 @@
 
       switch(jKind)
         {
-        case org_tigris_subversion_javahl_RevisionKind_unspecified:
+        case org_apache_subversion_javahl_RevisionKind_unspecified:
           m_revision.kind = svn_opt_revision_unspecified;
           break;
-        case org_tigris_subversion_javahl_RevisionKind_number:
+        case org_apache_subversion_javahl_RevisionKind_number:
           m_revision.kind = svn_opt_revision_number;
           {
             static jfieldID fidNum = 0;
@@ -97,7 +97,7 @@
             m_revision.value.number = (svn_revnum_t) jNumber;
           }
           break;
-        case org_tigris_subversion_javahl_RevisionKind_date:
+        case org_apache_subversion_javahl_RevisionKind_date:
           m_revision.kind = svn_opt_revision_date;
           {
             static jfieldID fidDate = 0;
@@ -147,19 +147,19 @@
             m_revision.value.date = jMillSec * 1000;
           }
           break;
-        case org_tigris_subversion_javahl_RevisionKind_committed:
+        case org_apache_subversion_javahl_RevisionKind_committed:
           m_revision.kind = svn_opt_revision_committed;
           break;
-        case org_tigris_subversion_javahl_RevisionKind_previous:
+        case org_apache_subversion_javahl_RevisionKind_previous:
           m_revision.kind = svn_opt_revision_previous;
           break;
-        case org_tigris_subversion_javahl_RevisionKind_base:
+        case org_apache_subversion_javahl_RevisionKind_base:
           m_revision.kind = svn_opt_revision_base;
           break;
-        case org_tigris_subversion_javahl_RevisionKind_working:
+        case org_apache_subversion_javahl_RevisionKind_working:
           m_revision.kind = svn_opt_revision_working;
           break;
-        case org_tigris_subversion_javahl_RevisionKind_head:
+        case org_apache_subversion_javahl_RevisionKind_head:
           m_revision.kind = svn_opt_revision_head;
           break;
         }

Modified: subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp?rev=908296&r1=908295&r2=908296&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp Wed Feb 10 00:40:48 2010
@@ -62,9 +62,9 @@
 #include "svn_dirent_uri.h"
 #include "svn_utf.h"
 #include "svn_private_config.h"
-#include "../include/org_tigris_subversion_javahl_Revision.h"
-#include "../include/org_tigris_subversion_javahl_NodeKind.h"
-#include "../include/org_tigris_subversion_javahl_StatusKind.h"
+#include "../include/org_apache_subversion_javahl_Revision.h"
+#include "../include/org_apache_subversion_javahl_NodeKind.h"
+#include "../include/org_apache_subversion_javahl_StatusKind.h"
 #include "JNIStringHolder.h"
 #include <vector>
 #include <iostream>

Modified: subversion/trunk/subversion/bindings/javahl/native/StatusCallback.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/StatusCallback.cpp?rev=908296&r1=908295&r2=908296&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/StatusCallback.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/StatusCallback.cpp Wed Feb 10 00:40:48
2010
@@ -29,9 +29,9 @@
 #include "EnumMapper.h"
 #include "JNIUtil.h"
 #include "svn_time.h"
-#include "../include/org_tigris_subversion_javahl_NodeKind.h"
-#include "../include/org_tigris_subversion_javahl_Revision.h"
-#include "../include/org_tigris_subversion_javahl_StatusKind.h"
+#include "../include/org_apache_subversion_javahl_NodeKind.h"
+#include "../include/org_apache_subversion_javahl_Revision.h"
+#include "../include/org_apache_subversion_javahl_StatusKind.h"
 
 /**
  * Create a StatusCallback object
@@ -135,16 +135,16 @@
     return NULL;
 
   jstring jUrl = NULL;
-  jint jNodeKind = org_tigris_subversion_javahl_NodeKind_unknown;
-  jlong jRevision = org_tigris_subversion_javahl_Revision_SVN_INVALID_REVNUM;
+  jint jNodeKind = org_apache_subversion_javahl_NodeKind_unknown;
+  jlong jRevision = org_apache_subversion_javahl_Revision_SVN_INVALID_REVNUM;
   jlong jLastChangedRevision =
-    org_tigris_subversion_javahl_Revision_SVN_INVALID_REVNUM;
+    org_apache_subversion_javahl_Revision_SVN_INVALID_REVNUM;
   jlong jLastChangedDate = 0;
   jstring jLastCommitAuthor = NULL;
-  jint jTextType = org_tigris_subversion_javahl_StatusKind_none;
-  jint jPropType = org_tigris_subversion_javahl_StatusKind_none;
-  jint jRepositoryTextType = org_tigris_subversion_javahl_StatusKind_none;
-  jint jRepositoryPropType = org_tigris_subversion_javahl_StatusKind_none;
+  jint jTextType = org_apache_subversion_javahl_StatusKind_none;
+  jint jPropType = org_apache_subversion_javahl_StatusKind_none;
+  jint jRepositoryTextType = org_apache_subversion_javahl_StatusKind_none;
+  jint jRepositoryPropType = org_apache_subversion_javahl_StatusKind_none;
   jboolean jIsLocked = JNI_FALSE;
   jboolean jIsCopied = JNI_FALSE;
   jboolean jIsSwitched = JNI_FALSE;
@@ -156,16 +156,16 @@
   jstring jConflictWorking = NULL;
   jstring jURLCopiedFrom = NULL;
   jlong jRevisionCopiedFrom =
-    org_tigris_subversion_javahl_Revision_SVN_INVALID_REVNUM;
+    org_apache_subversion_javahl_Revision_SVN_INVALID_REVNUM;
   jstring jLockToken = NULL;
   jstring jLockComment = NULL;
   jstring jLockOwner = NULL;
   jlong jLockCreationDate = 0;
   jobject jLock = NULL;
   jlong jOODLastCmtRevision =
-    org_tigris_subversion_javahl_Revision_SVN_INVALID_REVNUM;
+    org_apache_subversion_javahl_Revision_SVN_INVALID_REVNUM;
   jlong jOODLastCmtDate = 0;
-  jint jOODKind = org_tigris_subversion_javahl_NodeKind_none;
+  jint jOODKind = org_apache_subversion_javahl_NodeKind_none;
   jstring jOODLastCmtAuthor = NULL;
   jstring jChangelist = NULL;
   if (status != NULL)

Copied: subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/LockStatus.java
(from r907931, subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/LockStatus.java)
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/LockStatus.java?p2=subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/LockStatus.java&p1=subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/LockStatus.java&r1=907931&r2=908296&rev=908296&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/LockStatus.java
(original)
+++ subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/LockStatus.java
Wed Feb 10 00:40:48 2010
@@ -21,7 +21,7 @@
  * @endcopyright
  */
 
-package org.tigris.subversion.javahl;
+package org.apache.subversion.javahl;
 
 /**
  * @since 1.2

Copied: subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/Operation.java
(from r907931, subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Operation.java)
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/Operation.java?p2=subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/Operation.java&p1=subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Operation.java&r1=907931&r2=908296&rev=908296&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Operation.java
(original)
+++ subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/Operation.java
Wed Feb 10 00:40:48 2010
@@ -21,7 +21,7 @@
  * @endcopyright
  */
 
-package org.tigris.subversion.javahl;
+package org.apache.subversion.javahl;
 
 /**
  * Poor mans enum for svn_wc_operation_t

Modified: subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/UserPasswordCallback.java
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/UserPasswordCallback.java?rev=908296&r1=908295&r2=908296&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/UserPasswordCallback.java
(original)
+++ subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/UserPasswordCallback.java
Wed Feb 10 00:40:48 2010
@@ -31,6 +31,36 @@
 public interface UserPasswordCallback
 {
     /**
+     * Reject the connection to the server.
+     */
+    public static final int Reject = 0;
+
+    /**
+     * Accept the connection to the server <i>once</i>.
+     */
+    public static final int AcceptTemporary = 1;
+
+    /**
+     * @deprecated Use the correctly spelled "AcceptTemporary"
+     * constant instead.
+     */
+    public static final int AccecptTemporary = AcceptTemporary;
+
+    /**
+     * Accept the connection to the server <i>forever</i>.
+     */
+    public static final int AcceptPermanently = 2;
+
+    /**
+     * If there are problems with the certifcate of the SSL-server, this
+     * callback will be used to deside if the connection will be used.
+     * @param info              the probblems with the certificate.
+     * @param allowPermanently  if AcceptPermantly is a legal answer
+     * @return                  one of Reject/AcceptTemporary/AcceptPermanently
+     */
+    public int askTrustSSLServer(String info, boolean allowPermanently);
+
+    /**
      * Ask the user for username and password
      * The entered username/password is retrieved by the getUsername
      * getPasswort methods.



Mime
View raw message