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/30 03:06:10 UTC
svn commit: r904709 [1/3] - in /subversion/trunk: ./
subversion/bindings/javahl/src/org/apache/subversion/javahl/
subversion/bindings/javahl/tests/org/apache/
subversion/bindings/javahl/tests/org/apache/subversion/
subversion/bindings/javahl/tests/org/...
Author: hwright
Date: Sat Jan 30 02:06:08 2010
New Revision: 904709
URL: http://svn.apache.org/viewvc?rev=904709&view=rev
Log:
JavaHL: First attempt to port the JavaHL tests to the new org.apache.subversion
package. The tests should now compile with 'make javahl-compat-tests', but
it is doubtful they will run and/or pass.
* Makefile.in:
Add check-javahl-compat target.
* build.conf
(javahl-compat-tests): New.
[ in subversion/bindings/javahl/ ]
* tests/org/apache/subversion/javahl/SVNAdminTests.java,
tests/org/apache/subversion/javahl/BasicTests.java,
tests/org/apache/subversion/javahl/RunTests.java,
tests/org/apache/subversion/javahl/SVNTests.java,
tests/org/apache/subversion/javahl/WC.java,
src/org/apache/subversion/javahl/NotifyAction.java,
src/org/apache/subversion/javahl/IInput.java,
src/org/apache/subversion/javahl/LogDate.java,
src/org/apache/subversion/javahl/BlameCallbackImpl.java,
src/org/apache/subversion/javahl/LogMessage.java,
src/org/apache/subversion/javahl/ScheduleKind.java,
src/org/apache/subversion/javahl/IOutput.java,
src/org/apache/subversion/javahl/SVNAdmin.java,
src/org/apache/subversion/javahl/MergeinfoLogKind.java,
src/org/apache/subversion/javahl/Path.java:
New.
Added:
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/BlameCallbackImpl.java
- copied, changed from r904327, subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/BlameCallbackImpl.java
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/IInput.java
- copied, changed from r903915, subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/InputInterface.java
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/IOutput.java
- copied, changed from r903915, subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/OutputInterface.java
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/LogDate.java
- copied, changed from r903915, subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/LogDate.java
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/LogMessage.java
- copied, changed from r903915, subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/LogMessage.java
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/MergeinfoLogKind.java
- copied, changed from r903915, subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/MergeinfoLogKind.java
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/NotifyAction.java
- copied, changed from r903915, subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/NotifyAction.java
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/Path.java
- copied, changed from r903915, subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Path.java
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNAdmin.java
- copied, changed from r903915, subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNAdmin.java
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ScheduleKind.java
- copied, changed from r903915, subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ScheduleKind.java
subversion/trunk/subversion/bindings/javahl/tests/org/apache/
subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/
subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/
subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
- copied, changed from r903915, subversion/trunk/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java
subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/RunTests.java
- copied, changed from r903915, subversion/trunk/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/RunTests.java
subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNAdminTests.java
- copied, changed from r903915, subversion/trunk/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/SVNAdminTests.java
subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNTests.java
- copied, changed from r903915, subversion/trunk/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/SVNTests.java
subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/WC.java
- copied, changed from r903915, subversion/trunk/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/WC.java
Modified:
subversion/trunk/Makefile.in
subversion/trunk/build.conf
Modified: subversion/trunk/Makefile.in
URL: http://svn.apache.org/viewvc/subversion/trunk/Makefile.in?rev=904709&r1=904708&r2=904709&view=diff
==============================================================================
--- subversion/trunk/Makefile.in (original)
+++ subversion/trunk/Makefile.in Sat Jan 30 02:06:08 2010
@@ -326,6 +326,7 @@
javahl_java_CLASSPATH=$(JAVA_CLASSPATH)
javahl_compat_CLASSPATH=$(JAVA_CLASSPATH)
javahl_tests_CLASSPATH=$(JAVA_CLASSPATH)
+javahl_compat_tests_CLASSPATH=$(JAVA_CLASSPATH)
RUBY = @RUBY@
RUBY_MAJOR = @RUBY_MAJOR@
@@ -431,6 +432,10 @@
rm -f $(libsvnjavahl_PATH)/*.lo
rm -f $(libsvnjavahl_PATH)/*.o
+check-javahl-compat: javahl-compat-tests
+ @FIX_JAVAHL_LIB@
+ $(JAVA) "-Dtest.rootdir=$(javahl_test_rootdir)" "-Dtest.srcdir=$(javahl_test_srcdir)" "-Dtest.rooturl=$(BASE_URL)" "-Dtest.fstype=$(FS_TYPE)" -Djava.library.path=@JAVAHL_OBJDIR@:$(libdir) -classpath $(javahl_compat_tests_PATH):$(javahl_tests_CLASSPATH) "-Dtest.tests=$(JAVAHL_TESTS)" org.apache.subversion.javahl.RunTests
+
check-javahl: javahl
@FIX_JAVAHL_LIB@
$(JAVA) "-Dtest.rootdir=$(javahl_test_rootdir)" "-Dtest.srcdir=$(javahl_test_srcdir)" "-Dtest.rooturl=$(BASE_URL)" "-Dtest.fstype=$(FS_TYPE)" -Djava.library.path=@JAVAHL_OBJDIR@:$(libdir) -classpath $(javahl_tests_PATH):$(javahl_tests_CLASSPATH) "-Dtest.tests=$(JAVAHL_TESTS)" org.tigris.subversion.javahl.RunTests
Modified: subversion/trunk/build.conf
URL: http://svn.apache.org/viewvc/subversion/trunk/build.conf?rev=904709&r1=904708&r2=904709&view=diff
==============================================================================
--- subversion/trunk/build.conf (original)
+++ subversion/trunk/build.conf Sat Jan 30 02:06:08 2010
@@ -550,6 +550,17 @@
#jar = svn-javahl.jar
package-roots = org
+[javahl-compat-tests]
+type = java
+path = subversion/bindings/javahl/tests/org/apache/subversion/javahl
+sources = *.java
+install = javahl-java
+link-cmd = $(COMPILE_JAVAHL_JAVAC)
+classes = subversion/bindings/javahl/classes
+package-roots = org
+### Java targets don't do up-to-date checks yet.
+#add-deps = javahl-compat
+
[javahl-tests]
type = java
path = subversion/bindings/javahl/tests/org/tigris/subversion/javahl
Copied: subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/BlameCallbackImpl.java (from r904327, subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/BlameCallbackImpl.java)
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/BlameCallbackImpl.java?p2=subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/BlameCallbackImpl.java&p1=subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/BlameCallbackImpl.java&r1=904327&r2=904709&rev=904709&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/BlameCallbackImpl.java (original)
+++ subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/BlameCallbackImpl.java Sat Jan 30 02:06:08 2010
@@ -21,18 +21,24 @@
* @endcopyright
*/
-package org.tigris.subversion.javahl;
+package org.apache.subversion.javahl;
+import org.apache.subversion.javahl.callback.*;
+
+import java.util.Map;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
/**
* Implementation of {@link BlameCallback} interface.
*
* @since 1.5
*/
-public class BlameCallbackImpl implements BlameCallback, BlameCallback2
+public class BlameCallbackImpl implements BlameCallback3
{
/** list of blame records (lines) */
@@ -60,6 +66,29 @@
line));
}
+ public void singleLine(long lineNum, long rev, Map revProps,
+ long mergedRevision, Map mergedRevProps,
+ String mergedPath, String line, boolean localChange)
+ throws ClientException
+ {
+ DateFormat df = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS");
+
+ try {
+ singleLine(
+ df.parse((String) revProps.get("svn:date")),
+ rev,
+ (String) revProps.get("svn:author"),
+ mergedRevProps == null ? null
+ : df.parse((String) mergedRevProps.get("svn:date")),
+ mergedRevision,
+ mergedRevProps == null ? null
+ : (String) mergedRevProps.get("svn:author"),
+ mergedPath, line);
+ } catch (ParseException e) {
+ throw ClientException.fromException(e);
+ }
+ }
+
private Date getDate(Date date, Date merged_date) {
return (merged_date == null ? date : merged_date);
}
Copied: subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/IInput.java (from r903915, subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/InputInterface.java)
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/IInput.java?p2=subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/IInput.java&p1=subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/InputInterface.java&r1=903915&r2=904709&rev=904709&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/InputInterface.java (original)
+++ subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/IInput.java Sat Jan 30 02:06:08 2010
@@ -21,7 +21,7 @@
* @endcopyright
*/
-package org.tigris.subversion.javahl;
+package org.apache.subversion.javahl;
import java.io.IOException;
@@ -29,7 +29,7 @@
* Interface for data to be received from subversion
* used for SVNAdmin.load and SVNAdmin.dump
*/
-public interface InputInterface
+public interface IInput
{
/**
* read the number of data.length bytes from input.
Copied: subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/IOutput.java (from r903915, subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/OutputInterface.java)
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/IOutput.java?p2=subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/IOutput.java&p1=subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/OutputInterface.java&r1=903915&r2=904709&rev=904709&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/OutputInterface.java (original)
+++ subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/IOutput.java Sat Jan 30 02:06:08 2010
@@ -21,14 +21,14 @@
* @endcopyright
*/
-package org.tigris.subversion.javahl;
+package org.apache.subversion.javahl;
import java.io.IOException;
/**
* Interface to send data to subversion used by SVNAdmin.load.
*/
-public interface OutputInterface
+public interface IOutput
{
/**
* write the bytes in data to java
Copied: subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/LogDate.java (from r903915, subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/LogDate.java)
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/LogDate.java?p2=subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/LogDate.java&p1=subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/LogDate.java&r1=903915&r2=904709&rev=904709&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/LogDate.java (original)
+++ subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/LogDate.java Sat Jan 30 02:06:08 2010
@@ -21,7 +21,7 @@
* @endcopyright
*/
-package org.tigris.subversion.javahl;
+package org.apache.subversion.javahl;
import java.text.DateFormat;
import java.text.ParseException;
Copied: subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/LogMessage.java (from r903915, subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/LogMessage.java)
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/LogMessage.java?p2=subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/LogMessage.java&p1=subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/LogMessage.java&r1=903915&r2=904709&rev=904709&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/LogMessage.java (original)
+++ subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/LogMessage.java Sat Jan 30 02:06:08 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/MergeinfoLogKind.java (from r903915, subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/MergeinfoLogKind.java)
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/MergeinfoLogKind.java?p2=subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/MergeinfoLogKind.java&p1=subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/MergeinfoLogKind.java&r1=903915&r2=904709&rev=904709&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/MergeinfoLogKind.java (original)
+++ subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/MergeinfoLogKind.java Sat Jan 30 02:06:08 2010
@@ -21,7 +21,7 @@
* @endcopyright
*/
-package org.tigris.subversion.javahl;
+package org.apache.subversion.javahl;
/**
* class for kind of mergeinfo logs
Copied: subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/NotifyAction.java (from r903915, subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/NotifyAction.java)
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/NotifyAction.java?p2=subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/NotifyAction.java&p1=subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/NotifyAction.java&r1=903915&r2=904709&rev=904709&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/NotifyAction.java (original)
+++ subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/NotifyAction.java Sat Jan 30 02:06:08 2010
@@ -21,7 +21,7 @@
* @endcopyright
*/
-package org.tigris.subversion.javahl;
+package org.apache.subversion.javahl;
/**
* The type of action triggering the notification
Copied: subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/Path.java (from r903915, subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Path.java)
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/Path.java?p2=subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/Path.java&p1=subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Path.java&r1=903915&r2=904709&rev=904709&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Path.java (original)
+++ subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/Path.java Sat Jan 30 02:06:08 2010
@@ -21,7 +21,7 @@
* @endcopyright
*/
-package org.tigris.subversion.javahl;
+package org.apache.subversion.javahl;
/**
* Subversion path validation and manipulation.
Copied: subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNAdmin.java (from r903915, subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNAdmin.java)
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNAdmin.java?p2=subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNAdmin.java&p1=subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNAdmin.java&r1=903915&r2=904709&rev=904709&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNAdmin.java (original)
+++ subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNAdmin.java Sat Jan 30 02:06:08 2010
@@ -21,7 +21,7 @@
* @endcopyright
*/
-package org.tigris.subversion.javahl;
+package org.apache.subversion.javahl;
/**
* This class offers the same commands as the svnadmin commandline
@@ -119,8 +119,8 @@
* @param incremental the dump will be incremantal
* @throws ClientException throw in case of problem
*/
- public void dump(String path, OutputInterface dataOut,
- OutputInterface errorOut, Revision start,
+ public void dump(String path, IOutput dataOut,
+ IOutput errorOut, Revision start,
Revision end, boolean incremental)
throws ClientException
{
@@ -139,8 +139,8 @@
* @throws ClientException throw in case of problem
* @since 1.5
*/
- public native void dump(String path, OutputInterface dataOut,
- OutputInterface errorOut, Revision start,
+ public native void dump(String path, IOutput dataOut,
+ IOutput errorOut, Revision start,
Revision end, boolean incremental,
boolean useDeltas)
throws ClientException;
@@ -198,8 +198,8 @@
* in put optional.
* @throws ClientException throw in case of problem
*/
- public void load(String path, InputInterface dataInput,
- OutputInterface messageOutput, boolean ignoreUUID,
+ public void load(String path, IInput dataInput,
+ IOutput messageOutput, boolean ignoreUUID,
boolean forceUUID, String relativePath)
throws ClientException
{
@@ -222,8 +222,8 @@
* @throws ClientException throw in case of problem
* @since 1.5
*/
- public native void load(String path, InputInterface dataInput,
- OutputInterface messageOutput, boolean ignoreUUID,
+ public native void load(String path, IInput dataInput,
+ IOutput messageOutput, boolean ignoreUUID,
boolean forceUUID, boolean usePreCommitHook,
boolean usePostCommitHook, String relativePath)
throws ClientException;
@@ -298,7 +298,7 @@
* @param end the last revision
* @throws ClientException If an error occurred.
*/
- public native void verify(String path, OutputInterface messageOut,
+ public native void verify(String path, IOutput messageOut,
Revision start, Revision end)
throws ClientException;
Copied: subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ScheduleKind.java (from r903915, subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ScheduleKind.java)
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ScheduleKind.java?p2=subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ScheduleKind.java&p1=subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ScheduleKind.java&r1=903915&r2=904709&rev=904709&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ScheduleKind.java (original)
+++ subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ScheduleKind.java Sat Jan 30 02:06:08 2010
@@ -21,7 +21,7 @@
* @endcopyright
*/
-package org.tigris.subversion.javahl;
+package org.apache.subversion.javahl;
/**
* The schedule states an entry can be in.