xmlbeans-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ra...@apache.org
Subject svn commit: r151215 - in xmlbeans/trunk: bin/dumpxsb bin/inst2xsd bin/scomp bin/svalidate bin/validate bin/xsd2inst bin/xsdtree build.xml external/lib/oldxbean.jar xkit/README.txt xkit/anttask.html
Date Thu, 03 Feb 2005 19:56:20 GMT
Author: radup
Date: Thu Feb  3 11:56:13 2005
New Revision: 151215

URL: http://svn.apache.org/viewcvs?view=rev&rev=151215
Log:
Distribution cleanup work.

Removed:
    xmlbeans/trunk/xkit/anttask.html
Modified:
    xmlbeans/trunk/bin/dumpxsb
    xmlbeans/trunk/bin/inst2xsd
    xmlbeans/trunk/bin/scomp
    xmlbeans/trunk/bin/svalidate
    xmlbeans/trunk/bin/validate
    xmlbeans/trunk/bin/xsd2inst
    xmlbeans/trunk/bin/xsdtree
    xmlbeans/trunk/build.xml
    xmlbeans/trunk/external/lib/oldxbean.jar
    xmlbeans/trunk/xkit/README.txt

Modified: xmlbeans/trunk/bin/dumpxsb
URL: http://svn.apache.org/viewcvs/xmlbeans/trunk/bin/dumpxsb?view=diff&r1=151214&r2=151215
==============================================================================
--- xmlbeans/trunk/bin/dumpxsb (original)
+++ xmlbeans/trunk/bin/dumpxsb Thu Feb  3 11:56:13 2005
@@ -4,7 +4,12 @@
 #Prints the contents of an xsb file in human-readmble form
 
 cp=
+if [ -f $XMLBEANS_HOME/build/ar/xbean.jar ];
+then
 cp=$cp:$XMLBEANS_HOME/build/ar/xbean.jar:$XMLBEANS_HOME/build/lib/jsr173_api.jar
+else
+cp=$cp:$XMLBEANS_HOME/lib/xbean.jar:$XMLBEANS_HOME/lib/jsr173_api.jar
+fi
 
 case "`uname`" in
     CYGWIN*)

Modified: xmlbeans/trunk/bin/inst2xsd
URL: http://svn.apache.org/viewcvs/xmlbeans/trunk/bin/inst2xsd?view=diff&r1=151214&r2=151215
==============================================================================
--- xmlbeans/trunk/bin/inst2xsd (original)
+++ xmlbeans/trunk/bin/inst2xsd Thu Feb  3 11:56:13 2005
@@ -4,7 +4,12 @@
 #Builds xsd files from xml instance files.
 
 cp=
-cp=$cp:$XMLBEANS_HOME/build/ar/xbean.jar:$XMLBEANS_HOME/build/lib/jsr173_api.jar:$XMLBEANS_HOME/build/lib/resolver.jar
+if [ -f $XMLBEANS_HOME/build/ar/xbean.jar ];
+then
+cp=$cp:$XMLBEANS_HOME/build/ar/xbean.jar:$XMLBEANS_HOME/build/lib/jsr173_api.jar
+else
+cp=$cp:$XMLBEANS_HOME/lib/xbean.jar:$XMLBEANS_HOME/lib/jsr173_api.jar
+fi
 
 case "`uname`" in
     CYGWIN*)

Modified: xmlbeans/trunk/bin/scomp
URL: http://svn.apache.org/viewcvs/xmlbeans/trunk/bin/scomp?view=diff&r1=151214&r2=151215
==============================================================================
--- xmlbeans/trunk/bin/scomp (original)
+++ xmlbeans/trunk/bin/scomp Thu Feb  3 11:56:13 2005
@@ -4,7 +4,12 @@
 #Builds XBean types from xsd files.
 
 cp=
-cp=$cp:$XMLBEANS_HOME/build/ar/xbean.jar:$XMLBEANS_HOME/build/lib/jsr173_api.jar:$XMLBEANS_HOME/build/lib/resolver.jar
+if [ -f $XMLBEANS_HOME/build/ar/xbean.jar ];
+then
+cp=$cp:$XMLBEANS_HOME/build/ar/xbean.jar:$XMLBEANS_HOME/build/lib/jsr173_api.jar:$XMLBEANS_HOME/build/lib/resolver.jar;
+else
+cp=$cp:$XMLBEANS_HOME/lib/xbean.jar:$XMLBEANS_HOME/lib/jsr173_api.jar:$XMLBEANS_HOME/lib/resolver.jar;
+fi
 
 case "`uname`" in
     CYGWIN*)

Modified: xmlbeans/trunk/bin/svalidate
URL: http://svn.apache.org/viewcvs/xmlbeans/trunk/bin/svalidate?view=diff&r1=151214&r2=151215
==============================================================================
--- xmlbeans/trunk/bin/svalidate (original)
+++ xmlbeans/trunk/bin/svalidate Thu Feb  3 11:56:13 2005
@@ -4,7 +4,12 @@
 #
 # Validates an instance against a schema.
 
+if [ -f $XMLBEANS_HOME/build/ar/xbean.jar ];
+then
 CP=$XMLBEANS_HOME/build/ar/xbean.jar:$XMLBEANS_HOME/build/lib/jsr173_api.jar:$XMLBEANS_HOME/build/lib/jsr173_ri.jar
+else
+cp=$cp:$XMLBEANS_HOME/lib/xbean.jar:$XMLBEANS_HOME/lib/jsr173_api.jar:$XMLBEANS_HOME/lib/jsr173_ri.jar
+fi
 
 case "`uname`" in
     CYGWIN*)
@@ -12,4 +17,4 @@
         ;;
 esac
 
-exec java -classpath $CP org.apache.xmlbeans.impl.tool.StreamInstanceValidator $*
+java -classpath $CP org.apache.xmlbeans.impl.tool.StreamInstanceValidator $*

Modified: xmlbeans/trunk/bin/validate
URL: http://svn.apache.org/viewcvs/xmlbeans/trunk/bin/validate?view=diff&r1=151214&r2=151215
==============================================================================
--- xmlbeans/trunk/bin/validate (original)
+++ xmlbeans/trunk/bin/validate Thu Feb  3 11:56:13 2005
@@ -5,7 +5,12 @@
 # Validates an instance against a schema.
 
 CP=
+if [ -f $XMLBEANS_HOME/build/ar/xbean.jar ];
+then
 CP=$CP:$XMLBEANS_HOME/build/ar/xbean.jar:$XMLBEANS_HOME/build/lib/jsr173_api.jar
+else
+CP=$CP:$XMLBEANS_HOME/lib/xbean.jar:$XMLBEANS_HOME/lib/jsr173_api.jar
+fi
 
 case "`uname`" in
     CYGWIN*)

Modified: xmlbeans/trunk/bin/xsd2inst
URL: http://svn.apache.org/viewcvs/xmlbeans/trunk/bin/xsd2inst?view=diff&r1=151214&r2=151215
==============================================================================
--- xmlbeans/trunk/bin/xsd2inst (original)
+++ xmlbeans/trunk/bin/xsd2inst Thu Feb  3 11:56:13 2005
@@ -3,7 +3,12 @@
 #Schema to instance tool
 
 cp=
+if [ -f $XMLBEANS_HOME/build/ar/xbean.jar ];
+then
 cp=$XMLBEANS_HOME/build/ar/xbean.jar:$XMLBEANS_HOME/build/lib/jsr173_api.jar
+else
+cp=$cp:$XMLBEANS_HOME/lib/xbean.jar:$XMLBEANS_HOME/lib/jsr173_api.jar
+fi
 
 case "`uname`" in
     CYGWIN*)

Modified: xmlbeans/trunk/bin/xsdtree
URL: http://svn.apache.org/viewcvs/xmlbeans/trunk/bin/xsdtree?view=diff&r1=151214&r2=151215
==============================================================================
--- xmlbeans/trunk/bin/xsdtree (original)
+++ xmlbeans/trunk/bin/xsdtree Thu Feb  3 11:56:13 2005
@@ -3,7 +3,12 @@
 # Invokes type hierarchy printer
 
 cp=
-cp=$cp:$XMLBEANS_HOME/build/ar/xbean.jar:$XMLBEANS_HOME/build/lib/jsr173_api.jar:$XMLBEANS_HOME/build/lib/resolver.jar
+if [ -f $XMLBEANS_HOME/build/ar/xbean.jar ];
+then
+cp=$cp:$XMLBEANS_HOME/build/ar/xbean.jar:$XMLBEANS_HOME/build/lib/jsr173_api.jar
+else
+cp=$cp:$XMLBEANS_HOME/lib/xbean.jar:$XMLBEANS_HOME/lib/jsr173_api.jar
+fi
 
 case "`uname`" in
     CYGWIN*)

Modified: xmlbeans/trunk/build.xml
URL: http://svn.apache.org/viewcvs/xmlbeans/trunk/build.xml?view=diff&r1=151214&r2=151215
==============================================================================
--- xmlbeans/trunk/build.xml (original)
+++ xmlbeans/trunk/build.xml Thu Feb  3 11:56:13 2005
@@ -260,22 +260,22 @@
             <fileset dir="src/xmlschema/schema" includes="XML.xsd"/>
         </copy>
         <copy todir="build/private/xmlbeans-${product.version}/schemas">
-            <fileset dir="test/src" includes="easypo/*.xsd,easypo/*.xsdconfig"/>
-            <fileset dir="test/cases/schema" includes="cyclone/**/*.xsd,j2ee/*.xsd"/>
+            <fileset dir="test/cases/xbean/xmlobject"
+                includes="easypo.xsd,easypo.xsdconfig,numerals.xsd,nameworld.xsd"/>
         </copy>
 
         <mkdir dir="build/private/xmlbeans-${product.version}/lib"/>
         <copy todir="build/private/xmlbeans-${product.version}/lib" file="build/ar/xbean.jar"/>
 
-        <mkdir dir="build/private/xmlbeans-${product.version}/src/schema"/>
-        <copy todir="build/private/xmlbeans-${product.version}/src/schema">
-            <fileset dir="src/toolschema"/>
-        </copy>
-
         <mkdir dir="build/private/xmlbeans-${product.version}/docs"/>
         <copy todir="build/private/xmlbeans-${product.version}/docs">
             <fileset dir="build/docs"/>
         </copy>
+        
+        <mkdir dir="build/private/xmlbeans-${product.version}/samples"/>
+        <copy todir="build/private/xmlbeans-${product.version}/samples">
+            <fileset dir="samples/cursor"/>
+        </copy>
 
         <zip destfile="build/private/xmlbeans-${product.version}.zip"
             basedir="build/private"
@@ -291,19 +291,22 @@
         <delete file="build/private/xmlbeans-${product.version}-src.tgz"/>
 
         <zip destfile="build/private/xmlbeans-${product.version}-src.zip">
-            <zipfileset
-                dir="."
-                includes="**"
-                excludes="build/**"
-                prefix="xmlbeans-${product.version}"/>
+            <zipfileset dir="." prefix="xmlbeans-${product.version}">
+                <patternset id="src.dist.content.dirs"
+                    includes="bin/** docs/** external/** samples/** src/**"/>
+                <patternset id="src.dist.content.files"
+                    includes="build.xml README.txt testbuild.xml xbeanenv.cmd xbeanenv.sh"/>
+           	    <patternset id="src.dist.content.tests"
+                    includes=""/><!-- don't have tests part of the distribution yet
-->
+            </zipfileset>
         </zip>
         <tar destfile="build/private/xmlbeans-${product.version}-src.tgz"
             compression="gzip">
-            <tarfileset
-                dir="."
-                includes="**"
-                excludes="build/**"
-                prefix="xmlbeans-${product.version}"/>
+            <tarfileset dir="." prefix="xmlbeans-${product.version}">
+                <patternset refid="src.dist.content.dirs"/>
+                <patternset refid="src.dist.content.files"/>
+                <patternset refid="src.dist.content.tests"/>
+            </tarfileset>
         </tar>
     </target>
 

Modified: xmlbeans/trunk/external/lib/oldxbean.jar
URL: http://svn.apache.org/viewcvs/xmlbeans/trunk/external/lib/oldxbean.jar?view=diff&r1=151214&r2=151215
==============================================================================
Binary files - no diff available.

Modified: xmlbeans/trunk/xkit/README.txt
URL: http://svn.apache.org/viewcvs/xmlbeans/trunk/xkit/README.txt?view=diff&r1=151214&r2=151215
==============================================================================
--- xmlbeans/trunk/xkit/README.txt (original)
+++ xmlbeans/trunk/xkit/README.txt Thu Feb  3 11:56:13 2005
@@ -7,41 +7,45 @@
 Kit contents:
 
 (1) One copy of xbean.jar, which contains XMLBeans.
-    Should work on any JDK 1.4.x.
+    Should work on any JDK 1.4.x or 1.5.x.
     ./lib/xbean.jar
 
 (2) License information for XML Beans and included libraries
-    ./license.txt
+    ./license.txt ???????????????
 
 (3) One folder full of command-line scripts, pointing to the
     useful main() functions in the JAR.
     ./bin
 
-(4) One bit of ant task documentation.
-    ./anttask.html
-
-(5) A copy of the plain javadoc tree for org.apache.xmlbeans.*
+(4) A copy of the plain javadoc tree for org.apache.xmlbeans.*
     ./docs/reference
 
-(6) A preliminary collection of nicely formatted user-level
+(5) A preliminary collection of nicely formatted user-level
     documentation HTML (includes reformatted and nicely
     organized javadoc as well)
     ./docs/guide
 
-(7) A few sample schemas
+(6) A few sample schemas
     ./schemas
 
+(7) Two samples that show the use of the XmlCursor API. Between
+    this README file and the two samples, you should be well on
+    your way to becoming an XmlBeans expert
+    ./samples
+
+(8) Tests ??????
+    ./tests
 
 Where to start?
 
 (1) Setup.
 
-    1. make sure you have a JDK 1.4.x installed; that java[.exe]
-       is on your path and that JAVA_HOME/bin contains java[.exe],
-       javac[.exe], and jar[.exe].
+    1. make sure you have a JDK 1.4.x installed (or 1.5.x); that
+       java[.exe] is on your path and that JAVA_HOME/bin contains
+       java[.exe], javac[.exe], and jar[.exe].
 
     2. set your XMLBEANS_HOME env variable to point to the directory
-       containing xbean.jar (i.e., ./lib).
+       in which you installed XmlBeans (i.e., /home/user/xmlbeans-2.0.0).
 
     3. put the scripts in ./bin on your path.
 
@@ -54,23 +58,25 @@
        schemas you can try out.
 
          - easypo: a contrived simple starter "purchase order"
-         - cyclone: an actual customer schema (cyclonecommerce.com)
-         - s4s: the Schema for Schema
-         - j2ee: j2ee descriptor schemas
+         - nameworld: another simple schema
+         - numerals: schema illustrating the use of various flavors
+                     of XmlSchema simple types
+         - s4s: the Schema for Schema and Schema for XML
 
        To compile them, you can just send the whole directory to
-       scomp, for example, "cd samples"; then "scomp easypo".
+       scomp, "scomp samples", or compile each file individually,
+       "cd samples"; then "scomp easypo.xsd".
        You will get an "xmltypes.jar" out that contains all the
        compiled XMLBeans.  To pick your own JAR filename just say
 
-       scomp -out myeasypo.jar easypo
+       scomp -out myeasypo.jar easypo.xsd
 
 
     2. Especially as you get started, you will want to see the
        .java source code for the generated code.  To get that,
        use a command-line like
 
-       scomp -src mysrcdir -out myeasypo.jar easypo
+       scomp -src mysrcdir -out myeasypo.jar easypo.xsd
 
        The "mysrcdir" will contain all the .java source code
        for the generated XMLBeans.
@@ -116,11 +122,12 @@
       org.apache.xmlbeans.XmlBeans, including a function that can be
       used to determine whether a Java class is an XmlBean and
       functions to manage runtime-loading of schema type
-      systems.
+      systems or programatically compiling Schema files
 
     With that, you're ready to navigate the javadoc and play
     with the code.  Also, try reading some of our 
-    docs that are included in ./docs
+    docs that are included in ./docs and samples, included
+    in ./samples
 
 (3) Try some of the other utilities; you can also see a few
     examples of XMLBean techniques in their source code.
@@ -157,3 +164,6 @@
        of a type system.  They are analogous to .class files
        for .java.
 
+    5. "inst2xsd"
+
+    6. "xsd2inst"



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xmlbeans.apache.org
For additional commands, e-mail: commits-help@xmlbeans.apache.org


Mime
View raw message