You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xmlbeans.apache.org by ra...@apache.org on 2007/05/11 20:35:23 UTC
svn commit: r537261 - in /xmlbeans/trunk: ./ bin/ external/lib/
samples/AbstractTypes/
Author: radup
Date: Fri May 11 11:35:20 2007
New Revision: 537261
URL: http://svn.apache.org/viewvc?view=rev&rev=537261
Log:
Fix for issues XMLBEANS-330 and XMLBEANS-324. Changed the XmlBeans main build file to move the QName class in a jar of its own.
Modified:
xmlbeans/trunk/bin/dumpxsb
xmlbeans/trunk/bin/dumpxsb.cmd
xmlbeans/trunk/bin/inst2xsd
xmlbeans/trunk/bin/inst2xsd.cmd
xmlbeans/trunk/bin/scomp
xmlbeans/trunk/bin/scomp.cmd
xmlbeans/trunk/bin/scopy.cmd
xmlbeans/trunk/bin/sdownload
xmlbeans/trunk/bin/sdownload.cmd
xmlbeans/trunk/bin/sfactor
xmlbeans/trunk/bin/sfactor.cmd
xmlbeans/trunk/bin/svalidate
xmlbeans/trunk/bin/svalidate.cmd
xmlbeans/trunk/bin/validate
xmlbeans/trunk/bin/validate.cmd
xmlbeans/trunk/bin/xpretty
xmlbeans/trunk/bin/xpretty.cmd
xmlbeans/trunk/bin/xsd2inst
xmlbeans/trunk/bin/xsd2inst.cmd
xmlbeans/trunk/bin/xsdtree
xmlbeans/trunk/bin/xsdtree.cmd
xmlbeans/trunk/bin/xstc
xmlbeans/trunk/bin/xstc.cmd
xmlbeans/trunk/build.xml
xmlbeans/trunk/external/lib/oldxbean.jar
xmlbeans/trunk/samples/AbstractTypes/build.xml
Modified: xmlbeans/trunk/bin/dumpxsb
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/bin/dumpxsb?view=diff&rev=537261&r1=537260&r2=537261
==============================================================================
--- xmlbeans/trunk/bin/dumpxsb (original)
+++ xmlbeans/trunk/bin/dumpxsb Fri May 11 11:35:20 2007
@@ -22,7 +22,7 @@
if [ -z "$XMLBEANS_LIB" ]; then . `dirname $0`/_setlib; fi
-cp=$XMLBEANS_LIB/xbean.jar:$XMLBEANS_LIB/jsr173_1.0_api.jar
+cp=$XMLBEANS_LIB/xbean.jar:$XMLBEANS_LIB/xmlbeans-qname.jar:$XMLBEANS_LIB/jsr173_1.0_api.jar
case "`uname`" in
CYGWIN*)
Modified: xmlbeans/trunk/bin/dumpxsb.cmd
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/bin/dumpxsb.cmd?view=diff&rev=537261&r1=537260&r2=537261
==============================================================================
--- xmlbeans/trunk/bin/dumpxsb.cmd (original)
+++ xmlbeans/trunk/bin/dumpxsb.cmd Fri May 11 11:35:20 2007
@@ -23,7 +23,7 @@
if "%XMLBEANS_LIB%" EQU "" call "%~dp0_setlib"
set cp=
-set cp=%cp%;%XMLBEANS_LIB%\xbean.jar;%XMLBEANS_LIB%\jsr173_1.0_api.jar
+set cp=%cp%;%XMLBEANS_LIB%\xbean.jar;%XMLBEANS_LIB%\xmlbeans-qname.jar;%XMLBEANS_LIB%\jsr173_1.0_api.jar
java -classpath "%cp%" org.apache.xmlbeans.impl.tool.XsbDumper %*
Modified: xmlbeans/trunk/bin/inst2xsd
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/bin/inst2xsd?view=diff&rev=537261&r1=537260&r2=537261
==============================================================================
--- xmlbeans/trunk/bin/inst2xsd (original)
+++ xmlbeans/trunk/bin/inst2xsd Fri May 11 11:35:20 2007
@@ -20,7 +20,7 @@
if [ -z "$XMLBEANS_LIB" ]; then . `dirname $0`/_setlib; fi
-cp=$XMLBEANS_LIB/xbean.jar:$XMLBEANS_LIB/jsr173_1.0_api.jar
+cp=$XMLBEANS_LIB/xbean.jar:$XMLBEANS_LIB/xmlbeans-qname.jar:$XMLBEANS_LIB/jsr173_1.0_api.jar
case "`uname`" in
CYGWIN*)
Modified: xmlbeans/trunk/bin/inst2xsd.cmd
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/bin/inst2xsd.cmd?view=diff&rev=537261&r1=537260&r2=537261
==============================================================================
--- xmlbeans/trunk/bin/inst2xsd.cmd (original)
+++ xmlbeans/trunk/bin/inst2xsd.cmd Fri May 11 11:35:20 2007
@@ -24,7 +24,7 @@
if "%XMLBEANS_LIB%" EQU "" call "%~dp0_setlib"
set cp=
-set cp=%cp%;%XMLBEANS_LIB%\xbean.jar
+set cp=%cp%;%XMLBEANS_LIB%\xbean.jar;%XMLBEANS_LIB%\xmlbeans-qname.jar
set cp=%cp%;%XMLBEANS_LIB%\jsr173_1.0_api.jar
set cp=%cp%;%XMLBEANS_LIB%\resolver.jar
Modified: xmlbeans/trunk/bin/scomp
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/bin/scomp?view=diff&rev=537261&r1=537260&r2=537261
==============================================================================
--- xmlbeans/trunk/bin/scomp (original)
+++ xmlbeans/trunk/bin/scomp Fri May 11 11:35:20 2007
@@ -20,7 +20,7 @@
if [ -z "$XMLBEANS_LIB" ]; then . `dirname $0`/_setlib; fi
-cp=$XMLBEANS_LIB/xbean.jar:$XMLBEANS_LIB/jsr173_1.0_api.jar:$JAVA_HOME/lib/tools.jar:$XMLBEANS_LIB/resolver.jar
+cp=$XMLBEANS_LIB/xbean.jar:$XMLBEANS_LIB/xmlbeans-qname.jar:$XMLBEANS_LIB/jsr173_1.0_api.jar:$JAVA_HOME/lib/tools.jar:$XMLBEANS_LIB/resolver.jar
case "`uname`" in
CYGWIN*)
Modified: xmlbeans/trunk/bin/scomp.cmd
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/bin/scomp.cmd?view=diff&rev=537261&r1=537260&r2=537261
==============================================================================
--- xmlbeans/trunk/bin/scomp.cmd (original)
+++ xmlbeans/trunk/bin/scomp.cmd Fri May 11 11:35:20 2007
@@ -25,6 +25,7 @@
set cp=
set cp=%cp%;%XMLBEANS_LIB%\xbean.jar
+set cp=%cp%;%XMLBEANS_LIB%\xmlbeans-qname.jar
set cp=%cp%;%XMLBEANS_LIB%\jsr173_1.0_api.jar
set cp=%cp%;%JAVA_HOME%\lib\tools.jar
set cp=%cp%;%XMLBEANS_LIB%\resolver.jar
Modified: xmlbeans/trunk/bin/scopy.cmd
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/bin/scopy.cmd?view=diff&rev=537261&r1=537260&r2=537261
==============================================================================
--- xmlbeans/trunk/bin/scopy.cmd (original)
+++ xmlbeans/trunk/bin/scopy.cmd Fri May 11 11:35:20 2007
@@ -24,7 +24,7 @@
if "%XMLBEANS_LIB%" EQU "" call "%~dp0_setlib"
set cp=
-set cp=%cp%;%XMLBEANS_LIB%\xbean.jar;%XMLBEANS_LIB%\jsr173_1.0_api.jar
+set cp=%cp%;%XMLBEANS_LIB%\xbean.jar;%XMLBEANS_LIB%\xmlbeans-qname.jar;%XMLBEANS_LIB%\jsr173_1.0_api.jar
java -classpath "%cp%" org.apache.xmlbeans.impl.tool.SchemaCopy %*
Modified: xmlbeans/trunk/bin/sdownload
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/bin/sdownload?view=diff&rev=537261&r1=537260&r2=537261
==============================================================================
--- xmlbeans/trunk/bin/sdownload (original)
+++ xmlbeans/trunk/bin/sdownload Fri May 11 11:35:20 2007
@@ -20,7 +20,7 @@
if [ -z "$XMLBEANS_LIB" ]; then . `dirname $0`/_setlib; fi
-cp=$XMLBEANS_LIB/xbean.jar:$XMLBEANS_LIB/jsr173_1.0_api.jar
+cp=$XMLBEANS_LIB/xbean.jar:$XMLBEANS_LIB/xmlbeans-qname.jar:$XMLBEANS_LIB/jsr173_1.0_api.jar
case "`uname`" in
CYGWIN*)
Modified: xmlbeans/trunk/bin/sdownload.cmd
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/bin/sdownload.cmd?view=diff&rev=537261&r1=537260&r2=537261
==============================================================================
--- xmlbeans/trunk/bin/sdownload.cmd (original)
+++ xmlbeans/trunk/bin/sdownload.cmd Fri May 11 11:35:20 2007
@@ -25,6 +25,7 @@
set cp=
set cp=%cp%;%XMLBEANS_LIB%\xbean.jar
+set cp=%cp%;%XMLBEANS_LIB%\xmlbeans-qname.jar
set cp=%cp%;%XMLBEANS_LIB%\jsr173_1.0_api.jar
set cp=%cp%;%XMLBEANS_LIB%\resolver.jar
Modified: xmlbeans/trunk/bin/sfactor
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/bin/sfactor?view=diff&rev=537261&r1=537260&r2=537261
==============================================================================
--- xmlbeans/trunk/bin/sfactor (original)
+++ xmlbeans/trunk/bin/sfactor Fri May 11 11:35:20 2007
@@ -22,7 +22,7 @@
if [ -z "$XMLBEANS_LIB" ]; then . `dirname $0`/_setlib; fi
-cp=$XMLBEANS_LIB/xbean.jar:$XMLBEANS_LIB/jsr173_1.0_api.jar:$XMLBEANS_LIB/resolver.jar
+cp=$XMLBEANS_LIB/xbean.jar:$XMLBEANS_LIB/xmlbeans-qname.jar:$XMLBEANS_LIB/jsr173_1.0_api.jar:$XMLBEANS_LIB/resolver.jar
case "`uname`" in
CYGWIN*)
Modified: xmlbeans/trunk/bin/sfactor.cmd
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/bin/sfactor.cmd?view=diff&rev=537261&r1=537260&r2=537261
==============================================================================
--- xmlbeans/trunk/bin/sfactor.cmd (original)
+++ xmlbeans/trunk/bin/sfactor.cmd Fri May 11 11:35:20 2007
@@ -24,7 +24,7 @@
if "%XMLBEANS_LIB%" EQU "" call "%~dp0_setlib"
set cp=
-set cp=%cp%;%XMLBEANS_LIB%\xbean.jar;%XMLBEANS_LIB%\jsr173_1.0_api.jar;%XMLBEANS_LIB%\resolver.jar;
+set cp=%cp%;%XMLBEANS_LIB%\xbean.jar;%XMLBEANS_LIB%\xmlbeans-qname.jar;%XMLBEANS_LIB%\jsr173_1.0_api.jar;%XMLBEANS_LIB%\resolver.jar;
java -classpath "%cp%" org.apache.xmlbeans.impl.tool.FactorImports %*
Modified: xmlbeans/trunk/bin/svalidate
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/bin/svalidate?view=diff&rev=537261&r1=537260&r2=537261
==============================================================================
--- xmlbeans/trunk/bin/svalidate (original)
+++ xmlbeans/trunk/bin/svalidate Fri May 11 11:35:20 2007
@@ -21,7 +21,7 @@
if [ -z "$XMLBEANS_LIB" ]; then . `dirname $0`/_setlib; fi
-cp=$XMLBEANS_LIB/xbean.jar:$XMLBEANS_LIB/jsr173_1.0_api.jar:$XMLBEANS_LIB/jsr173_1.0_ri.jar
+cp=$XMLBEANS_LIB/xbean.jar:$XMLBEANS_LIB/xmlbeans-qname.jar:$XMLBEANS_LIB/jsr173_1.0_api.jar:$XMLBEANS_LIB/jsr173_1.0_ri.jar
case "`uname`" in
CYGWIN*)
Modified: xmlbeans/trunk/bin/svalidate.cmd
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/bin/svalidate.cmd?view=diff&rev=537261&r1=537260&r2=537261
==============================================================================
--- xmlbeans/trunk/bin/svalidate.cmd (original)
+++ xmlbeans/trunk/bin/svalidate.cmd Fri May 11 11:35:20 2007
@@ -25,6 +25,7 @@
set cp=
set cp=%cp%;%XMLBEANS_LIB%\xbean.jar
+set cp=%cp%;%XMLBEANS_LIB%\xmlbeans-qname.jar
set cp=%cp%;%XMLBEANS_LIB%\jsr173_1.0_api.jar
set cp=%cp%;%XMLBEANS_LIB%\jsr173_1.0_ri.jar
Modified: xmlbeans/trunk/bin/validate
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/bin/validate?view=diff&rev=537261&r1=537260&r2=537261
==============================================================================
--- xmlbeans/trunk/bin/validate (original)
+++ xmlbeans/trunk/bin/validate Fri May 11 11:35:20 2007
@@ -21,7 +21,7 @@
if [ -z "$XMLBEANS_LIB" ]; then . `dirname $0`/_setlib; fi
-cp=$XMLBEANS_LIB/xbean.jar:$XMLBEANS_LIB/jsr173_1.0_api.jar
+cp=$XMLBEANS_LIB/xbean.jar:$XMLBEANS_LIB/xmlbeans-qname.jar:$XMLBEANS_LIB/jsr173_1.0_api.jar
case "`uname`" in
CYGWIN*)
Modified: xmlbeans/trunk/bin/validate.cmd
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/bin/validate.cmd?view=diff&rev=537261&r1=537260&r2=537261
==============================================================================
--- xmlbeans/trunk/bin/validate.cmd (original)
+++ xmlbeans/trunk/bin/validate.cmd Fri May 11 11:35:20 2007
@@ -25,6 +25,7 @@
set cp=
set cp=%cp%;%XMLBEANS_LIB%\xbean.jar
+set cp=%cp%;%XMLBEANS_LIB%\xmlbeans-qname.jar
set cp=%cp%;%XMLBEANS_LIB%\jsr173_1.0_api.jar
java -classpath "%cp%" org.apache.xmlbeans.impl.tool.InstanceValidator %*
Modified: xmlbeans/trunk/bin/xpretty
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/bin/xpretty?view=diff&rev=537261&r1=537260&r2=537261
==============================================================================
--- xmlbeans/trunk/bin/xpretty (original)
+++ xmlbeans/trunk/bin/xpretty Fri May 11 11:35:20 2007
@@ -19,7 +19,7 @@
if [ -z "$XMLBEANS_LIB" ]; then . `dirname $0`/_setlib; fi
-cp=$XMLBEANS_LIB/xbean.jar:$XMLBEANS_LIB/jsr173_1.0_api.jar
+cp=$XMLBEANS_LIB/xbean.jar:$XMLBEANS_LIB/xmlbeans-qname.jar:$XMLBEANS_LIB/jsr173_1.0_api.jar
case "`uname`" in
CYGWIN*)
Modified: xmlbeans/trunk/bin/xpretty.cmd
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/bin/xpretty.cmd?view=diff&rev=537261&r1=537260&r2=537261
==============================================================================
--- xmlbeans/trunk/bin/xpretty.cmd (original)
+++ xmlbeans/trunk/bin/xpretty.cmd Fri May 11 11:35:20 2007
@@ -22,6 +22,6 @@
if "%XMLBEANS_LIB%" EQU "" call "%~dp0_setlib"
set cp=
-set cp=%cp%;%XMLBEANS_LIB%\xbean.jar;%XMLBEANS_LIB%\jsr173_1.0_api.jar
+set cp=%cp%;%XMLBEANS_LIB%\xbean.jar;%XMLBEANS_LIB%\xmlbeans-qname.jar;%XMLBEANS_LIB%\jsr173_1.0_api.jar
java -classpath "%cp%" org.apache.xmlbeans.impl.tool.PrettyPrinter %*
Modified: xmlbeans/trunk/bin/xsd2inst
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/bin/xsd2inst?view=diff&rev=537261&r1=537260&r2=537261
==============================================================================
--- xmlbeans/trunk/bin/xsd2inst (original)
+++ xmlbeans/trunk/bin/xsd2inst Fri May 11 11:35:20 2007
@@ -19,7 +19,7 @@
if [ -z "$XMLBEANS_LIB" ]; then . `dirname $0`/_setlib; fi
-cp=$XMLBEANS_LIB/xbean.jar:$XMLBEANS_LIB/jsr173_1.0_api.jar
+cp=$XMLBEANS_LIB/xbean.jar:$XMLBEANS_LIB/xmlbeans-qname.jar:$XMLBEANS_LIB/jsr173_1.0_api.jar
case "`uname`" in
CYGWIN*)
Modified: xmlbeans/trunk/bin/xsd2inst.cmd
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/bin/xsd2inst.cmd?view=diff&rev=537261&r1=537260&r2=537261
==============================================================================
--- xmlbeans/trunk/bin/xsd2inst.cmd (original)
+++ xmlbeans/trunk/bin/xsd2inst.cmd Fri May 11 11:35:20 2007
@@ -24,6 +24,7 @@
set cp=
set cp=%cp%;%XMLBEANS_LIB%\xbean.jar
+set cp=%cp%;%XMLBEANS_LIB%\xmlbeans-qname.jar
set cp=%cp%;%XMLBEANS_LIB%\jsr173_1.0_api.jar
java -classpath "%cp%" org.apache.xmlbeans.impl.xsd2inst.SchemaInstanceGenerator %*
Modified: xmlbeans/trunk/bin/xsdtree
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/bin/xsdtree?view=diff&rev=537261&r1=537260&r2=537261
==============================================================================
--- xmlbeans/trunk/bin/xsdtree (original)
+++ xmlbeans/trunk/bin/xsdtree Fri May 11 11:35:20 2007
@@ -19,7 +19,7 @@
if [ -z "$XMLBEANS_LIB" ]; then . `dirname $0`/_setlib; fi
-cp=$XMLBEANS_LIB/xbean.jar:$XMLBEANS_LIB/jsr173_1.0_api.jar
+cp=$XMLBEANS_LIB/xbean.jar:$XMLBEANS_LIB/xmlbeans-qname.jar:$XMLBEANS_LIB/jsr173_1.0_api.jar
case "`uname`" in
CYGWIN*)
Modified: xmlbeans/trunk/bin/xsdtree.cmd
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/bin/xsdtree.cmd?view=diff&rev=537261&r1=537260&r2=537261
==============================================================================
--- xmlbeans/trunk/bin/xsdtree.cmd (original)
+++ xmlbeans/trunk/bin/xsdtree.cmd Fri May 11 11:35:20 2007
@@ -22,6 +22,6 @@
if "%XMLBEANS_LIB%" EQU "" call "%~dp0_setlib"
set cp=
-set cp=%cp%;%XMLBEANS_LIB%\xbean.jar;%XMLBEANS_LIB%\jsr173_1.0_api.jar;
+set cp=%cp%;%XMLBEANS_LIB%\xbean.jar;%XMLBEANS_LIB%\xmlbeans-qname.jar;%XMLBEANS_LIB%\jsr173_1.0_api.jar;
java -classpath "%cp%" org.apache.xmlbeans.impl.tool.TypeHierarchyPrinter %*
Modified: xmlbeans/trunk/bin/xstc
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/bin/xstc?view=diff&rev=537261&r1=537260&r2=537261
==============================================================================
--- xmlbeans/trunk/bin/xstc (original)
+++ xmlbeans/trunk/bin/xstc Fri May 11 11:35:20 2007
@@ -19,7 +19,7 @@
if [ -z "$XMLBEANS_LIB" ]; then . `dirname $0`/_setlib; fi
-cp=$XMLBEANS_LIB/xbean.jar:$XMLBEANS_LIB/jsr173_1.0_api.jar:$XMLBEANS_LIB/resolver.jar
+cp=$XMLBEANS_LIB/xbean.jar:$XMLBEANS_LIB/xmlbeans-qname.jar:$XMLBEANS_LIB/jsr173_1.0_api.jar:$XMLBEANS_LIB/resolver.jar
case "`uname`" in
CYGWIN*)
Modified: xmlbeans/trunk/bin/xstc.cmd
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/bin/xstc.cmd?view=diff&rev=537261&r1=537260&r2=537261
==============================================================================
--- xmlbeans/trunk/bin/xstc.cmd (original)
+++ xmlbeans/trunk/bin/xstc.cmd Fri May 11 11:35:20 2007
@@ -23,6 +23,7 @@
set cp=
set cp=%cp%;%XMLBEANS_LIB%\xbean.jar
+set cp=%cp%;%XMLBEANS_LIB%\xmlbeans-qname.jar
set cp=%cp%;%XMLBEANS_LIB%\jsr173_1.0_api.jar
set cp=%cp%;%XMLBEANS_LIB%\resolver.jar
Modified: xmlbeans/trunk/build.xml
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/build.xml?view=diff&rev=537261&r1=537260&r2=537261
==============================================================================
--- xmlbeans/trunk/build.xml (original)
+++ xmlbeans/trunk/build.xml Fri May 11 11:35:20 2007
@@ -186,7 +186,7 @@
</target>
- <target name="xbean" depends="xbean.jar">
+ <target name="xbean" depends="xbean.jar,xmlpublic.jar">
<copy file="build/lib/xbean.jar" tofile="build/ar/xbean.jar"/>
</target>
@@ -344,6 +344,7 @@
<fileset dir="build/lib">
<include name="xbean.jar"/>
<include name="xmlpublic.jar"/>
+ <include name="xmlbeans-qname.jar"/>
<include name="xbean_xpath.jar"/>
<include name="resolver.jar"/>
<include name="jsr173_1.0_api.jar"/>
@@ -446,7 +447,8 @@
xmlinputstream.classes, resolver.jar, xbean_xpath.jar,
piccolo.classes, tools.classes, jamsupport.classes">
<jar jarfile="build/lib/xbean.jar" index="true">
- <fileset dir="build/classes/xmlpublic"/>
+ <fileset dir="build/classes/xmlpublic"
+ excludes="javax/**"/>
<fileset dir="build/classes/typeholder"/>
<fileset dir="build/classes/typestore"/>
<fileset dir="build/classes/common"/>
@@ -476,6 +478,10 @@
</section>
</manifest>
</jar>
+ <jar jarfile="build/lib/xmlbeans-qname.jar">
+ <fileset dir="build/classes/xmlpublic"
+ includes="javax/xml/namespace/QName.class,javax/xml/namespace/NamespaceContext.class"/>
+ </jar>
</target>
<!-- build XMLInputStream interface ============================================= -->
@@ -514,7 +520,8 @@
<target name="xmlpublic.jar" depends="dirs,xmlinputstream.classes, xmlpublic.classes, xmlschema.classes, xsdschema.classes">
<jar jarfile="build/lib/xmlpublic.jar" index="true">
- <fileset dir="build/classes/xmlpublic"/>
+ <fileset dir="build/classes/xmlpublic"
+ excludes="javax/**"/>
<fileset dir="build/classes/xmlschema"/>
<fileset dir="build/classes/xsdschema"/>
<manifest>
@@ -546,13 +553,13 @@
<!-- common target ============================================= -->
- <target name="common.classes" depends="dirs, xmlpublic.jar, xmlinputstream.classes, jsr173_1.0.jars">
+ <target name="common.classes" depends="dirs, xmlpublic.classes, xmlinputstream.classes, jsr173_1.0.jars">
<mkdir dir="build/classes/common"/>
<javac srcdir="src/common" destdir="build/classes/common" source="${javac.source}" target="${javac.target}" debug="on">
<classpath>
<pathelement location="build/lib/jsr173_1.0_api.jar"/>
<pathelement location="build/classes/xmlinputstream"/>
- <pathelement location="build/lib/xmlpublic.jar"/>
+ <pathelement location="build/classes/xmlpublic"/>
</classpath>
</javac>
@@ -738,6 +745,7 @@
<path id="bootstrap.run.path">
<pathelement location="build/private/lib/oldxbean.jar"/>
<pathelement location="build/lib/jsr173_1.0_api.jar"/>
+ <pathelement location="build/classes/xmlpublic"/>
</path>
<path id="bootstrap.compile.path">
@@ -797,11 +805,11 @@
<!-- xmlconfig target =============================================== -->
- <target name="xmlconfig.classes" depends="dirs, xmlpublic.jar, configschema.classes">
+ <target name="xmlconfig.classes" depends="dirs, xmlpublic.classes, configschema.classes">
<mkdir dir="build/classes/xmlconfig"/>
<javac srcdir="src/xmlconfig" destdir="build/classes/xmlconfig" source="${javac.source}" target="${javac.target}" debug="on">
<classpath>
- <pathelement location="build/lib/xmlpublic.jar"/>
+ <pathelement location="build/classes/xmlpublic"/>
<pathelement location="build/classes/configschema"/>
</classpath>
</javac>
@@ -928,7 +936,7 @@
<!-- xpath target ============================================= -->
- <target name="xpath.classes" depends="dirs, xmlpublic.jar, store.classes, saxon8.jar">
+ <target name="xpath.classes" depends="dirs, xmlpublic.classes, store.classes, saxon8.jar">
<mkdir dir="build/classes/xpath_xquery"/>
<javac
destdir="build/classes/xpath_xquery"
Modified: xmlbeans/trunk/external/lib/oldxbean.jar
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/external/lib/oldxbean.jar?view=diff&rev=537261&r1=537260&r2=537261
==============================================================================
Binary files - no diff available.
Modified: xmlbeans/trunk/samples/AbstractTypes/build.xml
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/samples/AbstractTypes/build.xml?view=diff&rev=537261&r1=537260&r2=537261
==============================================================================
--- xmlbeans/trunk/samples/AbstractTypes/build.xml (original)
+++ xmlbeans/trunk/samples/AbstractTypes/build.xml Fri May 11 11:35:20 2007
@@ -29,7 +29,7 @@
<echo message="xmlbeans.lib: ${xmlbeans.lib}"/>
<path id="xmlbeans.classpath">
- <fileset dir="${xmlbeans.lib}" includes="xbean.jar,jsr173_1.0_api.jar"/>
+ <fileset dir="${xmlbeans.lib}" includes="xbean.jar,xmlbeans-qname.jar,jsr173_1.0_api.jar"/>
</path>
<taskdef name="scomp"
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xmlbeans.apache.org
For additional commands, e-mail: commits-help@xmlbeans.apache.org