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.

git-svn-id: https://svn.apache.org/repos/asf/xmlbeans/trunk@537261 13f79535-47bb-0310-9956-ffa450edef68

Author: Radu Preotiuc

bin/dumpxsb

@@ -22,7 +22,7 @@ echo `dirname $0`
 
 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*)

bin/dumpxsb.cmd

@@ -23,7 +23,7 @@ setlocal
 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 %*
 

bin/inst2xsd

@@ -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*)

bin/inst2xsd.cmd

@@ -24,7 +24,7 @@ setlocal
 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
 

bin/scomp

@@ -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*)

bin/scomp.cmd

@@ -25,6 +25,7 @@ if "%XMLBEANS_LIB%" EQU "" call "%~dp0_setlib"
 
 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

bin/scopy.cmd

@@ -24,7 +24,7 @@ setlocal
 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 %*
 

bin/sdownload

@@ -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*)

bin/sdownload.cmd

@@ -25,6 +25,7 @@ if "%XMLBEANS_LIB%" EQU "" call "%~dp0_setlib"
 
 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
 

bin/sfactor

@@ -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*)

bin/sfactor.cmd

@@ -24,7 +24,7 @@ setlocal
 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 %*
 

bin/svalidate

@@ -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*)

bin/svalidate.cmd

@@ -25,6 +25,7 @@ if "%XMLBEANS_LIB%" EQU "" call "%~dp0_setlib"
 
 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
 

bin/validate

@@ -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*)

bin/validate.cmd

@@ -25,6 +25,7 @@ if "%XMLBEANS_LIB%" EQU "" call "%~dp0_setlib"
 
 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 %*

bin/xpretty

@@ -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*)

bin/xpretty.cmd

@@ -22,6 +22,6 @@ setlocal
 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 %*

bin/xsd2inst

@@ -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*)

bin/xsd2inst.cmd

@@ -24,6 +24,7 @@ if "%XMLBEANS_LIB%" EQU "" call "%~dp0_setlib"
 
 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 %*

bin/xsdtree

@@ -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*)

bin/xsdtree.cmd

@@ -22,6 +22,6 @@ setlocal
 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 %*

bin/xstc

@@ -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*)

bin/xstc.cmd

@@ -23,6 +23,7 @@ if "%XMLBEANS_LIB%" EQU "" call "%~dp0_setlib"
 
 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
 

build.xml

@@ -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"

external/lib/oldxbean.jar

@@ -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"