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/08/16 17:58:29 UTC
cvs commit: xml-xmlbeans/v2/test/src/xmlobject/extensions/interfaceFeature/methodNameCollision/checkin NameCollisionTest.java
ericvas 2004/08/16 08:58:29
Modified: v2/external/lib oldxbean.jar
v2/src/newstore2/org/apache/xmlbeans/impl/newstore2 Cur.java
Cursor.java Jsr173.java Locale.java Saver.java
Validate.java Xobj.java
v2/src/typeimpl/org/apache/xmlbeans/impl/schema
SchemaTypeLoaderBase.java
v2/src/typeimpl/org/apache/xmlbeans/impl/values
XmlObjectBase.java
v2/src/xmlpublic/org/apache/xmlbeans XmlOptions.java
v2/src/xmlstore/org/apache/xmlbeans/impl/store Saver.java
v2/test/src/dom/checkin DomTests.java
v2/test/src/xmlcursor/checkin CopyTest.java
GetAllNamespacesTest.java MoveCharsTest.java
StoreTests.java ToFirstContentTokenTest.java
v2/test/src/xmlcursor/xpath/jaxen/checkin
JaxenXPathTests.java
v2/test/src/xmlobject/checkin AssortedTests.java
InstanceValidationTests.java
SelectChldAttTests.java
v2/test/src/xmlobject/extensions/interfaceFeature/methodNameCollision/checkin
NameCollisionTest.java
Log:
Turn on new store
Revision Changes Path
1.11 +11495 -12919xml-xmlbeans/v2/external/lib/oldxbean.jar
<<Binary file>>
1.42 +52 -49 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.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- Cur.java 26 Jul 2004 18:24:13 -0000 1.41
+++ Cur.java 16 Aug 2004 15:58:25 -0000 1.42
@@ -2644,15 +2644,26 @@
return isOnList( _locale._registered );
}
+ static final String LOAD_USE_LOCALE_CHAR_UTIL = "LOAD_USE_LOCALE_CHAR_UTIL";
+
static final class CurLoadContext extends LoadContext
{
CurLoadContext ( Locale l, XmlOptions options )
{
-// TODO - use a thread local charUtil to load the xml -- don't use the
-// locales charUtil, let the Locales _charUtil be specific to it because
-// it is not thread safe to share a thread local charUtil between Locales
-
options = XmlOptions.maskNull( options );
+
+ _locale = l;
+
+ _charUtil =
+ options.hasOption( LOAD_USE_LOCALE_CHAR_UTIL )
+ ? _locale.getCharUtil()
+ : CharUtil.getThreadLocalCharUtil();
+
+ _frontier = createDomDocumentRootXobj( _locale );
+ _after = false;
+
+ _lastXobj = _frontier;
+ _lastPos = 0;
if (options.hasOption( XmlOptions.LOAD_REPLACE_DOCUMENT_ELEMENT ))
{
@@ -2667,13 +2678,6 @@
_substituteNamespaces = (Map) options.get( XmlOptions.LOAD_SUBSTITUTE_NAMESPACES );
_additionalNamespaces = (Map) options.get( XmlOptions.LOAD_ADDITIONAL_NAMESPACES );
- _locale = l;
- _frontier = createDomDocumentRootXobj( l );
- _after = false;
-
- _lastXobj = _frontier;
- _lastPos = 0;
-
_locale._versionAll++;
_locale._versionSansText++;
}
@@ -2817,8 +2821,9 @@
{
if (!_stripComments)
{
- CharUtil cu = _locale._charUtil;
- comment( cu.saveChars( chars, off, cch, null, 0, 0 ), cu._offSrc, cu._cchSrc );
+ comment(
+ _charUtil.saveChars(
+ chars, off, cch, null, 0, 0 ), _charUtil._offSrc, _charUtil._cchSrc );
}
}
@@ -2836,23 +2841,23 @@
private void stripLeadingWhitespace ( )
{
- CharUtil cu = _locale._charUtil;
-
if (_after)
{
_frontier._srcAfter =
- cu.stripRight( _frontier._srcAfter, _frontier._offAfter, _frontier._cchAfter );
+ _charUtil.stripRight(
+ _frontier._srcAfter, _frontier._offAfter, _frontier._cchAfter );
- _frontier._offAfter = cu._offSrc;
- _frontier._cchAfter = cu._cchSrc;
+ _frontier._offAfter = _charUtil._offSrc;
+ _frontier._cchAfter = _charUtil._cchSrc;
}
else
{
_frontier._srcValue =
- cu.stripRight( _frontier._srcValue, _frontier._offValue, _frontier._cchValue );
+ _charUtil.stripRight(
+ _frontier._srcValue, _frontier._offValue, _frontier._cchValue );
- _frontier._offValue = cu._offSrc;
- _frontier._cchValue = cu._cchSrc;
+ _frontier._offValue = _charUtil._offSrc;
+ _frontier._cchValue = _charUtil._cchSrc;
}
}
@@ -2861,8 +2866,6 @@
if (cch <= 0)
return;
- CharUtil cu = _locale._charUtil;
-
_lastXobj = _frontier;
_lastPos = _frontier._cchValue + 1;
@@ -2871,23 +2874,23 @@
_lastPos += _frontier._cchAfter + 1;
_frontier._srcAfter =
- cu.saveChars(
+ _charUtil.saveChars(
src, off, cch,
_frontier._srcAfter, _frontier._offAfter, _frontier._cchAfter );
- _frontier._offAfter = cu._offSrc;
- _frontier._cchAfter = cu._cchSrc;
+ _frontier._offAfter = _charUtil._offSrc;
+ _frontier._cchAfter = _charUtil._cchSrc;
}
else
{
_frontier._srcValue =
- cu.saveChars(
+ _charUtil.saveChars(
src, off, cch,
_frontier._srcValue, _frontier._offValue, _frontier._cchValue );
- _frontier._offValue = cu._offSrc;
- _frontier._cchValue = cu._cchSrc;
+ _frontier._offValue = _charUtil._offSrc;
+ _frontier._cchValue = _charUtil._cchSrc;
}
}
@@ -2902,9 +2905,9 @@
if (_stripWhitespace)
{
- srcObj = _locale._charUtil.stripLeft( srcObj, off, cch );
- off = _locale._charUtil._offSrc;
- cch = _locale._charUtil._cchSrc;
+ srcObj = _charUtil.stripLeft( srcObj, off, cch );
+ off = _charUtil._offSrc;
+ cch = _charUtil._cchSrc;
}
text( srcObj, off, cch );
@@ -2948,9 +2951,7 @@
// See if the document element is a fragment
- boolean isFrag =
- c.getName().equals( Locale._openuriFragment ) ||
- c.getName().equals( Locale._xmlFragment );
+ boolean isFrag = Locale.isFragmentQName( c.getName() );
if (_discardDocElem || isFrag)
{
@@ -3036,20 +3037,22 @@
_frontier.dump();
}
- private Locale _locale;
- private Xobj _frontier;
- private boolean _after;
-
- private Xobj _lastXobj;
- private int _lastPos;
-
- private boolean _discardDocElem;
- private QName _replaceDocElem;
- private boolean _stripWhitespace;
- private boolean _stripComments;
- private boolean _stripProcinsts;
- private Map _substituteNamespaces;
- private Map _additionalNamespaces;
+ private Locale _locale;
+ private CharUtil _charUtil;
+
+ private Xobj _frontier;
+ private boolean _after;
+
+ private Xobj _lastXobj;
+ private int _lastPos;
+
+ private boolean _discardDocElem;
+ private QName _replaceDocElem;
+ private boolean _stripWhitespace;
+ private boolean _stripComments;
+ private boolean _stripProcinsts;
+ private Map _substituteNamespaces;
+ private Map _additionalNamespaces;
}
//
1.25 +164 -34 xml-xmlbeans/v2/src/newstore2/org/apache/xmlbeans/impl/newstore2/Cursor.java
Index: Cursor.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/src/newstore2/org/apache/xmlbeans/impl/newstore2/Cursor.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- Cursor.java 4 Aug 2004 21:15:06 -0000 1.24
+++ Cursor.java 16 Aug 2004 15:58:25 -0000 1.25
@@ -15,6 +15,8 @@
package org.apache.xmlbeans.impl.newstore2;
+import java.util.ArrayList;
+
import java.io.PrintStream;
import javax.xml.namespace.QName;
@@ -23,6 +25,8 @@
import org.apache.xmlbeans.xml.stream.XMLInputStream;
+import org.apache.xmlbeans.SchemaTypeLoader;
+import org.apache.xmlbeans.SchemaType;
import org.apache.xmlbeans.XmlCursor;
import org.apache.xmlbeans.XmlCursor.TokenType;
import org.apache.xmlbeans.XmlCursor.ChangeStamp;
@@ -579,62 +583,185 @@
return (Node) _cur.getDom();
}
- public Node _newDomNode ( XmlOptions options )
+ private static final class DomSaver extends Saver
{
- boolean isFrag;
+ DomSaver ( Cur c, XmlOptions options )
+ {
+ super( c, options );
+
+ if (c.isUserNode())
+ _type = c.getUser().get_schema_type();
+
+ _stl = c._locale._schemaTypeLoader;
+ _options = options;
+ }
- if (_cur.isRoot())
+ Node saveDom ( )
{
- Cur cEnd = _cur.tempCur();
- cEnd.toEnd();
+ Locale l = Locale.getLocale( _stl, _options );
- _cur.nextWithAttrs();
+ l.enter();
- isFrag = Locale.isFragment( _cur, cEnd );
+ try
+ {
+ _nodeCur = l.getCur(); // Not weak or temp
- cEnd.release();
+ while ( process() )
+ ;
- _cur.toParent();
+ while ( !_nodeCur.isRoot() )
+ _nodeCur.toParent();
+
+ if (_type != null)
+ _nodeCur.setType( _type );
+
+ Node node = (Node) _nodeCur.getDom();
+
+ _nodeCur.release();
+
+ _nodeCur = null;
+
+ return node;
+ }
+ finally
+ {
+ l.exit();
+ }
}
- else
- isFrag = true;
+
+ protected boolean emitElement ( SaveCur c, ArrayList attrNames, ArrayList attrValues )
+ {
+ // If there was text or comments before the frag element, I will loose them -- oh well
+ // Also, I will lose any attributes and namesapces on the fragment -- DOM can
+ // have attrs in fragments
+
+ if (Locale.isFragmentQName( c.getName() ))
+ {
+ _nodeCur.createDomDocFragRoot();
+ _nodeCur.next();
+ }
+ else
+ {
+ ensureDoc();
- Locale l = Locale.getLocale( _cur._locale._schemaTypeLoader, null );
+ _nodeCur.createElement( getQualifiedName( c, c.getName() ) );
+ _nodeCur.next();
+
+ for ( iterateMappings() ; hasMapping() ; nextMapping() )
+ {
+ _nodeCur.createAttr( _nodeCur._locale.createXmlns( mappingPrefix() ) );
+ _nodeCur.next();
+ _nodeCur.insertString( mappingUri() );
+ _nodeCur.toParent();
+ _nodeCur.skipWithAttrs();
+ }
+
+ for ( int i = 0 ; i < attrNames.size() ; i ++ )
+ {
+ _nodeCur.createAttr( getQualifiedName( c, (QName) attrNames.get( i ) ) );
+ _nodeCur.next();
+ _nodeCur.insertString( (String) attrValues.get( i ) );
+ _nodeCur.toParent();
+ _nodeCur.skipWithAttrs();
+ }
+ }
+
+ return false;
+ }
+
+ protected void emitFinish ( SaveCur c )
+ {
+ if (!Locale.isFragmentQName( c.getName() ))
+ {
+ assert _nodeCur.isEnd();
+ _nodeCur.next();
+ }
+ }
+
+ protected void emitText ( SaveCur c )
+ {
+ ensureDoc();
- l.enter();
+ Object src = c.getChars();
- try
+ if (c._cchSrc > 0)
+ {
+ _nodeCur.insertChars( src, c._offSrc, c._cchSrc );
+ _nodeCur.next();
+ }
+ }
+
+ protected void emitComment ( SaveCur c )
{
- Cur c = l.tempCur();
+ ensureDoc();
- if (isFrag)
- c.createDomDocFragRoot();
- else
- c.createDomDocumentRoot();
+ _nodeCur.createComment();
+ emitTextValue( c );
+ _nodeCur.skip();
+ }
+
+ protected void emitProcinst ( SaveCur c )
+ {
+ ensureDoc();
- c.next();
+ _nodeCur.createProcinst( c.getName().getLocalPart() );
+ emitTextValue( c );
+ _nodeCur.skip();
+ }
- if (_cur.isText())
- c.insertChars( _cur.getChars( -1 ), _cur._offSrc, _cur._cchSrc );
- else if (_cur.isRoot())
- Cur.moveNodeContents( _cur._xobj.copyNode( l ), c, true );
- else if (_cur.kind() > 0)
- _cur.copyNode( c );
+ private QName getQualifiedName ( SaveCur c, QName name )
+ {
+ String uri = name.getNamespaceURI();
+
+ String prefix = uri.length() > 0 ? getUriMapping( uri ) : "";
- c.toParent();
+ if (prefix.equals( name.getPrefix() ))
+ return name;
- assert c.isRoot();
+ return _nodeCur._locale.makeQName( uri, name.getLocalPart(), prefix );
+ }
- Node n = (Node) c.getDom();
+ private void emitTextValue ( SaveCur c )
+ {
+ c.push();
+ c.next();
- c.release();
+ if (c.isText())
+ {
+ _nodeCur.next();
+ _nodeCur.insertChars( c.getChars(), c._offSrc, c._cchSrc );
+ _nodeCur.toParent();
+ }
- return n;
+ c.pop();
}
- finally
+
+ private void ensureDoc ( )
+ {
+ if (!_nodeCur.isPositioned())
+ {
+ _nodeCur.createDomDocumentRoot();
+ _nodeCur.next();
+ }
+ }
+
+ private Cur _nodeCur;
+ private SchemaType _type;
+ private SchemaTypeLoader _stl;
+ private XmlOptions _options;
+ }
+
+ public Node _newDomNode ( XmlOptions options )
+ {
+ // Must ignore inner options for compat with v1.
+
+ if (XmlOptions.hasOption( options, XmlOptions.SAVE_INNER ))
{
- l.exit();
+ options = new XmlOptions( options );
+ options.remove( XmlOptions.SAVE_INNER );
}
+
+ return new DomSaver( _cur, options ).saveDom();
}
public boolean _toCursor ( Cursor other )
@@ -686,6 +813,7 @@
public boolean _hasNextSelection ( )
{
+ int curr = _currentSelection;
push();
try
@@ -694,6 +822,7 @@
}
finally
{
+ _currentSelection = curr;
pop();
}
}
@@ -726,6 +855,7 @@
public int _getSelectionCount ( )
{
+ // Should never get to MAX_VALUE selection index, so, state should not change
_toSelection( Integer.MAX_VALUE );
return _cur.selectionCount();
@@ -1023,7 +1153,7 @@
public void _setTextValue ( char[] sourceChars, int offset, int length )
{
- CharUtil cu = _cur._locale._charUtil;
+ CharUtil cu = _cur._locale.getCharUtil();
setTextValue(
cu.saveChars( sourceChars, offset, length, null, 0, 0 ), cu._offSrc, cu._cchSrc );
1.14 +1 -1 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.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- Jsr173.java 26 Jul 2004 18:24:13 -0000 1.13
+++ Jsr173.java 16 Aug 2004 15:58:25 -0000 1.14
@@ -806,7 +806,7 @@
// TODO - avoid creating a string here
String s = getText();
- return _locale._charUtil.isWhiteSpace( s, 0, s.length() );
+ return _locale.getCharUtil().isWhiteSpace( s, 0, s.length() );
}
public Location getLocation ( )
1.23 +37 -8 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.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- Locale.java 4 Aug 2004 21:15:06 -0000 1.22
+++ Locale.java 16 Aug 2004 15:58:25 -0000 1.23
@@ -147,8 +147,6 @@
// Lazy create this (loading up a locale should use the thread locale one)
// same goes for the qname factory .. use thread local for hte most part when loading
- _charUtil = new CharUtil( 1024 );
-
_qnameFactory = new DefaultQNameFactory();
_locations = new Locations( this );
@@ -487,11 +485,20 @@
}
}
+ static boolean isFragmentQName ( QName name )
+ {
+ return name.equals( Locale._openuriFragment ) || name.equals( Locale._xmlFragment );
+ }
+
static boolean isFragment ( Cur start, Cur end )
{
assert !end.isAttr();
+ start.push();
+ end.push();
+
int numDocElems = 0;
+ boolean isFrag = false;
while ( ! start.isSamePos( end ) )
{
@@ -501,10 +508,16 @@
break;
if (k == TEXT && !isWhiteSpace( start.getCharsAsString( -1 )))
- return true;
+ {
+ isFrag = true;
+ break;
+ }
if (k == ELEM && ++numDocElems > 1)
- return true;
+ {
+ isFrag = true;
+ break;
+ }
// Move to next token
@@ -516,9 +529,10 @@
start.next();
}
- assert numDocElems == 0 || numDocElems == 1;
+ start.pop();
+ end.pop();
- return numDocElems != 1;
+ return isFrag || numDocElems != 1;
}
//
//
@@ -1012,7 +1026,14 @@
_options = options;
_type = type;
- initSaxHandler( l, options );
+ // Because SAX loading is not atomic with respect to XmlBeans, I can't use the default
+ // thread local CharUtil. Instruct the SaxHandler (and the LoadContext, eventually)
+ // to use the Locale specific CharUtil.
+
+ XmlOptions saxHandlerOptions = new XmlOptions( options );
+ saxHandlerOptions.put( Cur.LOAD_USE_LOCALE_CHAR_UTIL );
+
+ initSaxHandler( l, saxHandlerOptions );
}
public ContentHandler getContentHandler ( )
@@ -1932,6 +1953,14 @@
//
//
+ CharUtil getCharUtil ( )
+ {
+ if (_charUtil == null)
+ _charUtil = new CharUtil( 1024 );
+
+ return _charUtil;
+ }
+
long version ( )
{
return _versionAll;
@@ -2796,7 +2825,7 @@
Locations _locations;
- CharUtil _charUtil;
+ private CharUtil _charUtil;
Saaj _saaj;
1.29 +3 -9 xml-xmlbeans/v2/src/newstore2/org/apache/xmlbeans/impl/newstore2/Saver.java
Index: Saver.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/src/newstore2/org/apache/xmlbeans/impl/newstore2/Saver.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- Saver.java 26 Jul 2004 18:24:13 -0000 1.28
+++ Saver.java 16 Aug 2004 15:58:25 -0000 1.29
@@ -156,15 +156,9 @@
positionToInner( c, start, end );
if (Locale.isFragment( start, end ))
- {
- positionToInner( c, start, end );
cur = new FragSaveCur( start, end, fragName );
- }
else if (synthName != null)
- {
- positionToInner( c, start, end );
cur = new FragSaveCur( start, end, synthName );
- }
else
cur = new DocSaveCur( c );
@@ -176,7 +170,6 @@
if (saveInner)
{
positionToInner( c, start, end );
- boolean isFrag = Locale.isFragment( start, end );
cur =
new FragSaveCur(
@@ -185,6 +178,7 @@
else if (synthName != null)
{
positionToInner( c, start, end );
+
cur = new FragSaveCur( start, end, synthName );
}
else
@@ -519,7 +513,7 @@
for ( iterateMappings() ; hasMapping() ; nextMapping() )
if (mappingPrefix().equals( prefix ))
- return;;
+ return;
addMapping( prefix, uri );
}
@@ -2074,7 +2068,7 @@
//
//
- private static abstract class SaveCur
+ static abstract class SaveCur
{
final boolean isRoot ( ) { return kind() == ROOT; }
final boolean isElem ( ) { return kind() == ELEM; }
1.3 +3 -3 xml-xmlbeans/v2/src/newstore2/org/apache/xmlbeans/impl/newstore2/Validate.java
Index: Validate.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/src/newstore2/org/apache/xmlbeans/impl/newstore2/Validate.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Validate.java 26 Jul 2004 18:24:13 -0000 1.2
+++ Validate.java 16 Aug 2004 15:58:25 -0000 1.3
@@ -204,7 +204,7 @@
if (_cur.isAttr())
{
return
- _cur._locale._charUtil.isWhiteSpace(
+ _cur._locale.getCharUtil().isWhiteSpace(
_cur.getFirstChars(), _cur._offSrc, _cur._cchSrc );
}
@@ -213,13 +213,13 @@
if (_oneChunk)
{
return
- _cur._locale._charUtil.isWhiteSpace(
+ _cur._locale.getCharUtil().isWhiteSpace(
_textCur.getChars( -1 ), _textCur._offSrc, _textCur._cchSrc );
}
String s = _textSb.toString();
- return _cur._locale._charUtil.isWhiteSpace( s, 0, s.length() );
+ return _cur._locale.getCharUtil().isWhiteSpace( s, 0, s.length() );
}
public String getNamespaceForPrefix ( String prefix )
1.5 +16 -12 xml-xmlbeans/v2/src/newstore2/org/apache/xmlbeans/impl/newstore2/Xobj.java
Index: Xobj.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/src/newstore2/org/apache/xmlbeans/impl/newstore2/Xobj.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Xobj.java 4 Aug 2004 21:15:06 -0000 1.4
+++ Xobj.java 16 Aug 2004 15:58:25 -0000 1.5
@@ -863,7 +863,7 @@
// Now, remove the actual chars
int pa = posAfter();
- CharUtil cu = _locale._charUtil;
+ CharUtil cu = _locale.getCharUtil();
if (p < pa)
{
@@ -920,7 +920,7 @@
// I do not assume that inserting after text will have a parent. There are use cases
// from moveNodesContents which excersize this.
- CharUtil cu = _locale._charUtil;
+ CharUtil cu = _locale.getCharUtil();
if (p < pa)
{
@@ -1113,8 +1113,10 @@
if (lastAttr == null || lastAttr._cchAfter <= 0)
{
- _locale._charUtil._offSrc = 0;
- _locale._charUtil._cchSrc = 0;
+ CharUtil cu = _locale.getCharUtil();
+
+ cu._offSrc = 0;
+ cu._cchSrc = 0;
return null;
}
@@ -1134,8 +1136,8 @@
// These return the remainder of the char triple that getChars starts
- final int offSrc ( ) { return _locale._charUtil._offSrc; }
- final int cchSrc ( ) { return _locale._charUtil._cchSrc; }
+ final int offSrc ( ) { return _locale.getCharUtil()._offSrc; }
+ final int cchSrc ( ) { return _locale.getCharUtil()._cchSrc; }
Object getChars ( int pos, int cch )
{
@@ -1148,8 +1150,10 @@
if (cch == 0)
{
- _locale._charUtil._offSrc = 0;
- _locale._charUtil._cchSrc = 0;
+ CharUtil cu = _locale.getCharUtil();
+
+ cu._offSrc = 0;
+ cu._cchSrc = 0;
return null;
}
@@ -1170,15 +1174,15 @@
if (pos >= pa)
{
src = _srcAfter;
- _locale._charUtil._offSrc = _offAfter + pos - pa;
+ _locale.getCharUtil()._offSrc = _offAfter + pos - pa;
}
else
{
src = _srcValue;
- _locale._charUtil._offSrc = _offValue + pos - 1;
+ _locale.getCharUtil()._offSrc = _offValue + pos - 1;
}
- _locale._charUtil._cchSrc = cch;
+ _locale.getCharUtil()._cchSrc = cch;
return src;
}
@@ -1694,7 +1698,7 @@
_locale.exit();
}
- return _user;
+ return getUser();
}
public QName get_xsi_type ( )
1.6 +18 -18 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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- SchemaTypeLoaderBase.java 11 May 2004 20:25:12 -0000 1.5
+++ SchemaTypeLoaderBase.java 16 Aug 2004 15:58:26 -0000 1.6
@@ -19,8 +19,8 @@
import org.apache.xmlbeans.impl.validator.ValidatingXMLInputStream;
// NEWSTORE START
-//import org.apache.xmlbeans.impl.newstore2.Locale;
-import org.apache.xmlbeans.impl.store.Root;
+import org.apache.xmlbeans.impl.newstore2.Locale;
+//import org.apache.xmlbeans.impl.store.Root;
// NEWSTORE END
import org.apache.xmlbeans.SchemaAttributeGroup;
@@ -187,8 +187,8 @@
return hook.newInstance( this, type, options );
// NEWSTORE START
-// return Locale.newInstance( this, type, options );
- return Root.newInstance( this, type, options );
+ return Locale.newInstance( this, type, options );
+// return Root.newInstance( this, type, options );
// NEWSTORE END
}
@@ -200,8 +200,8 @@
return hook.parse( this, xmlText, type, options );
// NEWSTORE START
-// return Locale.parseToXmlObject( this, xmlText, type, options );
- return Root.parse( this, xmlText, type, options );
+ return Locale.parseToXmlObject( this, xmlText, type, options );
+// return Root.parse( this, xmlText, type, options );
// NEWSTORE END
}
@@ -213,8 +213,8 @@
return hook.parse( this, xis, type, options );
// NEWSTORE START
-// return Locale.parseToXmlObject( this, xis, type, options );
- return Root.parse( this, xis, type, options );
+ return Locale.parseToXmlObject( this, xis, type, options );
+// return Root.parse( this, xis, type, options );
// NEWSTORE END
}
@@ -226,8 +226,8 @@
return hook.parse( this, xsr, type, options );
// NEWSTORE START
-// return Locale.parseToXmlObject( this, xsr, type, options );
- return Root.parse( this, xsr, type, options );
+ return Locale.parseToXmlObject( this, xsr, type, options );
+// return Root.parse( this, xsr, type, options );
// NEWSTORE END
}
@@ -343,8 +343,8 @@
return hook.parse( this, jiois, type, options );
// NEWSTORE START
-// XmlObject result = Locale.parseToXmlObject( this, jiois, type, options );
- XmlObject result = Root.parse( this, jiois, type, options );
+ XmlObject result = Locale.parseToXmlObject( this, jiois, type, options );
+// XmlObject result = Root.parse( this, jiois, type, options );
// NEWSTORE END
if (digestStream != null)
@@ -361,8 +361,8 @@
return hook.parse( this, jior, type, options );
// NEWSTORE START
-// return Locale.parseToXmlObject( this, jior, type, options );
- return Root.parse( this, jior, type, options );
+ return Locale.parseToXmlObject( this, jior, type, options );
+// return Root.parse( this, jior, type, options );
// NEWSTORE END
}
@@ -374,8 +374,8 @@
return hook.parse( this, node, type, options );
// NEWSTORE START
-// return Locale.parseToXmlObject( this, node, type, options );
- return Root.parse( this, node, type, options );
+ return Locale.parseToXmlObject( this, node, type, options );
+// return Root.parse( this, node, type, options );
// NEWSTORE END
}
@@ -387,8 +387,8 @@
return hook.newXmlSaxHandler( this, type, options );
// NEWSTORE START
-// return Locale.newSaxHandler( this, type, options );
- return Root.newSaxHandler( this, type, options );
+ return Locale.newSaxHandler( this, type, options );
+// return Root.newSaxHandler( this, type, options );
// NEWSTORE END
}
1.11 +13 -13 xml-xmlbeans/v2/src/typeimpl/org/apache/xmlbeans/impl/values/XmlObjectBase.java
Index: XmlObjectBase.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/src/typeimpl/org/apache/xmlbeans/impl/values/XmlObjectBase.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- XmlObjectBase.java 7 Aug 2004 01:31:36 -0000 1.10
+++ XmlObjectBase.java 16 Aug 2004 15:58:26 -0000 1.11
@@ -236,18 +236,18 @@
check_orphaned();
// NEWSTORE START
-// // Note that new_cursor does not really need sync ....
-//
-// XmlLocale l = getXmlLocale();
-//
-// if (l.noSync()) { l.enter(); try { return get_store().new_cursor(); } finally { l.exit(); } }
-// else synchronized ( l ) { l.enter(); try { return get_store().new_cursor(); } finally { l.exit(); } }
-//
- synchronized (monitor())
- {
- check_orphaned();
- return get_store().new_cursor();
- }
+ // Note that new_cursor does not really need sync ....
+
+ XmlLocale l = getXmlLocale();
+
+ if (l.noSync()) { l.enter(); try { return get_store().new_cursor(); } finally { l.exit(); } }
+ else synchronized ( l ) { l.enter(); try { return get_store().new_cursor(); } finally { l.exit(); } }
+
+// synchronized (monitor())
+// {
+// check_orphaned();
+// return get_store().new_cursor();
+// }
// NEWSTORE END
}
@@ -443,7 +443,7 @@
c.dispose();
}
- return _typedArray(selections);
+ return _typedArray(selections);
}
public XmlObject[] execQuery ( String path )
1.10 +3 -0 xml-xmlbeans/v2/src/xmlpublic/org/apache/xmlbeans/XmlOptions.java
Index: XmlOptions.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/src/xmlpublic/org/apache/xmlbeans/XmlOptions.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- XmlOptions.java 2 Jul 2004 18:58:31 -0000 1.9
+++ XmlOptions.java 16 Aug 2004 15:58:27 -0000 1.10
@@ -734,8 +734,11 @@
/** Used to test a generic option */
public boolean hasOption ( Object option ) { return _map.containsKey( option ); }
+ public static boolean hasOption ( XmlOptions options, Object option ) { return options == null ? false : options.hasOption( option ); }
+
/** Used to get a generic option */
public Object get ( Object option ) { return _map.get( option ); }
+ public void remove ( Object option ) { _map.remove( option ); }
/** Used to test a generic option on an options object that may be null */
public static Object safeGet(XmlOptions o, Object option) {
1.12 +8 -11 xml-xmlbeans/v2/src/xmlstore/org/apache/xmlbeans/impl/store/Saver.java
Index: Saver.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/src/xmlstore/org/apache/xmlbeans/impl/store/Saver.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Saver.java 26 Jul 2004 18:24:15 -0000 1.11
+++ Saver.java 16 Aug 2004 15:58:27 -0000 1.12
@@ -1085,11 +1085,8 @@
{
renamePrefix = (String) _namespaceStack.get( i - 8 );
- if (renamePrefix == null ||
- !renamePrefix.equals( prefix ))
- {
+ if (renamePrefix == null || !renamePrefix.equals( prefix ))
break;
- }
}
i -= 8;
@@ -4417,13 +4414,13 @@
// to create the fragment
// NEWSTORE START
-// DOMImplementation impl =
-// org.apache.xmlbeans.impl.newstore2.Public2.getDomImplementation();
-//
-// _doc = impl.createDocument( null, "foo", null );
-//
-// _doc.removeChild( _doc.getDocumentElement() );
- _doc = ((DocumentBuilder) _threadDocumentBuilderFactory.get()).newDocument();
+ DOMImplementation impl =
+ org.apache.xmlbeans.impl.newstore2.Public2.getDomImplementation();
+
+ _doc = impl.createDocument( null, "foo", null );
+
+ _doc.removeChild( _doc.getDocumentElement() );
+// _doc = ((DocumentBuilder) _threadDocumentBuilderFactory.get()).newDocument();
// NEWSTORE END
Node result;
1.5 +12 -12 xml-xmlbeans/v2/test/src/dom/checkin/DomTests.java
Index: DomTests.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/src/dom/checkin/DomTests.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DomTests.java 26 Jul 2004 18:24:15 -0000 1.4
+++ DomTests.java 16 Aug 2004 15:58:27 -0000 1.5
@@ -107,18 +107,18 @@
doTestDomExport(xml);
// NEWSTORE START
- try {
- xml =
- "<xml-fragment " +
- " foo='bar'>" +
- "</xml-fragment>";
-
- doTestDomExport(xml);
-
- Assert.assertTrue(false);
- }
- catch (Exception e) {
- }
+// try {
+// xml =
+// "<xml-fragment " +
+// " foo='bar'>" +
+// "</xml-fragment>";
+//
+// doTestDomExport(xml);
+//
+// Assert.assertTrue(false);
+// }
+// catch (Exception e) {
+// }
// NEWSTORE END
XmlObject x = XmlObject.Factory.parse(xx);
1.5 +8 -8 xml-xmlbeans/v2/test/src/xmlcursor/checkin/CopyTest.java
Index: CopyTest.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/src/xmlcursor/checkin/CopyTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- CopyTest.java 26 Jul 2004 18:24:16 -0000 1.4
+++ CopyTest.java 16 Aug 2004 15:58:27 -0000 1.5
@@ -154,16 +154,16 @@
xc0.toPrevSibling();
// assertEquals("<zip xmlns=\"" + Common.CLM_NS + "\" " + Common.CLM_XSI_NS + ">90952</zip>", xc0.xmlText());
// NEWSTORE START
-// String sExpected = "<po:zip " +
-// "xmlns=\"http://www.tranxml.org/TranXML/Version4.0\" " +
-// "xmlns:xsi=\"http://www.w3.org/2000/10/XMLSchema-instance\" " +
-// "xmlns:po=\"http://xbean.test/xmlcursor/PurchaseOrder\">" +
-// "90952</po:zip>";
- String sExpected = "<pur:zip " +
+ String sExpected = "<po:zip " +
"xmlns=\"http://www.tranxml.org/TranXML/Version4.0\" " +
"xmlns:xsi=\"http://www.w3.org/2000/10/XMLSchema-instance\" " +
- "xmlns:pur=\"http://xbean.test/xmlcursor/PurchaseOrder\">" +
- "90952</pur:zip>";
+ "xmlns:po=\"http://xbean.test/xmlcursor/PurchaseOrder\">" +
+ "90952</po:zip>";
+// String sExpected = "<pur:zip " +
+// "xmlns=\"http://www.tranxml.org/TranXML/Version4.0\" " +
+// "xmlns:xsi=\"http://www.w3.org/2000/10/XMLSchema-instance\" " +
+// "xmlns:pur=\"http://xbean.test/xmlcursor/PurchaseOrder\">" +
+// "90952</pur:zip>";
// NEWSTORE END
assertEquals(sExpected, xc0.xmlText());
1.4 +7 -7 xml-xmlbeans/v2/test/src/xmlcursor/checkin/GetAllNamespacesTest.java
Index: GetAllNamespacesTest.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/src/xmlcursor/checkin/GetAllNamespacesTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- GetAllNamespacesTest.java 26 Jul 2004 18:24:16 -0000 1.3
+++ GetAllNamespacesTest.java 16 Aug 2004 15:58:27 -0000 1.4
@@ -96,14 +96,14 @@
toNextTokenOfType(m_xc, XmlCursor.TokenType.START);
// NEWSTORE START
-// m_xc.getAllNamespaces(null);
- try {
m_xc.getAllNamespaces(null);
- fail("Map is null: should get an error");
- }
- catch (Exception e) {
- System.err.println("Error thrown " + e.getMessage());
- }
+// try {
+// m_xc.getAllNamespaces(null);
+// fail("Map is null: should get an error");
+// }
+// catch (Exception e) {
+// System.err.println("Error thrown " + e.getMessage());
+// }
// NEWSTORE END
}
1.4 +4 -4 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- MoveCharsTest.java 26 Jul 2004 18:24:16 -0000 1.3
+++ MoveCharsTest.java 16 Aug 2004 15:58:27 -0000 1.4
@@ -59,10 +59,10 @@
assertEquals("234", xc1.getChars());
assertEquals(3, m_xc.moveChars(3, xc1));
// NEWSTORE START
-// assertEquals("34", m_xc.getChars());
-// assertEquals("34", xc1.getChars());
- assertEquals("01234", m_xc.getChars());
- assertEquals("234", xc1.getChars());
+ assertEquals("34", m_xc.getChars());
+ assertEquals("34", xc1.getChars());
+// assertEquals("01234", m_xc.getChars());
+// assertEquals("234", xc1.getChars());
// NEWSTORE END
} finally {
xc1.dispose();
1.4 +357 -357 xml-xmlbeans/v2/test/src/xmlcursor/checkin/StoreTests.java
Index: StoreTests.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/src/xmlcursor/checkin/StoreTests.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- StoreTests.java 26 Jul 2004 18:24:16 -0000 1.3
+++ StoreTests.java 16 Aug 2004 15:58:27 -0000 1.4
@@ -383,7 +383,7 @@
{
_sb.append( s );
// NEWSTORE START
-// if (buf != null)
+ if (buf != null)
// NEWSTORE END
_sb.append( buf, off, cch );
_sb.append( "\n" );
@@ -1121,7 +1121,7 @@
throws Exception
{
// NEWSTORE START
- doXmlStreamTest( xml );
+// doXmlStreamTest( xml );
// NEWSTORE END
doSaverTest( xml );
}
@@ -1162,311 +1162,311 @@
}
// NEWSTORE START
- public void testXMLStream ( )
- throws Exception
- {
- XmlObject o =
- XmlObject.Factory.parse(
- "<foo x=\"y\" xmlns=\"default.com\">" +
- "<!-- x -->bar</foo>" );
-
- XmlCursor c = o.newCursor();
-
- c.toNextToken();
- c.toNextToken();
- c.toNextToken();
- c.toNextToken();
-
- c.insertElement( "bar", "bar.com" );
-
- c.toStartDoc();
-
- XMLInputStream xis = c.newXMLInputStream();
-
- XMLEvent xev;
- StartDocument startDocument;
- EndDocument endDocument;
- StartElement startElement;
- AttributeIterator attributeIterator;
- StartPrefixMapping startPrefixMapping;
- EndPrefixMapping endPrefixMapping;
- ChangePrefixMapping cpm;
- EndElement endElement;
- Attribute attribute;
- Comment comment;
- CharacterData characterData;
- XMLName name;
- String str;
- Map map;
-
- xev = startDocument = (StartDocument) xis.next();
- Assert.assertTrue( xev.getType() == XMLEvent.START_DOCUMENT );
- Assert.assertTrue( !xev.hasName() );
- Assert.assertTrue( startDocument.isStartDocument() );
-
- xev = startPrefixMapping = (StartPrefixMapping) xis.next();
- Assert.assertTrue( xev.getType() == XMLEvent.START_PREFIX_MAPPING );
- Assert.assertTrue( !xev.hasName() );
- Assert.assertTrue( xev.isStartPrefixMapping() );
- str = startPrefixMapping.getNamespaceUri();
- Assert.assertTrue( str.equals( "default.com" ) );
- Assert.assertTrue( startPrefixMapping.getPrefix().length() == 0 );
-
- xev = startElement = (StartElement) xis.next();
- Assert.assertTrue( xev.getType() == XMLEvent.START_ELEMENT );
- Assert.assertTrue( xev.hasName() );
- Assert.assertTrue( xev.isStartElement() );
- assertName( startElement.getName(), "default.com", "foo", null );
- attributeIterator = startElement.getAttributes();
- attribute = attributeIterator.next();
- assertName( attribute.getName(), null, "x", null );
- Assert.assertTrue( attribute.getValue().equals( "y" ) );
- Assert.assertTrue( attributeIterator.next() == null );
- attributeIterator = startElement.getNamespaces();
- attribute = attributeIterator.next();
- assertName( attribute.getName(), null, "xmlns", null );
- Assert.assertTrue( attribute.getValue().equals( "default.com" ) );
- Assert.assertTrue( attributeIterator.next() == null );
- attributeIterator = startElement.getAttributesAndNamespaces();
- Assert.assertTrue( attributeIterator.next() != null );
- Assert.assertTrue( attributeIterator.next() != null );
- Assert.assertTrue( attributeIterator.next() == null );
- name = new XmlNameImpl( null, "x", null );
- attribute = startElement.getAttributeByName( name );
- Assert.assertTrue( attribute != null );
- Assert.assertTrue( attribute.getValue().equals( "y" ) );
- name = new XmlNameImpl( null, "xmlns", null );
- attribute = startElement.getAttributeByName( name );
- Assert.assertTrue( attribute == null );
- str = startElement.getNamespaceUri( null );
- Assert.assertTrue( str.equals( "default.com" ) );
-
- xev = startPrefixMapping = (StartPrefixMapping) xis.next();
- Assert.assertTrue( xev.getType() == XMLEvent.START_PREFIX_MAPPING );
- Assert.assertTrue( !xev.hasName() );
- Assert.assertTrue( xev.isStartPrefixMapping() );
- str = startPrefixMapping.getNamespaceUri();
- Assert.assertTrue( str.equals( "bar.com" ) );
- Assert.assertTrue( startPrefixMapping.getPrefix().equals( "bar" ) );
-
- xev = startElement = (StartElement) xis.next();
- Assert.assertTrue( xev.getType() == XMLEvent.START_ELEMENT );
- Assert.assertTrue( xev.hasName() );
- Assert.assertTrue( xev.isStartElement() );
- assertName( startElement.getName(), "bar.com", "bar", "bar" );
- attributeIterator = startElement.getAttributes();
- Assert.assertTrue( attributeIterator.next() == null );
- attributeIterator = startElement.getNamespaces();
- attribute = attributeIterator.next();
- assertName( attribute.getName(), null, "bar", "xmlns" );
- Assert.assertTrue( attribute.getValue().equals( "bar.com" ) );
- Assert.assertTrue( attributeIterator.next() == null );
- attributeIterator = startElement.getAttributesAndNamespaces();
- Assert.assertTrue( attributeIterator.next() != null );
- Assert.assertTrue( attributeIterator.next() == null );
- str = startElement.getNamespaceUri( "bar" );
- Assert.assertTrue( str.equals( "bar.com" ) );
- map = startElement.getNamespaceMap();
- Assert.assertTrue( map.get( "bar" ).equals( "bar.com" ) );
-
- xev = endElement = (EndElement) xis.next();
- Assert.assertTrue( xev.getType() == XMLEvent.END_ELEMENT );
- Assert.assertTrue( xev.hasName() );
- Assert.assertTrue( xev.isEndElement() );
- assertName( endElement.getName(), "bar.com", "bar", "bar" );
-
- xev = endPrefixMapping = (EndPrefixMapping) xis.next();
- Assert.assertTrue( xev.getType() == XMLEvent.END_PREFIX_MAPPING );
- Assert.assertTrue( !xev.hasName() );
- Assert.assertTrue( xev.isEndPrefixMapping() );
- Assert.assertTrue( endPrefixMapping.getPrefix().equals( "bar" ) );
-
- xev = comment = (Comment) xis.next();
- Assert.assertTrue( xev.getType() == XMLEvent.COMMENT );
- Assert.assertTrue( !xev.hasName() );
- Assert.assertTrue( comment.hasContent() );
- Assert.assertTrue( comment.getContent().equals( " x " ) );
-
- xev = characterData = (CharacterData) xis.next();
- Assert.assertTrue( xev.getType() == XMLEvent.CHARACTER_DATA );
- Assert.assertTrue( !xev.hasName() );
- Assert.assertTrue( xev.isCharacterData() );
- Assert.assertTrue( characterData.hasContent() );
- Assert.assertTrue( characterData.getContent().equals( "bar" ) );
-
- xev = endElement = (EndElement) xis.next();
- Assert.assertTrue( xev.getType() == XMLEvent.END_ELEMENT );
- Assert.assertTrue( xev.hasName() );
- Assert.assertTrue( xev.isEndElement() );
- assertName( endElement.getName(), "default.com", "foo", null );
-
- xev = cpm = (ChangePrefixMapping) xis.next();
- Assert.assertTrue( xev.getType() == XMLEvent.CHANGE_PREFIX_MAPPING );
- Assert.assertTrue( !xev.hasName() );
- Assert.assertTrue( xev.isChangePrefixMapping() );
- Assert.assertTrue( cpm.getPrefix().length() == 0 );
- Assert.assertTrue( cpm.getOldNamespaceUri().equals( "default.com" ) );
- Assert.assertTrue( cpm.getNewNamespaceUri().equals( "" ) );
-
- xev = endDocument = (EndDocument) xis.next();
- Assert.assertTrue( xev.getType() == XMLEvent.END_DOCUMENT );
- Assert.assertTrue( !xev.hasName() );
- Assert.assertTrue( xev.isEndDocument() );
-
- xev = xis.next();
- Assert.assertTrue( xev == null );
-
- //
- // Test ChangePrefixMapping event
- //
-
- o = XmlObject.Factory.parse( "<foo xmlns:x=\"y\"><bar xmlns:x=\"z\"/></foo>" );
- c = o.newCursor();
- xis = c.newXMLInputStream();
-
- startDocument = (StartDocument) xis.next();
-
- startPrefixMapping = (StartPrefixMapping) xis.next();
- str = startPrefixMapping.getNamespaceUri();
- Assert.assertTrue( str.equals( "y" ) );
- Assert.assertTrue( startPrefixMapping.getPrefix().equals( "x" ) );
-
- startElement = (StartElement) xis.next();
-
- startPrefixMapping = (StartPrefixMapping) xis.next();
- str = startPrefixMapping.getNamespaceUri();
- Assert.assertTrue( str.equals( "z" ) );
- Assert.assertTrue( startPrefixMapping.getPrefix().equals( "x" ) );
-
- startElement = (StartElement) xis.next();
-
- endElement = (EndElement) xis.next();
-
- cpm = (ChangePrefixMapping) xis.next();
- str = cpm.getOldNamespaceUri();
- Assert.assertTrue( str.equals( "z" ) );
- str = cpm.getNewNamespaceUri();
- Assert.assertTrue( str.equals( "y" ) );
- str = cpm.getPrefix();
- Assert.assertTrue( str.equals( "x" ) );
-
- endElement = (EndElement) xis.next();
-
- endPrefixMapping = (EndPrefixMapping) xis.next();
- Assert.assertTrue( endPrefixMapping.getPrefix().equals( "x" ) );
-
- endDocument = (EndDocument) xis.next();
-
- xev = xis.next();
- Assert.assertTrue( xev == null );
-
- //
- // Test CharacterData events
- //
-
- o = XmlObject.Factory.parse( "<foo>a<bar>b<baz>c</baz>d</bar>e</foo>" );
- c = o.newCursor();
- xis = c.newXMLInputStream();
-
- startDocument = (StartDocument) xis.next();
-
- startElement = (StartElement) xis.next();
-
- characterData = (CharacterData) xis.next();
- Assert.assertTrue( characterData.hasContent() );
- Assert.assertTrue( characterData.getContent().equals( "a" ) );
-
- startElement = (StartElement) xis.next();
-
- characterData = (CharacterData) xis.next();
- Assert.assertTrue( characterData.hasContent() );
- Assert.assertTrue( characterData.getContent().equals( "b" ) );
-
- startElement = (StartElement) xis.next();
-
- characterData = (CharacterData) xis.next();
- Assert.assertTrue( characterData.hasContent() );
- Assert.assertTrue( characterData.getContent().equals( "c" ) );
-
- endElement = (EndElement) xis.next();
-
- characterData = (CharacterData) xis.next();
- Assert.assertTrue( characterData.hasContent() );
- Assert.assertTrue( characterData.getContent().equals( "d" ) );
-
- endElement = (EndElement) xis.next();
-
- characterData = (CharacterData) xis.next();
- Assert.assertTrue( characterData.hasContent() );
- Assert.assertTrue( characterData.getContent().equals( "e" ) );
-
- endElement = (EndElement) xis.next();
-
- endDocument = (EndDocument) xis.next();
-
- xev = xis.next();
- Assert.assertTrue( xev == null );
-
- //
- // Test SubStreams
- //
-
- o = XmlObject.Factory.parse( "<foo>a<bar>b<baz>c</baz>d</bar>e</foo>" );
- c = o.newCursor();
- xis = c.newXMLInputStream();
-
- startDocument = (StartDocument) xis.next();
-
- startElement = (StartElement) xis.next();
-
- characterData = (CharacterData) xis.next();
- Assert.assertTrue( characterData.hasContent() );
- Assert.assertTrue( characterData.getContent().equals( "a" ) );
-
- startElement = (StartElement) xis.next();
-
- characterData = (CharacterData) xis.next();
- Assert.assertTrue( characterData.hasContent() );
- Assert.assertTrue( characterData.getContent().equals( "b" ) );
-
- XMLInputStream xis2 = xis.getSubStream();
-
- startElement = (StartElement) xis.next();
-
- characterData = (CharacterData) xis.next();
- Assert.assertTrue( characterData.hasContent() );
- Assert.assertTrue( characterData.getContent().equals( "c" ) );
-
- endElement = (EndElement) xis.next();
-
- characterData = (CharacterData) xis.next();
- Assert.assertTrue( characterData.hasContent() );
- Assert.assertTrue( characterData.getContent().equals( "d" ) );
-
- startElement = (StartElement) xis2.next();
-
- characterData = (CharacterData) xis2.next();
- Assert.assertTrue( characterData.hasContent() );
- Assert.assertTrue( characterData.getContent().equals( "c" ) );
-
- endElement = (EndElement) xis2.next();
-
- xev = xis2.next();
- Assert.assertTrue( xev == null );
-
- endElement = (EndElement) xis.next();
-
- characterData = (CharacterData) xis.next();
- Assert.assertTrue( characterData.hasContent() );
- Assert.assertTrue( characterData.getContent().equals( "e" ) );
-
- endElement = (EndElement) xis.next();
-
- endDocument = (EndDocument) xis.next();
-
- xev = xis.next();
- Assert.assertTrue( xev == null );
- }
+// public void testXMLStream ( )
+// throws Exception
+// {
+// XmlObject o =
+// XmlObject.Factory.parse(
+// "<foo x=\"y\" xmlns=\"default.com\">" +
+// "<!-- x -->bar</foo>" );
+//
+// XmlCursor c = o.newCursor();
+//
+// c.toNextToken();
+// c.toNextToken();
+// c.toNextToken();
+// c.toNextToken();
+//
+// c.insertElement( "bar", "bar.com" );
+//
+// c.toStartDoc();
+//
+// XMLInputStream xis = c.newXMLInputStream();
+//
+// XMLEvent xev;
+// StartDocument startDocument;
+// EndDocument endDocument;
+// StartElement startElement;
+// AttributeIterator attributeIterator;
+// StartPrefixMapping startPrefixMapping;
+// EndPrefixMapping endPrefixMapping;
+// ChangePrefixMapping cpm;
+// EndElement endElement;
+// Attribute attribute;
+// Comment comment;
+// CharacterData characterData;
+// XMLName name;
+// String str;
+// Map map;
+//
+// xev = startDocument = (StartDocument) xis.next();
+// Assert.assertTrue( xev.getType() == XMLEvent.START_DOCUMENT );
+// Assert.assertTrue( !xev.hasName() );
+// Assert.assertTrue( startDocument.isStartDocument() );
+//
+// xev = startPrefixMapping = (StartPrefixMapping) xis.next();
+// Assert.assertTrue( xev.getType() == XMLEvent.START_PREFIX_MAPPING );
+// Assert.assertTrue( !xev.hasName() );
+// Assert.assertTrue( xev.isStartPrefixMapping() );
+// str = startPrefixMapping.getNamespaceUri();
+// Assert.assertTrue( str.equals( "default.com" ) );
+// Assert.assertTrue( startPrefixMapping.getPrefix().length() == 0 );
+//
+// xev = startElement = (StartElement) xis.next();
+// Assert.assertTrue( xev.getType() == XMLEvent.START_ELEMENT );
+// Assert.assertTrue( xev.hasName() );
+// Assert.assertTrue( xev.isStartElement() );
+// assertName( startElement.getName(), "default.com", "foo", null );
+// attributeIterator = startElement.getAttributes();
+// attribute = attributeIterator.next();
+// assertName( attribute.getName(), null, "x", null );
+// Assert.assertTrue( attribute.getValue().equals( "y" ) );
+// Assert.assertTrue( attributeIterator.next() == null );
+// attributeIterator = startElement.getNamespaces();
+// attribute = attributeIterator.next();
+// assertName( attribute.getName(), null, "xmlns", null );
+// Assert.assertTrue( attribute.getValue().equals( "default.com" ) );
+// Assert.assertTrue( attributeIterator.next() == null );
+// attributeIterator = startElement.getAttributesAndNamespaces();
+// Assert.assertTrue( attributeIterator.next() != null );
+// Assert.assertTrue( attributeIterator.next() != null );
+// Assert.assertTrue( attributeIterator.next() == null );
+// name = new XmlNameImpl( null, "x", null );
+// attribute = startElement.getAttributeByName( name );
+// Assert.assertTrue( attribute != null );
+// Assert.assertTrue( attribute.getValue().equals( "y" ) );
+// name = new XmlNameImpl( null, "xmlns", null );
+// attribute = startElement.getAttributeByName( name );
+// Assert.assertTrue( attribute == null );
+// str = startElement.getNamespaceUri( null );
+// Assert.assertTrue( str.equals( "default.com" ) );
+//
+// xev = startPrefixMapping = (StartPrefixMapping) xis.next();
+// Assert.assertTrue( xev.getType() == XMLEvent.START_PREFIX_MAPPING );
+// Assert.assertTrue( !xev.hasName() );
+// Assert.assertTrue( xev.isStartPrefixMapping() );
+// str = startPrefixMapping.getNamespaceUri();
+// Assert.assertTrue( str.equals( "bar.com" ) );
+// Assert.assertTrue( startPrefixMapping.getPrefix().equals( "bar" ) );
+//
+// xev = startElement = (StartElement) xis.next();
+// Assert.assertTrue( xev.getType() == XMLEvent.START_ELEMENT );
+// Assert.assertTrue( xev.hasName() );
+// Assert.assertTrue( xev.isStartElement() );
+// assertName( startElement.getName(), "bar.com", "bar", "bar" );
+// attributeIterator = startElement.getAttributes();
+// Assert.assertTrue( attributeIterator.next() == null );
+// attributeIterator = startElement.getNamespaces();
+// attribute = attributeIterator.next();
+// assertName( attribute.getName(), null, "bar", "xmlns" );
+// Assert.assertTrue( attribute.getValue().equals( "bar.com" ) );
+// Assert.assertTrue( attributeIterator.next() == null );
+// attributeIterator = startElement.getAttributesAndNamespaces();
+// Assert.assertTrue( attributeIterator.next() != null );
+// Assert.assertTrue( attributeIterator.next() == null );
+// str = startElement.getNamespaceUri( "bar" );
+// Assert.assertTrue( str.equals( "bar.com" ) );
+// map = startElement.getNamespaceMap();
+// Assert.assertTrue( map.get( "bar" ).equals( "bar.com" ) );
+//
+// xev = endElement = (EndElement) xis.next();
+// Assert.assertTrue( xev.getType() == XMLEvent.END_ELEMENT );
+// Assert.assertTrue( xev.hasName() );
+// Assert.assertTrue( xev.isEndElement() );
+// assertName( endElement.getName(), "bar.com", "bar", "bar" );
+//
+// xev = endPrefixMapping = (EndPrefixMapping) xis.next();
+// Assert.assertTrue( xev.getType() == XMLEvent.END_PREFIX_MAPPING );
+// Assert.assertTrue( !xev.hasName() );
+// Assert.assertTrue( xev.isEndPrefixMapping() );
+// Assert.assertTrue( endPrefixMapping.getPrefix().equals( "bar" ) );
+//
+// xev = comment = (Comment) xis.next();
+// Assert.assertTrue( xev.getType() == XMLEvent.COMMENT );
+// Assert.assertTrue( !xev.hasName() );
+// Assert.assertTrue( comment.hasContent() );
+// Assert.assertTrue( comment.getContent().equals( " x " ) );
+//
+// xev = characterData = (CharacterData) xis.next();
+// Assert.assertTrue( xev.getType() == XMLEvent.CHARACTER_DATA );
+// Assert.assertTrue( !xev.hasName() );
+// Assert.assertTrue( xev.isCharacterData() );
+// Assert.assertTrue( characterData.hasContent() );
+// Assert.assertTrue( characterData.getContent().equals( "bar" ) );
+//
+// xev = endElement = (EndElement) xis.next();
+// Assert.assertTrue( xev.getType() == XMLEvent.END_ELEMENT );
+// Assert.assertTrue( xev.hasName() );
+// Assert.assertTrue( xev.isEndElement() );
+// assertName( endElement.getName(), "default.com", "foo", null );
+//
+// xev = cpm = (ChangePrefixMapping) xis.next();
+// Assert.assertTrue( xev.getType() == XMLEvent.CHANGE_PREFIX_MAPPING );
+// Assert.assertTrue( !xev.hasName() );
+// Assert.assertTrue( xev.isChangePrefixMapping() );
+// Assert.assertTrue( cpm.getPrefix().length() == 0 );
+// Assert.assertTrue( cpm.getOldNamespaceUri().equals( "default.com" ) );
+// Assert.assertTrue( cpm.getNewNamespaceUri().equals( "" ) );
+//
+// xev = endDocument = (EndDocument) xis.next();
+// Assert.assertTrue( xev.getType() == XMLEvent.END_DOCUMENT );
+// Assert.assertTrue( !xev.hasName() );
+// Assert.assertTrue( xev.isEndDocument() );
+//
+// xev = xis.next();
+// Assert.assertTrue( xev == null );
+//
+// //
+// // Test ChangePrefixMapping event
+// //
+//
+// o = XmlObject.Factory.parse( "<foo xmlns:x=\"y\"><bar xmlns:x=\"z\"/></foo>" );
+// c = o.newCursor();
+// xis = c.newXMLInputStream();
+//
+// startDocument = (StartDocument) xis.next();
+//
+// startPrefixMapping = (StartPrefixMapping) xis.next();
+// str = startPrefixMapping.getNamespaceUri();
+// Assert.assertTrue( str.equals( "y" ) );
+// Assert.assertTrue( startPrefixMapping.getPrefix().equals( "x" ) );
+//
+// startElement = (StartElement) xis.next();
+//
+// startPrefixMapping = (StartPrefixMapping) xis.next();
+// str = startPrefixMapping.getNamespaceUri();
+// Assert.assertTrue( str.equals( "z" ) );
+// Assert.assertTrue( startPrefixMapping.getPrefix().equals( "x" ) );
+//
+// startElement = (StartElement) xis.next();
+//
+// endElement = (EndElement) xis.next();
+//
+// cpm = (ChangePrefixMapping) xis.next();
+// str = cpm.getOldNamespaceUri();
+// Assert.assertTrue( str.equals( "z" ) );
+// str = cpm.getNewNamespaceUri();
+// Assert.assertTrue( str.equals( "y" ) );
+// str = cpm.getPrefix();
+// Assert.assertTrue( str.equals( "x" ) );
+//
+// endElement = (EndElement) xis.next();
+//
+// endPrefixMapping = (EndPrefixMapping) xis.next();
+// Assert.assertTrue( endPrefixMapping.getPrefix().equals( "x" ) );
+//
+// endDocument = (EndDocument) xis.next();
+//
+// xev = xis.next();
+// Assert.assertTrue( xev == null );
+//
+// //
+// // Test CharacterData events
+// //
+//
+// o = XmlObject.Factory.parse( "<foo>a<bar>b<baz>c</baz>d</bar>e</foo>" );
+// c = o.newCursor();
+// xis = c.newXMLInputStream();
+//
+// startDocument = (StartDocument) xis.next();
+//
+// startElement = (StartElement) xis.next();
+//
+// characterData = (CharacterData) xis.next();
+// Assert.assertTrue( characterData.hasContent() );
+// Assert.assertTrue( characterData.getContent().equals( "a" ) );
+//
+// startElement = (StartElement) xis.next();
+//
+// characterData = (CharacterData) xis.next();
+// Assert.assertTrue( characterData.hasContent() );
+// Assert.assertTrue( characterData.getContent().equals( "b" ) );
+//
+// startElement = (StartElement) xis.next();
+//
+// characterData = (CharacterData) xis.next();
+// Assert.assertTrue( characterData.hasContent() );
+// Assert.assertTrue( characterData.getContent().equals( "c" ) );
+//
+// endElement = (EndElement) xis.next();
+//
+// characterData = (CharacterData) xis.next();
+// Assert.assertTrue( characterData.hasContent() );
+// Assert.assertTrue( characterData.getContent().equals( "d" ) );
+//
+// endElement = (EndElement) xis.next();
+//
+// characterData = (CharacterData) xis.next();
+// Assert.assertTrue( characterData.hasContent() );
+// Assert.assertTrue( characterData.getContent().equals( "e" ) );
+//
+// endElement = (EndElement) xis.next();
+//
+// endDocument = (EndDocument) xis.next();
+//
+// xev = xis.next();
+// Assert.assertTrue( xev == null );
+//
+// //
+// // Test SubStreams
+// //
+//
+// o = XmlObject.Factory.parse( "<foo>a<bar>b<baz>c</baz>d</bar>e</foo>" );
+// c = o.newCursor();
+// xis = c.newXMLInputStream();
+//
+// startDocument = (StartDocument) xis.next();
+//
+// startElement = (StartElement) xis.next();
+//
+// characterData = (CharacterData) xis.next();
+// Assert.assertTrue( characterData.hasContent() );
+// Assert.assertTrue( characterData.getContent().equals( "a" ) );
+//
+// startElement = (StartElement) xis.next();
+//
+// characterData = (CharacterData) xis.next();
+// Assert.assertTrue( characterData.hasContent() );
+// Assert.assertTrue( characterData.getContent().equals( "b" ) );
+//
+// XMLInputStream xis2 = xis.getSubStream();
+//
+// startElement = (StartElement) xis.next();
+//
+// characterData = (CharacterData) xis.next();
+// Assert.assertTrue( characterData.hasContent() );
+// Assert.assertTrue( characterData.getContent().equals( "c" ) );
+//
+// endElement = (EndElement) xis.next();
+//
+// characterData = (CharacterData) xis.next();
+// Assert.assertTrue( characterData.hasContent() );
+// Assert.assertTrue( characterData.getContent().equals( "d" ) );
+//
+// startElement = (StartElement) xis2.next();
+//
+// characterData = (CharacterData) xis2.next();
+// Assert.assertTrue( characterData.hasContent() );
+// Assert.assertTrue( characterData.getContent().equals( "c" ) );
+//
+// endElement = (EndElement) xis2.next();
+//
+// xev = xis2.next();
+// Assert.assertTrue( xev == null );
+//
+// endElement = (EndElement) xis.next();
+//
+// characterData = (CharacterData) xis.next();
+// Assert.assertTrue( characterData.hasContent() );
+// Assert.assertTrue( characterData.getContent().equals( "e" ) );
+//
+// endElement = (EndElement) xis.next();
+//
+// endDocument = (EndDocument) xis.next();
+//
+// xev = xis.next();
+// Assert.assertTrue( xev == null );
+// }
// NEWSTORE END
private XmlCursor navDoc ( XmlObject x, String dirs )
@@ -1598,8 +1598,8 @@
cFrom = navDoc( x, "d" );
cTo = navNewCursor( cFrom, "" );
// NEWSTORE START
-// Assert.assertTrue( cFrom.moveXml( cTo ) );
- Assert.assertTrue( !cFrom.moveXml( cTo ) );
+ Assert.assertTrue( cFrom.moveXml( cTo ) );
+// Assert.assertTrue( !cFrom.moveXml( cTo ) );
// NEWSTORE END
cFrom.insertChars( "[FROM]" );
cTo.insertChars( "[TO]" );
@@ -1611,12 +1611,12 @@
new QName( null, "bar" ) );
// NEWSTORE START
-// Assert.assertTrue(
-// x.xmlText( options ).equals( "<bar>[TO]<foo>abcdef</foo>[FROM]</bar>" ) ||
-// x.xmlText( options ).equals( "<bar>[FROM]<foo>abcdef</foo>[TO]</bar>" ) );
Assert.assertTrue(
- x.xmlText( options ).equals( "<bar>[FROM][TO]<foo>abcdef</foo></bar>" ) ||
- x.xmlText( options ).equals( "<bar>[TO][FROM]<foo>abcdef</foo></bar>" ) );
+ x.xmlText( options ).equals( "<bar>[TO]<foo>abcdef</foo>[FROM]</bar>" ) ||
+ x.xmlText( options ).equals( "<bar>[FROM]<foo>abcdef</foo>[TO]</bar>" ) );
+// Assert.assertTrue(
+// x.xmlText( options ).equals( "<bar>[FROM][TO]<foo>abcdef</foo></bar>" ) ||
+// x.xmlText( options ).equals( "<bar>[TO][FROM]<foo>abcdef</foo></bar>" ) );
// NEWSTORE END
//
@@ -1626,17 +1626,17 @@
cFrom = navDoc( x, "d" );
cTo = navNewCursor( cFrom, "ttt" );
// NEWSTORE START
-// Assert.assertTrue( cFrom.moveXml( cTo ) );
- Assert.assertTrue( !cFrom.moveXml( cTo ) );
+ Assert.assertTrue( cFrom.moveXml( cTo ) );
+// Assert.assertTrue( !cFrom.moveXml( cTo ) );
// NEWSTORE END
cFrom.insertChars( "[FROM]" );
cTo.insertChars( "[TO]" );
Assert.assertTrue(
// NEWSTORE START
-// x.xmlText( options ).equals( "<bar><foo>abcdef</foo>[FROM][TO]</bar>" ) ||
-// x.xmlText( options ).equals( "<bar><foo>abcdef</foo>[TO][FROM]</bar>" ) );
- x.xmlText( options ).equals( "<bar>[FROM]<foo>abcdef</foo>[TO]</bar>" ) );
+ x.xmlText( options ).equals( "<bar><foo>abcdef</foo>[FROM][TO]</bar>" ) ||
+ x.xmlText( options ).equals( "<bar><foo>abcdef</foo>[TO][FROM]</bar>" ) );
+// x.xmlText( options ).equals( "<bar>[FROM]<foo>abcdef</foo>[TO]</bar>" ) );
// NEWSTORE END
//
@@ -2306,18 +2306,18 @@
}
// NEWSTORE START
- public void testAnnotation ( )
- throws Exception
- {
- XmlObject x = XmlObject.Factory.parse( "<foo/>" );
- XmlCursor c = x.newCursor();
- c.toNextToken();
- MyAnno a = new MyAnno();
- c.setBookmark( a );
- Assert.assertTrue( c.removeXml() );
- XmlCursor c2 = a.createCursor();
- Assert.assertTrue( c2 == null );
- }
+// public void testAnnotation ( )
+// throws Exception
+// {
+// XmlObject x = XmlObject.Factory.parse( "<foo/>" );
+// XmlCursor c = x.newCursor();
+// c.toNextToken();
+// MyAnno a = new MyAnno();
+// c.setBookmark( a );
+// Assert.assertTrue( c.removeXml() );
+// XmlCursor c2 = a.createCursor();
+// Assert.assertTrue( c2 == null );
+// }
// NEWSTORE END
public void testAttrSetter ( )
@@ -2619,8 +2619,8 @@
// 'a' prefix namespace is not remapped
// NEWSTORE START
-// String expect = "<a xmlns:a=\"aNS\" xmlns:b=\"bNS\" xmlns:c=\"cNS\"><a:b/></a>";
- String expect = "<a xmlns:c=\"cNS\" xmlns:b=\"bNS\" xmlns:a=\"aNS\"><a:b/></a>";
+ String expect = "<a xmlns:a=\"aNS\" xmlns:b=\"bNS\" xmlns:c=\"cNS\"><a:b/></a>";
+// String expect = "<a xmlns:c=\"cNS\" xmlns:b=\"bNS\" xmlns:a=\"aNS\"><a:b/></a>";
// NEWSTORE END
xml = "<a xmlns='aNS'><b/></a>";
@@ -2637,36 +2637,36 @@
// default namespace is not remapped
// NEWSTORE START
-// expect = "<a xmlns=\"aNS\" xmlns:b=\"bNS\" xmlns:c=\"cNS\"><b/></a>";
- expect = "<a xmlns:c=\"cNS\" xmlns:b=\"bNS\" xmlns=\"aNS\"><b/></a>";
+ expect = "<a xmlns=\"aNS\" xmlns:b=\"bNS\" xmlns:c=\"cNS\"><b/></a>";
+// expect = "<a xmlns:c=\"cNS\" xmlns:b=\"bNS\" xmlns=\"aNS\"><b/></a>";
// NEWSTORE END
Assert.assertEquals( expect, x.xmlText() );
}
// NEWSTORE START
- public void testCR135193()
- throws Exception
- {
- String xml = "<a xmlns='aNS' xmlns:b='bNS'><b><c/></b></a>";
-
- XmlObject x = XmlObject.Factory.parse(xml);
-
- // get an XMLInputStream and move to XMLEvent.START_ELEMENT for 'b'
- XmlCursor c = x.newCursor();
- XMLInputStream xis = c.newXMLInputStream();
- c.dispose();
- while (xis.hasNext() && xis.next().getType() != XMLEvent.START_ELEMENT) {
- }
-
- // reparse from 'b' element using an sub-XMLInputStream
- XMLInputStream xis1 = xis.getSubStream();
- XmlObject x1 = XmlObject.Factory.parse(xis1);
-
- // CR135193: namespaces including default are set on the 'b' child
- String expect = "<b xmlns=\"aNS\" xmlns:b=\"bNS\"><c/></b>";
- Assert.assertEquals( expect, x1.xmlText() );
- }
+// public void testCR135193()
+// throws Exception
+// {
+// String xml = "<a xmlns='aNS' xmlns:b='bNS'><b><c/></b></a>";
+//
+// XmlObject x = XmlObject.Factory.parse(xml);
+//
+// // get an XMLInputStream and move to XMLEvent.START_ELEMENT for 'b'
+// XmlCursor c = x.newCursor();
+// XMLInputStream xis = c.newXMLInputStream();
+// c.dispose();
+// while (xis.hasNext() && xis.next().getType() != XMLEvent.START_ELEMENT) {
+// }
+//
+// // reparse from 'b' element using an sub-XMLInputStream
+// XMLInputStream xis1 = xis.getSubStream();
+// XmlObject x1 = XmlObject.Factory.parse(xis1);
+//
+// // CR135193: namespaces including default are set on the 'b' child
+// String expect = "<b xmlns=\"aNS\" xmlns:b=\"bNS\"><c/></b>";
+// Assert.assertEquals( expect, x1.xmlText() );
+// }
// NEWSTORE END
}
1.4 +6 -6 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ToFirstContentTokenTest.java 26 Jul 2004 18:24:16 -0000 1.3
+++ ToFirstContentTokenTest.java 16 Aug 2004 15:58:27 -0000 1.4
@@ -75,12 +75,12 @@
assertEquals(TokenType.NAMESPACE, m_xc.currentTokenType());
// NEWSTORE START
-// assertEquals(m_xc.getTextValue(),"nsuri");
- try {
- m_xc.getTextValue();
- fail("Expecting Illegal State Exception");
- } catch (IllegalStateException ie) {
- }
+ assertEquals(m_xc.getTextValue(),"nsuri");
+// try {
+// m_xc.getTextValue();
+// fail("Expecting Illegal State Exception");
+// } catch (IllegalStateException ie) {
+// }
// NEWSTORE END
}
1.4 +5 -5 xml-xmlbeans/v2/test/src/xmlcursor/xpath/jaxen/checkin/JaxenXPathTests.java
Index: JaxenXPathTests.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/src/xmlcursor/xpath/jaxen/checkin/JaxenXPathTests.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JaxenXPathTests.java 4 Aug 2004 21:15:07 -0000 1.3
+++ JaxenXPathTests.java 16 Aug 2004 15:58:28 -0000 1.4
@@ -53,11 +53,11 @@
public void testConformance() throws Exception {
// EricVas: I'm not implementing Jaxen in V2's newstore ... need to find a replacement for Jaxen
// NEWSTORE START
- XmlObject doc = null;
-
- doc = XmlObject.Factory.parse(sXml);
-
- runAll(doc, xpath);
+// XmlObject doc = null;
+//
+// doc = XmlObject.Factory.parse(sXml);
+//
+// runAll(doc, xpath);
// NEWSTORE END
}
1.5 +4 -4 xml-xmlbeans/v2/test/src/xmlobject/checkin/AssortedTests.java
Index: AssortedTests.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/src/xmlobject/checkin/AssortedTests.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AssortedTests.java 26 Jul 2004 18:24:17 -0000 1.4
+++ AssortedTests.java 16 Aug 2004 15:58:28 -0000 1.5
@@ -46,15 +46,15 @@
// valid chars
cur.setTextValue("<something or other:\u03C0\uD7FF>");
// NEWSTORE START
-// Assert.assertEquals("<test><something or other:\u03C0\uD7FF></test>", xdoc.toString());
- Assert.assertEquals("<test><something or other:\u03C0\uD7FF></test>" + newLine, xdoc.toString());
+ Assert.assertEquals("<test><something or other:\u03C0\uD7FF></test>", xdoc.toString());
+// Assert.assertEquals("<test><something or other:\u03C0\uD7FF></test>" + newLine, xdoc.toString());
// NEWSTORE END
// invalid chars - control chars, unicode surrogates, FFFF/FFFE, etc
cur.setTextValue("<something\0or\1other:\u0045\uFFFE\uD800\uDFFF\uDB80\uDC00\u03C0\uD7FF\u001F>");
// NEWSTORE START
-// Assert.assertEquals("<test><something?or?other:\u0045?????\u03C0\uD7FF?></test>", xdoc.toString());
- Assert.assertEquals("<test><something?or?other:\u0045?????\u03C0\uD7FF?></test>" + newLine, xdoc.toString());
+ Assert.assertEquals("<test><something?or?other:\u0045?????\u03C0\uD7FF?></test>", xdoc.toString());
+// Assert.assertEquals("<test><something?or?other:\u0045?????\u03C0\uD7FF?></test>" + newLine, xdoc.toString());
// NEWSTORE END
}
1.5 +71 -71 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- InstanceValidationTests.java 26 Jul 2004 18:24:17 -0000 1.4
+++ InstanceValidationTests.java 16 Aug 2004 15:58:28 -0000 1.5
@@ -557,16 +557,16 @@
File[] schemasF = { schemeFile, xmlFile };
// NEWSTORE START
-// stl = makeSchemaTypeLoader( schemasF );
- Root.disableStoreValidation();
- try
- {
- stl = makeSchemaTypeLoader( schemasF );
- }
- finally
- {
- Root.enableStoreValidation();
- }
+ stl = makeSchemaTypeLoader( schemasF );
+// Root.disableStoreValidation();
+// try
+// {
+// stl = makeSchemaTypeLoader( schemasF );
+// }
+// finally
+// {
+// Root.enableStoreValidation();
+// }
// NEWSTORE END
SchemaType type =
@@ -1246,67 +1246,67 @@
}
// NEWSTORE START
- public void testValidate4 ( )
- throws Exception
- {
- String schema =
- "<xs:schema xmlns:xs='http://www.w3.org/2001/XMLSchema'>\n" +
- "\n" +
- " <xs:element name='any'>\n" +
- " </xs:element>\n" +
- "\n" +
- " <xs:simpleType name='kindaPrime'>\n" +
- " <xs:restriction base='xs:decimal'>\n" +
- " <xs:pattern value='[0-9]*[13579]'/>\n" +
- " <xs:enumeration value='3'/>\n" +
- " <xs:enumeration value='5'/>\n" +
- " <xs:enumeration value='7'/>\n" +
- " <xs:enumeration value='11'/>\n" +
- " <xs:enumeration value='13'/>\n" +
- " <xs:enumeration value='17'/>\n" +
- " <xs:enumeration value='19'/>\n" +
- " </xs:restriction>\n" +
- " </xs:simpleType>\n" +
- "\n" +
- "</xs:schema>\n" +
- "";
-
- String[] schemas = { schema };
-
- SchemaTypeLoader stl = makeSchemaTypeLoader( schemas );
-
- XmlObject x =
- stl.parse(
- "<any " + ns + " xsi:type='kindaPrime'>100</any>",
- null, null );
-
- // Make sure the unvalidated stream is OK
-
- XMLInputStream xis = x.newXMLInputStream();
-
- while ( xis.hasNext() )
- xis.next();
-
- // Make sure the validated stream fails
-
- boolean blewChunks = false;
-
- xis =
- stl.newValidatingXMLInputStream(
- x.newXMLInputStream(), null, null );
-
- try
- {
- while ( xis.hasNext() )
- xis.next();
- }
- catch ( XMLStreamValidationException e )
- {
- blewChunks = true;
- }
-
- Assert.assertTrue( blewChunks );
- }
+// public void testValidate4 ( )
+// throws Exception
+// {
+// String schema =
+// "<xs:schema xmlns:xs='http://www.w3.org/2001/XMLSchema'>\n" +
+// "\n" +
+// " <xs:element name='any'>\n" +
+// " </xs:element>\n" +
+// "\n" +
+// " <xs:simpleType name='kindaPrime'>\n" +
+// " <xs:restriction base='xs:decimal'>\n" +
+// " <xs:pattern value='[0-9]*[13579]'/>\n" +
+// " <xs:enumeration value='3'/>\n" +
+// " <xs:enumeration value='5'/>\n" +
+// " <xs:enumeration value='7'/>\n" +
+// " <xs:enumeration value='11'/>\n" +
+// " <xs:enumeration value='13'/>\n" +
+// " <xs:enumeration value='17'/>\n" +
+// " <xs:enumeration value='19'/>\n" +
+// " </xs:restriction>\n" +
+// " </xs:simpleType>\n" +
+// "\n" +
+// "</xs:schema>\n" +
+// "";
+//
+// String[] schemas = { schema };
+//
+// SchemaTypeLoader stl = makeSchemaTypeLoader( schemas );
+//
+// XmlObject x =
+// stl.parse(
+// "<any " + ns + " xsi:type='kindaPrime'>100</any>",
+// null, null );
+//
+// // Make sure the unvalidated stream is OK
+//
+// XMLInputStream xis = x.newXMLInputStream();
+//
+// while ( xis.hasNext() )
+// xis.next();
+//
+// // Make sure the validated stream fails
+//
+// boolean blewChunks = false;
+//
+// xis =
+// stl.newValidatingXMLInputStream(
+// x.newXMLInputStream(), null, null );
+//
+// try
+// {
+// while ( xis.hasNext() )
+// xis.next();
+// }
+// catch ( XMLStreamValidationException e )
+// {
+// blewChunks = true;
+// }
+//
+// Assert.assertTrue( blewChunks );
+// }
// NEWSTORE END
public void testValidate5 ( )
1.4 +8 -8 xml-xmlbeans/v2/test/src/xmlobject/checkin/SelectChldAttTests.java
Index: SelectChldAttTests.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/src/xmlobject/checkin/SelectChldAttTests.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SelectChldAttTests.java 26 Jul 2004 18:24:17 -0000 1.3
+++ SelectChldAttTests.java 16 Aug 2004 15:58:28 -0000 1.4
@@ -124,8 +124,8 @@
Assert.assertTrue("8 selectAttributes set'##other' : ",
verifyResult(xos[0].selectAttributes(QNameSet.forWildcardNamespaceString("##other", uri)),
// NEWSTORE START
-// new String[]{"<xml-fragment xmlns:p=\"uri:other_namespace\">attribute in #other namespace</xml-fragment>"}));
- new String[]{"<xml-fragment>attribute in #other namespace</xml-fragment>"}));
+ new String[]{"<xml-fragment xmlns:p=\"uri:other_namespace\">attribute in #other namespace</xml-fragment>"}));
+// new String[]{"<xml-fragment>attribute in #other namespace</xml-fragment>"}));
// NEWSTORE END
// elemC
@@ -165,17 +165,17 @@
Assert.assertTrue("12a selectChildren in the any bucket for typeExtendedC: ",
verifyResult(xos[0].selectAttributes(qnsb.toQNameSet()),
// NEWSTORE START
-// new String[]{"<xml-fragment xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xmlns:p=\"uri_other_namespace\">attribute in any bucket</xml-fragment>"}));
- new String[]{"<xml-fragment>attribute in any bucket</xml-fragment>"}));
+ new String[]{"<xml-fragment xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xmlns:p=\"uri_other_namespace\">attribute in any bucket</xml-fragment>"}));
+// new String[]{"<xml-fragment>attribute in any bucket</xml-fragment>"}));
// NEWSTORE END
//print("12b selectChildren in the any bucket for typeExtendedC: " , xos[0].selectAttributes(TypeExtendedC.type.qnameSetForWildcardAttributes()));
Assert.assertTrue("12b selectChildren in the any bucket for typeExtendedC: ",
verifyResult(xos[0].selectAttributes(TypeExtendedC.type.qnameSetForWildcardAttributes()),
// NEWSTORE START
-// new String[]{"<xml-fragment xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xmlns:p=\"uri_other_namespace\">typeExtendedC</xml-fragment>",
-// "<xml-fragment xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xmlns:p=\"uri_other_namespace\">attribute in any bucket</xml-fragment>"}));
- new String[]{"<xml-fragment>typeExtendedC</xml-fragment>",
- "<xml-fragment>attribute in any bucket</xml-fragment>"}));
+ new String[]{"<xml-fragment xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xmlns:p=\"uri_other_namespace\">typeExtendedC</xml-fragment>",
+ "<xml-fragment xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xmlns:p=\"uri_other_namespace\">attribute in any bucket</xml-fragment>"}));
+// new String[]{"<xml-fragment>typeExtendedC</xml-fragment>",
+// "<xml-fragment>attribute in any bucket</xml-fragment>"}));
// NEWSTORE END
}
1.4 +3 -3 xml-xmlbeans/v2/test/src/xmlobject/extensions/interfaceFeature/methodNameCollision/checkin/NameCollisionTest.java
Index: NameCollisionTest.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/src/xmlobject/extensions/interfaceFeature/methodNameCollision/checkin/NameCollisionTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- NameCollisionTest.java 26 Jul 2004 18:24:17 -0000 1.3
+++ NameCollisionTest.java 16 Aug 2004 15:58:29 -0000 1.4
@@ -49,9 +49,9 @@
it[i].setAge(50);
it[i].setName4("BEAN Name"+i);
// NEWSTORE START
-// sExpected.append("<consultant age=\"50\" name=\"BEAN Name"+i+"\"/>");
- sExpected.append("<consultant name=\"BEAN Name"+i+"\" " +
- "age=\"50\"/>");
+ sExpected.append("<consultant age=\"50\" name=\"BEAN Name"+i+"\"/>");
+// sExpected.append("<consultant name=\"BEAN Name"+i+"\" " +
+// "age=\"50\"/>");
// NEWSTORE END
}
---------------------------------------------------------------------
To unsubscribe, e-mail: xmlbeans-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xmlbeans-cvs-help@xml.apache.org