You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by br...@apache.org on 2013/11/25 11:25:06 UTC
svn commit: r1545212 [2/2] - in
/subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl: ./
native/ native/jniwrapper/ src/org/apache/subversion/javahl/
src/org/apache/subversion/javahl/types/ tests/org/apache/subversion/javahl/
tests/org...
Modified: subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNRemote.java
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNRemote.java?rev=1545212&r1=1545211&r2=1545212&view=diff
==============================================================================
--- subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNRemote.java (original)
+++ subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNRemote.java Mon Nov 25 10:25:05 2013
@@ -34,7 +34,8 @@ import java.io.OutputStream;
/**
* Encapsulates an RA session object and related operations.
- * @see subversion/include/svn_ra.h#svn_ra_open
+ * @see <a href="http://svn.apache.org/repos/asf/subversion/trunk/subversion/include/svn_ra.h">svn_ra.h</a>,
+ * the documentation of the <code>svn_ra_open</code> function.
* @since 1.9
*/
public interface ISVNRemote
@@ -53,9 +54,11 @@ public interface ISVNRemote
/** Change the URL of the session to point to a new path in the
* same repository.
+ *<p>
+ * <b>Note:</b> The operation fails if the URL has a different
+ * repository root than the current session URL.
+ *<p>
* @throws ClientException
- * @note The operation fails if the URL has a different repository
- * root than the current session URL.
*/
void reparent(String url) throws ClientException;
@@ -115,20 +118,22 @@ public interface ISVNRemote
/**
* Change the value of an unversioned property.
+ *<p>
+ * <b>Note:</b> If the server has Capability.atomic_revprops and
+ * <code>oldValue</code> is not <code>null</code>, and the present
+ * value of the propery is not <code>oldValue</code> (e.g., if
+ * another client changed the property), then the operation will
+ * fail.
+ *<p>
+ * <b>Note:</b> If the server does not adveritse
+ * Capability.atomic_revprops, then <code>oldValue</code>
+ * <em>must</em> be <code>null</code>.
+ *<p>
* @param revision The revision to which the propery is attached
* @param propertyName The name of the propery
* @param oldValue The previous value of the property (see note below)
* @param newValue The new value of the property. If <code>newValue</code>
* is <code>null</code>, the property will be deleted.
- *
- * @node If the server has Capability.atomic_revprops and
- * <code>oldValue</code> is not <code>null</code>, and the
- * present value of the propery is not <code>oldValue</code>
- * (e.g., if another client changed the property), then
- * the operation will fail.
- * @note If the server does not adveritse Capability.atomic_revprops,
- * then <code>oldValue</code> <em>must</em> be <code>null</code>.
- *
* @throws IllegalArgumentException if <code>oldValue</code> is not
* <code>null</code> and the server does not advertise the
* atomic_revprops capability.
@@ -292,7 +297,7 @@ public interface ISVNRemote
*
* @param revision The revision to look for <code>paths</code>
* in. Defaults to the youngest revision when
- * {@link Revision.SVN_INVALID_REVNUM}.
+ * {@link Revision#SVN_INVALID_REVNUM}.
* @param inherit Indicates whether explicit, explicit or
* inherited, or only inherited mergeinfo for
* <code>paths</code> is retrieved.
Modified: subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/src/org/apache/subversion/javahl/JNIError.java
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/src/org/apache/subversion/javahl/JNIError.java?rev=1545212&r1=1545211&r2=1545212&view=diff
==============================================================================
--- subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/src/org/apache/subversion/javahl/JNIError.java (original)
+++ subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/src/org/apache/subversion/javahl/JNIError.java Mon Nov 25 10:25:05 2013
@@ -28,13 +28,9 @@ package org.apache.subversion.javahl;
*/
public class JNIError extends Error
{
- // Update the serialVersionUID when there is a incompatible change
- // made to this class. See any of the following, depending upon
- // the Java release.
- // http://java.sun.com/j2se/1.3/docs/guide/serialization/spec/version.doc7.html
- // http://java.sun.com/j2se/1.4/pdf/serial-spec.pdf
- // http://java.sun.com/j2se/1.5.0/docs/guide/serialization/spec/version.html#6678
- // http://java.sun.com/javase/6/docs/platform/serialization/spec/version.html#6678
+ // Update the serialVersionUID when there is a incompatible change made to
+ // this class. See the java documentation for when a change is incompatible.
+ // http://java.sun.com/javase/7/docs/platform/serialization/spec/version.html#6678
private static final long serialVersionUID = 1L;
/**
Modified: subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/src/org/apache/subversion/javahl/NativeException.java
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/src/org/apache/subversion/javahl/NativeException.java?rev=1545212&r1=1545211&r2=1545212&view=diff
==============================================================================
--- subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/src/org/apache/subversion/javahl/NativeException.java (original)
+++ subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/src/org/apache/subversion/javahl/NativeException.java Mon Nov 25 10:25:05 2013
@@ -29,13 +29,9 @@ package org.apache.subversion.javahl;
*/
class NativeException extends SubversionException
{
- // Update the serialVersionUID when there is a incompatible change
- // made to this class. See any of the following, depending upon
- // the Java release.
- // http://java.sun.com/j2se/1.3/docs/guide/serialization/spec/version.doc7.html
- // http://java.sun.com/j2se/1.4/pdf/serial-spec.pdf
- // http://java.sun.com/j2se/1.5.0/docs/guide/serialization/spec/version.html#6678
- // http://java.sun.com/javase/6/docs/platform/serialization/spec/version.html#6678
+ // Update the serialVersionUID when there is a incompatible change made to
+ // this class. See the java documentation for when a change is incompatible.
+ // http://java.sun.com/javase/7/docs/platform/serialization/spec/version.html#6678
private static final long serialVersionUID = 1L;
/**
Modified: subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/src/org/apache/subversion/javahl/ProgressEvent.java
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/src/org/apache/subversion/javahl/ProgressEvent.java?rev=1545212&r1=1545211&r2=1545212&view=diff
==============================================================================
--- subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/src/org/apache/subversion/javahl/ProgressEvent.java (original)
+++ subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/src/org/apache/subversion/javahl/ProgressEvent.java Mon Nov 25 10:25:05 2013
@@ -31,13 +31,9 @@ import org.apache.subversion.javahl.call
*/
public class ProgressEvent implements java.io.Serializable
{
- // Update the serialVersionUID when there is a incompatible change
- // made to this class. See any of the following, depending upon
- // the Java release.
- // http://java.sun.com/j2se/1.3/docs/guide/serialization/spec/version.doc7.html
- // http://java.sun.com/j2se/1.4/pdf/serial-spec.pdf
- // http://java.sun.com/j2se/1.5.0/docs/guide/serialization/spec/version.html#6678
- // http://java.sun.com/javase/6/docs/platform/serialization/spec/version.html#6678
+ // Update the serialVersionUID when there is a incompatible change made to
+ // this class. See the java documentation for when a change is incompatible.
+ // http://java.sun.com/javase/7/docs/platform/serialization/spec/version.html#6678
private static final long serialVersionUID = 1L;
/**
Modified: subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/src/org/apache/subversion/javahl/ReposNotifyInformation.java
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/src/org/apache/subversion/javahl/ReposNotifyInformation.java?rev=1545212&r1=1545211&r2=1545212&view=diff
==============================================================================
--- subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/src/org/apache/subversion/javahl/ReposNotifyInformation.java (original)
+++ subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/src/org/apache/subversion/javahl/ReposNotifyInformation.java Mon Nov 25 10:25:05 2013
@@ -32,13 +32,9 @@ import org.apache.subversion.javahl.call
*/
public class ReposNotifyInformation extends EventObject
{
- // Update the serialVersionUID when there is a incompatible change
- // made to this class. See any of the following, depending upon
- // the Java release.
- // http://java.sun.com/j2se/1.3/docs/guide/serialization/spec/version.doc7.html
- // http://java.sun.com/j2se/1.4/pdf/serial-spec.pdf
- // http://java.sun.com/j2se/1.5.0/docs/guide/serialization/spec/version.html#6678
- // http://java.sun.com/javase/6/docs/platform/serialization/spec/version.html#6678
+ // Update the serialVersionUID when there is a incompatible change made to
+ // this class. See the java documentation for when a change is incompatible.
+ // http://java.sun.com/javase/7/docs/platform/serialization/spec/version.html#6678
private static final long serialVersionUID = 1L;
/**
Modified: subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java?rev=1545212&r1=1545211&r2=1545212&view=diff
==============================================================================
--- subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java (original)
+++ subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java Mon Nov 25 10:25:05 2013
@@ -112,6 +112,7 @@ public class SVNClient implements ISVNCl
/**
* @deprecated
*/
+ @Deprecated
public native String getLastPath();
public native void status(String path, Depth depth, boolean onServer,
@@ -218,6 +219,7 @@ public class SVNClient implements ISVNCl
throws ClientException;
/** @deprecated */
+ @Deprecated
public void move(Set<String> srcPaths, String destPath,
boolean force, boolean moveAsChild,
boolean makeParents,
@@ -326,6 +328,7 @@ public class SVNClient implements ISVNCl
/** @deprecated */
+ @Deprecated
public native void mergeReintegrate(String path, Revision pegRevision,
String localPath, boolean dryRun)
throws ClientException;
Modified: subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNUtil.java
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNUtil.java?rev=1545212&r1=1545211&r2=1545212&view=diff
==============================================================================
--- subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNUtil.java (original)
+++ subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNUtil.java Mon Nov 25 10:25:05 2013
@@ -402,7 +402,7 @@ public class SVNUtil
* <dd>relative to the server's hostname</dd>
* </dl>
*<p>
- * The <code>../<code> and ^/ relative URLs may use <code>..<code>
+ * The <code>../<code> and ^/ relative URLs may use <code>..</code>
* to remove path elements up to the server root.
*<p>
* The external URL should not be canonicalized before calling
@@ -431,7 +431,7 @@ public class SVNUtil
* @see translateStream
* @see untranslateStream
*/
- public static final byte[] EOL_LF = substLib.EOL_LF;
+ public static final byte[] EOL_LF = SubstLib.EOL_LF;
/**
* Use the carraige-return code point ('<code>\x0d</code>')
@@ -439,7 +439,7 @@ public class SVNUtil
* @see translateStream
* @see untranslateStream
*/
- public static final byte[] EOL_CR = substLib.EOL_CR;
+ public static final byte[] EOL_CR = SubstLib.EOL_CR;
/**
* Use carriage-return/linefeed sequence ('<code>\x0d\x0a</code>')
@@ -447,7 +447,7 @@ public class SVNUtil
* @see translateStream
* @see untranslateStream
*/
- public static final byte[] EOL_CRLF = substLib.EOL_CRLF;
+ public static final byte[] EOL_CRLF = SubstLib.EOL_CRLF;
/**
Modified: subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/ChangePath.java
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/ChangePath.java?rev=1545212&r1=1545211&r2=1545212&view=diff
==============================================================================
--- subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/ChangePath.java (original)
+++ subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/ChangePath.java Mon Nov 25 10:25:05 2013
@@ -25,13 +25,9 @@ package org.apache.subversion.javahl.typ
public class ChangePath implements java.io.Serializable
{
- // Update the serialVersionUID when there is a incompatible change
- // made to this class. See any of the following, depending upon
- // the Java release.
- // http://java.sun.com/j2se/1.3/docs/guide/serialization/spec/version.doc7.html
- // http://java.sun.com/j2se/1.4/pdf/serial-spec.pdf
- // http://java.sun.com/j2se/1.5.0/docs/guide/serialization/spec/version.html#6678
- // http://java.sun.com/javase/6/docs/platform/serialization/spec/version.html#6678
+ // Update the serialVersionUID when there is a incompatible change made to
+ // this class. See the java documentation for when a change is incompatible.
+ // http://java.sun.com/javase/7/docs/platform/serialization/spec/version.html#6678
private static final long serialVersionUID = 2L;
/**
Modified: subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Checksum.java
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Checksum.java?rev=1545212&r1=1545211&r2=1545212&view=diff
==============================================================================
--- subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Checksum.java (original)
+++ subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Checksum.java Mon Nov 25 10:25:05 2013
@@ -25,13 +25,9 @@ package org.apache.subversion.javahl.typ
public class Checksum implements java.io.Serializable
{
- // Update the serialVersionUID when there is a incompatible change
- // made to this class. See any of the following, depending upon
- // the Java release.
- // http://java.sun.com/j2se/1.3/docs/guide/serialization/spec/version.doc7.html
- // http://java.sun.com/j2se/1.4/pdf/serial-spec.pdf
- // http://java.sun.com/j2se/1.5.0/docs/guide/serialization/spec/version.html#6678
- // http://java.sun.com/javase/6/docs/platform/serialization/spec/version.html#6678
+ // Update the serialVersionUID when there is a incompatible change made to
+ // this class. See the java documentation for when a change is incompatible.
+ // http://java.sun.com/javase/7/docs/platform/serialization/spec/version.html#6678
private static final long serialVersionUID = 1L;
/**
Modified: subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/CopySource.java
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/CopySource.java?rev=1545212&r1=1545211&r2=1545212&view=diff
==============================================================================
--- subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/CopySource.java (original)
+++ subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/CopySource.java Mon Nov 25 10:25:05 2013
@@ -29,13 +29,9 @@ package org.apache.subversion.javahl.typ
*/
public class CopySource implements java.io.Serializable
{
- // Update the serialVersionUID when there is a incompatible change
- // made to this class. See any of the following, depending upon
- // the Java release.
- // http://java.sun.com/j2se/1.3/docs/guide/serialization/spec/version.doc7.html
- // http://java.sun.com/j2se/1.4/pdf/serial-spec.pdf
- // http://java.sun.com/j2se/1.5.0/docs/guide/serialization/spec/version.html#6678
- // http://java.sun.com/javase/6/docs/platform/serialization/spec/version.html#6678
+ // Update the serialVersionUID when there is a incompatible change made to
+ // this class. See the java documentation for when a change is incompatible.
+ // http://java.sun.com/javase/7/docs/platform/serialization/spec/version.html#6678
private static final long serialVersionUID = 1L;
/**
Modified: subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/DirEntry.java
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/DirEntry.java?rev=1545212&r1=1545211&r2=1545212&view=diff
==============================================================================
--- subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/DirEntry.java (original)
+++ subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/DirEntry.java Mon Nov 25 10:25:05 2013
@@ -32,13 +32,9 @@ import org.apache.subversion.javahl.ISVN
*/
public class DirEntry implements java.io.Serializable
{
- // Update the serialVersionUID when there is a incompatible change
- // made to this class. See any of the following, depending upon
- // the Java release.
- // http://java.sun.com/j2se/1.3/docs/guide/serialization/spec/version.doc7.html
- // http://java.sun.com/j2se/1.4/pdf/serial-spec.pdf
- // http://java.sun.com/j2se/1.5.0/docs/guide/serialization/spec/version.html#6678
- // http://java.sun.com/javase/6/docs/platform/serialization/spec/version.html#6678
+ // Update the serialVersionUID when there is a incompatible change made to
+ // this class. See the java documentation for when a change is incompatible.
+ // http://java.sun.com/javase/7/docs/platform/serialization/spec/version.html#6678
private static final long serialVersionUID = 1L;
/**
Modified: subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/ExternalItem.java
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/ExternalItem.java?rev=1545212&r1=1545211&r2=1545212&view=diff
==============================================================================
--- subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/ExternalItem.java (original)
+++ subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/ExternalItem.java Mon Nov 25 10:25:05 2013
@@ -130,6 +130,11 @@ public class ExternalItem implements jav
/* Exception class for failed revision kind validation. */
private static class BadRevisionKindException extends SubversionException
{
+ // Update the serialVersionUID when there is a incompatible change made to
+ // this class. See the java documentation for when a change is incompatible.
+ // http://java.sun.com/javase/7/docs/platform/serialization/spec/version.html#6678
+ private static final long serialVersionUID = 1L;
+
public BadRevisionKindException(String param)
{
super("the '" + param + "' constructor argument" +
Modified: subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Info.java
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Info.java?rev=1545212&r1=1545211&r2=1545212&view=diff
==============================================================================
--- subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Info.java (original)
+++ subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Info.java Mon Nov 25 10:25:05 2013
@@ -35,13 +35,9 @@ import org.apache.subversion.javahl.ISVN
*/
public class Info implements java.io.Serializable
{
- // Update the serialVersionUID when there is a incompatible change
- // made to this class. See any of the following, depending upon
- // the Java release.
- // http://java.sun.com/j2se/1.3/docs/guide/serialization/spec/version.doc7.html
- // http://java.sun.com/j2se/1.4/pdf/serial-spec.pdf
- // http://java.sun.com/j2se/1.5.0/docs/guide/serialization/spec/version.html#6678
- // http://java.sun.com/javase/6/docs/platform/serialization/spec/version.html#6678
+ // Update the serialVersionUID when there is a incompatible change made to
+ // this class. See the java documentation for when a change is incompatible.
+ // http://java.sun.com/javase/7/docs/platform/serialization/spec/version.html#6678
private static final long serialVersionUID = 1L;
/**
Modified: subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Lock.java
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Lock.java?rev=1545212&r1=1545211&r2=1545212&view=diff
==============================================================================
--- subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Lock.java (original)
+++ subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Lock.java Mon Nov 25 10:25:05 2013
@@ -31,13 +31,9 @@ import java.util.Date;
*/
public class Lock implements java.io.Serializable
{
- // Update the serialVersionUID when there is a incompatible change
- // made to this class. See any of the following, depending upon
- // the Java release.
- // http://java.sun.com/j2se/1.3/docs/guide/serialization/spec/version.doc7.html
- // http://java.sun.com/j2se/1.4/pdf/serial-spec.pdf
- // http://java.sun.com/j2se/1.5.0/docs/guide/serialization/spec/version.html#6678
- // http://java.sun.com/javase/6/docs/platform/serialization/spec/version.html#6678
+ // Update the serialVersionUID when there is a incompatible change made to
+ // this class. See the java documentation for when a change is incompatible.
+ // http://java.sun.com/javase/7/docs/platform/serialization/spec/version.html#6678
private static final long serialVersionUID = 1L;
/**
Modified: subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Mergeinfo.java
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Mergeinfo.java?rev=1545212&r1=1545211&r2=1545212&view=diff
==============================================================================
--- subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Mergeinfo.java (original)
+++ subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Mergeinfo.java Mon Nov 25 10:25:05 2013
@@ -37,13 +37,9 @@ import org.apache.subversion.javahl.Subv
*/
public class Mergeinfo implements java.io.Serializable
{
- // Update the serialVersionUID when there is a incompatible change
- // made to this class. See any of the following, depending upon
- // the Java release.
- // http://java.sun.com/j2se/1.3/docs/guide/serialization/spec/version.doc7.html
- // http://java.sun.com/j2se/1.4/pdf/serial-spec.pdf
- // http://java.sun.com/j2se/1.5.0/docs/guide/serialization/spec/version.html#6678
- // http://java.sun.com/javase/6/docs/platform/serialization/spec/version.html#6678
+ // Update the serialVersionUID when there is a incompatible change made to
+ // this class. See the java documentation for when a change is incompatible.
+ // http://java.sun.com/javase/7/docs/platform/serialization/spec/version.html#6678
private static final long serialVersionUID = 1L;
/**
Modified: subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Revision.java
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Revision.java?rev=1545212&r1=1545211&r2=1545212&view=diff
==============================================================================
--- subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Revision.java (original)
+++ subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Revision.java Mon Nov 25 10:25:05 2013
@@ -32,13 +32,9 @@ import java.util.Locale;
*/
public class Revision implements java.io.Serializable
{
- // Update the serialVersionUID when there is a incompatible change
- // made to this class. See any of the following, depending upon
- // the Java release.
- // http://java.sun.com/j2se/1.3/docs/guide/serialization/spec/version.doc7.html
- // http://java.sun.com/j2se/1.4/pdf/serial-spec.pdf
- // http://java.sun.com/j2se/1.5.0/docs/guide/serialization/spec/version.html#6678
- // http://java.sun.com/javase/6/docs/platform/serialization/spec/version.html#6678
+ // Update the serialVersionUID when there is a incompatible change made to
+ // this class. See the java documentation for when a change is incompatible.
+ // http://java.sun.com/javase/7/docs/platform/serialization/spec/version.html#6678
private static final long serialVersionUID = 1L;
/**
Modified: subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/RevisionRange.java
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/RevisionRange.java?rev=1545212&r1=1545211&r2=1545212&view=diff
==============================================================================
--- subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/RevisionRange.java (original)
+++ subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/RevisionRange.java Mon Nov 25 10:25:05 2013
@@ -29,13 +29,9 @@ package org.apache.subversion.javahl.typ
*/
public class RevisionRange implements Comparable<RevisionRange>, java.io.Serializable
{
- // Update the serialVersionUID when there is a incompatible change
- // made to this class. See any of the following, depending upon
- // the Java release.
- // http://java.sun.com/j2se/1.3/docs/guide/serialization/spec/version.doc7.html
- // http://java.sun.com/j2se/1.4/pdf/serial-spec.pdf
- // http://java.sun.com/j2se/1.5.0/docs/guide/serialization/spec/version.html#6678
- // http://java.sun.com/javase/6/docs/platform/serialization/spec/version.html#6678
+ // Update the serialVersionUID when there is a incompatible change made to
+ // this class. See the java documentation for when a change is incompatible.
+ // http://java.sun.com/javase/7/docs/platform/serialization/spec/version.html#6678
private static final long serialVersionUID = 2L;
private Revision from;
Modified: subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Status.java
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Status.java?rev=1545212&r1=1545211&r2=1545212&view=diff
==============================================================================
--- subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Status.java (original)
+++ subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Status.java Mon Nov 25 10:25:05 2013
@@ -35,13 +35,9 @@ import org.apache.subversion.javahl.Conf
*/
public class Status implements java.io.Serializable
{
- // Update the serialVersionUID when there is a incompatible change
- // made to this class. See any of the following, depending upon
- // the Java release.
- // http://java.sun.com/j2se/1.3/docs/guide/serialization/spec/version.doc7.html
- // http://java.sun.com/j2se/1.4/pdf/serial-spec.pdf
- // http://java.sun.com/j2se/1.5.0/docs/guide/serialization/spec/version.html#6678
- // http://java.sun.com/javase/6/docs/platform/serialization/spec/version.html#6678
+ // Update the serialVersionUID when there is a incompatible change made to
+ // this class. See the java documentation for when a change is incompatible.
+ // http://java.sun.com/javase/7/docs/platform/serialization/spec/version.html#6678
private static final long serialVersionUID = 2L;
/**
Modified: subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java?rev=1545212&r1=1545211&r2=1545212&view=diff
==============================================================================
--- subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java (original)
+++ subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java Mon Nov 25 10:25:05 2013
@@ -2347,7 +2347,7 @@ public class BasicTests extends SVNTests
List<RevisionRange> ranges = mergeInfo.getRevisions(mergeSrc);
assertTrue("Missing merge info for source '" + mergeSrc + "' on '" +
targetPath + '\'', ranges != null && !ranges.isEmpty());
- RevisionRange range = (RevisionRange) ranges.get(0);
+ RevisionRange range = ranges.get(0);
String expectedMergedRevs = expectedMergeStart + "-" + expectedMergeEnd;
assertEquals("Unexpected first merged revision range for '" +
mergeSrc + "' on '" + targetPath + '\'',
@@ -2610,6 +2610,7 @@ public class BasicTests extends SVNTests
* @throws Throwable
* @since 1.5
*/
+ @SuppressWarnings("deprecation")
public void testMergeReintegrate() throws Throwable
{
OneTest thisTest = setupAndPerformMerge();
@@ -3266,7 +3267,7 @@ public class BasicTests extends SVNTests
// Rigorously inspect one of our DiffSummary notifications.
final String BETA_PATH = "A/B/E/beta";
- DiffSummary betaDiff = (DiffSummary) summaries.get(BETA_PATH);
+ DiffSummary betaDiff = summaries.get(BETA_PATH);
assertNotNull("No diff summary for " + BETA_PATH, betaDiff);
assertEquals("Incorrect path for " + BETA_PATH, BETA_PATH,
betaDiff.getPath());
@@ -3860,6 +3861,8 @@ public class BasicTests extends SVNTests
extends HashMap<String, Collection<String>>
implements ChangelistCallback
{
+ private static final long serialVersionUID = 1L;
+
public void doChangelist(String path, String changelist)
{
path = fileToSVNPath(new File(path), true);
Modified: subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNRemoteTests.java
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNRemoteTests.java?rev=1545212&r1=1545211&r2=1545212&view=diff
==============================================================================
--- subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNRemoteTests.java (original)
+++ subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNRemoteTests.java Mon Nov 25 10:25:05 2013
@@ -160,9 +160,13 @@ public class SVNRemoteTests extends SVNT
}
catch (ClientException ex)
{
- svnErrorCode = ex.getAllMessages().get(0).getCode();
+ List<ClientException.ErrorMessage> msgs = ex.getAllMessages();
+ svnErrorCode = msgs.get(msgs.size() - 1).getCode();
}
- assertEquals(180001, svnErrorCode);
+
+ assertTrue(svnErrorCode == 180001 // file:
+ || svnErrorCode == 210005 // svn:
+ || svnErrorCode == 2); // http:
}
public void testDatedRev() throws Exception
Modified: subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNTests.java
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNTests.java?rev=1545212&r1=1545211&r2=1545212&view=diff
==============================================================================
--- subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNTests.java (original)
+++ subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNTests.java Mon Nov 25 10:25:05 2013
@@ -927,7 +927,7 @@ class SVNTests extends TestCase
public Status[] getStatusArray()
{
- return (Status[]) statuses.toArray(new Status[statuses.size()]);
+ return statuses.toArray(new Status[statuses.size()]);
}
}
}
Modified: subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/tests/org/apache/subversion/javahl/UtilTests.java
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/tests/org/apache/subversion/javahl/UtilTests.java?rev=1545212&r1=1545211&r2=1545212&view=diff
==============================================================================
--- subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/tests/org/apache/subversion/javahl/UtilTests.java (original)
+++ subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/tests/org/apache/subversion/javahl/UtilTests.java Mon Nov 25 10:25:05 2013
@@ -39,6 +39,7 @@ import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
+import java.util.HashMap;
/**
* Tests the JavaHL SVNUtil APIs.
@@ -427,8 +428,12 @@ public class UtilTests extends SVNTests
final Map<String, byte[]> keywords =
SVNUtil.buildKeywords(keywordsValue, 42, "http://a/b/c",
"http://a", new Date(1), "X");
+ final Map<String, byte[]> null_keywords = new HashMap<String, byte[]>();
byte[] buffer = new byte[1024];
+ for (Map.Entry<String, byte[]> e : keywords.entrySet())
+ null_keywords.put(e.getKey(), null);
+
// InputStream; expand
InputStream testin = null;
try {
@@ -473,7 +478,7 @@ public class UtilTests extends SVNTests
try {
testin = SVNUtil.translateStream(
new ByteArrayInputStream(contentsExpanded),
- SVNUtil.EOL_LF, true, keywords, false);
+ SVNUtil.EOL_LF, true, null_keywords, false);
final int size = testin.read(buffer);
testin.close();
testin = null;
@@ -492,8 +497,7 @@ public class UtilTests extends SVNTests
testin = SVNUtil.translateStream(
new ByteArrayInputStream(contentsExpanded),
SVNUtil.EOL_LF, true, false,
- keywordsValue, 42, "http://a/b/c",
- "http://a", new Date(1), "X");
+ keywordsValue, 0, "", "", new Date(1), "");
final int size = testin.read(buffer);
testin.close();
testin = null;
@@ -551,7 +555,7 @@ public class UtilTests extends SVNTests
try {
ByteArrayOutputStream result = new ByteArrayOutputStream();
testout = SVNUtil.translateStream(
- result, SVNUtil.EOL_LF, true, keywords, false);
+ result, SVNUtil.EOL_LF, true, null_keywords, false);
testout.write(contentsExpanded);
testout.close();
testout = null;
@@ -569,8 +573,7 @@ public class UtilTests extends SVNTests
ByteArrayOutputStream result = new ByteArrayOutputStream();
testout = SVNUtil.translateStream(
result, SVNUtil.EOL_LF, true, false,
- keywordsValue, 42, "http://a/b/c",
- "http://a", new Date(1), "X");
+ keywordsValue, 0, "", "", new Date(1), "");
testout.write(contentsExpanded);
testout.close();
testout = null;
Modified: subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/tests/org/apache/subversion/javahl/WC.java
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/tests/org/apache/subversion/javahl/WC.java?rev=1545212&r1=1545211&r2=1545212&view=diff
==============================================================================
--- subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/tests/org/apache/subversion/javahl/WC.java (original)
+++ subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/tests/org/apache/subversion/javahl/WC.java Mon Nov 25 10:25:05 2013
@@ -34,11 +34,12 @@ import java.util.Date;
import org.apache.subversion.javahl.types.*;
-import junit.framework.Assert;
+import junit.framework.TestCase;
+
/**
* This class describe the expected state of the working copy
*/
-public class WC
+public class WC extends TestCase
{
/**
* the map of the items of the working copy. The relative path is the key
@@ -169,9 +170,9 @@ public class WC
// since having no content signals a directory, changes of removing the
// content or setting a former not set content is not allowed. That
// would change the type of the item.
- Assert.assertNotNull("cannot unset content", content);
+ assertNotNull("cannot unset content", content);
Item i = items.get(path);
- Assert.assertNotNull("cannot set content on directory", i.myContent);
+ assertNotNull("cannot set content on directory", i.myContent);
i.myContent = content;
}
@@ -304,13 +305,13 @@ public class WC
*/
void check(DirEntry[] tested, String singleFilePath)
{
- Assert.assertEquals("not a single dir entry", 1, tested.length);
+ assertEquals("not a single dir entry", 1, tested.length);
Item item = items.get(singleFilePath);
- Assert.assertNotNull("not found in working copy", item);
- Assert.assertNotNull("not a file", item.myContent);
- Assert.assertEquals("state says file, working copy not",
- tested[0].getNodeKind(),
- item.nodeKind == null ? NodeKind.file : item.nodeKind);
+ assertNotNull("not found in working copy", item);
+ assertNotNull("not a file", item.myContent);
+ assertEquals("state says file, working copy not",
+ tested[0].getNodeKind(),
+ item.nodeKind == null ? NodeKind.file : item.nodeKind);
}
/**
@@ -342,19 +343,18 @@ public class WC
{
String name = basePath + entry.getPath();
Item item = items.get(name);
- Assert.assertNotNull("null paths won't be found in working copy",
- item);
+ assertNotNull("null paths won't be found in working copy", item);
if (item.myContent != null)
{
- Assert.assertEquals("Expected '" + entry + "' to be file",
- entry.getNodeKind(),
- item.nodeKind == null ? NodeKind.file : item.nodeKind);
+ assertEquals("Expected '" + entry + "' to be file",
+ entry.getNodeKind(),
+ item.nodeKind == null ? NodeKind.file : item.nodeKind);
}
else
{
- Assert.assertEquals("Expected '" + entry + "' to be dir",
- entry.getNodeKind(),
- item.nodeKind == null ? NodeKind.dir : item.nodeKind);
+ assertEquals("Expected '" + entry + "' to be dir",
+ entry.getNodeKind(),
+ item.nodeKind == null ? NodeKind.dir : item.nodeKind);
}
item.touched = true;
}
@@ -369,9 +369,9 @@ public class WC
!item.myPath.equals(basePath))
{
// Non-recursive checks will fail here.
- Assert.assertFalse("Expected path '" + item.myPath +
- "' not found in dir entries",
- recursive);
+ assertFalse("Expected path '" + item.myPath +
+ "' not found in dir entries",
+ recursive);
// Look deeper under the tree.
boolean found = false;
@@ -387,8 +387,8 @@ public class WC
}
}
}
- Assert.assertTrue("Expected path '" + item.myPath +
- "' not found in dir entries", found);
+ assertTrue("Expected path '" + item.myPath +
+ "' not found in dir entries", found);
}
}
}
@@ -436,14 +436,14 @@ public class WC
for (Status status : tested)
{
String path = status.getPath();
- Assert.assertTrue("status path starts not with working copy path",
- path.startsWith(normalizeWCPath));
+ assertTrue("status path starts not with working copy path",
+ path.startsWith(normalizeWCPath));
// we calculate the relative path to the working copy root
if (path.length() > workingCopyPath.length() + 1)
{
- Assert.assertEquals("missing '/' in status path",
- path.charAt(workingCopyPath.length()), '/');
+ assertEquals("missing '/' in status path",
+ path.charAt(workingCopyPath.length()), '/');
path = path.substring(workingCopyPath.length() + 1);
}
else
@@ -451,25 +451,23 @@ public class WC
path = "";
Item item = items.get(path);
- Assert.assertNotNull("status not found in working copy: " + path,
- item);
- Assert.assertEquals("wrong text status in working copy: " + path,
- item.textStatus, status.getTextStatus());
+ assertNotNull("status not found in working copy: " + path, item);
+ assertEquals("wrong text status in working copy: " + path,
+ item.textStatus, status.getTextStatus());
if (item.workingCopyRev != -1)
- Assert.assertEquals("wrong revision number in working copy: "
- + path,
- item.workingCopyRev, status.getRevisionNumber());
- Assert.assertEquals("lock status wrong: " + path,
- item.isLocked, status.isLocked());
- Assert.assertEquals("switch status wrong: " + path,
- item.isSwitched, status.isSwitched());
- Assert.assertEquals("wrong prop status in working copy: " + path,
- item.propStatus, status.getPropStatus());
+ assertEquals("wrong revision number in working copy: " + path,
+ item.workingCopyRev, status.getRevisionNumber());
+ assertEquals("lock status wrong: " + path,
+ item.isLocked, status.isLocked());
+ assertEquals("switch status wrong: " + path,
+ item.isSwitched, status.isSwitched());
+ assertEquals("wrong prop status in working copy: " + path,
+ item.propStatus, status.getPropStatus());
if (item.myContent != null)
{
- Assert.assertEquals("state says file, working copy not: " + path,
- status.getNodeKind(),
- item.nodeKind == null ? NodeKind.file : item.nodeKind);
+ assertEquals("state says file, working copy not: " + path,
+ status.getNodeKind(),
+ item.nodeKind == null ? NodeKind.file : item.nodeKind);
if (status.getTextStatus() == Status.Kind.normal ||
item.checkContent)
{
@@ -483,26 +481,26 @@ public class WC
buffer.append((char) ch);
}
rd.close();
- Assert.assertEquals("content mismatch: " + path,
- buffer.toString(), item.myContent);
+ assertEquals("content mismatch: " + path,
+ buffer.toString(), item.myContent);
}
}
else
{
- Assert.assertEquals("state says dir, working copy not: " + path,
- status.getNodeKind(),
- item.nodeKind == null ? NodeKind.dir : item.nodeKind);
+ assertEquals("state says dir, working copy not: " + path,
+ status.getNodeKind(),
+ item.nodeKind == null ? NodeKind.dir : item.nodeKind);
}
if (checkRepos)
{
- Assert.assertEquals("Last commit revisions for OOD path '"
- + item.myPath + "' don't match:",
- item.reposLastCmtRevision,
- status.getReposLastCmtRevisionNumber());
- Assert.assertEquals("Last commit kinds for OOD path '"
- + item.myPath + "' don't match:",
- item.reposKind, status.getReposKind());
+ assertEquals("Last commit revisions for OOD path '"
+ + item.myPath + "' don't match:",
+ item.reposLastCmtRevision,
+ status.getReposLastCmtRevisionNumber());
+ assertEquals("Last commit kinds for OOD path '"
+ + item.myPath + "' don't match:",
+ item.reposKind, status.getReposKind());
// Only the last committed rev and kind is available for
// paths deleted in the repos.
@@ -511,17 +509,17 @@ public class WC
long lastCmtTime =
(status.getReposLastCmtDate() == null ?
0 : status.getReposLastCmtDate().getTime());
- Assert.assertEquals("Last commit dates for OOD path '" +
- item.myPath + "' don't match:",
- new Date(item.reposLastCmtDate),
- new Date(lastCmtTime));
- Assert.assertEquals("Last commit authors for OOD path '"
- + item.myPath + "' don't match:",
- item.reposLastCmtAuthor,
- status.getReposLastCmtAuthor());
- Assert.assertNotNull("URL for path " + item.myPath
- + " should not be null",
- status.getUrl());
+ assertEquals("Last commit dates for OOD path '" +
+ item.myPath + "' don't match:",
+ new Date(item.reposLastCmtDate),
+ new Date(lastCmtTime));
+ assertEquals("Last commit authors for OOD path '"
+ + item.myPath + "' don't match:",
+ item.reposLastCmtAuthor,
+ status.getReposLastCmtAuthor());
+ assertNotNull("URL for path " + item.myPath
+ + " should not be null",
+ status.getUrl());
}
}
item.touched = true;
@@ -531,9 +529,9 @@ public class WC
// result array
for (Item item : items.values())
{
- Assert.assertTrue("item '" + item.myPath +
- "' in working copy not found in status",
- item.touched);
+ assertTrue("item '" + item.myPath +
+ "' in working copy not found in status",
+ item.touched);
}
}
Modified: subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java?rev=1545212&r1=1545211&r2=1545212&view=diff
==============================================================================
--- subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java (original)
+++ subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java Mon Nov 25 10:25:05 2013
@@ -3360,9 +3360,12 @@ public class BasicTests extends SVNTests
private class MyChangelistCallback extends HashMap
implements ChangelistCallback
{
+ private static final long serialVersionUID = 1L;
+
@SuppressWarnings("unchecked")
public void doChangelist(String path, String changelist)
{
+ path = fileToSVNPath(new File(path), true);
if (super.containsKey(path))
{
// Append the changelist to the existing list