You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xmlbeans.apache.org by ce...@apache.org on 2004/02/23 18:18:14 UTC
cvs commit: xml-xmlbeans/v2/test/src/xpath/org/apache/xmlbeans/impl/xpath/jaxen XBeansDemo.java
cezar 2004/02/23 09:18:14
Modified: v2 build.xml
v2/src/marshal/org/apache/xmlbeans/impl/richParser
XMLStreamReaderExtImpl.java
v2/src/typeimpl/org/apache/xmlbeans/impl/util
XsTypeConverter.java
v2/test/cases/marshal doc.xml
v2/test/src/drt/drtcases SmokeTests.java
v2/test/src/xpath/org/apache/xmlbeans/impl/xpath/jaxen
XBeansDemo.java
Log:
Fixed default value for elements with spaces.
Moved xpath dependency in xbean_xpath.jar and separated the xpath test in the drt.
CR: Scott, Eric
DRT: passes
Revision Changes Path
1.37 +34 -26 xml-xmlbeans/v2/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/build.xml,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- build.xml 18 Feb 2004 19:25:53 -0000 1.36
+++ build.xml 23 Feb 2004 17:18:13 -0000 1.37
@@ -65,19 +65,6 @@
<move file="build/lib/jsr173_1.0_ri.jar" tofile="build/lib/jsr173_ri.jar"/>
</target>
- <target name="check.jaxen.jar">
- <condition property="jaxen.jar.exists">
- <available file="build/lib/jaxen.jar"/>
- </condition>
- </target>
-
- <target name="jaxen.jar" depends="check.jaxen.jar, dirs" unless="jaxen.jar.exists">
- <!--get dest="build/lib/jaxen.jar"
- src="http://www.ibiblio.org/maven/jaxen/jars/jaxen-1.1-beta-2.jar"
- verbose="true" usetimestamp="true" ignoreerrors="true"/-->
- <copy file="external/lib/jaxen-1.1-beta-2.jar" tofile="build/lib/jaxen.jar" />
- </target>
-
<!-- get resolver.jar -->
<target name="check.xcresolver.zip">
<condition property="xcresolver.zip.exists">
@@ -124,7 +111,7 @@
<mkdir dir="build/private/lib"/>
</target>
- <target name="drt" depends="builddrt, rundrt, jamdrt"/>
+ <target name="drt" depends="builddrt, rundrt, drtjam, drtxpath"/>
<target name="rundrt" >
<echo message="Running random tester"/>
@@ -141,7 +128,7 @@
<mkdir dir="build/test/output"/>
<echo message="Running xbean product drt tests"/>
- <echo message="JUnit output being sent to xbean/build/test/output/drt-product.txt"/>
+ <echo message="JUnit output being sent to build/test/output/drt-product.txt"/>
<junit fork="yes" printsummary="yes" haltonfailure="yes" showoutput="yes">
<jvmarg value="-ea"/>
<sysproperty key="xbean.rootdir" value="${basedir}"/>
@@ -157,7 +144,6 @@
<pathelement location="build/private/lib/schemas.jar"/>
<pathelement location="build/private/lib/xstypes.jar"/>
<pathelement location="build/private/lib/enumtest.jar"/>
- <pathelement location="build/lib/jaxen.jar"/>
<pathelement location="build/private/classes/marshal"/>
</classpath>
<formatter type="plain"/>
@@ -167,7 +153,7 @@
<antcall target="xmlcatalogTest" /-->
</target>
- <path id="xmlcatalogTest.run.path">
+ <path id="xmlcatalogTest.run.path">
<pathelement location="build/lib/xbean.jar"/>
<pathelement location="build/lib/jsr173_api.jar"/>
<pathelement location="build/lib/resolver.jar"/>
@@ -182,7 +168,26 @@
<echo message="___ XML Catalog Test : PASSED" />
</target>
- <target name='jamdrt'>
+ <target name='drtxpath' depends="xbean_xpath.jar" >
+ <echo message="DRT: XPath Jaxen - JUnit output being sent to build/test/output/drt-xpath.txt"/>
+ <junit fork="yes" printsummary="yes" haltonfailure="yes" showoutput="yes">
+ <jvmarg value="-ea"/>
+ <sysproperty key="xbean.rootdir" value="${basedir}"/>
+ <sysproperty key="treeasserts" value="true"/>
+ <classpath>
+ <pathelement location="external/lib/junit.jar"/>
+ <pathelement location="build/ar/xbean.jar"/>
+ <pathelement location="build/lib/jsr173_api.jar"/>
+ <pathelement location="build/lib/jsr173_ri.jar"/>
+ <pathelement location="build/private/lib/drt.jar"/>
+ <pathelement location="build/lib/xbean_xpath.jar"/>
+ </classpath>
+ <formatter type="plain"/>
+ <test name="drtcases.JaxenXPathTests" outfile="build/test/output/drt-xpath" />
+ </junit>
+ </target>
+
+ <target name="drtjam">
<ant dir='test/src/jamtest' target='all' inheritAll='false' />
</target>
@@ -262,7 +267,6 @@
<pathelement location="build/private/lib/enumtest.jar"/>
<pathelement location="build/private/lib/xstypes.jar"/>
<pathelement location="build/private/classes/marshal"/>
- <pathelement location="build/lib/jaxen.jar"/>
<pathelement location="build/classes/xmlinputstream"/>
</path>
@@ -635,7 +639,6 @@
<fileset dir="build/classes/marshal"/>
<fileset dir="build/classes/repackage"/>
<fileset dir="build/classes/jam"/>
- <fileset dir="build/classes/xpath"/>
<fileset dir="src/license"/>
</jar>
</target>
@@ -1099,7 +1102,7 @@
<!-- xpath target ============================================= -->
- <target name="xpath.classes" depends="dirs, xmlpublic.jar, jaxen.jar, xmlstore.classes">
+ <target name="xpath.classes" depends="dirs, xmlpublic.jar, xmlstore.classes">
<mkdir dir="build/classes/xpath"/>
<javac
srcdir="src/xpath"
@@ -1110,14 +1113,19 @@
<classpath id="xpath.compile.path">
<pathelement location="build/classes/xmlpublic"/>
<pathelement location="build/classes/xmlstore"/>
- <pathelement location="build/lib/jaxen.jar"/>
+ <pathelement location="external/lib/jaxen-1.1-beta-2.jar"/>
</classpath>
</javac>
</target>
+ <target name="xbean_xpath.jar" depends="dirs, xpath.classes">
+ <unjar src="external/lib/jaxen-1.1-beta-2.jar" dest="build/classes/xpath" />
+ <jar jarfile="build/lib/xbean_xpath.jar" basedir="build/classes/xpath"/>
+ </target>
+
<!-- test xpath target ============================================= -->
- <target name="test_xpath.classes" depends="dirs, xmlpublic.jar, jsr173_api.jar, jaxen.jar">
+ <target name="test_xpath.classes" depends="dirs, xmlpublic.jar, jsr173_api.jar, xbean_xpath.jar">
<mkdir dir="build/private/classes/testxpath"/>
<javac
srcdir="test/src/xpath"
@@ -1128,18 +1136,18 @@
<classpath id="testxpath.compile.path">
<pathelement location="build/lib/xmlpublic.jar"/>
<pathelement location="build/lib/jsr173_api.jar"/>
- <pathelement location="build/lib/jaxen.jar"/>
+ <pathelement location="build/lib/xbean_xpath.jar"/>
<pathelement location="build/classes/xmlinputstream"/>
</classpath>
</javac>
</target>
- <target name="run_test_xpath" depends="test_xpath.classes, xbean">
+ <target name="run_test_xpath" depends="test_xpath.classes, xbean_xpath.jar">
<java classname="org.apache.xmlbeans.impl.xpath.jaxen.XBeansDemo" fork="true" failonerror="true">
<classpath>
<pathelement location="build/lib/xbean.jar"/>
<pathelement location="build/lib/jsr173_api.jar"/>
- <pathelement location="build/lib/jaxen.jar"/>
+ <pathelement location="build/lib/xbean_xpath.jar"/>
<pathelement location="build/private/classes/testxpath"/>
</classpath>
<jvmarg value="-da"/>
1.7 +4 -1 xml-xmlbeans/v2/src/marshal/org/apache/xmlbeans/impl/richParser/XMLStreamReaderExtImpl.java
Index: XMLStreamReaderExtImpl.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/src/marshal/org/apache/xmlbeans/impl/richParser/XMLStreamReaderExtImpl.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XMLStreamReaderExtImpl.java 18 Feb 2004 17:48:32 -0000 1.6
+++ XMLStreamReaderExtImpl.java 23 Feb 2004 17:18:13 -0000 1.7
@@ -753,6 +753,8 @@
{
_nonWSStart = 0;
_nonWSEnd = _length;
+
+ // takes defaultValue only if there wasn't any text
if (!_hasText && _xmlSteam._defaultValue!=null)
{
_length = 0;
@@ -768,7 +770,8 @@
if (!XMLChar.isSpace(_buf[_nonWSEnd-1]))
break;
- if (!_hasText && _xmlSteam._defaultValue!=null)
+ // takes defaultValue if length after triming is 0
+ if (length()==0 && _xmlSteam._defaultValue!=null)
{
_length = 0;
fillBufferFromString(_xmlSteam._defaultValue);
1.3 +1 -1 xml-xmlbeans/v2/src/typeimpl/org/apache/xmlbeans/impl/util/XsTypeConverter.java
Index: XsTypeConverter.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/src/typeimpl/org/apache/xmlbeans/impl/util/XsTypeConverter.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XsTypeConverter.java 12 Feb 2004 20:06:22 -0000 1.2
+++ XsTypeConverter.java 23 Feb 2004 17:18:13 -0000 1.3
@@ -557,7 +557,7 @@
private static String trimInitialPlus(String xml)
{
- if (xml.charAt(0) == '+') {
+ if (xml.length()>0 && xml.charAt(0) == '+') {
return xml.substring(1);
} else {
return xml;
1.12 +1 -1 xml-xmlbeans/v2/test/cases/marshal/doc.xml
Index: doc.xml
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/cases/marshal/doc.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- doc.xml 20 Feb 2004 00:38:44 -0000 1.11
+++ doc.xml 23 Feb 2004 17:18:13 -0000 1.12
@@ -15,7 +15,7 @@
<n1:MyClassArray xsi:type="n1:MySubClass">
<n1:Myatt>NextValueShouldBeDefaulted</n1:Myatt>
- <n1:BigInt></n1:BigInt> <!-- test default elements -->
+ <n1:BigInt> </n1:BigInt> <!-- test default elements -->
</n1:MyClassArray>
<n1:MyClassArray n3:type="n1:MySubClass" xmlns:n3="http://www.w3.org/2001/XMLSchema-instance">
1.8 +0 -1 xml-xmlbeans/v2/test/src/drt/drtcases/SmokeTests.java
Index: SmokeTests.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/src/drt/drtcases/SmokeTests.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- SmokeTests.java 12 Feb 2004 20:06:31 -0000 1.7
+++ SmokeTests.java 23 Feb 2004 17:18:14 -0000 1.8
@@ -45,7 +45,6 @@
suite.addTest(GDateTests.suite());
suite.addTest(SubstGroupTests.suite());
suite.addTest(BindingTests.suite());
- suite.addTest(JaxenXPathTests.suite());
suite.addTest(MarshalTests.suite());
suite.addTest(SaveLoadTests.suite());
suite.addTest(RichParserTests.suite());
1.4 +1 -1 xml-xmlbeans/v2/test/src/xpath/org/apache/xmlbeans/impl/xpath/jaxen/XBeansDemo.java
Index: XBeansDemo.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/src/xpath/org/apache/xmlbeans/impl/xpath/jaxen/XBeansDemo.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XBeansDemo.java 12 Feb 2004 20:06:32 -0000 1.3
+++ XBeansDemo.java 23 Feb 2004 17:18:14 -0000 1.4
@@ -75,7 +75,7 @@
Iterator resultIter = results.iterator();
- System.out.println("Document :: " + doc );
+ //System.out.println("Document :: " + doc );
System.out.println(" XPath :: " + xpath );
System.out.println("");
System.out.println("Results" );
---------------------------------------------------------------------
To unsubscribe, e-mail: xmlbeans-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xmlbeans-cvs-help@xml.apache.org