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/01/27 23:45:23 UTC
svn commit: r903894 [1/2] - in /subversion/trunk: ./ build/generator/
subversion/bindings/javahl/src/org/apache/
subversion/bindings/javahl/src/org/apache/subversion/
subversion/bindings/javahl/src/org/apache/subversion/javahl/
subversion/bindings/java...
Author: hwright
Date: Wed Jan 27 22:45:19 2010
New Revision: 903894
URL: http://svn.apache.org/viewvc?rev=903894&view=rev
Log:
A first pass at creating a JavaHL package in the org.apache.subversion
namespace. This only migrates the interface, and creates a new sub-package
for all the callbacks.
There is also some build-system munging to get this to build. To do so, run
'make javahl-compat'. Eventually, though, it should be folded into the
proper target, and everything should be built together.
* Makefile.in:
Add classpath for javahl-compat, and also ensure the source directory
is part of the classpath.
* build.conf
(javahl-compat): New.
* subversion/bindings/javahl/src/org/apache/subversion/javahl:
New package, with content largely copied (and trimmed) from
org.tigris.subverison.javahl.
* build/generator/gen_base.py
(TargetJavaClasses): Handle multiple packages for the same target (needed
for the javahl-compat target).
Added:
subversion/trunk/subversion/bindings/javahl/src/org/apache/
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ChangePath.java
- copied, changed from r903532, subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ChangePath.java
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ClientException.java
- copied, changed from r903474, subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ClientException.java
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/CommitItem.java
- copied, changed from r903549, subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/CommitItem.java
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/CommitItemStateFlags.java
- copied, changed from r903549, subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/CommitItemStateFlags.java
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/CommitMessage.java
- copied, changed from r903549, subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/CommitMessage.java
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ConflictDescriptor.java
- copied, changed from r903532, subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ConflictDescriptor.java
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ConflictResult.java
- copied, changed from r903549, subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ConflictResult.java
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ConflictVersion.java
- copied, changed from r903532, subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ConflictVersion.java
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/CopySource.java
- copied, changed from r903549, subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/CopySource.java
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/Depth.java
- copied, changed from r903532, subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Depth.java
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/DiffSummary.java
- copied, changed from r903549, subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/DiffSummary.java
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/DirEntry.java
- copied, changed from r903549, subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/DirEntry.java
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java
- copied, changed from r903474, subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClientInterface.java
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/Info2.java
- copied, changed from r903532, subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Info2.java
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/Lock.java
- copied, changed from r903532, subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Lock.java
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/Mergeinfo.java
- copied, changed from r903549, subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Mergeinfo.java
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/NativeException.java
- copied, changed from r903474, subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/NativeException.java
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/NodeKind.java
- copied, changed from r903532, subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/NodeKind.java
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/NotifyInformation.java
- copied, changed from r903549, subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/NotifyInformation.java
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ProgressEvent.java
- copied, changed from r903549, subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ProgressEvent.java
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/PropertyData.java
- copied, changed from r903532, subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/PropertyData.java
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/Revision.java
- copied, changed from r903532, subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Revision.java
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/RevisionKind.java
- copied, changed from r903532, subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/RevisionKind.java
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/RevisionRange.java
- copied, changed from r903549, subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/RevisionRange.java
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/Status.java
- copied, changed from r903549, subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Status.java
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/StatusKind.java
- copied, changed from r903549, subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/StatusKind.java
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/SubversionException.java
- copied, changed from r903474, subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SubversionException.java
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/Version.java
- copied, changed from r903532, subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Version.java
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/BlameCallback3.java
- copied, changed from r903532, subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/BlameCallback3.java
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/ChangelistCallback.java
- copied, changed from r903532, subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ChangelistCallback.java
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/ConflictResolverCallback.java
- copied, changed from r903549, subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ConflictResolverCallback.java
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/DiffSummaryCallback.java
- copied, changed from r903549, subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/DiffSummaryReceiver.java
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/InfoCallback.java
- copied, changed from r903474, subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/InfoCallback.java
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/ListCallback.java
- copied, changed from r903549, subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ListCallback.java
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/LogMessageCallback.java
- copied, changed from r903532, subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/LogMessageCallback.java
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/NotifyCallback.java
- copied, changed from r903549, subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Notify2.java
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/ProgressCallback.java
- copied, changed from r903549, subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ProgressListener.java
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/ProplistCallback.java
- copied, changed from r903532, subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ProplistCallback.java
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/StatusCallback.java
- copied, changed from r903549, subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/StatusCallback.java
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/UserPasswordCallback.java
- copied, changed from r903549, subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/PromptUserPassword.java
Modified:
subversion/trunk/Makefile.in
subversion/trunk/build.conf
subversion/trunk/build/generator/gen_base.py
Modified: subversion/trunk/Makefile.in
URL: http://svn.apache.org/viewvc/subversion/trunk/Makefile.in?rev=903894&r1=903893&r2=903894&view=diff
==============================================================================
--- subversion/trunk/Makefile.in (original)
+++ subversion/trunk/Makefile.in Wed Jan 27 22:45:19 2010
@@ -322,8 +322,9 @@
JAVAH = @JAVAH@
JAR = @JAR@
-JAVA_CLASSPATH=@JAVA_CLASSPATH@
+JAVA_CLASSPATH=$(abs_srcdir)/subversion/bindings/javahl/src:@JAVA_CLASSPATH@
javahl_java_CLASSPATH=$(JAVA_CLASSPATH)
+javahl_compat_CLASSPATH=$(JAVA_CLASSPATH)
javahl_tests_CLASSPATH=$(JAVA_CLASSPATH)
RUBY = @RUBY@
Modified: subversion/trunk/build.conf
URL: http://svn.apache.org/viewvc/subversion/trunk/build.conf?rev=903894&r1=903893&r2=903894&view=diff
==============================================================================
--- subversion/trunk/build.conf (original)
+++ subversion/trunk/build.conf Wed Jan 27 22:45:19 2010
@@ -527,6 +527,17 @@
#
# JavaHL targets
#
+[javahl-compat]
+type = java
+path = subversion/bindings/javahl/src/org/apache/subversion/javahl
+ subversion/bindings/javahl/src/org/apache/subversion/javahl/callback
+src-root = subversion/bindings/javahl/src
+sources = *.java
+install = javahl-java
+link-cmd = $(COMPILE_JAVAHL_JAVAC)
+classes = subversion/bindings/javahl/classes
+package-roots = org
+
[javahl-java]
type = java
path = subversion/bindings/javahl/src/org/tigris/subversion/javahl
Modified: subversion/trunk/build/generator/gen_base.py
URL: http://svn.apache.org/viewvc/subversion/trunk/build/generator/gen_base.py?rev=903894&r1=903893&r2=903894&view=diff
==============================================================================
--- subversion/trunk/build/generator/gen_base.py (original)
+++ subversion/trunk/build/generator/gen_base.py Wed Jan 27 22:45:19 2010
@@ -712,7 +712,9 @@
self.output_dir = self.classes
def add_dependencies(self):
- sources =_collect_paths(self.sources, self.path)
+ sources = []
+ for p in self.path.split():
+ sources.extend(_collect_paths(self.sources, p))
for src, reldir in sources:
if src[-5:] == '.java':
@@ -750,7 +752,7 @@
# collect all the paths where stuff might get built
### we should collect this from the dependency nodes rather than
### the sources. "what dir are you going to put yourself into?"
- self.gen_obj.target_dirs.append(self.path)
+ self.gen_obj.target_dirs.extend(self.path.split())
self.gen_obj.target_dirs.append(self.classes)
for pattern in self.sources.split():
dirname = build_path_dirname(pattern)
Copied: subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ChangePath.java (from r903532, subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ChangePath.java)
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ChangePath.java?p2=subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ChangePath.java&p1=subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ChangePath.java&r1=903532&r2=903894&rev=903894&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ChangePath.java (original)
+++ subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ChangePath.java Wed Jan 27 22:45:19 2010
@@ -21,7 +21,7 @@
* @endcopyright
*/
-package org.tigris.subversion.javahl;
+package org.apache.subversion.javahl;
public class ChangePath implements java.io.Serializable
{
Copied: subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ClientException.java (from r903474, subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ClientException.java)
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ClientException.java?p2=subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ClientException.java&p1=subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ClientException.java&r1=903474&r2=903894&rev=903894&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ClientException.java (original)
+++ subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ClientException.java Wed Jan 27 22:45:19 2010
@@ -21,7 +21,7 @@
* @endcopyright
*/
-package org.tigris.subversion.javahl;
+package org.apache.subversion.javahl;
/**
* This exception is thrown whenever something goes wrong in the
Copied: subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/CommitItem.java (from r903549, subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/CommitItem.java)
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/CommitItem.java?p2=subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/CommitItem.java&p1=subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/CommitItem.java&r1=903549&r2=903894&rev=903894&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/CommitItem.java (original)
+++ subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/CommitItem.java Wed Jan 27 22:45:19 2010
@@ -21,7 +21,7 @@
* @endcopyright
*/
-package org.tigris.subversion.javahl;
+package org.apache.subversion.javahl;
/**
* This class describes a item which will be commited.
Copied: subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/CommitItemStateFlags.java (from r903549, subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/CommitItemStateFlags.java)
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/CommitItemStateFlags.java?p2=subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/CommitItemStateFlags.java&p1=subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/CommitItemStateFlags.java&r1=903549&r2=903894&rev=903894&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/CommitItemStateFlags.java (original)
+++ subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/CommitItemStateFlags.java Wed Jan 27 22:45:19 2010
@@ -21,7 +21,7 @@
* @endcopyright
*/
-package org.tigris.subversion.javahl;
+package org.apache.subversion.javahl;
/**
* The constants in this interface describe the changes to an item to
Copied: subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/CommitMessage.java (from r903549, subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/CommitMessage.java)
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/CommitMessage.java?p2=subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/CommitMessage.java&p1=subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/CommitMessage.java&r1=903549&r2=903894&rev=903894&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/CommitMessage.java (original)
+++ subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/CommitMessage.java Wed Jan 27 22:45:19 2010
@@ -21,7 +21,7 @@
* @endcopyright
*/
-package org.tigris.subversion.javahl;
+package org.apache.subversion.javahl;
/**
* This is callback interface which has to implemented by the client
Copied: subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ConflictDescriptor.java (from r903532, subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ConflictDescriptor.java)
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ConflictDescriptor.java?p2=subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ConflictDescriptor.java&p1=subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ConflictDescriptor.java&r1=903532&r2=903894&rev=903894&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ConflictDescriptor.java (original)
+++ subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ConflictDescriptor.java Wed Jan 27 22:45:19 2010
@@ -21,7 +21,7 @@
* @endcopyright
*/
-package org.tigris.subversion.javahl;
+package org.apache.subversion.javahl;
/**
* The description of a merge conflict, encountered during
Copied: subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ConflictResult.java (from r903549, subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ConflictResult.java)
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ConflictResult.java?p2=subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ConflictResult.java&p1=subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ConflictResult.java&r1=903549&r2=903894&rev=903894&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ConflictResult.java (original)
+++ subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ConflictResult.java Wed Jan 27 22:45:19 2010
@@ -21,7 +21,7 @@
* @endcopyright
*/
-package org.tigris.subversion.javahl;
+package org.apache.subversion.javahl;
/**
* The result returned by the callback API used to handle conflicts
Copied: subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ConflictVersion.java (from r903532, subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ConflictVersion.java)
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ConflictVersion.java?p2=subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ConflictVersion.java&p1=subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ConflictVersion.java&r1=903532&r2=903894&rev=903894&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ConflictVersion.java (original)
+++ subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ConflictVersion.java Wed Jan 27 22:45:19 2010
@@ -21,7 +21,7 @@
* @endcopyright
*/
-package org.tigris.subversion.javahl;
+package org.apache.subversion.javahl;
/**
* The description of a merge conflict, encountered during
Copied: subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/CopySource.java (from r903549, subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/CopySource.java)
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/CopySource.java?p2=subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/CopySource.java&p1=subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/CopySource.java&r1=903549&r2=903894&rev=903894&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/CopySource.java (original)
+++ subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/CopySource.java Wed Jan 27 22:45:19 2010
@@ -21,7 +21,7 @@
* @endcopyright
*/
-package org.tigris.subversion.javahl;
+package org.apache.subversion.javahl;
/**
* A description of a copy source.
@@ -58,7 +58,7 @@
* @param path
* @param revision The source revision.
* @param pegRevision The peg revision. Typically interpreted as
- * {@link org.tigris.subversion.javahl.Revision#HEAD} when
+ * {@link org.apache.subversion.javahl.Revision#HEAD} when
* <code>null</code>.
*/
public CopySource(String path, Revision revision, Revision pegRevision)
Copied: subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/Depth.java (from r903532, subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Depth.java)
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/Depth.java?p2=subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/Depth.java&p1=subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Depth.java&r1=903532&r2=903894&rev=903894&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Depth.java (original)
+++ subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/Depth.java Wed Jan 27 22:45:19 2010
@@ -21,7 +21,7 @@
* @endcopyright
*/
-package org.tigris.subversion.javahl;
+package org.apache.subversion.javahl;
/**
* The concept of depth for directories.
Copied: subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/DiffSummary.java (from r903549, subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/DiffSummary.java)
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/DiffSummary.java?p2=subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/DiffSummary.java&p1=subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/DiffSummary.java&r1=903549&r2=903894&rev=903894&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/DiffSummary.java (original)
+++ subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/DiffSummary.java Wed Jan 27 22:45:19 2010
@@ -21,7 +21,7 @@
* @endcopyright
*/
-package org.tigris.subversion.javahl;
+package org.apache.subversion.javahl;
import java.util.EventObject;
Copied: subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/DirEntry.java (from r903549, subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/DirEntry.java)
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/DirEntry.java?p2=subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/DirEntry.java&p1=subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/DirEntry.java&r1=903549&r2=903894&rev=903894&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/DirEntry.java (original)
+++ subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/DirEntry.java Wed Jan 27 22:45:19 2010
@@ -21,7 +21,7 @@
* @endcopyright
*/
-package org.tigris.subversion.javahl;
+package org.apache.subversion.javahl;
import java.util.Date;
Copied: subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java (from r903474, subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClientInterface.java)
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java?p2=subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java&p1=subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClientInterface.java&r1=903474&r2=903894&rev=903894&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClientInterface.java (original)
+++ subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java Wed Jan 27 22:45:19 2010
@@ -21,7 +21,9 @@
* @endcopyright
*/
-package org.tigris.subversion.javahl;
+package org.apache.subversion.javahl;
+
+import org.apache.subversion.javahl.callback.*;
import java.io.OutputStream;
import java.util.Map;
@@ -30,7 +32,7 @@
* This interface is the commom interface for all subversion
* operations. It is implemented by SVNClient and SVNClientSynchronized
*/
-public interface SVNClientInterface
+public interface ISVNClient
{
/**
* release the native peer (should not depend on finalize)
@@ -63,80 +65,6 @@
public boolean isAdminDirectory(String name);
/**
- * Returns the last destination path submitted.
- * @deprecated
- * @return path in Subversion format.
- * @since 1.0
- */
- String getLastPath();
-
- /**
- * Returns the status of a single file in the path.
- *
- * @param path File to gather status.
- * @param onServer Request status information from the server.
- * @return The Subversion status of the file, or <code>null</code>
- * if no status is available.
- * @deprecated Use {@link #status(String, int, boolean, boolean,
- * boolean, boolean, StatusCallback)}
- * instead.
- * @since 1.0
- */
- Status singleStatus(String path, boolean onServer) throws ClientException;
-
- /**
- * List a directory or file of the working copy.
- *
- * @param path Path to explore.
- * @param descend Recurse into subdirectories if they exist.
- * @param onServer Request status information from server.
- * @param getAll get status for uninteresting (unchanged) files.
- * @return Array of Status entries.
- * @deprecated Use {@link #status(String, int, boolean, boolean,
- * boolean, boolean, StatusCallback)}
- * instead.
- * @since 1.0
- */
- Status[] status(String path, boolean descend, boolean onServer,
- boolean getAll) throws ClientException;
-
- /**
- * List a directory or file of the working copy.
- *
- * @param path Path to explore.
- * @param descend Recurse into subdirectories if they exist.
- * @param onServer Request status information from server.
- * @param getAll get status for uninteresting (unchanged) files.
- * @param noIgnore get status for normaly ignored files and directories.
- * @return Array of Status entries.
- * @deprecated Use {@link #status(String, int, boolean, boolean,
- * boolean, boolean, StatusCallback)}
- * instead.
- * @since 1.0
- */
- Status[] status(String path, boolean descend, boolean onServer,
- boolean getAll, boolean noIgnore) throws ClientException;
-
- /**
- * List a directory or file of the working copy.
- *
- * @param path Path to explore.
- * @param descend Recurse into subdirectories if they exist.
- * @param onServer Request status information from server.
- * @param getAll get status for uninteresting (unchanged) files.
- * @param noIgnore get status for normaly ignored files and directories.
- * @param ignoreExternals if externals are ignored during status
- * @return Array of Status entries.
- * @deprecated Use {@link #status(String, int, boolean, boolean,
- * boolean, boolean, StatusCallback)}
- * instead.
- * @since 1.2
- */
- Status[] status(String path, boolean descend, boolean onServer,
- boolean getAll, boolean noIgnore, boolean ignoreExternals)
- throws ClientException;
-
- /**
* List a directory or file of the working copy.
*
* @param path Path to explore.
@@ -155,34 +83,6 @@
/**
* Lists the directory entries of an url on the server.
- * @param url the url to list
- * @param revision the revision to list
- * @param recurse recurse into subdirectories
- * @return Array of DirEntry objects.
- * @deprecated Use {@link #list(String, Revision, Revision, int, int,
- * boolean, ListCallback)} instead.
- * @since 1.0
- */
- DirEntry[] list(String url, Revision revision, boolean recurse)
- throws ClientException;
-
- /**
- * Lists the directory entries of an url on the server.
- * @param url the url to list
- * @param revision the revision to list
- * @param pegRevision the revision to interpret url
- * @param recurse recurse into subdirectories
- * @return Array of DirEntry objects.
- * @deprecated Use {@link #list(String, Revision, Revision, int, int,
- * boolean, ListCallback)} instead.
- * @since 1.2
- */
- DirEntry[] list(String url, Revision revision, Revision pegRevision,
- boolean recurse)
- throws ClientException;
-
- /**
- * Lists the directory entries of an url on the server.
* @param url the url to list
* @param revision the revision to list
* @param pegRevision the revision to interpret url
@@ -227,105 +127,7 @@
* @param prompt the callback interface
* @since 1.0
*/
- void setPrompt(PromptUserPassword prompt);
-
- /**
- * Retrieve the log messages for an item
- * @param path path or url to get the log message for.
- * @param revisionStart first revision to show
- * @param revisionEnd last revision to show
- * @return array of LogMessages
- * @deprecated Use {@link #logMessages(String, Revision, Revision, Revision,
- * boolean, boolean, boolean, String[],
- * long, LogMessageCallback)} instead.
- * @since 1.0
- */
- LogMessage[] logMessages(String path, Revision revisionStart,
- Revision revisionEnd) throws ClientException;
-
- /**
- * Retrieve the log messages for an item
- * @param path path or url to get the log message for.
- * @param revisionStart first revision to show
- * @param revisionEnd last revision to show
- * @param stopOnCopy do not continue on copy operations
- * @return array of LogMessages
- * @deprecated Use {@link #logMessages(String, Revision, Revision, Revision,
- * boolean, boolean, boolean, String[],
- * long, LogMessageCallback)} instead.
- * @since 1.0
- */
- LogMessage[] logMessages(String path, Revision revisionStart,
- Revision revisionEnd, boolean stopOnCopy)
- throws ClientException;
-
- /**
- * Retrieve the log messages for an item
- * @param path path or url to get the log message for.
- * @param revisionStart first revision to show
- * @param revisionEnd last revision to show
- * @param stopOnCopy do not continue on copy operations
- * @param discoverPath returns the paths of the changed items in the
- * returned objects
- * @return array of LogMessages
- * @deprecated Use {@link #logMessages(String, Revision, Revision, Revision,
- * boolean, boolean, boolean, String[],
- * long, LogMessageCallback)} instead.
- * @since 1.0
- */
- LogMessage[] logMessages(String path, Revision revisionStart,
- Revision revisionEnd, boolean stopOnCopy,
- boolean discoverPath)
- throws ClientException;
-
- /**
- * Retrieve the log messages for an item
- * @param path path or url to get the log message for.
- * @param revisionStart first revision to show
- * @param revisionEnd last revision to show
- * @param stopOnCopy do not continue on copy operations
- * @param discoverPath returns the paths of the changed items in the
- * returned objects
- * @param limit limit the number of log messages (if 0 or less no
- * limit)
- * @return array of LogMessages
- * @since 1.2
- * @deprecated Use {@link #logMessages(String, Revision, Revision, Revision,
- * boolean, boolean, boolean, String[],
- * long, LogMessageCallback)} instead.
- */
- LogMessage[] logMessages(String path, Revision revisionStart,
- Revision revisionEnd, boolean stopOnCopy,
- boolean discoverPath, long limit)
- throws ClientException;
-
- /**
- * Retrieve the log messages for an item.
- * @param path path or url to get the log message for.
- * @param pegRevision revision to interpret path
- * @param revisionStart first revision to show
- * @param revisionEnd last revision to show
- * @param stopOnCopy do not continue on copy operations
- * @param discoverPath returns the paths of the changed items in the
- * returned objects
- * @param includeMergedRevisions include log messages for revisions which
- * were merged.
- * @param revProps the revprops to retrieve
- * @param limit limit the number of log messages (if 0 or less no
- * limit)
- * @param callback the object to receive the log messages
- * @since 1.5
- * @deprecated Use {@link #logMessages(String, Revision, RevisionRange[],
- * boolean, boolean, boolean, String[],
- * long, LogMessageCallback)} instead.
- */
- void logMessages(String path, Revision pegRevision,
- Revision revisionStart,
- Revision revisionEnd, boolean stopOnCopy,
- boolean discoverPath, boolean includeMergedRevisions,
- String[] revProps, long limit,
- LogMessageCallback callback)
- throws ClientException;
+ void setPrompt(UserPasswordCallback prompt);
/**
* Retrieve the log messages for an item.
@@ -355,38 +157,6 @@
* @param moduleName name of the module to checkout.
* @param destPath destination directory for checkout.
* @param revision the revision to checkout.
- * @param recurse whether you want it to checkout files recursively.
- * @throws ClientException
- * @deprecated Use {@link #checkout(String, String, Revision, Revision,
- * int, boolean, boolean)} instead.
- * @since 1.0
- */
- long checkout(String moduleName, String destPath, Revision revision,
- boolean recurse)
- throws ClientException;
-
- /**
- * Executes a revision checkout.
- * @param moduleName name of the module to checkout.
- * @param destPath destination directory for checkout.
- * @param revision the revision to checkout.
- * @param pegRevision the peg revision to interpret the path
- * @param recurse whether you want it to checkout files recursively.
- * @param ignoreExternals if externals are ignored during checkout
- * @throws ClientException
- * @deprecated Use {@link #checkout(String, String, Revision, Revision,
- * int, boolean, boolean)} instead.
- * @since 1.2
- */
- long checkout(String moduleName, String destPath, Revision revision,
- Revision pegRevision, boolean recurse,
- boolean ignoreExternals) throws ClientException;
-
- /**
- * Executes a revision checkout.
- * @param moduleName name of the module to checkout.
- * @param destPath destination directory for checkout.
- * @param revision the revision to checkout.
* @param pegRevision the peg revision to interpret the path
* @param depth how deep to checkout files recursively.
* @param ignoreExternals if externals are ignored during checkout
@@ -404,19 +174,9 @@
* to the calling program.
* @param notify listener that the SVN library should call on many
* file operations.
- * @deprecated Use {@link #notification2(Notify2)} instead.
- * @since 1.0
- */
- void notification(Notify notify);
-
- /**
- * Sets the notification callback used to send processing information back
- * to the calling program.
- * @param notify listener that the SVN library should call on many
- * file operations.
* @since 1.2
*/
- void notification2(Notify2 notify);
+ void notification2(NotifyCallback notify);
/**
* Set the conflict resolution callback.
@@ -432,7 +192,7 @@
* @param listener The progress callback.
* @since 1.5
*/
- void setProgressListener(ProgressListener listener);
+ void setProgressCallback(ProgressCallback listener);
/**
* Sets the commit message handler. This allows more complex commit message
@@ -448,19 +208,6 @@
* @param path path or url to be deleted
* @param message if path is a url, this will be the commit message.
* @param force delete even when there are local modifications.
- * @throws ClientException
- * @deprecated Use {@link #remove(String[], String, boolean, boolean)}
- * instead.
- * @since 1.0
- */
- void remove(String[] path, String message, boolean force)
- throws ClientException;
-
- /**
- * Sets a file for deletion.
- * @param path path or url to be deleted
- * @param message if path is a url, this will be the commit message.
- * @param force delete even when there are local modifications.
* @param keepLocal only remove the paths from the repository.
* @param revpropTable A string-to-string mapping of revision properties
* to values which will be set if this operation
@@ -475,16 +222,6 @@
/**
* Reverts a file to a pristine state.
* @param path path of the file.
- * @param recurse recurse into subdirectories
- * @throws ClientException
- * @deprecated Use {@link #revert(String, int)} instead.
- * @since 1.0
- */
- void revert(String path, boolean recurse) throws ClientException;
-
- /**
- * Reverts a file to a pristine state.
- * @param path path of the file.
* @param depth the depth to recurse into subdirectories
* @param changelists changelists to filter by
* @throws ClientException
@@ -496,31 +233,6 @@
/**
* Adds a file to the repository.
* @param path path to be added.
- * @param recurse recurse into subdirectories
- * @throws ClientException
- * @since 1.0
- * @deprecated Use {@link #add(String, int, boolean, boolean, boolean)}
- * instead.
- */
- void add(String path, boolean recurse) throws ClientException;
-
- /**
- * Adds a file to the repository.
- * @param path path to be added.
- * @param recurse recurse into subdirectories
- * @param force if adding a directory and recurse true and path is a
- * directory, all not already managed files are added.
- * @throws ClientException
- * @since 1.2
- * @deprecated Use {@link #add(String, int, boolean, boolean, boolean)}
- * instead.
- */
- void add(String path, boolean recurse, boolean force)
- throws ClientException;
-
- /**
- * Adds a file to the repository.
- * @param path path to be added.
* @param depth the depth to recurse into subdirectories
* @param force if adding a directory and recurse true and path is a
* directory, all not already managed files are added.
@@ -540,37 +252,6 @@
* @param revision the revision number to update.
* Revision.HEAD will update to the
* latest revision.
- * @param recurse recursively update.
- * @throws ClientException
- * @deprecated Use {@link #update(String, Revision, int, boolean,
- * boolean, boolean)} instead.
- * @since 1.0
- */
- long update(String path, Revision revision, boolean recurse)
- throws ClientException;
-
- /**
- * Updates the directories or files from repository
- * @param path array of target files.
- * @param revision the revision number to update.
- * Revision.HEAD will update to the
- * latest revision.
- * @param recurse recursively update.
- * @param ignoreExternals if externals are ignored during update
- * @throws ClientException
- * @deprecated Use {@link #update(String[], Revision, int, boolean,
- * boolean, boolean)} instead.
- * @since 1.2
- */
- long[] update(String[] path, Revision revision, boolean recurse,
- boolean ignoreExternals) throws ClientException;
-
- /**
- * Updates the directory or file from repository
- * @param path target file.
- * @param revision the revision number to update.
- * Revision.HEAD will update to the
- * latest revision.
* @param depth the depth to recursively update.
* @param depthIsSticky if set, and depth is not {@link Depth#unknown},
* then also set the ambient depth value to depth.
@@ -604,38 +285,6 @@
/**
* Commits changes to the repository.
- * @param path files to commit.
- * @param message log message.
- * @param recurse whether the operation should be done recursively.
- * @return The new revision number created by the commit, or
- * {@link Revision#SVN_INVALID_REVNUM} if the revision number is
- * invalid.
- * @throws ClientException
- * @deprecated Use {@link #commit(String[], String, int, boolean, boolean,
- * String[])} instead.
- */
- long commit(String[] path, String message, boolean recurse)
- throws ClientException;
-
- /**
- * Commits changes to the repository.
- * @param path files to commit.
- * @param message log message.
- * @param recurse whether the operation should be done recursively.
- * @param noUnlock do remove any locks
- * @return The new revision number created by the commit, or
- * {@link Revision#SVN_INVALID_REVNUM} if the revision number is
- * invalid.
- * @throws ClientException
- * @deprecated Use {@link #commit(String[], String, int, boolean, boolean,
- * String[])} instead.
- * @since 1.2
- */
- long commit(String[] path, String message, boolean recurse,
- boolean noUnlock) throws ClientException;
-
- /**
- * Commits changes to the repository.
* @param path files to commit.
* @param message log message.
* @param depth how deep to recurse in subdirectories
@@ -680,43 +329,6 @@
throws ClientException;
/**
- * Copy versioned paths with the history preserved.
- *
- * @param sources A list of <code>CopySource</code> objects.
- * @param destPath Destination path or URL.
- * @param message Commit message. May be <code>null</code> if
- * <code>destPath</code> is not a URL.
- * @param copyAsChild Whether to copy <code>srcPaths</code> as
- * children of <code>destPath</code>.
- * @param makeParents Whether to create intermediate parents
- * @param revpropTable A string-to-string mapping of revision properties
- * to values which will be set if this operation
- * results in a commit.
- * @throws ClientException If the copy operation fails.
- * @since 1.5
- * @deprecated Use {@link #copy(CopySource[], String, String, boolean,
- * boolean, boolean, Map)} instead.
- */
- void copy(CopySource[] sources, String destPath, String message,
- boolean copyAsChild, boolean makeParents, Map revpropTable)
- throws ClientException;
-
- /**
- * Copy versioned paths with the history preserved (with
- * <code>copyAsChild</code> behavior).
- *
- * @param srcPath source path or url
- * @param destPath destination path or url
- * @param message commit message if destPath is an url
- * @param revision source revision
- * @throws ClientException
- * @deprecated Use {@link #copy(CopySource[], String, String, boolean,
- * boolean, boolean, Map)} instead.
- */
- void copy(String srcPath, String destPath, String message,
- Revision revision) throws ClientException;
-
- /**
* Move or rename versioned paths.
*
* @param srcPaths Source paths or URLs.
@@ -740,31 +352,6 @@
throws ClientException;
/**
- * @deprecated Use {@link #move(String[], String, String, boolean, boolean,
- * boolean)} instead.
- * @since 1.2
- */
- void move(String srcPath, String destPath, String message,
- Revision ignored, boolean force)
- throws ClientException;
-
- /**
- * Move or rename versioned paths (with <code>moveAsChild</code>
- * behavior).
- *
- * @param srcPath source path or url
- * @param destPath destination path or url
- * @param message commit message if destPath is an url
- * @param force even with local modifications.
- * @throws ClientException
- * @deprecated Use {@link #move(String[], String, String, boolean, boolean,
- * boolean)} instead.
- * @since 1.2
- */
- void move(String srcPath, String destPath, String message,
- boolean force) throws ClientException;
-
- /**
* Creates a directory directly in a repository or creates a
* directory on disk and schedules it for addition.
* @param path directories to be created
@@ -810,50 +397,6 @@
throws SubversionException;
/**
- * Removes the <i>conflicted</i> state on a WC path (or tree).
- * @see #resolved(String, int, int)
- * @deprecated Use {@link #resolved(String, int, int)} instead.
- */
- void resolved(String path, boolean recurse) throws ClientException;
-
- /**
- * Exports the contents of either a subversion repository into a
- * 'clean' directory (meaning a directory with no administrative
- * directories).
- * @param srcPath the url of the repository path to be exported
- * @param destPath a destination path that must not already exist.
- * @param revision the revsion to be exported
- * @param force set if it is ok to overwrite local files
- * @throws ClientException
- * @deprecated Use {@link #doExport(String, String, Revision, Revision,
- * boolean, boolean, int, String)} instead.
- * @since 1.0
- */
- long doExport(String srcPath, String destPath, Revision revision,
- boolean force) throws ClientException;
-
- /**
- * Exports the contents of either a subversion repository into a
- * 'clean' directory (meaning a directory with no administrative
- * directories).
- * @param srcPath the url of the repository path to be exported
- * @param destPath a destination path that must not already exist.
- * @param revision the revsion to be exported
- * @param pegRevision the revision to interpret srcPath
- * @param force set if it is ok to overwrite local files
- * @param ignoreExternals ignore external during export
- * @param recurse recurse to subdirectories
- * @param nativeEOL which EOL characters to use during export
- * @throws ClientException
- * @deprecated Use {@link #doExport(String, String, Revision, Revision,
- * boolean, boolean, int, String)} instead.
- * @since 1.2
- */
- long doExport(String srcPath, String destPath, Revision revision,
- Revision pegRevision, boolean force, boolean ignoreExternals,
- boolean recurse, String nativeEOL) throws ClientException;
-
- /**
* Exports the contents of either a subversion repository into a
* 'clean' directory (meaning a directory with no administrative
* directories).
@@ -879,20 +422,6 @@
* @param path the working copy path
* @param url the new url for the working copy
* @param revision the new base revision of working copy
- * @param recurse traverse into subdirectories
- * @throws ClientException
- * @deprecated Use {@link #doSwitch(String, String, Revision, boolean)}
- * instead.
- * @since 1.0
- */
- long doSwitch(String path, String url, Revision revision, boolean recurse)
- throws ClientException;
-
- /**
- * Update local copy to mirror a new url.
- * @param path the working copy path
- * @param url the new url for the working copy
- * @param revision the new base revision of working copy
* @param pegRevision the revision at which to interpret <code>path</code>
* @param depth how deep to traverse into subdirectories
* @param depthIsSticky if set, and depth is not {@link Depth#unknown},
@@ -913,21 +442,6 @@
* @param path the local path
* @param url the target url
* @param message the log message.
- * @param recurse traverse into subdirectories
- * @throws ClientException
- * @deprecated Use {@link #doImport(String, String, String, int, boolean,
- * boolean)} instead.
- * @since 1.0
- */
- void doImport(String path, String url, String message, boolean recurse)
- throws ClientException;
-
- /**
- * Import a file or directory into a repository directory at
- * head.
- * @param path the local path
- * @param url the target url
- * @param message the log message.
* @param depth depth to traverse into subdirectories
* @param noIgnore whether to add files matched by ignore patterns
* @param ignoreUnknownNodeTypes whether to ignore files which
@@ -957,47 +471,6 @@
/**
* Merge changes from two paths into a new local path.
- * @param path1 first path or url
- * @param revision1 first revision
- * @param path2 second path or url
- * @param revision2 second revision
- * @param localPath target local path
- * @param force overwrite local changes
- * @param recurse traverse into subdirectories
- * @throws ClientException
- * @deprecated Use {@link #merge(String, Revision, String, Revision,
- * String, boolean, int, boolean, boolean,
- * boolean)} instead.
- * @since 1.0
- */
- void merge(String path1, Revision revision1, String path2,
- Revision revision2, String localPath, boolean force,
- boolean recurse) throws ClientException;
-
- /**
- * Merge changes from two paths into a new local path.
- * @param path1 first path or url
- * @param revision1 first revision
- * @param path2 second path or url
- * @param revision2 second revision
- * @param localPath target local path
- * @param force overwrite local changes
- * @param recurse traverse into subdirectories
- * @param ignoreAncestry ignore if files are not related
- * @param dryRun do not change anything
- * @throws ClientException
- * @deprecated Use {@link #merge(String, Revision, String, Revision,
- * String, boolean, int, boolean, boolean,
- * boolean)} instead.
- * @since 1.2
- */
- void merge(String path1, Revision revision1, String path2,
- Revision revision2, String localPath, boolean force,
- boolean recurse, boolean ignoreAncestry, boolean dryRun)
- throws ClientException;
-
- /**
- * Merge changes from two paths into a new local path.
*
* @param path1 first path or url
* @param revision1 first revision
@@ -1018,28 +491,6 @@
throws ClientException;
/**
- * Merge changes from two paths into a new local path.
- * @param path path or url
- * @param pegRevision revision to interpret path
- * @param revision1 first revision
- * @param revision2 second revision
- * @param localPath target local path
- * @param force overwrite local changes
- * @param recurse traverse into subdirectories
- * @param ignoreAncestry ignore if files are not related
- * @param dryRun do not change anything
- * @throws ClientException
- * @deprecated Use {@link #merge(String, Revision, RevisionRange[],
- * String, boolean, int, boolean,
- * boolean, boolean)} instead.
- * @since 1.2
- */
- void merge(String path, Revision pegRevision, Revision revision1,
- Revision revision2, String localPath, boolean force,
- boolean recurse, boolean ignoreAncestry, boolean dryRun)
- throws ClientException;
-
- /**
* Merge set of revisions into a new local path.
* @param path path or url
* @param pegRevision revision to interpret path
@@ -1097,80 +548,19 @@
* @param pathOrUrl target of merge
* @param pegRevision peg rev for pathOrUrl
* @param mergeSourceUrl the source of the merge
- * @param srcPegRevision peg rev for mergeSourceUrl
- * @param discoverChangedPaths return paths of changed items
- * @param depth the depth to recurse to
- * @param revProps the revprops to retrieve
- * @param callback the object to receive the log messages
- * @since 1.7
- */
- void getMergeinfoLog(int kind, String pathOrUrl,
- Revision pegRevision, String mergeSourceUrl,
- Revision srcPegRevision, boolean discoverChangedPaths,
- int depth, String[] revprops,
- LogMessageCallback callback)
- throws ClientException;
-
- /**
- * Retrieve either merged or eligible-to-be-merged revisions.
- * @param kind kind of revisions to receive
- * @param pathOrUrl target of merge
- * @param pegRevision peg rev for pathOrUrl
- * @param mergeSourceUrl the source of the merge
- * @param srcPegRevision peg rev for mergeSourceUrl
- * @param discoverChangedPaths return paths of changed items
- * @param revProps the revprops to retrieve
- * @param callback the object to receive the log messages
- * @deprecated Use {@link #getMergeinfoLog(int, String, Revision, String,
- * Revision, boolean, int,
- * String[], LogMessageCallback)}
- * @since 1.5
- */
- void getMergeinfoLog(int kind, String pathOrUrl,
- Revision pegRevision, String mergeSourceUrl,
- Revision srcPegRevision, boolean discoverChangedPaths,
- String[] revprops, LogMessageCallback callback)
- throws ClientException;
-
- /**
- * Display the differences between two paths
- * @param target1 first path or url
- * @param revision1 first revision
- * @param target2 second path or url
- * @param revision2 second revision
- * @param outFileName file name where difference are written
- * @param recurse traverse into subdirectories
- * @throws ClientException
- * @deprecated Use {@link #diff(String, Revision, String, Revision,
- * String, String, int, boolean, boolean,
- * boolean)} instead.
- * @since 1.0
- */
- void diff(String target1, Revision revision1, String target2,
- Revision revision2, String outFileName, boolean recurse)
- throws ClientException;
-
- /**
- * Display the differences between two paths
- * @param target1 first path or url
- * @param revision1 first revision
- * @param target2 second path or url
- * @param revision2 second revision
- * @param outFileName file name where difference are written
- * @param recurse traverse into subdirectories
- * @param ignoreAncestry ignore if files are not related
- * @param noDiffDeleted no output on deleted files
- * @param force diff even on binary files
- * @throws ClientException
- * @deprecated Use {@link #diff(String, Revision, String, Revision,
- * String, String, int, boolean, boolean,
- * boolean)} instead.
- * @since 1.2
+ * @param srcPegRevision peg rev for mergeSourceUrl
+ * @param discoverChangedPaths return paths of changed items
+ * @param depth the depth to recurse to
+ * @param revProps the revprops to retrieve
+ * @param callback the object to receive the log messages
+ * @since 1.7
*/
- void diff(String target1, Revision revision1, String target2,
- Revision revision2, String outFileName, boolean recurse,
- boolean ignoreAncestry, boolean noDiffDeleted, boolean force)
- throws ClientException;
+ void getMergeinfoLog(int kind, String pathOrUrl,
+ Revision pegRevision, String mergeSourceUrl,
+ Revision srcPegRevision, boolean discoverChangedPaths,
+ int depth, String[] revprops,
+ LogMessageCallback callback)
+ throws ClientException;
/**
* Display the differences between two paths
@@ -1196,52 +586,6 @@
throws ClientException;
/**
- * Display the differences between two paths
- * @param target1 first path or url
- * @param revision1 first revision
- * @param target2 second path or url
- * @param revision2 second revision
- * @param relativeToDir index path is relative to this path
- * @param outFileName file name where difference are written
- * @param depth how deep to traverse into subdirectories
- * @param ignoreAncestry ignore if files are not related
- * @param noDiffDeleted no output on deleted files
- * @param force diff even on binary files
- * @throws ClientException
- * @deprecated Use {@link #diff(String, Revision, String, Revision,
- * String, String, int, boolean, boolean,
- * boolean, boolean)} instead.
- * @since 1.5
- */
- void diff(String target1, Revision revision1, String target2,
- Revision revision2, String relativeToDir, String outFileName,
- int depth, String[] changelists, boolean ignoreAncestry,
- boolean noDiffDeleted, boolean force)
- throws ClientException;
-
- /**
- * Display the differences between two paths.
- * @param target path or url
- * @param pegRevision revision tointerpret target
- * @param startRevision first Revision to compare
- * @param endRevision second Revision to compare
- * @param outFileName file name where difference are written
- * @param recurse traverse into subdirectories
- * @param ignoreAncestry ignore if files are not related
- * @param noDiffDeleted no output on deleted files
- * @param force diff even on binary files
- * @throws ClientException
- * @deprecated Use {@link #diff(String, Revision, Revision, Revision,
- * String, String, int, boolean, boolean,
- * boolean)} instead.
- * @since 1.2
- */
- void diff(String target, Revision pegRevision, Revision startRevision,
- Revision endRevision, String outFileName, boolean recurse,
- boolean ignoreAncestry, boolean noDiffDeleted, boolean force)
- throws ClientException;
-
- /**
* Display the differences between two paths.
* @param target path or url
* @param pegRevision revision tointerpret target
@@ -1266,31 +610,6 @@
throws ClientException;
/**
- * Display the differences between two paths.
- * @param target path or url
- * @param pegRevision revision tointerpret target
- * @param startRevision first Revision to compare
- * @param endRevision second Revision to compare
- * @param relativeToDir index path is relative to this path
- * @param outFileName file name where difference are written
- * @param depth how deep to traverse into subdirectories
- * @param changelists if non-null, filter paths using changelists
- * @param ignoreAncestry ignore if files are not related
- * @param noDiffDeleted no output on deleted files
- * @param force diff even on binary files
- * @throws ClientException
- * @deprecated Use {@link #diff(String, Revision, Revision, Revision,
- * String, String, int, boolean, boolean,
- * boolean, boolean)} instead.
- * @since 1.5
- */
- void diff(String target, Revision pegRevision, Revision startRevision,
- Revision endRevision, String relativeToDir, String outFileName,
- int depth, String[] changelists, boolean ignoreAncestry,
- boolean noDiffDeleted, boolean force)
- throws ClientException;
-
- /**
* Produce a diff summary which lists the items changed between
* path and revision pairs.
*
@@ -1314,7 +633,7 @@
void diffSummarize(String target1, Revision revision1,
String target2, Revision revision2,
int depth, String[] changelists, boolean ignoreAncestry,
- DiffSummaryReceiver receiver)
+ DiffSummaryCallback receiver)
throws ClientException;
/**
@@ -1326,7 +645,7 @@
* <code>target</code>. If {@link RevisionKind#unspecified} or
* <code>null</code>, behave identically to {@link
* #diffSummarize(String, Revision, String, Revision, int,
- * boolean, DiffSummaryReceiver)}, using <code>path</code> for
+ * boolean, DiffSummaryCallback)}, using <code>path</code> for
* both of that method's targets.
* @param startRevision Beginning of range for comparsion of
* <code>target</code>.
@@ -1348,50 +667,11 @@
void diffSummarize(String target, Revision pegRevision,
Revision startRevision, Revision endRevision,
int depth, String[] changelists, boolean ignoreAncestry,
- DiffSummaryReceiver receiver)
+ DiffSummaryCallback receiver)
throws ClientException;
/**
* Retrieves the properties of an item
- * @param path the path of the item
- * @return array of property objects
- * @throws ClientException
- * @deprecated Use {@link #properties(String, Revision, Revision,
- * int, ProplistCallback)} instead.
- * @since 1.0
- */
- PropertyData[] properties(String path) throws ClientException;
-
- /**
- * Retrieves the properties of an item
- * @param path the path of the item
- * @param revision the revision of the item
- * @return array of property objects
- * @throws ClientException
- * @deprecated Use {@link #properties(String, Revision, Revision,
- * int, ProplistCallback)} instead.
- * @since 1.2
- */
- PropertyData[] properties(String path, Revision revision)
- throws ClientException;
-
- /**
- * Retrieves the properties of an item
- * @param path the path of the item
- * @param revision the revision of the item
- * @param pegRevision the revision to interpret path
- * @return array of property objects
- * @throws ClientException
- * @deprecated Use {@link #properties(String, Revision, Revision,
- * int, ProplistCallback)} instead.
- * @since 1.2
- */
- PropertyData[] properties(String path, Revision revision,
- Revision pegRevision)
- throws ClientException;
-
- /**
- * Retrieves the properties of an item
*
* @param path the path of the item
* @param revision the revision of the item
@@ -1408,66 +688,6 @@
/**
* Sets one property of an item with a String value
- * @param path path of the item
- * @param name name of the property
- * @param value new value of the property
- * @param recurse set property also on the subdirectories
- * @throws ClientException
- * @deprecated Use {@link #propertySet(String, String, String, int,
- * boolean)} instead.
- * @since 1.0
- */
- void propertySet(String path, String name, String value, boolean recurse)
- throws ClientException;
-
- /**
- * Sets one property of an item with a String value
- * @param path path of the item
- * @param name name of the property
- * @param value new value of the property
- * @param recurse set property also on the subdirectories
- * @param force do not check if the value is valid
- * @throws ClientException
- * @deprecated Use {@link #propertySet(String, String, String, int,
- * boolean)} instead.
- * @since 1.2
- */
- void propertySet(String path, String name, String value, boolean recurse,
- boolean force)
- throws ClientException;
-
- /**
- * Sets one property of an item with a byte array value
- * @param path path of the item
- * @param name name of the property
- * @param value new value of the property
- * @param recurse set property also on the subdirectories
- * @throws ClientException
- * @deprecated Use {@link #propertySet(String, String, String, int,
- * boolean)} instead.
- * @since 1.0
- */
- void propertySet(String path, String name, byte[] value, boolean recurse)
- throws ClientException;
-
- /**
- * Sets one property of an item with a byte array value
- * @param path path of the item
- * @param name name of the property
- * @param value new value of the property
- * @param recurse set property also on the subdirectories
- * @param force do not check if the value is valid
- * @throws ClientException
- * @deprecated Use {@link #propertySet(String, String, String, int,
- * boolean)} instead.
- * @since 1.2
- */
- void propertySet(String path, String name, byte[] value, boolean recurse,
- boolean force)
- throws ClientException;
-
- /**
- * Sets one property of an item with a String value
*
* @param path path of the item
* @param name name of the property
@@ -1490,18 +710,6 @@
* Remove one property of an item.
* @param path path of the item
* @param name name of the property
- * @param recurse remove the property also on subdirectories
- * @throws ClientException
- * @deprecated Use {@link #propertyRemove(String, String, int)} instead.
- * @since 1.0
- */
- void propertyRemove(String path, String name, boolean recurse)
- throws ClientException;
-
- /**
- * Remove one property of an item.
- * @param path path of the item
- * @param name name of the property
* @param depth the depth to recurse into subdirectories
* @param changelists changelists to filter by
* @throws ClientException
@@ -1512,68 +720,6 @@
throws ClientException;
/**
- * Create and sets one property of an item with a String value
- * @param path path of the item
- * @param name name of the property
- * @param value new value of the property
- * @param recurse set property also on the subdirectories
- * @throws ClientException
- * @deprecated Use {@link #propertyCreate(String, String, String, int,
- * boolean)} instead.
- * @since 1.0
- */
- void propertyCreate(String path, String name, String value,
- boolean recurse)
- throws ClientException;
-
- /**
- * Create and sets one property of an item with a String value
- * @param path path of the item
- * @param name name of the property
- * @param value new value of the property
- * @param recurse set property also on the subdirectories
- * @param force do not check if the value is valid
- * @throws ClientException
- * @deprecated Use {@link #propertyCreate(String, String, String, int,
- * boolean)} instead.
- * @since 1.2
- */
- void propertyCreate(String path, String name, String value,
- boolean recurse, boolean force)
- throws ClientException;
-
- /**
- * Create and sets one property of an item with a byte array value
- * @param path path of the item
- * @param name name of the property
- * @param value new value of the property
- * @param recurse set property also on the subdirectories
- * @throws ClientException
- * @deprecated Use {@link #propertyCreate(String, String, String, int,
- * boolean)} instead.
- * @since 1.0
- */
- void propertyCreate(String path, String name, byte[] value,
- boolean recurse)
- throws ClientException;
-
- /**
- * Create and sets one property of an item with a byte array value
- * @param path path of the item
- * @param name name of the property
- * @param value new value of the property
- * @param recurse set property also on the subdirectories
- * @param force do not check if the value is valid
- * @throws ClientException
- * @deprecated Use {@link #propertyCreate(String, String, String, int,
- * boolean)} instead.
- * @since 1.2
- */
- void propertyCreate(String path, String name, byte[] value,
- boolean recurse, boolean force)
- throws ClientException;
-
- /**
* Create and sets one property of an item with a byte array value
*
* @param path path of the item
@@ -1645,17 +791,6 @@
* Retrieve one property of one item
* @param path path of the item
* @param name name of property
- * @return the Property
- * @throws ClientException
- * @deprecated Use {@link #propertyGet(String, String, Revision)} instead.
- * @since 1.0
- */
- PropertyData propertyGet(String path, String name) throws ClientException;
-
- /**
- * Retrieve one property of one item
- * @param path path of the item
- * @param name name of property
* @param revision revision of the item
* @return the Property
* @throws ClientException
@@ -1682,18 +817,6 @@
* Retrieve the content of a file
* @param path the path of the file
* @param revision the revision to retrieve
- * @return the content as byte array
- * @throws ClientException
- * @deprecated Use {@link #fileContent(String, Revision, Revision)}
- * instead.
- * @since 1.0
- */
- byte[] fileContent(String path, Revision revision) throws ClientException;
-
- /**
- * Retrieve the content of a file
- * @param path the path of the file
- * @param revision the revision to retrieve
* @param pegRevision the revision to interpret path
* @return the content as byte array
* @throws ClientException
@@ -1733,82 +856,6 @@
throws ClientException;
/**
- * Return for each line of the file, the author and the revision of the
- * last together with the content.
- * @deprecated
- * @param path the path
- * @param revisionStart the first revision to show
- * @param revisionEnd the last revision to show
- * @return the content together with author and revision of last change
- * @throws ClientException
- * @deprecated Use {@link #blame(String, Revision, Revision, Revision,
- * boolean, boolean, BlameCallback2)}
- * instead.
- * @since 1.0
- */
- byte[] blame(String path, Revision revisionStart, Revision revisionEnd)
- throws ClientException;
-
- /**
- * Retrieve the content together with the author, the revision and the date
- * of the last change of each line
- * @param path the path
- * @param revisionStart the first revision to show
- * @param revisionEnd the last revision to show
- * @param callback callback to receive the file content and the other
- * information
- * @throws ClientException
- * @deprecated Use {@link #blame(String, Revision, Revision, Revision,
- * boolean, boolean, BlameCallback2)}
- * instead.
- * @since 1.0
- */
- void blame(String path, Revision revisionStart, Revision revisionEnd,
- BlameCallback callback) throws ClientException;
-
- /**
- * Retrieve the content together with the author, the revision and the date
- * of the last change of each line
- * @param path the path
- * @param pegRevision the revision to interpret the path
- * @param revisionStart the first revision to show
- * @param revisionEnd the last revision to show
- * @param callback callback to receive the file content and the other
- * information
- * @throws ClientException
- * @deprecated Use {@link #blame(String, Revision, Revision, Revision,
- * boolean, boolean, BlameCallback2)}
- * instead.
- * @since 1.2
- */
- void blame(String path, Revision pegRevision, Revision revisionStart,
- Revision revisionEnd,
- BlameCallback callback) throws ClientException;
-
- /**
- * Retrieve the content together with the author, the revision and the date
- * of the last change of each line
- * @param path the path
- * @param pegRevision the revision to interpret the path
- * @param revisionStart the first revision to show
- * @param revisionEnd the last revision to show
- * @param ignoreMimeType whether or not to ignore the mime-type
- * @param includeMergedRevisions whether or not to include extra merge
- * information
- * @param callback callback to receive the file content and the other
- * information
- * @throws ClientException
- * @deprecated Use {@link #blame(String, Revision, Revision, Revision,
- * boolean, boolean, BlameCallback3)}
- * instead.
- * @since 1.5
- */
- void blame(String path, Revision pegRevision, Revision revisionStart,
- Revision revisionEnd, boolean ignoreMimeType,
- boolean includeMergedRevisions,
- BlameCallback2 callback) throws ClientException;
-
- /**
* Retrieve the content together with the author, the revision and the date
* of the last change of each line
* @param path the path
@@ -1857,17 +904,6 @@
void cancelOperation() throws ClientException;
/**
- * Retrieves the working copy information for an item
- * @param path path of the item
- * @return the information object
- * @throws ClientException
- * @deprecated Use {@link #info2(String, Revision, Revision, int,
- * InfoCallback)} instead.
- * @since 1.0
- */
- Info info(String path) throws ClientException;
-
- /**
* Add paths to a changelist
* @param paths paths to add to the changelist
* @param changelist changelist name
@@ -1927,21 +963,6 @@
* @param pathOrUrl the path or the url of the item
* @param revision the revision of the item to return
* @param pegRevision the revision to interpret pathOrUrl
- * @param recurse flag if to recurse, if the item is a directory
- * @return the information objects
- * @deprecated Use {@link #info2(String, Revision, Revision, int,
- * InfoCallback)} instead.
- * @since 1.2
- */
- Info2[] info2(String pathOrUrl, Revision revision, Revision pegRevision,
- boolean recurse)
- throws ClientException;
-
- /**
- * Retrieve information about repository or working copy items.
- * @param pathOrUrl the path or the url of the item
- * @param revision the revision of the item to return
- * @param pegRevision the revision to interpret pathOrUrl
* @param depth the depth to recurse
* @param changelists if non-null, filter paths using changelists
* @param callback a callback to receive the infos retrieved
Copied: subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/Info2.java (from r903532, subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Info2.java)
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/Info2.java?p2=subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/Info2.java&p1=subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Info2.java&r1=903532&r2=903894&rev=903894&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Info2.java (original)
+++ subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/Info2.java Wed Jan 27 22:45:19 2010
@@ -21,7 +21,7 @@
* @endcopyright
*/
-package org.tigris.subversion.javahl;
+package org.apache.subversion.javahl;
import java.util.Date;
Copied: subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/Lock.java (from r903532, subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Lock.java)
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/Lock.java?p2=subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/Lock.java&p1=subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Lock.java&r1=903532&r2=903894&rev=903894&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Lock.java (original)
+++ subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/Lock.java Wed Jan 27 22:45:19 2010
@@ -22,7 +22,7 @@
* @endcopyright
*/
-package org.tigris.subversion.javahl;
+package org.apache.subversion.javahl;
import java.util.Date;
Copied: subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/Mergeinfo.java (from r903549, subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Mergeinfo.java)
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/Mergeinfo.java?p2=subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/Mergeinfo.java&p1=subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Mergeinfo.java&r1=903549&r2=903894&rev=903894&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Mergeinfo.java (original)
+++ subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/Mergeinfo.java Wed Jan 27 22:45:19 2010
@@ -21,7 +21,7 @@
* @endcopyright
*/
-package org.tigris.subversion.javahl;
+package org.apache.subversion.javahl;
import java.util.ArrayList;
import java.util.HashMap;
Copied: subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/NativeException.java (from r903474, subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/NativeException.java)
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/NativeException.java?p2=subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/NativeException.java&p1=subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/NativeException.java&r1=903474&r2=903894&rev=903894&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/NativeException.java (original)
+++ subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/NativeException.java Wed Jan 27 22:45:19 2010
@@ -21,7 +21,7 @@
* @endcopyright
*/
-package org.tigris.subversion.javahl;
+package org.apache.subversion.javahl;
/**
* This exception is thrown whenever something goes wrong in the
Copied: subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/NodeKind.java (from r903532, 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/apache/subversion/javahl/NodeKind.java?p2=subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/NodeKind.java&p1=subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/NodeKind.java&r1=903532&r2=903894&rev=903894&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/NodeKind.java (original)
+++ subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/NodeKind.java Wed Jan 27 22:45:19 2010
@@ -21,7 +21,7 @@
* @endcopyright
*/
-package org.tigris.subversion.javahl;
+package org.apache.subversion.javahl;
/**
* Poor mans enum for svn_node_kind_t
Copied: subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/NotifyInformation.java (from r903549, subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/NotifyInformation.java)
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/NotifyInformation.java?p2=subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/NotifyInformation.java&p1=subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/NotifyInformation.java&r1=903549&r2=903894&rev=903894&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/NotifyInformation.java (original)
+++ subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/NotifyInformation.java Wed Jan 27 22:45:19 2010
@@ -21,7 +21,7 @@
* @endcopyright
*/
-package org.tigris.subversion.javahl;
+package org.apache.subversion.javahl;
import java.util.EventObject;