Author: hwright
Date: Wed Feb 16 11:52:40 2011
New Revision: 1071214
URL: http://svn.apache.org/viewvc?rev=1071214&view=rev
Log:
Move the RevisionRange, Mergeinfo, Property, Info, CopySource classes to
org.apache.subversion.javahl.types.
This will (temporarily) break the JavaHL bindings.
[ in subversion/bindings/javahl/ ]
* src/org/apache/subversion/javahl/RevisionRange.java,
src/org/apache/subversion/javahl/Mergeinfo.java,
src/org/apache/subversion/javahl/Property.java,
src/org/apache/subversion/javahl/CopySource.java,
src/org/apache/subversion/javahl/Info.java:
Move to src/org/apache/subversion/javahl/types.
* src/org/apache/subversion/javahl/callback/InfoCallback.java:
Update imports.
* src/org/tigris/subversion/javahl/Mergeinfo.java,
src/org/tigris/subversion/javahl/SVNClient.java,
src/org/tigris/subversion/javahl/Info2.java,
src/org/tigris/subversion/javahl/Info.java,
src/org/tigris/subversion/javahl/CopySource.java,
src/org/tigris/subversion/javahl/RevisionRange.java:
Update references.
Added:
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/CopySource.java
- copied, changed from r1070925,
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/CopySource.java
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Info.java
- copied, changed from r1070925,
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/Info.java
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Mergeinfo.java
- copied, changed from r1070925,
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/Mergeinfo.java
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Property.java
- copied, changed from r1070925,
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/Property.java
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/RevisionRange.java
- copied, changed from r1070925,
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/RevisionRange.java
Removed:
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/CopySource.java
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/Info.java
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/Mergeinfo.java
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/Property.java
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/RevisionRange.java
Modified:
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/InfoCallback.java
subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/CopySource.java
subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Info.java
subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Info2.java
subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Mergeinfo.java
subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/RevisionRange.java
subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java
Modified:
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/InfoCallback.java
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/InfoCallback.java?rev=1071214&r1=1071213&r2=1071214&view=diff
==============================================================================
---
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/InfoCallback.java
(original)
+++
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/InfoCallback.java
Wed Feb 16 11:52:40 2011
@@ -23,8 +23,8 @@
package org.apache.subversion.javahl.callback;
-import org.apache.subversion.javahl.Info;
import org.apache.subversion.javahl.ISVNClient;
+import org.apache.subversion.javahl.types.Info;
/**
* This interface is used to retrieve info each result in a
Copied:
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/CopySource.java
(from r1070925,
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/CopySource.java)
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/CopySource.java?p2=subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/CopySource.java&p1=subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/CopySource.java&r1=1070925&r2=1071214&rev=1071214&view=diff
==============================================================================
---
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/CopySource.java
(original)
+++
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/CopySource.java
Wed Feb 16 11:52:40 2011
@@ -21,9 +21,8 @@
* @endcopyright
*/
-package org.apache.subversion.javahl;
+package org.apache.subversion.javahl.types;
-import org.apache.subversion.javahl.types.Revision;
/**
* A description of a copy source.
Copied:
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Info.java
(from r1070925,
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/Info.java)
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Info.java?p2=subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Info.java&p1=subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/Info.java&r1=1070925&r2=1071214&rev=1071214&view=diff
==============================================================================
---
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/Info.java
(original)
+++
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Info.java
Wed Feb 16 11:52:40 2011
@@ -21,11 +21,12 @@
* @endcopyright
*/
-package org.apache.subversion.javahl;
+package org.apache.subversion.javahl.types;
import java.util.Date;
-import org.apache.subversion.javahl.types.*;
+import org.apache.subversion.javahl.ConflictDescriptor;
+import org.apache.subversion.javahl.ISVNClient;
/**
* this class is returned by {@link ISVNClient#info2} and contains information
Copied:
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Mergeinfo.java
(from r1070925,
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/Mergeinfo.java)
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Mergeinfo.java?p2=subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Mergeinfo.java&p1=subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/Mergeinfo.java&r1=1070925&r2=1071214&rev=1071214&view=diff
==============================================================================
---
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/Mergeinfo.java
(original)
+++
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Mergeinfo.java
Wed Feb 16 11:52:40 2011
@@ -21,7 +21,7 @@
* @endcopyright
*/
-package org.apache.subversion.javahl;
+package org.apache.subversion.javahl.types;
import java.util.ArrayList;
import java.util.HashMap;
@@ -30,6 +30,8 @@ import java.util.Map;
import java.util.Set;
import java.util.StringTokenizer;
+import org.apache.subversion.javahl.SubversionException;
+
/**
* Merge history for a path.
*
Copied:
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Property.java
(from r1070925,
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/Property.java)
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Property.java?p2=subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Property.java&p1=subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/Property.java&r1=1070925&r2=1071214&rev=1071214&view=diff
==============================================================================
---
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/Property.java
(original)
+++
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Property.java
Wed Feb 16 11:52:40 2011
@@ -21,7 +21,7 @@
* @endcopyright
*/
-package org.apache.subversion.javahl;
+package org.apache.subversion.javahl.types;
/**
* This class describes standard Subversion known properties
Copied:
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/RevisionRange.java
(from r1070925,
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/RevisionRange.java)
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/RevisionRange.java?p2=subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/RevisionRange.java&p1=subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/RevisionRange.java&r1=1070925&r2=1071214&rev=1071214&view=diff
==============================================================================
---
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/RevisionRange.java
(original)
+++
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/RevisionRange.java
Wed Feb 16 11:52:40 2011
@@ -21,9 +21,8 @@
* @endcopyright
*/
-package org.apache.subversion.javahl;
+package org.apache.subversion.javahl.types;
-import org.apache.subversion.javahl.types.Revision;
/**
* Object that describes a revision range
Modified:
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/tigris/subversion/javahl/CopySource.java?rev=1071214&r1=1071213&r2=1071214&view=diff
==============================================================================
---
subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/CopySource.java
(original)
+++
subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/CopySource.java
Wed Feb 16 11:52:40 2011
@@ -68,9 +68,9 @@ public class CopySource implements java.
this.pegRevision = pegRevision;
}
- public org.apache.subversion.javahl.CopySource toApache()
+ public org.apache.subversion.javahl.types.CopySource toApache()
{
- return new org.apache.subversion.javahl.CopySource(path,
+ return new org.apache.subversion.javahl.types.CopySource(path,
revision == null ? null : revision.toApache(),
pegRevision == null ? null : pegRevision.toApache());
}
Modified:
subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Info.java
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Info.java?rev=1071214&r1=1071213&r2=1071214&view=diff
==============================================================================
---
subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Info.java
(original)
+++
subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Info.java
Wed Feb 16 11:52:40 2011
@@ -144,7 +144,7 @@ public class Info implements java.io.Ser
/**
* A backward-compat constructor
*/
- public Info(org.apache.subversion.javahl.Info aInfo)
+ public Info(org.apache.subversion.javahl.types.Info aInfo)
{
this((new File(aInfo.getPath())).getName(), aInfo.getUrl(),
aInfo.getReposUUID(), aInfo.getReposRootUrl(),
@@ -153,7 +153,7 @@ public class Info implements java.io.Ser
aInfo.getLastChangedAuthor(), aInfo.getRev(),
aInfo.getLastChangedRev(), aInfo.getLastChangedDate(),
aInfo.getTextTime(), aInfo.getPropTime(), aInfo.getCopyFromUrl()
!= null,
- aInfo.getSchedule() ==
org.apache.subversion.javahl.Info.ScheduleKind.delete,
+ aInfo.getSchedule() ==
org.apache.subversion.javahl.types.Info.ScheduleKind.delete,
checkAbsent(aInfo.getPath()), checkIncomplete(aInfo.getPath()),
aInfo.getCopyFromRev(), aInfo.getCopyFromUrl());
}
Modified:
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/tigris/subversion/javahl/Info2.java?rev=1071214&r1=1071213&r2=1071214&view=diff
==============================================================================
---
subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Info2.java
(original)
+++
subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Info2.java
Wed Feb 16 11:52:40 2011
@@ -250,7 +250,7 @@ public class Info2 implements java.io.Se
/**
* A backward-compat constructor.
*/
- public Info2(org.apache.subversion.javahl.Info aInfo)
+ public Info2(org.apache.subversion.javahl.types.Info aInfo)
{
this(aInfo.getPath(), aInfo.getUrl(), aInfo.getRev(),
NodeKind.fromApache(aInfo.getKind()),
Modified:
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/tigris/subversion/javahl/Mergeinfo.java?rev=1071214&r1=1071213&r2=1071214&view=diff
==============================================================================
---
subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Mergeinfo.java
(original)
+++
subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Mergeinfo.java
Wed Feb 16 11:52:40 2011
@@ -71,18 +71,18 @@ public class Mergeinfo implements java.i
/**
* A constructor for backward compat.
*/
- public Mergeinfo(org.apache.subversion.javahl.Mergeinfo aMergeinfo)
+ public Mergeinfo(org.apache.subversion.javahl.types.Mergeinfo aMergeinfo)
{
this();
Set<String> srcPaths = aMergeinfo.getPaths();
for (String srcPath : srcPaths)
{
- List<org.apache.subversion.javahl.RevisionRange> aRanges =
+ List<org.apache.subversion.javahl.types.RevisionRange> aRanges =
aMergeinfo.getRevisionRange(srcPath);
List<RevisionRange> list = new ArrayList<RevisionRange>();
- for (org.apache.subversion.javahl.RevisionRange range : aRanges)
+ for (org.apache.subversion.javahl.types.RevisionRange range :
aRanges)
{
list.add(new RevisionRange(range));
}
Modified:
subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/RevisionRange.java
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/RevisionRange.java?rev=1071214&r1=1071213&r2=1071214&view=diff
==============================================================================
---
subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/RevisionRange.java
(original)
+++
subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/RevisionRange.java
Wed Feb 16 11:52:40 2011
@@ -57,7 +57,7 @@ public class RevisionRange implements Co
this.to = to;
}
- public RevisionRange(org.apache.subversion.javahl.RevisionRange aRange)
+ public RevisionRange(org.apache.subversion.javahl.types.RevisionRange
aRange)
{
this(Revision.createFromApache(aRange.getFromRevision()),
Revision.createFromApache(aRange.getToRevision()));
@@ -109,9 +109,9 @@ public class RevisionRange implements Co
}
}
- public org.apache.subversion.javahl.RevisionRange toApache()
+ public org.apache.subversion.javahl.types.RevisionRange toApache()
{
- return new org.apache.subversion.javahl.RevisionRange(
+ return new org.apache.subversion.javahl.types.RevisionRange(
from == null ? null : from.toApache(),
to == null ? null : to.toApache());
}
Modified:
subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java?rev=1071214&r1=1071213&r2=1071214&view=diff
==============================================================================
---
subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java
(original)
+++
subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java
Wed Feb 16 11:52:40 2011
@@ -567,8 +567,8 @@ public class SVNClient implements SVNCli
try
{
- List<org.apache.subversion.javahl.RevisionRange> aRevisions =
- new
ArrayList<org.apache.subversion.javahl.RevisionRange>(revisionRanges.length);
+ List<org.apache.subversion.javahl.types.RevisionRange> aRevisions =
+ new
ArrayList<org.apache.subversion.javahl.types.RevisionRange>(revisionRanges.length);
for (RevisionRange range : revisionRanges)
{
@@ -980,8 +980,8 @@ public class SVNClient implements SVNCli
{
try
{
- List<org.apache.subversion.javahl.CopySource> aCopySources =
- new ArrayList<org.apache.subversion.javahl.CopySource>(
+ List<org.apache.subversion.javahl.types.CopySource> aCopySources =
+ new ArrayList<org.apache.subversion.javahl.types.CopySource>(
sources.length);
for (CopySource src : sources)
@@ -1382,8 +1382,8 @@ public class SVNClient implements SVNCli
{
try
{
- List<org.apache.subversion.javahl.RevisionRange> aRevisions =
- new
ArrayList<org.apache.subversion.javahl.RevisionRange>(revisions.length);
+ List<org.apache.subversion.javahl.types.RevisionRange> aRevisions =
+ new
ArrayList<org.apache.subversion.javahl.types.RevisionRange>(revisions.length);
for (RevisionRange range : revisions )
{
@@ -1428,7 +1428,7 @@ public class SVNClient implements SVNCli
{
try
{
- org.apache.subversion.javahl.Mergeinfo aMergeinfo =
+ org.apache.subversion.javahl.types.Mergeinfo aMergeinfo =
aSVNClient.getMergeinfo(path,
pegRevision == null ? null : pegRevision.toApache());
@@ -1489,7 +1489,7 @@ public class SVNClient implements SVNCli
try
{
aSVNClient.getMergeinfoLog(
- org.apache.subversion.javahl.Mergeinfo.LogKind.values()[kind],
+
org.apache.subversion.javahl.types.Mergeinfo.LogKind.values()[kind],
pathOrUrl, pegRevision == null ? null : pegRevision.toApache(),
mergeSourceUrl,
srcPegRevision == null ? null : srcPegRevision.toApache(),
@@ -2350,15 +2350,15 @@ public class SVNClient implements SVNCli
{
try
{
- final List<org.apache.subversion.javahl.Info> infos =
- new ArrayList<org.apache.subversion.javahl.Info>();
+ final List<org.apache.subversion.javahl.types.Info> infos =
+ new
ArrayList<org.apache.subversion.javahl.types.Info>();
aSVNClient.info2(path,
org.apache.subversion.javahl.types.Revision.HEAD,
org.apache.subversion.javahl.types.Revision.HEAD,
org.apache.subversion.javahl.types.Depth.empty,
null, new
org.apache.subversion.javahl.callback.InfoCallback()
{
- public void
singleInfo(org.apache.subversion.javahl.Info info) {
+ public void
singleInfo(org.apache.subversion.javahl.types.Info info) {
infos.add(info);
}
});
@@ -2595,7 +2595,7 @@ public class SVNClient implements SVNCli
Depth.toADepth(depth), changelists == null ? null
: Arrays.asList(changelists),
new org.apache.subversion.javahl.callback.InfoCallback () {
- public void singleInfo(org.apache.subversion.javahl.Info aInfo)
+ public void singleInfo(org.apache.subversion.javahl.types.Info
aInfo)
{
callback.singleInfo(aInfo == null ? null : new Info2(aInfo));
}
