You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xmlbeans.apache.org by er...@apache.org on 2004/11/03 19:04:59 UTC
cvs commit: xml-xmlbeans/v2/test/src/xmlobject/detailed IsImmutableTest.java
ericvas 2004/11/03 10:04:59
Modified: v2 build.xml
v2/src/newstore2/org/apache/xmlbeans/impl/newstore2 Cur.java
Jsr173.java Locale.java Path.java Query.java
v2/src/typeimpl/org/apache/xmlbeans/impl/schema
SchemaTypeLoaderBase.java
v2/src/xpath/org/apache/xmlbeans/impl/xpath/jaxen
XBeansXPathAdv.java
v2/test/src/xmlcursor/checkin AddToSelectionTest.java
BeginElementTest.java DisposeTest.java
GetAllBookmarkRefsTest.java GetBookmarkTest.java
GetCharsTest.java GetCharsType2Test.java
InsertAttributeTest.java InsertCharsTest.java
InsertCommentTest.java InsertProcInstTest.java
IsAtSamePositionAsTest.java
IsInSameDocumentTest.java MoveCharsTest.java
RemoveCharsTest.java SetAttributeTextTest.java
SetBookmarkTest.java SetNameTest.java
SetTextTest.java ToCursorTest.java
ToFirstAttributeTest.java
ToFirstChildElementTest.java
ToFirstContentTokenTest.java
ToLastAttributeTest.java
ToLastChildElementTest.java
ToNextAttributeTest.java ToNextBookmarkTest.java
ToNextCharTest.java ToNextElementTest.java
ToNextSelectionTest.java ToParentElementTest.java
ToPrevAttributeTest.java ToPrevCharTest.java
ToPrevElementTest.java
v2/test/src/xmlcursor/detailed GetTextTest.java
InsertAttributeTest2.java InsertNamespaceTest.java
SelectionsTest.java ToBookmarkTest.java
ToChildTest.java
v2/test/src/xmlobject/checkin InstanceValidationTests.java
v2/test/src/xmlobject/detailed IsImmutableTest.java
Added: v2/src/newstore2/org/apache/xmlbeans/impl/newstore2
JaxenXBeansDelegate.java
Removed: v2/src/xmlstore/org/apache/xmlbeans/impl/store Cursor.java
Goobers.java JaxenXBeansDelegate.java Path.java
Root.java Saver.java Splay.java Text.java Type.java
XmlObjectList.java XqrlDelegate.java
Log:
Removal of old store code - some bug fixes
Revision Changes Path
1.90 +4 -24 xml-xmlbeans/v2/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/build.xml,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- build.xml 1 Nov 2004 04:25:58 -0000 1.89
+++ build.xml 3 Nov 2004 18:04:54 -0000 1.90
@@ -294,7 +294,7 @@
<target name="xbean.jar"
depends="dirs, xmlpublic.classes, typestore.classes, common.classes,
- typeimpl.classes, xmlcomp.classes, xmlstore.classes,
+ typeimpl.classes, xmlcomp.classes,
newstore2.classes, saaj_api.classes,
marshal.classes, xpath.classes, oldxbean.jar, xsdschema.classes,
xmlinputstream.classes, resolver.jar, xbean_xpath.jar,
@@ -309,7 +309,6 @@
<fileset dir="build/classes/toolschema"/>
<fileset dir="build/classes/xsdschema"/>
<fileset dir="build/classes/xmlschema"/>
- <fileset dir="build/classes/xmlstore"/>
<fileset dir="build/classes/newstore2"/>
<fileset dir="build/classes/saaj_api"/>
<fileset dir="build/classes/xmlinputstream"/>
@@ -391,14 +390,13 @@
<!-- typeimpl target ============================================== -->
- <target name="typeimpl.classes" depends="dirs, xmlstore.classes, newstore2.classes,
+ <target name="typeimpl.classes" depends="dirs, newstore2.classes,
repackage.classes, xmlpublic.classes, typestore.classes, xsdschema.classes,
configschema.classes, toolschema.classes, jsr173_api.jar, jam">
<mkdir dir="build/classes/typeimpl"/>
<javac destdir="build/classes/typeimpl" source="${javac.source}" target="${javac.target}" debug="on">
<classpath>
<pathelement location="build/classes/newstore2"/>
- <pathelement location="build/classes/xmlstore"/>
<pathelement location="build/classes/xmlinputstream"/>
<pathelement location="build/classes/common"/>
<pathelement location="build/classes/repackage"/>
@@ -473,24 +471,6 @@
</target>
- <!-- xmlstore target ============================================== -->
-
- <target name="xmlstore.classes"
- depends="dirs, common.classes, typestore.classes, xmlpublic.classes, newstore2.classes">
- <mkdir dir="build/classes/xmlstore"/>
- <javac srcdir="src/xmlstore" destdir="build/classes/xmlstore" source="${javac.source}" target="${javac.target}" debug="on">
- <classpath id="xmlstore.compile.path">
- <pathelement location="build/lib/jsr173_api.jar"/>
- <pathelement location="build/classes/xmlinputstream"/>
- <pathelement location="build/classes/typestore"/>
- <pathelement location="build/classes/xmlpublic"/>
- <pathelement location="build/classes/newstore2"/>
- <pathelement location="build/classes/common"/>
- </classpath>
- </javac>
-
- </target>
-
<!-- saaj_api target ============================================== -->
<target name="saaj_api.classes" depends="dirs">
@@ -774,7 +754,7 @@
<!-- xpath target ============================================= -->
- <target name="xpath.classes" depends="dirs, xmlpublic.jar, xmlstore.classes">
+ <target name="xpath.classes" depends="dirs, xmlpublic.jar, newstore2.classes">
<mkdir dir="build/classes/xpath"/>
<javac
srcdir="src/xpath"
@@ -784,7 +764,7 @@
debug="on">
<classpath id="xpath.compile.path">
<pathelement location="build/classes/xmlpublic"/>
- <pathelement location="build/classes/xmlstore"/>
+ <pathelement location="build/classes/newstore2"/>
<pathelement location="external/lib/jaxen-1.1-beta-2.jar"/>
</classpath>
</javac>
1.48 +6 -10 xml-xmlbeans/v2/src/newstore2/org/apache/xmlbeans/impl/newstore2/Cur.java
Index: Cur.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/src/newstore2/org/apache/xmlbeans/impl/newstore2/Cur.java,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- Cur.java 9 Oct 2004 17:30:16 -0000 1.47
+++ Cur.java 3 Nov 2004 18:04:55 -0000 1.48
@@ -2564,7 +2564,7 @@
if (_state != POOLED && _state != DISPOSED)
{
- // Clean up ant state
+ // Clean up any state
while ( _stackTop != -1 )
popButStay();
@@ -2584,16 +2584,13 @@
// Release weak reference and attacked value
- if (_value != null && _value instanceof Locale.Ref)
+ if (_ref != null)
{
- Locale.Ref r = (Locale.Ref) _value;
-
- r.clear();
- r._cur = null;
+ _ref.clear();
+ _ref._cur = null;
}
- _value = null;
- _key = null;
+ _ref = null;
// Unregister and either diapose of cursor or add it back to pool
@@ -3402,8 +3399,7 @@
Cur _next;
Cur _prev;
- Object _key;
- Object _value;
+ Locale.Ref _ref;
int _stackTop;
1.19 +3 -3 xml-xmlbeans/v2/src/newstore2/org/apache/xmlbeans/impl/newstore2/Jsr173.java
Index: Jsr173.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/src/newstore2/org/apache/xmlbeans/impl/newstore2/Jsr173.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- Jsr173.java 9 Oct 2004 17:30:16 -0000 1.18
+++ Jsr173.java 3 Nov 2004 18:04:56 -0000 1.19
@@ -289,7 +289,7 @@
StringBuffer sb = new StringBuffer();
- for ( int depth = 1 ; depth > 0 ; )
+ for ( ; ; )
{
if (!hasNext())
throw new XMLStreamException();
@@ -297,9 +297,9 @@
int e = next();
if (e == END_ELEMENT)
- depth--;
+ break;
else if (e == START_ELEMENT)
- depth++;
+ throw new XMLStreamException();
else if (e != COMMENT && e != PROCESSING_INSTRUCTION)
sb.append( getText() );
}
1.30 +3 -3 xml-xmlbeans/v2/src/newstore2/org/apache/xmlbeans/impl/newstore2/Locale.java
Index: Locale.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/src/newstore2/org/apache/xmlbeans/impl/newstore2/Locale.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- Locale.java 22 Oct 2004 18:22:09 -0000 1.29
+++ Locale.java 3 Nov 2004 18:04:56 -0000 1.30
@@ -2220,9 +2220,9 @@
Cur c = getCur();
assert c._tempFrame == -1;
- assert c._value == null;
+ assert c._ref == null;
- c._value = new Ref( c, o );
+ c._ref = new Ref( c, o );
return c;
}
@@ -2300,7 +2300,7 @@
assert c._state == Cur.POOLED;
assert c._prev == null && c._next == null;
assert c._xobj == null && c._pos == Cur.NO_POS;
- assert c._value == null;
+ assert c._ref == null;
_registered = c.listInsert( _registered );
c._state = Cur.REGISTERED;
1.6 +1 -1 xml-xmlbeans/v2/src/newstore2/org/apache/xmlbeans/impl/newstore2/Path.java
Index: Path.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/src/newstore2/org/apache/xmlbeans/impl/newstore2/Path.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Path.java 18 Aug 2004 15:25:51 -0000 1.5
+++ Path.java 3 Nov 2004 18:04:56 -0000 1.6
@@ -78,7 +78,7 @@
private static final int FORCE_XBEAN = 1;
private static final int FORCE_NEITHER = 2;
- static Path getCompiledPath ( String pathExpr, XmlOptions options )
+ public static Path getCompiledPath ( String pathExpr, XmlOptions options )
{
options = XmlOptions.maskNull( options );
1.2 +1 -1 xml-xmlbeans/v2/src/newstore2/org/apache/xmlbeans/impl/newstore2/Query.java
Index: Query.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/src/newstore2/org/apache/xmlbeans/impl/newstore2/Query.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Query.java 4 Aug 2004 21:15:06 -0000 1.1
+++ Query.java 3 Nov 2004 18:04:56 -0000 1.2
@@ -35,7 +35,7 @@
return getCompiledQuery( queryExpr, options ).execute( c, options );
}
- static synchronized Query getCompiledQuery ( String queryExpr, XmlOptions options )
+ public static synchronized Query getCompiledQuery ( String queryExpr, XmlOptions options )
{
return getCompiledQuery( queryExpr, Path.getCurrentNodeVar( options ) );
}
1.1 xml-xmlbeans/v2/src/newstore2/org/apache/xmlbeans/impl/newstore2/JaxenXBeansDelegate.java
Index: JaxenXBeansDelegate.java
===================================================================
/* Copyright 2004 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.xmlbeans.impl.newstore2;
import java.lang.reflect.Constructor;
import java.util.List;
/**
* Author: Cezar Andrei (cezar.andrei at bea.com)
* Date: Nov 6, 2003
*
* Help class to decouple from xbean_xpath.jar and jaxen.jar (version v1.1 beta2)
*/
public final class JaxenXBeansDelegate
{
private JaxenXBeansDelegate()
{}
static SelectPathInterface createInstance(String xpath)
{
if (_constructor==null)
return null;
try
{
return (JaxenXBeansDelegate.SelectPathInterface)_constructor.newInstance(new Object[] {xpath});
}
catch (Exception e)
{
throw new RuntimeException(e);
}
}
// Loose coupling functionality with xbean_xpath.jar
private static Constructor _constructor;
static
{
boolean hasTheJars = false;
Class jaxenXPathImpl = null;
try
{
// from jaxen.jar
Class.forName( "org.jaxen.BaseXPath" );
// from xbean_xpath.jar
jaxenXPathImpl = Class.forName( "org.apache.xmlbeans.impl.xpath.jaxen.XBeansXPathAdv" );
hasTheJars = true;
}
catch ( ClassNotFoundException e )
{
hasTheJars = false;
}
catch ( NoClassDefFoundError e )
{
hasTheJars = false;
}
if (hasTheJars)
{
try
{
_constructor =
jaxenXPathImpl.getConstructor( new Class[] { String.class } );
}
catch ( Exception e )
{
throw new RuntimeException( e );
}
}
}
public static interface SelectPathInterface
{
public List selectPath(Object node);
}
}
1.11 +2 -2 xml-xmlbeans/v2/src/typeimpl/org/apache/xmlbeans/impl/schema/SchemaTypeLoaderBase.java
Index: SchemaTypeLoaderBase.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/src/typeimpl/org/apache/xmlbeans/impl/schema/SchemaTypeLoaderBase.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- SchemaTypeLoaderBase.java 9 Oct 2004 17:30:16 -0000 1.10
+++ SchemaTypeLoaderBase.java 3 Nov 2004 18:04:56 -0000 1.11
@@ -60,8 +60,8 @@
public abstract class SchemaTypeLoaderBase implements SchemaTypeLoader
{
- private static final Method _pathCompiler = getMethod( "org.apache.xmlbeans.impl.store.Path", "getCompiledPath", new Class[] { String.class, XmlOptions.class } );
- private static final Method _queryCompiler = getMethod( "org.apache.xmlbeans.impl.store.Path", "getCompiledQuery", new Class[] { String.class, XmlOptions.class } );
+ private static final Method _pathCompiler = getMethod( "org.apache.xmlbeans.impl.newstore2.Path", "getCompiledPath", new Class[] { String.class, XmlOptions.class } );
+ private static final Method _queryCompiler = getMethod( "org.apache.xmlbeans.impl.newstore2.Query", "getCompiledQuery", new Class[] { String.class, XmlOptions.class } );
private static Method getMethod ( String className, String methodName, Class[] args )
{
1.3 +1 -1 xml-xmlbeans/v2/src/xpath/org/apache/xmlbeans/impl/xpath/jaxen/XBeansXPathAdv.java
Index: XBeansXPathAdv.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/src/xpath/org/apache/xmlbeans/impl/xpath/jaxen/XBeansXPathAdv.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XBeansXPathAdv.java 12 Feb 2004 20:06:30 -0000 1.2
+++ XBeansXPathAdv.java 3 Nov 2004 18:04:57 -0000 1.3
@@ -18,7 +18,7 @@
import org.jaxen.BaseXPath;
import org.jaxen.JaxenException;
import org.apache.xmlbeans.XmlCursor;
-import org.apache.xmlbeans.impl.store.JaxenXBeansDelegate;
+import org.apache.xmlbeans.impl.newstore2.JaxenXBeansDelegate;
import java.util.List;
1.3 +0 -1 xml-xmlbeans/v2/test/src/xmlcursor/checkin/AddToSelectionTest.java
Index: AddToSelectionTest.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/src/xmlcursor/checkin/AddToSelectionTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AddToSelectionTest.java 17 Jun 2004 16:29:38 -0000 1.2
+++ AddToSelectionTest.java 3 Nov 2004 18:04:57 -0000 1.3
@@ -31,7 +31,6 @@
import javax.xml.namespace.QName;
-import org.apache.xmlbeans.impl.store.Cursor;
import xmlcursor.common.BasicCursorTestCase;
import java.net.URL;
1.3 +0 -1 xml-xmlbeans/v2/test/src/xmlcursor/checkin/BeginElementTest.java
Index: BeginElementTest.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/src/xmlcursor/checkin/BeginElementTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- BeginElementTest.java 17 Jun 2004 16:29:38 -0000 1.2
+++ BeginElementTest.java 3 Nov 2004 18:04:57 -0000 1.3
@@ -28,7 +28,6 @@
import javax.xml.namespace.QName;
-import org.apache.xmlbeans.impl.store.Cursor;
import xmlcursor.common.Common;
import xmlcursor.common.BasicCursorTestCase;
1.3 +0 -1 xml-xmlbeans/v2/test/src/xmlcursor/checkin/DisposeTest.java
Index: DisposeTest.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/src/xmlcursor/checkin/DisposeTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DisposeTest.java 17 Jun 2004 16:29:38 -0000 1.2
+++ DisposeTest.java 3 Nov 2004 18:04:57 -0000 1.3
@@ -29,7 +29,6 @@
import javax.xml.namespace.QName;
-import org.apache.xmlbeans.impl.store.Cursor;
import xmlcursor.common.*;
import java.net.URL;
1.3 +0 -1 xml-xmlbeans/v2/test/src/xmlcursor/checkin/GetAllBookmarkRefsTest.java
Index: GetAllBookmarkRefsTest.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/src/xmlcursor/checkin/GetAllBookmarkRefsTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- GetAllBookmarkRefsTest.java 17 Jun 2004 16:29:38 -0000 1.2
+++ GetAllBookmarkRefsTest.java 3 Nov 2004 18:04:57 -0000 1.3
@@ -31,7 +31,6 @@
import javax.xml.namespace.QName;
-import org.apache.xmlbeans.impl.store.Cursor;
import xmlcursor.common.*;
import java.net.URL;
1.3 +0 -1 xml-xmlbeans/v2/test/src/xmlcursor/checkin/GetBookmarkTest.java
Index: GetBookmarkTest.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/src/xmlcursor/checkin/GetBookmarkTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- GetBookmarkTest.java 17 Jun 2004 16:29:38 -0000 1.2
+++ GetBookmarkTest.java 3 Nov 2004 18:04:57 -0000 1.3
@@ -31,7 +31,6 @@
import javax.xml.namespace.QName;
-import org.apache.xmlbeans.impl.store.Cursor;
import xmlcursor.common.*;
import java.net.URL;
1.3 +0 -1 xml-xmlbeans/v2/test/src/xmlcursor/checkin/GetCharsTest.java
Index: GetCharsTest.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/src/xmlcursor/checkin/GetCharsTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- GetCharsTest.java 17 Jun 2004 16:29:38 -0000 1.2
+++ GetCharsTest.java 3 Nov 2004 18:04:57 -0000 1.3
@@ -29,7 +29,6 @@
import javax.xml.namespace.QName;
-import org.apache.xmlbeans.impl.store.Cursor;
import xmlcursor.common.*;
import java.net.URL;
1.3 +0 -1 xml-xmlbeans/v2/test/src/xmlcursor/checkin/GetCharsType2Test.java
Index: GetCharsType2Test.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/src/xmlcursor/checkin/GetCharsType2Test.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- GetCharsType2Test.java 17 Jun 2004 16:29:38 -0000 1.2
+++ GetCharsType2Test.java 3 Nov 2004 18:04:57 -0000 1.3
@@ -29,7 +29,6 @@
import javax.xml.namespace.QName;
-import org.apache.xmlbeans.impl.store.Cursor;
import xmlcursor.common.*;
import java.net.URL;
1.3 +0 -1 xml-xmlbeans/v2/test/src/xmlcursor/checkin/InsertAttributeTest.java
Index: InsertAttributeTest.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/src/xmlcursor/checkin/InsertAttributeTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- InsertAttributeTest.java 17 Jun 2004 16:29:38 -0000 1.2
+++ InsertAttributeTest.java 3 Nov 2004 18:04:57 -0000 1.3
@@ -29,7 +29,6 @@
import javax.xml.namespace.QName;
-import org.apache.xmlbeans.impl.store.Cursor;
import xmlcursor.common.*;
import java.net.URL;
1.3 +0 -1 xml-xmlbeans/v2/test/src/xmlcursor/checkin/InsertCharsTest.java
Index: InsertCharsTest.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/src/xmlcursor/checkin/InsertCharsTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- InsertCharsTest.java 17 Jun 2004 16:29:38 -0000 1.2
+++ InsertCharsTest.java 3 Nov 2004 18:04:57 -0000 1.3
@@ -29,7 +29,6 @@
import javax.xml.namespace.QName;
-import org.apache.xmlbeans.impl.store.Cursor;
import xmlcursor.common.*;
import java.net.URL;
1.3 +0 -1 xml-xmlbeans/v2/test/src/xmlcursor/checkin/InsertCommentTest.java
Index: InsertCommentTest.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/src/xmlcursor/checkin/InsertCommentTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- InsertCommentTest.java 17 Jun 2004 16:29:38 -0000 1.2
+++ InsertCommentTest.java 3 Nov 2004 18:04:57 -0000 1.3
@@ -29,7 +29,6 @@
import javax.xml.namespace.QName;
-import org.apache.xmlbeans.impl.store.Cursor;
import xmlcursor.common.*;
import java.net.URL;
1.3 +0 -1 xml-xmlbeans/v2/test/src/xmlcursor/checkin/InsertProcInstTest.java
Index: InsertProcInstTest.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/src/xmlcursor/checkin/InsertProcInstTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- InsertProcInstTest.java 17 Jun 2004 16:29:38 -0000 1.2
+++ InsertProcInstTest.java 3 Nov 2004 18:04:57 -0000 1.3
@@ -29,7 +29,6 @@
import javax.xml.namespace.QName;
-import org.apache.xmlbeans.impl.store.Cursor;
import java.net.URL;
1.3 +0 -1 xml-xmlbeans/v2/test/src/xmlcursor/checkin/IsAtSamePositionAsTest.java
Index: IsAtSamePositionAsTest.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/src/xmlcursor/checkin/IsAtSamePositionAsTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- IsAtSamePositionAsTest.java 17 Jun 2004 16:29:38 -0000 1.2
+++ IsAtSamePositionAsTest.java 3 Nov 2004 18:04:57 -0000 1.3
@@ -31,7 +31,6 @@
import javax.xml.namespace.QName;
-import org.apache.xmlbeans.impl.store.Cursor;
import xmlcursor.common.*;
import java.net.URL;
1.3 +0 -1 xml-xmlbeans/v2/test/src/xmlcursor/checkin/IsInSameDocumentTest.java
Index: IsInSameDocumentTest.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/src/xmlcursor/checkin/IsInSameDocumentTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- IsInSameDocumentTest.java 17 Jun 2004 16:29:38 -0000 1.2
+++ IsInSameDocumentTest.java 3 Nov 2004 18:04:57 -0000 1.3
@@ -31,7 +31,6 @@
import javax.xml.namespace.QName;
-import org.apache.xmlbeans.impl.store.Cursor;
import xmlcursor.common.*;
import java.net.URL;
1.8 +0 -1 xml-xmlbeans/v2/test/src/xmlcursor/checkin/MoveCharsTest.java
Index: MoveCharsTest.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/src/xmlcursor/checkin/MoveCharsTest.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- MoveCharsTest.java 9 Oct 2004 17:30:17 -0000 1.7
+++ MoveCharsTest.java 3 Nov 2004 18:04:57 -0000 1.8
@@ -29,7 +29,6 @@
import javax.xml.namespace.QName;
-import org.apache.xmlbeans.impl.store.Cursor;
import xmlcursor.common.*;
import java.net.URL;
1.3 +0 -1 xml-xmlbeans/v2/test/src/xmlcursor/checkin/RemoveCharsTest.java
Index: RemoveCharsTest.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/src/xmlcursor/checkin/RemoveCharsTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- RemoveCharsTest.java 17 Jun 2004 16:29:38 -0000 1.2
+++ RemoveCharsTest.java 3 Nov 2004 18:04:57 -0000 1.3
@@ -29,7 +29,6 @@
import javax.xml.namespace.QName;
-import org.apache.xmlbeans.impl.store.Cursor;
import xmlcursor.common.*;
import java.net.URL;
1.4 +0 -1 xml-xmlbeans/v2/test/src/xmlcursor/checkin/SetAttributeTextTest.java
Index: SetAttributeTextTest.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/src/xmlcursor/checkin/SetAttributeTextTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SetAttributeTextTest.java 1 Jul 2004 00:01:29 -0000 1.3
+++ SetAttributeTextTest.java 3 Nov 2004 18:04:57 -0000 1.4
@@ -29,7 +29,6 @@
import javax.xml.namespace.QName;
-import org.apache.xmlbeans.impl.store.Cursor;
import xmlcursor.common.*;
import tools.util.JarUtil;
1.3 +0 -1 xml-xmlbeans/v2/test/src/xmlcursor/checkin/SetBookmarkTest.java
Index: SetBookmarkTest.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/src/xmlcursor/checkin/SetBookmarkTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SetBookmarkTest.java 17 Jun 2004 16:29:38 -0000 1.2
+++ SetBookmarkTest.java 3 Nov 2004 18:04:57 -0000 1.3
@@ -31,7 +31,6 @@
import javax.xml.namespace.QName;
-import org.apache.xmlbeans.impl.store.Cursor;
import xmlcursor.common.*;
import java.net.URL;
1.3 +0 -1 xml-xmlbeans/v2/test/src/xmlcursor/checkin/SetNameTest.java
Index: SetNameTest.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/src/xmlcursor/checkin/SetNameTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SetNameTest.java 17 Jun 2004 16:29:38 -0000 1.2
+++ SetNameTest.java 3 Nov 2004 18:04:57 -0000 1.3
@@ -29,7 +29,6 @@
import javax.xml.namespace.QName;
-import org.apache.xmlbeans.impl.store.Cursor;
import xmlcursor.common.*;
import java.net.URL;
1.4 +0 -1 xml-xmlbeans/v2/test/src/xmlcursor/checkin/SetTextTest.java
Index: SetTextTest.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/src/xmlcursor/checkin/SetTextTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SetTextTest.java 26 Jul 2004 18:24:16 -0000 1.3
+++ SetTextTest.java 3 Nov 2004 18:04:57 -0000 1.4
@@ -29,7 +29,6 @@
import javax.xml.namespace.QName;
-import org.apache.xmlbeans.impl.store.Cursor;
import xmlcursor.common.*;
import java.net.URL;
1.3 +0 -1 xml-xmlbeans/v2/test/src/xmlcursor/checkin/ToCursorTest.java
Index: ToCursorTest.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/src/xmlcursor/checkin/ToCursorTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ToCursorTest.java 17 Jun 2004 16:29:38 -0000 1.2
+++ ToCursorTest.java 3 Nov 2004 18:04:57 -0000 1.3
@@ -31,7 +31,6 @@
import javax.xml.namespace.QName;
-import org.apache.xmlbeans.impl.store.Cursor;
import xmlcursor.common.*;
import java.net.URL;
1.3 +0 -1 xml-xmlbeans/v2/test/src/xmlcursor/checkin/ToFirstAttributeTest.java
Index: ToFirstAttributeTest.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/src/xmlcursor/checkin/ToFirstAttributeTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ToFirstAttributeTest.java 17 Jun 2004 16:29:38 -0000 1.2
+++ ToFirstAttributeTest.java 3 Nov 2004 18:04:57 -0000 1.3
@@ -31,7 +31,6 @@
import javax.xml.namespace.QName;
-import org.apache.xmlbeans.impl.store.Cursor;
import xmlcursor.common.*;
import java.net.URL;
1.3 +0 -1 xml-xmlbeans/v2/test/src/xmlcursor/checkin/ToFirstChildElementTest.java
Index: ToFirstChildElementTest.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/src/xmlcursor/checkin/ToFirstChildElementTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ToFirstChildElementTest.java 17 Jun 2004 16:29:38 -0000 1.2
+++ ToFirstChildElementTest.java 3 Nov 2004 18:04:57 -0000 1.3
@@ -31,7 +31,6 @@
import javax.xml.namespace.QName;
-import org.apache.xmlbeans.impl.store.Cursor;
import xmlcursor.common.*;
import java.net.URL;
1.8 +0 -1 xml-xmlbeans/v2/test/src/xmlcursor/checkin/ToFirstContentTokenTest.java
Index: ToFirstContentTokenTest.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/src/xmlcursor/checkin/ToFirstContentTokenTest.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ToFirstContentTokenTest.java 9 Oct 2004 17:30:17 -0000 1.7
+++ ToFirstContentTokenTest.java 3 Nov 2004 18:04:57 -0000 1.8
@@ -31,7 +31,6 @@
import javax.xml.namespace.QName;
-import org.apache.xmlbeans.impl.store.Cursor;
import xmlcursor.common.*;
import java.net.URL;
1.3 +0 -1 xml-xmlbeans/v2/test/src/xmlcursor/checkin/ToLastAttributeTest.java
Index: ToLastAttributeTest.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/src/xmlcursor/checkin/ToLastAttributeTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ToLastAttributeTest.java 17 Jun 2004 16:29:38 -0000 1.2
+++ ToLastAttributeTest.java 3 Nov 2004 18:04:57 -0000 1.3
@@ -31,7 +31,6 @@
import javax.xml.namespace.QName;
-import org.apache.xmlbeans.impl.store.Cursor;
import xmlcursor.common.*;
import java.net.URL;
1.3 +0 -1 xml-xmlbeans/v2/test/src/xmlcursor/checkin/ToLastChildElementTest.java
Index: ToLastChildElementTest.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/src/xmlcursor/checkin/ToLastChildElementTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ToLastChildElementTest.java 17 Jun 2004 16:29:38 -0000 1.2
+++ ToLastChildElementTest.java 3 Nov 2004 18:04:57 -0000 1.3
@@ -31,7 +31,6 @@
import javax.xml.namespace.QName;
-import org.apache.xmlbeans.impl.store.Cursor;
import xmlcursor.common.*;
import java.net.URL;
1.3 +0 -1 xml-xmlbeans/v2/test/src/xmlcursor/checkin/ToNextAttributeTest.java
Index: ToNextAttributeTest.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/src/xmlcursor/checkin/ToNextAttributeTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ToNextAttributeTest.java 17 Jun 2004 16:29:38 -0000 1.2
+++ ToNextAttributeTest.java 3 Nov 2004 18:04:57 -0000 1.3
@@ -31,7 +31,6 @@
import javax.xml.namespace.QName;
-import org.apache.xmlbeans.impl.store.Cursor;
import xmlcursor.common.*;
import java.net.URL;
1.3 +0 -1 xml-xmlbeans/v2/test/src/xmlcursor/checkin/ToNextBookmarkTest.java
Index: ToNextBookmarkTest.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/src/xmlcursor/checkin/ToNextBookmarkTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ToNextBookmarkTest.java 17 Jun 2004 16:29:38 -0000 1.2
+++ ToNextBookmarkTest.java 3 Nov 2004 18:04:57 -0000 1.3
@@ -31,7 +31,6 @@
import javax.xml.namespace.QName;
-import org.apache.xmlbeans.impl.store.Cursor;
import xmlcursor.common.*;
import java.net.URL;
1.3 +0 -1 xml-xmlbeans/v2/test/src/xmlcursor/checkin/ToNextCharTest.java
Index: ToNextCharTest.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/src/xmlcursor/checkin/ToNextCharTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ToNextCharTest.java 17 Jun 2004 16:29:38 -0000 1.2
+++ ToNextCharTest.java 3 Nov 2004 18:04:57 -0000 1.3
@@ -31,7 +31,6 @@
import javax.xml.namespace.QName;
-import org.apache.xmlbeans.impl.store.Cursor;
import xmlcursor.common.*;
import java.net.URL;
1.3 +0 -1 xml-xmlbeans/v2/test/src/xmlcursor/checkin/ToNextElementTest.java
Index: ToNextElementTest.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/src/xmlcursor/checkin/ToNextElementTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ToNextElementTest.java 17 Jun 2004 16:29:38 -0000 1.2
+++ ToNextElementTest.java 3 Nov 2004 18:04:57 -0000 1.3
@@ -31,7 +31,6 @@
import javax.xml.namespace.QName;
-import org.apache.xmlbeans.impl.store.Cursor;
import xmlcursor.common.*;
import java.net.URL;
1.3 +0 -1 xml-xmlbeans/v2/test/src/xmlcursor/checkin/ToNextSelectionTest.java
Index: ToNextSelectionTest.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/src/xmlcursor/checkin/ToNextSelectionTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ToNextSelectionTest.java 17 Jun 2004 16:29:38 -0000 1.2
+++ ToNextSelectionTest.java 3 Nov 2004 18:04:57 -0000 1.3
@@ -31,7 +31,6 @@
import javax.xml.namespace.QName;
-import org.apache.xmlbeans.impl.store.Cursor;
import xmlcursor.common.*;
import java.net.URL;
1.3 +0 -1 xml-xmlbeans/v2/test/src/xmlcursor/checkin/ToParentElementTest.java
Index: ToParentElementTest.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/src/xmlcursor/checkin/ToParentElementTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ToParentElementTest.java 17 Jun 2004 16:29:38 -0000 1.2
+++ ToParentElementTest.java 3 Nov 2004 18:04:57 -0000 1.3
@@ -21,7 +21,6 @@
import javax.xml.namespace.QName;
-import org.apache.xmlbeans.impl.store.Cursor;
import xmlcursor.common.*;
import java.net.URL;
1.3 +0 -1 xml-xmlbeans/v2/test/src/xmlcursor/checkin/ToPrevAttributeTest.java
Index: ToPrevAttributeTest.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/src/xmlcursor/checkin/ToPrevAttributeTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ToPrevAttributeTest.java 17 Jun 2004 16:29:38 -0000 1.2
+++ ToPrevAttributeTest.java 3 Nov 2004 18:04:57 -0000 1.3
@@ -31,7 +31,6 @@
import javax.xml.namespace.QName;
-import org.apache.xmlbeans.impl.store.Cursor;
import xmlcursor.common.*;
import java.net.URL;
1.3 +0 -1 xml-xmlbeans/v2/test/src/xmlcursor/checkin/ToPrevCharTest.java
Index: ToPrevCharTest.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/src/xmlcursor/checkin/ToPrevCharTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ToPrevCharTest.java 17 Jun 2004 16:29:38 -0000 1.2
+++ ToPrevCharTest.java 3 Nov 2004 18:04:57 -0000 1.3
@@ -31,7 +31,6 @@
import javax.xml.namespace.QName;
-import org.apache.xmlbeans.impl.store.Cursor;
import xmlcursor.common.*;
import java.net.URL;
1.3 +0 -1 xml-xmlbeans/v2/test/src/xmlcursor/checkin/ToPrevElementTest.java
Index: ToPrevElementTest.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/src/xmlcursor/checkin/ToPrevElementTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ToPrevElementTest.java 17 Jun 2004 16:29:38 -0000 1.2
+++ ToPrevElementTest.java 3 Nov 2004 18:04:57 -0000 1.3
@@ -31,7 +31,6 @@
import javax.xml.namespace.QName;
-import org.apache.xmlbeans.impl.store.Cursor;
import xmlcursor.common.*;
import java.net.URL;
1.7 +0 -1 xml-xmlbeans/v2/test/src/xmlcursor/detailed/GetTextTest.java
Index: GetTextTest.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/src/xmlcursor/detailed/GetTextTest.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- GetTextTest.java 7 Oct 2004 22:07:43 -0000 1.6
+++ GetTextTest.java 3 Nov 2004 18:04:59 -0000 1.7
@@ -29,7 +29,6 @@
import javax.xml.namespace.QName;
-import org.apache.xmlbeans.impl.store.Cursor;
import xmlcursor.common.*;
import tools.util.JarUtil;
1.3 +0 -1 xml-xmlbeans/v2/test/src/xmlcursor/detailed/InsertAttributeTest2.java
Index: InsertAttributeTest2.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/src/xmlcursor/detailed/InsertAttributeTest2.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- InsertAttributeTest2.java 17 Jun 2004 16:29:39 -0000 1.2
+++ InsertAttributeTest2.java 3 Nov 2004 18:04:59 -0000 1.3
@@ -29,7 +29,6 @@
import javax.xml.namespace.QName;
-import org.apache.xmlbeans.impl.store.Cursor;
import xmlcursor.common.*;
import java.net.URL;
1.5 +0 -1 xml-xmlbeans/v2/test/src/xmlcursor/detailed/InsertNamespaceTest.java
Index: InsertNamespaceTest.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/src/xmlcursor/detailed/InsertNamespaceTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- InsertNamespaceTest.java 5 Oct 2004 20:43:30 -0000 1.4
+++ InsertNamespaceTest.java 3 Nov 2004 18:04:59 -0000 1.5
@@ -30,7 +30,6 @@
import javax.xml.namespace.QName;
-import org.apache.xmlbeans.impl.store.Cursor;
import xmlcursor.common.*;
import java.util.*;
1.5 +0 -1 xml-xmlbeans/v2/test/src/xmlcursor/detailed/SelectionsTest.java
Index: SelectionsTest.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/src/xmlcursor/detailed/SelectionsTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SelectionsTest.java 9 Oct 2004 17:30:17 -0000 1.4
+++ SelectionsTest.java 3 Nov 2004 18:04:59 -0000 1.5
@@ -31,7 +31,6 @@
import javax.xml.namespace.QName;
-import org.apache.xmlbeans.impl.store.Cursor;
import xmlcursor.common.*;
import java.net.URL;
1.8 +0 -1 xml-xmlbeans/v2/test/src/xmlcursor/detailed/ToBookmarkTest.java
Index: ToBookmarkTest.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/src/xmlcursor/detailed/ToBookmarkTest.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ToBookmarkTest.java 9 Oct 2004 17:30:17 -0000 1.7
+++ ToBookmarkTest.java 3 Nov 2004 18:04:59 -0000 1.8
@@ -31,7 +31,6 @@
import javax.xml.namespace.QName;
-import org.apache.xmlbeans.impl.store.Cursor;
import xmlcursor.common.*;
import tools.util.JarUtil;
1.5 +0 -1 xml-xmlbeans/v2/test/src/xmlcursor/detailed/ToChildTest.java
Index: ToChildTest.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/src/xmlcursor/detailed/ToChildTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ToChildTest.java 29 Sep 2004 18:22:11 -0000 1.4
+++ ToChildTest.java 3 Nov 2004 18:04:59 -0000 1.5
@@ -31,7 +31,6 @@
import javax.xml.namespace.QName;
-import org.apache.xmlbeans.impl.store.Cursor;
import xmlcursor.common.*;
import java.net.URL;
1.12 +0 -1 xml-xmlbeans/v2/test/src/xmlobject/checkin/InstanceValidationTests.java
Index: InstanceValidationTests.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/src/xmlobject/checkin/InstanceValidationTests.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- InstanceValidationTests.java 9 Oct 2004 17:30:18 -0000 1.11
+++ InstanceValidationTests.java 3 Nov 2004 18:04:59 -0000 1.12
@@ -21,7 +21,6 @@
import junit.framework.TestSuite;
import org.apache.xmlbeans.*;
import org.apache.xmlbeans.xml.stream.XMLInputStream;
-import org.apache.xmlbeans.impl.store.Root;
import org.apache.xmlbeans.impl.values.XmlValueOutOfRangeException;
import javax.xml.namespace.QName;
1.4 +0 -1 xml-xmlbeans/v2/test/src/xmlobject/detailed/IsImmutableTest.java
Index: IsImmutableTest.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/src/xmlobject/detailed/IsImmutableTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- IsImmutableTest.java 1 Jul 2004 00:01:30 -0000 1.3
+++ IsImmutableTest.java 3 Nov 2004 18:04:59 -0000 1.4
@@ -34,7 +34,6 @@
import javax.xml.namespace.QName;
import org.apache.xmlbeans.XmlAnySimpleType;
-import org.apache.xmlbeans.impl.store.Cursor;
import java.util.Vector;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xmlbeans.apache.org
For additional commands, e-mail: commits-help@xmlbeans.apache.org