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 2006/04/29 05:02:16 UTC

svn commit: r398074 - in /xmlbeans/trunk/bin: _setlib dumpxsb inst2xsd scomp sdownload sfactor svalidate validate xpretty xsd2inst xsdtree xstc

Author: radup
Date: Fri Apr 28 20:02:15 2006
New Revision: 398074

URL: http://svn.apache.org/viewcvs?rev=398074&view=rev
Log:
Enable XMLBeans installation in a directory containing spaces and also passing files containing spaces as arguments to the scripts.

Modified:
    xmlbeans/trunk/bin/_setlib
    xmlbeans/trunk/bin/dumpxsb
    xmlbeans/trunk/bin/inst2xsd
    xmlbeans/trunk/bin/scomp
    xmlbeans/trunk/bin/sdownload
    xmlbeans/trunk/bin/sfactor
    xmlbeans/trunk/bin/svalidate
    xmlbeans/trunk/bin/validate
    xmlbeans/trunk/bin/xpretty
    xmlbeans/trunk/bin/xsd2inst
    xmlbeans/trunk/bin/xsdtree
    xmlbeans/trunk/bin/xstc

Modified: xmlbeans/trunk/bin/_setlib
URL: http://svn.apache.org/viewcvs/xmlbeans/trunk/bin/_setlib?rev=398074&r1=398073&r2=398074&view=diff
==============================================================================
--- xmlbeans/trunk/bin/_setlib (original)
+++ xmlbeans/trunk/bin/_setlib Fri Apr 28 20:02:15 2006
@@ -15,18 +15,18 @@
 ##  limitations under the License.
 ##
 
-if [ -z $XMLBEANS_HOME ]; then
+if [ -z "$XMLBEANS_HOME" ]; then
     XMLBEANS_HOME=`dirname $0`/..
 fi
 
 XMLBEANS_LIB=
-if [ -f $XMLBEANS_HOME/build/lib/xbean.jar ]; then
+if [ -f "$XMLBEANS_HOME"/build/lib/xbean.jar ]; then
     XMLBEANS_LIB=$XMLBEANS_HOME/build/lib
 fi
-if [ -f $XMLBEANS_HOME/lib/xbean.jar ]; then
+if [ -f "$XMLBEANS_HOME"/lib/xbean.jar ]; then
     XMLBEANS_LIB=$XMLBEANS_HOME/lib
 fi
 
-if [ -z $XMLBEANS_LIB ]; then
+if [ -z "$XMLBEANS_LIB" ]; then
     echo "ERROR: Could not find xbean.jar, try set XMLBEANS_LIB to the directory containing xbean.jar"
 fi

Modified: xmlbeans/trunk/bin/dumpxsb
URL: http://svn.apache.org/viewcvs/xmlbeans/trunk/bin/dumpxsb?rev=398074&r1=398073&r2=398074&view=diff
==============================================================================
--- xmlbeans/trunk/bin/dumpxsb (original)
+++ xmlbeans/trunk/bin/dumpxsb Fri Apr 28 20:02:15 2006
@@ -20,7 +20,7 @@
 
 echo `dirname $0`
 
-if [ -z $XMLBEANS_LIB ]; then . `dirname $0`/_setlib; fi
+if [ -z "$XMLBEANS_LIB" ]; then . `dirname $0`/_setlib; fi
 
 cp=$XMLBEANS_LIB/xbean.jar:$XMLBEANS_LIB/jsr173_1.0_api.jar
 
@@ -30,4 +30,4 @@
         ;;
 esac
 
-java -classpath $cp org.apache.xmlbeans.impl.tool.XsbDumper $*
+java -classpath "$cp" org.apache.xmlbeans.impl.tool.XsbDumper "$@"

Modified: xmlbeans/trunk/bin/inst2xsd
URL: http://svn.apache.org/viewcvs/xmlbeans/trunk/bin/inst2xsd?rev=398074&r1=398073&r2=398074&view=diff
==============================================================================
--- xmlbeans/trunk/bin/inst2xsd (original)
+++ xmlbeans/trunk/bin/inst2xsd Fri Apr 28 20:02:15 2006
@@ -18,7 +18,7 @@
 #Instance to Schema tool
 #Builds xsd files from xml instance files.
 
-if [ -z $XMLBEANS_LIB ]; then . `dirname $0`/_setlib; fi
+if [ -z "$XMLBEANS_LIB" ]; then . `dirname $0`/_setlib; fi
 
 cp=$XMLBEANS_LIB/xbean.jar:$XMLBEANS_LIB/jsr173_1.0_api.jar
 
@@ -28,4 +28,4 @@
         ;;
 esac
 
-java -classpath $cp org.apache.xmlbeans.impl.inst2xsd.Inst2Xsd $*
+java -classpath "$cp" org.apache.xmlbeans.impl.inst2xsd.Inst2Xsd "$@"

Modified: xmlbeans/trunk/bin/scomp
URL: http://svn.apache.org/viewcvs/xmlbeans/trunk/bin/scomp?rev=398074&r1=398073&r2=398074&view=diff
==============================================================================
--- xmlbeans/trunk/bin/scomp (original)
+++ xmlbeans/trunk/bin/scomp Fri Apr 28 20:02:15 2006
@@ -18,7 +18,7 @@
 #Schema compiler
 #Builds XBean types from xsd files.
 
-if [ -z $XMLBEANS_LIB ]; then . `dirname $0`/_setlib; fi
+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
 
@@ -28,4 +28,4 @@
         ;;
 esac
 
-java -Xmx256m -classpath $cp org.apache.xmlbeans.impl.tool.SchemaCompiler $*
+java -Xmx256m -classpath "$cp" org.apache.xmlbeans.impl.tool.SchemaCompiler "$@"

Modified: xmlbeans/trunk/bin/sdownload
URL: http://svn.apache.org/viewcvs/xmlbeans/trunk/bin/sdownload?rev=398074&r1=398073&r2=398074&view=diff
==============================================================================
--- xmlbeans/trunk/bin/sdownload (original)
+++ xmlbeans/trunk/bin/sdownload Fri Apr 28 20:02:15 2006
@@ -18,7 +18,7 @@
 #Schema downloader
 #Tool to download Schema files
 
-if [ -z $XMLBEANS_LIB ]; then . `dirname $0`/_setlib; fi
+if [ -z "$XMLBEANS_LIB" ]; then . `dirname $0`/_setlib; fi
 
 cp=$XMLBEANS_LIB/xbean.jar:$XMLBEANS_LIB/jsr173_1.0_api.jar
 
@@ -28,4 +28,4 @@
         ;;
 esac
 
-java -classpath $cp org.apache.xmlbeans.impl.tool.SchemaResourceManager $*
+java -classpath "$cp" org.apache.xmlbeans.impl.tool.SchemaResourceManager "$@"

Modified: xmlbeans/trunk/bin/sfactor
URL: http://svn.apache.org/viewcvs/xmlbeans/trunk/bin/sfactor?rev=398074&r1=398073&r2=398074&view=diff
==============================================================================
--- xmlbeans/trunk/bin/sfactor (original)
+++ xmlbeans/trunk/bin/sfactor Fri Apr 28 20:02:15 2006
@@ -20,7 +20,7 @@
 ## Factors redundant definitions out of a set of schemas and 
 ## uses imports instead.
 
-if [ -z $XMLBEANS_LIB ]; then . `dirname $0`/_setlib; fi
+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
 
@@ -30,5 +30,5 @@
         ;;
 esac
 
-java -Xmx256m -classpath $cp org.apache.xmlbeans.impl.tool.FactorImports $*
+java -Xmx256m -classpath "$cp" org.apache.xmlbeans.impl.tool.FactorImports "$@"
 

Modified: xmlbeans/trunk/bin/svalidate
URL: http://svn.apache.org/viewcvs/xmlbeans/trunk/bin/svalidate?rev=398074&r1=398073&r2=398074&view=diff
==============================================================================
--- xmlbeans/trunk/bin/svalidate (original)
+++ xmlbeans/trunk/bin/svalidate Fri Apr 28 20:02:15 2006
@@ -19,14 +19,14 @@
 #
 # Validates an instance against a schema.
 
-if [ -z $XMLBEANS_LIB ]; then . `dirname $0`/_setlib; fi
+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/jsr173_1.0_api.jar:$XMLBEANS_LIB/jsr173_1.0_ri.jar
 
 case "`uname`" in
     CYGWIN*)
-        CP=`cygpath -w -p $CP`
+        cp=`cygpath -w -p $cp`
         ;;
 esac
 
-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?rev=398074&r1=398073&r2=398074&view=diff
==============================================================================
--- xmlbeans/trunk/bin/validate (original)
+++ xmlbeans/trunk/bin/validate Fri Apr 28 20:02:15 2006
@@ -19,14 +19,14 @@
 #
 # Validates an instance against a schema.
 
-if [ -z $XMLBEANS_LIB ]; then . `dirname $0`/_setlib; fi
+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/jsr173_1.0_api.jar
 
 case "`uname`" in
     CYGWIN*)
-        CP=`cygpath -w -p $CP`
+        cp=`cygpath -w -p $cp`
         ;;
 esac
 
-exec java -classpath $CP org.apache.xmlbeans.impl.tool.InstanceValidator $*
+exec java -classpath "$cp" org.apache.xmlbeans.impl.tool.InstanceValidator "$@"

Modified: xmlbeans/trunk/bin/xpretty
URL: http://svn.apache.org/viewcvs/xmlbeans/trunk/bin/xpretty?rev=398074&r1=398073&r2=398074&view=diff
==============================================================================
--- xmlbeans/trunk/bin/xpretty (original)
+++ xmlbeans/trunk/bin/xpretty Fri Apr 28 20:02:15 2006
@@ -17,7 +17,7 @@
 
 #Invokes pretty printer
 
-if [ -z $XMLBEANS_LIB ]; then . `dirname $0`/_setlib; fi
+if [ -z "$XMLBEANS_LIB" ]; then . `dirname $0`/_setlib; fi
 
 cp=$XMLBEANS_LIB/xbean.jar:$XMLBEANS_LIB/jsr173_1.0_api.jar
 
@@ -27,4 +27,4 @@
         ;;
 esac
 
-java -classpath $cp org.apache.xmlbeans.impl.tool.PrettyPrinter $*
+java -classpath "$cp" org.apache.xmlbeans.impl.tool.PrettyPrinter "$@"

Modified: xmlbeans/trunk/bin/xsd2inst
URL: http://svn.apache.org/viewcvs/xmlbeans/trunk/bin/xsd2inst?rev=398074&r1=398073&r2=398074&view=diff
==============================================================================
--- xmlbeans/trunk/bin/xsd2inst (original)
+++ xmlbeans/trunk/bin/xsd2inst Fri Apr 28 20:02:15 2006
@@ -17,7 +17,7 @@
 
 #Schema to instance tool
 
-if [ -z $XMLBEANS_LIB ]; then . `dirname $0`/_setlib; fi
+if [ -z "$XMLBEANS_LIB" ]; then . `dirname $0`/_setlib; fi
 
 cp=$XMLBEANS_LIB/xbean.jar:$XMLBEANS_LIB/jsr173_1.0_api.jar
 
@@ -27,4 +27,4 @@
         ;;
 esac
 
-java -classpath $cp org.apache.xmlbeans.impl.xsd2inst.SchemaInstanceGenerator $*
+java -classpath "$cp" org.apache.xmlbeans.impl.xsd2inst.SchemaInstanceGenerator "$@"

Modified: xmlbeans/trunk/bin/xsdtree
URL: http://svn.apache.org/viewcvs/xmlbeans/trunk/bin/xsdtree?rev=398074&r1=398073&r2=398074&view=diff
==============================================================================
--- xmlbeans/trunk/bin/xsdtree (original)
+++ xmlbeans/trunk/bin/xsdtree Fri Apr 28 20:02:15 2006
@@ -17,7 +17,7 @@
 
 # Invokes type hierarchy printer
 
-if [ -z $XMLBEANS_LIB ]; then . `dirname $0`/_setlib; fi
+if [ -z "$XMLBEANS_LIB" ]; then . `dirname $0`/_setlib; fi
 
 cp=$XMLBEANS_LIB/xbean.jar:$XMLBEANS_LIB/jsr173_1.0_api.jar
 
@@ -27,4 +27,4 @@
         ;;
 esac
 
-java -Xmx256m -classpath $cp org.apache.xmlbeans.impl.tool.TypeHierarchyPrinter $*
+java -Xmx256m -classpath "$cp" org.apache.xmlbeans.impl.tool.TypeHierarchyPrinter "$@"

Modified: xmlbeans/trunk/bin/xstc
URL: http://svn.apache.org/viewcvs/xmlbeans/trunk/bin/xstc?rev=398074&r1=398073&r2=398074&view=diff
==============================================================================
--- xmlbeans/trunk/bin/xstc (original)
+++ xmlbeans/trunk/bin/xstc Fri Apr 28 20:02:15 2006
@@ -17,7 +17,7 @@
 
 # Invokes XSTC
 
-if [ -z $XMLBEANS_LIB ]; then . `dirname $0`/_setlib; fi
+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
 
@@ -27,4 +27,4 @@
         ;;
 esac
 
-java -classpath $cp org.apache.xmlbeans.impl.tool.XSTCTester $*
+java -classpath "$cp" org.apache.xmlbeans.impl.tool.XSTCTester "$@"



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