You are viewing a plain text version of this content. The canonical link for it is here.
Posted to xmlbeans-cvs@xml.apache.org by ce...@apache.org on 2004/07/08 22:29:59 UTC
cvs commit: xml-xmlbeans/v2/test/src/xmlobject/schematypes/checkin SchemaTypesTests.java
cezar 2004/07/08 13:29:59
Modified: v2 build.xml
v2/src/repackage/repackage Repackage.java
v2/src/xmlstore/org/apache/xmlbeans/impl/store Root.java
v2/test/src/xmlobject/schematypes/checkin
SchemaTypesTests.java
Log:
- Finally enabling Piccolo by default. XmlOptions.setLoadUseXMLReader (XMLReader xmlReader) can be used when a diffrent parser is required.
- outside repackaging works now also on piccolo
CR: Eric
Checkintest: passes
Revision Changes Path
1.73 +25 -13 xml-xmlbeans/v2/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/build.xml,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- build.xml 1 Jul 2004 17:18:10 -0000 1.72
+++ build.xml 8 Jul 2004 20:29:58 -0000 1.73
@@ -691,6 +691,7 @@
<property name="repackage_arg" value=""/>
<property name="schema_compiler" value="org.apache.xmlbeans.impl.tool.SchemaCompiler"/>
<property name="bootstrap_schema_compiler" value="org.apache.xmlbeans.impl.tool.SchemaCompiler"/>
+ <property name="piccolo_package_name" value="org.apache.xmlbeans.impl.piccolo"/>
<!--
Params to repackage are:
@@ -702,11 +703,6 @@
org.apache.xmlbeans and apache.xmlbeans.impl, the public and implementation
packages.
- new_schema_compiler
-
- The name of the class which will new the new schema compiler. Will replace
- ${schema_compiler} during the bootstrap process.
-
rp_source_dir
From where the sources come...
@@ -737,11 +733,32 @@
<param name="replacement" value="${new_repackage_arg}"/>
</antcall>
+
+ <!-- apply the repachage_spec on old schema_compiler and get the result in new_schema_compiler property -->
+ <java classpath="build/classes/repackage" classname="repackage.Repackage" failonerror="true"
+ inputstring="${schema_compiler}" outputproperty="new_schema_compiler">
+ <arg line="${new_repackage_arg}"/>
+ </java>
+ <!-- modify the new build script with the new property -->
<antcall target="edit_build_script">
<param name="token" value="schema_compiler"/>
<param name="replacement" value="${new_schema_compiler}"/>
</antcall>
+
+ <!-- apply the repachage_spec on old piccolo_package_name and get the result in new_piccolo_package_name property -->
+ <java classpath="build/classes/repackage" classname="repackage.Repackage" failonerror="true"
+ inputstring="${piccolo_package_name}" outputproperty="new_piccolo_package_name">
+ <arg line="${new_repackage_arg}"/>
+ </java>
+ <!-- modify the new build script with the new property -->
+ <antcall target="edit_build_script">
+ <param name="token" value="piccolo_package_name"/>
+ <param name="replacement" value="${new_piccolo_package_name}"/>
+ </antcall>
+
+
+
<ant dir="${rp_target_dir}" target="xbean" inheritAll="false"/>
@@ -966,29 +983,24 @@
<uptodate property="piccolo.classes.notRequired"
targetfile="build/ar/xbean.jar" >
<srcfiles dir="external/lib" includes="**/piccolo_*.jar"/>
- <srcfiles dir="build/classes/piccolo" includes="**/*.class"/>
- <srcfiles dir="build/private/piccolo/src" includes="**/*.java"/>
- <srcfiles dir="build/private/piccolo/src_repackage" includes="**/*.java"/>
</uptodate>
</target>
<target name="piccolo.classes" depends="piccolo.classes.check, dirs" unless="piccolo.classes.notRequired">
+ <delete dir="build/private/piccolo" />
<mkdir dir="build/private/piccolo" />
<unjar src="external/lib/piccolo_apache_dist_20040629.jar" dest="build/private/piccolo" />
<echo message="Re-packaging XmlBeans" />
- <property
- name="piccolo_repackage_spec"
- value="com.bluecast:org.apache.xmlbeans.impl.piccolo"/>
-
<java classname="repackage.Repackage" fork="true" failonerror="true">
<classpath>
<pathelement location="build/classes/repackage"/>
</classpath>
- <arg line="-repackage ${piccolo_repackage_spec} -f build/private/piccolo/src -t build/private/piccolo/src_repackage"/>
+ <arg line="-repackage com.bluecast:${piccolo_package_name} -f build/private/piccolo/src -t build/private/piccolo/src_repackage"/>
</java>
+ <delete dir="build/classes/piccolo" />
<mkdir dir="build/classes/piccolo" />
<javac
destdir="build/classes/piccolo"
1.7 +27 -4 xml-xmlbeans/v2/src/repackage/repackage/Repackage.java
Index: Repackage.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/src/repackage/repackage/Repackage.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Repackage.java 18 Mar 2004 23:25:35 -0000 1.6
+++ Repackage.java 8 Jul 2004 20:29:59 -0000 1.7
@@ -45,11 +45,14 @@
failure = true;
}
- if (failure || sourceDir == null || targetDir == null || repackageSpec == null)
- throw new RuntimeException("Usage: repackage -repackage [spec] -f [sourcedir] -t [targetdir]");
+ if (failure || repackageSpec == null || (sourceDir == null ^ targetDir == null))
+ throw new RuntimeException("Usage: repackage -repackage [spec] [ -f [sourcedir] -t [targetdir] ]");
_repackager = new Repackager(repackageSpec);
-
+
+ if (sourceDir==null || targetDir==null)
+ return;
+
_sourceBase = new File(sourceDir);
_targetBase = new File(targetDir);
}
@@ -57,6 +60,12 @@
public void repackage () throws Exception
{
+ if (_sourceBase==null || _targetBase==null)
+ { // read from system.in, write on system.out
+ System.out.println( _repackager.repackage(readInputStream(System.in)).toString() );
+ return;
+ }
+
_fromPackages = _repackager.getFromPackages();
_toPackages = _repackager.getToPackages();
@@ -341,7 +350,21 @@
return w.getBuffer();
}
-
+
+ StringBuffer readInputStream ( InputStream is )
+ throws IOException
+ {
+ Reader r = new InputStreamReader( is );
+ StringWriter w = new StringWriter();
+
+ copy( r, w );
+
+ w.close();
+ r.close();
+
+ return w.getBuffer();
+ }
+
public static void copyFile ( File from, File to ) throws IOException
{
to.getParentFile().mkdirs();
1.14 +8 -2 xml-xmlbeans/v2/src/xmlstore/org/apache/xmlbeans/impl/store/Root.java
Index: Root.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/src/xmlstore/org/apache/xmlbeans/impl/store/Root.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- Root.java 29 Jun 2004 19:23:16 -0000 1.13
+++ Root.java 8 Jul 2004 20:29:59 -0000 1.14
@@ -665,7 +665,7 @@
{
try
{
- Class pc = Class.forName( "com.bluecast.xml.Piccolo" );
+ Class pc = Class.forName( "org.apache.xmlbeans.impl.piccolo.xml.Piccolo" );
XMLReader xr = (XMLReader) pc.newInstance();
@@ -1118,7 +1118,13 @@
{
is.setSystemId( "file://" );
- getSaxLoader().load( this, is, options );
+ // check for user supplied XMLReader
+ XMLReader xmlReader = (options==null ? null : (XMLReader)options.get(XmlOptions.LOAD_USE_XMLREADER));
+
+ if (xmlReader!=null)
+ new DefaultSaxLoader(xmlReader);
+ else
+ getSaxLoader().load( this, is, options );
return autoTypedDocument( type, options );
}
1.4 +2 -2 xml-xmlbeans/v2/test/src/xmlobject/schematypes/checkin/SchemaTypesTests.java
Index: SchemaTypesTests.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/src/xmlobject/schematypes/checkin/SchemaTypesTests.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SchemaTypesTests.java 1 Jul 2004 00:01:30 -0000 1.3
+++ SchemaTypesTests.java 8 Jul 2004 20:29:59 -0000 1.4
@@ -109,7 +109,7 @@
Assert.assertEquals("http://dmoz.org/World/Fran\u00e7ais/", person.getAnyuriAtt().toString());
Assert.assertEquals("http://3space.org/space%20space/", person.getAnyuri().toString());
- //RuntimeException: src/xmlstore/com/bea/xml/store/Splay.java(1537): ns != null && ns.length() > 0 failed
+ //RuntimeException: src/xmlstore/org/apache/xmlbeans/impl/store/Splay.java(1537): ns != null && ns.length() > 0 failed
//Assert.assertEquals("JPEG", person.getNotationAtt().toString());
//Assert.assertEquals("GIF", person.getNotation().toString());
}
@@ -150,7 +150,7 @@
person.setQname(new QName("ddd","eee"));
Assert.assertEquals("{ddd}eee", person.getQname().toString());
- //Exception: src/xmlstore/com/bea/xml/store/Type.java(189): user == _user failed
+ //Exception: src/xmlstore/org/apache/xmlbeans/impl/store/Type.java(189): user == _user failed
// person.setAnyuriAtt(URI.create("b.d:7002"));
// Assert.assertEquals("b.d:7002", person.getAnyuriAtt().toString());
---------------------------------------------------------------------
To unsubscribe, e-mail: xmlbeans-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xmlbeans-cvs-help@xml.apache.org