You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by fa...@apache.org on 2019/09/24 19:35:12 UTC
svn commit: r1867490 - in /xmlbeans/trunk/src: shell/
xmlpublic/org/apache/xmlbeans/
Author: fanningpj
Date: Tue Sep 24 19:35:12 2019
New Revision: 1867490
URL: http://svn.apache.org/viewvc?rev=1867490&view=rev
Log:
fix up classpaths in shell scripts
Modified:
xmlbeans/trunk/src/shell/_setlib
xmlbeans/trunk/src/shell/_setlib.cmd
xmlbeans/trunk/src/shell/dumpxsb
xmlbeans/trunk/src/shell/dumpxsb.cmd
xmlbeans/trunk/src/shell/inst2xsd
xmlbeans/trunk/src/shell/inst2xsd.cmd
xmlbeans/trunk/src/shell/scomp
xmlbeans/trunk/src/shell/scomp.cmd
xmlbeans/trunk/src/shell/scopy.cmd
xmlbeans/trunk/src/shell/sdownload
xmlbeans/trunk/src/shell/sdownload.cmd
xmlbeans/trunk/src/shell/sfactor
xmlbeans/trunk/src/shell/sfactor.cmd
xmlbeans/trunk/src/shell/svalidate
xmlbeans/trunk/src/shell/svalidate.cmd
xmlbeans/trunk/src/shell/validate
xmlbeans/trunk/src/shell/validate.cmd
xmlbeans/trunk/src/shell/xpretty
xmlbeans/trunk/src/shell/xpretty.cmd
xmlbeans/trunk/src/shell/xsd2inst
xmlbeans/trunk/src/shell/xsd2inst.cmd
xmlbeans/trunk/src/shell/xsdtree
xmlbeans/trunk/src/shell/xsdtree.cmd
xmlbeans/trunk/src/shell/xstc
xmlbeans/trunk/src/shell/xstc.cmd
xmlbeans/trunk/src/xmlpublic/org/apache/xmlbeans/XmlBeans.java
Modified: xmlbeans/trunk/src/shell/_setlib
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/shell/_setlib?rev=1867490&r1=1867489&r2=1867490&view=diff
==============================================================================
--- xmlbeans/trunk/src/shell/_setlib (original)
+++ xmlbeans/trunk/src/shell/_setlib Tue Sep 24 19:35:12 2019
@@ -20,13 +20,13 @@ if [ -z "$XMLBEANS_HOME" ]; then
fi
XMLBEANS_LIB=
-if [ -f "$XMLBEANS_HOME"/build/lib/xbean.jar ]; then
+if [ -f "$XMLBEANS_HOME"/build/lib/xmlbeans*.jar ]; then
XMLBEANS_LIB=$XMLBEANS_HOME/build/lib
fi
-if [ -f "$XMLBEANS_HOME"/lib/xbean.jar ]; then
+if [ -f "$XMLBEANS_HOME"/lib/xmlbeans*.jar ]; then
XMLBEANS_LIB=$XMLBEANS_HOME/lib
fi
if [ -z "$XMLBEANS_LIB" ]; then
- echo "ERROR: Could not find xbean.jar, try set XMLBEANS_LIB to the directory containing xbean.jar"
+ echo "ERROR: Could not find xmlbeans*.jar, try set XMLBEANS_LIB to the directory containing xmlbeans*.jar"
fi
Modified: xmlbeans/trunk/src/shell/_setlib.cmd
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/shell/_setlib.cmd?rev=1867490&r1=1867489&r2=1867490&view=diff
==============================================================================
--- xmlbeans/trunk/src/shell/_setlib.cmd (original)
+++ xmlbeans/trunk/src/shell/_setlib.cmd Tue Sep 24 19:35:12 2019
@@ -15,14 +15,14 @@
@REM
@rem Common script to set the XMLBEANS_LIB variable
-@rem to the directory containing xbean.jar
+@rem to the directory containing xmlbeans.jar
@echo off
if "%XMLBEANS_HOME%" EQU "" (set XMLBEANS_HOME=%~dp0..)
set XMLBEANS_LIB=
-if exist "%XMLBEANS_HOME%\build\lib\xbean.jar" set XMLBEANS_LIB=%XMLBEANS_HOME%\build\lib
-if exist "%XMLBEANS_HOME%\lib\xbean.jar" set XMLBEANS_LIB=%XMLBEANS_HOME%\lib
+if exist "%XMLBEANS_HOME%\build\lib\xmlbeans*.jar" set XMLBEANS_LIB=%XMLBEANS_HOME%\build\lib
+if exist "%XMLBEANS_HOME%\lib\xmlbeans*.jar" set XMLBEANS_LIB=%XMLBEANS_HOME%\lib
-if "%XMLBEANS_LIB%" EQU "" echo "ERROR: Could not find xbean.jar, try setting XMLBEANS_LIB to the directory containing xbean.jar"
+if "%XMLBEANS_LIB%" EQU "" echo "ERROR: Could not find xmlbeans*.jar, try setting XMLBEANS_LIB to the directory containing xmlbeans*.jar"
Modified: xmlbeans/trunk/src/shell/dumpxsb
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/shell/dumpxsb?rev=1867490&r1=1867489&r2=1867490&view=diff
==============================================================================
--- xmlbeans/trunk/src/shell/dumpxsb (original)
+++ xmlbeans/trunk/src/shell/dumpxsb Tue Sep 24 19:35:12 2019
@@ -22,7 +22,7 @@ echo `dirname $0`
if [ -z "$XMLBEANS_LIB" ]; then . `dirname $0`/_setlib; fi
-cp=$XMLBEANS_LIB/xbean.jar:$XMLBEANS_LIB/xmlbeans-qname.jar:$XMLBEANS_LIB/jsr173_1.0_api.jar
+cp=$XMLBEANS_LIB/*
case "`uname`" in
CYGWIN*)
Modified: xmlbeans/trunk/src/shell/dumpxsb.cmd
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/shell/dumpxsb.cmd?rev=1867490&r1=1867489&r2=1867490&view=diff
==============================================================================
--- xmlbeans/trunk/src/shell/dumpxsb.cmd (original)
+++ xmlbeans/trunk/src/shell/dumpxsb.cmd Tue Sep 24 19:35:12 2019
@@ -23,7 +23,7 @@ setlocal
if "%XMLBEANS_LIB%" EQU "" call "%~dp0_setlib"
set cp=
-set cp=%cp%;%XMLBEANS_LIB%\xbean.jar;%XMLBEANS_LIB%\xmlbeans-qname.jar;%XMLBEANS_LIB%\jsr173_1.0_api.jar
+set cp=%cp%;%XMLBEANS_LIB%\*;%XMLBEANS_LIB%\jsr173_1.0_api.jar
java -classpath "%cp%" org.apache.xmlbeans.impl.tool.XsbDumper %*
Modified: xmlbeans/trunk/src/shell/inst2xsd
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/shell/inst2xsd?rev=1867490&r1=1867489&r2=1867490&view=diff
==============================================================================
--- xmlbeans/trunk/src/shell/inst2xsd (original)
+++ xmlbeans/trunk/src/shell/inst2xsd Tue Sep 24 19:35:12 2019
@@ -20,7 +20,7 @@
if [ -z "$XMLBEANS_LIB" ]; then . `dirname $0`/_setlib; fi
-cp=$XMLBEANS_LIB/xbean.jar:$XMLBEANS_LIB/xmlbeans-qname.jar:$XMLBEANS_LIB/jsr173_1.0_api.jar
+cp=$XMLBEANS_LIB/*
case "`uname`" in
CYGWIN*)
Modified: xmlbeans/trunk/src/shell/inst2xsd.cmd
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/shell/inst2xsd.cmd?rev=1867490&r1=1867489&r2=1867490&view=diff
==============================================================================
--- xmlbeans/trunk/src/shell/inst2xsd.cmd (original)
+++ xmlbeans/trunk/src/shell/inst2xsd.cmd Tue Sep 24 19:35:12 2019
@@ -24,7 +24,7 @@ setlocal
if "%XMLBEANS_LIB%" EQU "" call "%~dp0_setlib"
set cp=
-set cp=%cp%;%XMLBEANS_LIB%\xbean.jar;%XMLBEANS_LIB%\xmlbeans-qname.jar
+set cp=%cp%;%XMLBEANS_LIB%\*
set cp=%cp%;%XMLBEANS_LIB%\jsr173_1.0_api.jar
set cp=%cp%;%XMLBEANS_LIB%\resolver.jar
Modified: xmlbeans/trunk/src/shell/scomp
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/shell/scomp?rev=1867490&r1=1867489&r2=1867490&view=diff
==============================================================================
--- xmlbeans/trunk/src/shell/scomp (original)
+++ xmlbeans/trunk/src/shell/scomp Tue Sep 24 19:35:12 2019
@@ -20,7 +20,7 @@
if [ -z "$XMLBEANS_LIB" ]; then . `dirname $0`/_setlib; fi
-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
+cp=$XMLBEANS_LIB/*:$JAVA_HOME/lib/tools.jar
case "`uname`" in
CYGWIN*)
Modified: xmlbeans/trunk/src/shell/scomp.cmd
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/shell/scomp.cmd?rev=1867490&r1=1867489&r2=1867490&view=diff
==============================================================================
--- xmlbeans/trunk/src/shell/scomp.cmd (original)
+++ xmlbeans/trunk/src/shell/scomp.cmd Tue Sep 24 19:35:12 2019
@@ -24,8 +24,7 @@ setlocal
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%\*
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/src/shell/scopy.cmd
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/shell/scopy.cmd?rev=1867490&r1=1867489&r2=1867490&view=diff
==============================================================================
--- xmlbeans/trunk/src/shell/scopy.cmd (original)
+++ xmlbeans/trunk/src/shell/scopy.cmd Tue Sep 24 19:35:12 2019
@@ -24,7 +24,7 @@ setlocal
if "%XMLBEANS_LIB%" EQU "" call "%~dp0_setlib"
set cp=
-set cp=%cp%;%XMLBEANS_LIB%\xbean.jar;%XMLBEANS_LIB%\xmlbeans-qname.jar;%XMLBEANS_LIB%\jsr173_1.0_api.jar
+set cp=%cp%;%XMLBEANS_LIB%\*;%XMLBEANS_LIB%\jsr173_1.0_api.jar
java -classpath "%cp%" org.apache.xmlbeans.impl.tool.SchemaCopy %*
Modified: xmlbeans/trunk/src/shell/sdownload
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/shell/sdownload?rev=1867490&r1=1867489&r2=1867490&view=diff
==============================================================================
--- xmlbeans/trunk/src/shell/sdownload (original)
+++ xmlbeans/trunk/src/shell/sdownload Tue Sep 24 19:35:12 2019
@@ -20,7 +20,7 @@
if [ -z "$XMLBEANS_LIB" ]; then . `dirname $0`/_setlib; fi
-cp=$XMLBEANS_LIB/xbean.jar:$XMLBEANS_LIB/xmlbeans-qname.jar:$XMLBEANS_LIB/jsr173_1.0_api.jar
+cp=$XMLBEANS_LIB/*
case "`uname`" in
CYGWIN*)
Modified: xmlbeans/trunk/src/shell/sdownload.cmd
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/shell/sdownload.cmd?rev=1867490&r1=1867489&r2=1867490&view=diff
==============================================================================
--- xmlbeans/trunk/src/shell/sdownload.cmd (original)
+++ xmlbeans/trunk/src/shell/sdownload.cmd Tue Sep 24 19:35:12 2019
@@ -24,8 +24,7 @@ setlocal
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%\*
set cp=%cp%;%XMLBEANS_LIB%\jsr173_1.0_api.jar
set cp=%cp%;%XMLBEANS_LIB%\resolver.jar
Modified: xmlbeans/trunk/src/shell/sfactor
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/shell/sfactor?rev=1867490&r1=1867489&r2=1867490&view=diff
==============================================================================
--- xmlbeans/trunk/src/shell/sfactor (original)
+++ xmlbeans/trunk/src/shell/sfactor Tue Sep 24 19:35:12 2019
@@ -22,7 +22,7 @@
if [ -z "$XMLBEANS_LIB" ]; then . `dirname $0`/_setlib; fi
-cp=$XMLBEANS_LIB/xbean.jar:$XMLBEANS_LIB/xmlbeans-qname.jar:$XMLBEANS_LIB/jsr173_1.0_api.jar:$XMLBEANS_LIB/resolver.jar
+cp=$XMLBEANS_LIB/*:$XMLBEANS_LIB/resolver.jar
case "`uname`" in
CYGWIN*)
Modified: xmlbeans/trunk/src/shell/sfactor.cmd
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/shell/sfactor.cmd?rev=1867490&r1=1867489&r2=1867490&view=diff
==============================================================================
--- xmlbeans/trunk/src/shell/sfactor.cmd (original)
+++ xmlbeans/trunk/src/shell/sfactor.cmd Tue Sep 24 19:35:12 2019
@@ -24,7 +24,7 @@ setlocal
if "%XMLBEANS_LIB%" EQU "" call "%~dp0_setlib"
set cp=
-set cp=%cp%;%XMLBEANS_LIB%\xbean.jar;%XMLBEANS_LIB%\xmlbeans-qname.jar;%XMLBEANS_LIB%\jsr173_1.0_api.jar;%XMLBEANS_LIB%\resolver.jar;
+set cp=%cp%;%XMLBEANS_LIB%\*;%XMLBEANS_LIB%\jsr173_1.0_api.jar;%XMLBEANS_LIB%\resolver.jar;
java -classpath "%cp%" org.apache.xmlbeans.impl.tool.FactorImports %*
Modified: xmlbeans/trunk/src/shell/svalidate
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/shell/svalidate?rev=1867490&r1=1867489&r2=1867490&view=diff
==============================================================================
--- xmlbeans/trunk/src/shell/svalidate (original)
+++ xmlbeans/trunk/src/shell/svalidate Tue Sep 24 19:35:12 2019
@@ -21,7 +21,7 @@
if [ -z "$XMLBEANS_LIB" ]; then . `dirname $0`/_setlib; fi
-cp=$XMLBEANS_LIB/xbean.jar:$XMLBEANS_LIB/xmlbeans-qname.jar:$XMLBEANS_LIB/jsr173_1.0_api.jar:$XMLBEANS_LIB/jsr173_1.0_ri.jar
+cp=$XMLBEANS_LIB/*:$XMLBEANS_LIB/jsr173_1.0_ri.jar
case "`uname`" in
CYGWIN*)
Modified: xmlbeans/trunk/src/shell/svalidate.cmd
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/shell/svalidate.cmd?rev=1867490&r1=1867489&r2=1867490&view=diff
==============================================================================
--- xmlbeans/trunk/src/shell/svalidate.cmd (original)
+++ xmlbeans/trunk/src/shell/svalidate.cmd Tue Sep 24 19:35:12 2019
@@ -24,8 +24,7 @@ setlocal
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%\*
set cp=%cp%;%XMLBEANS_LIB%\jsr173_1.0_api.jar
set cp=%cp%;%XMLBEANS_LIB%\jsr173_1.0_ri.jar
Modified: xmlbeans/trunk/src/shell/validate
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/shell/validate?rev=1867490&r1=1867489&r2=1867490&view=diff
==============================================================================
--- xmlbeans/trunk/src/shell/validate (original)
+++ xmlbeans/trunk/src/shell/validate Tue Sep 24 19:35:12 2019
@@ -21,7 +21,7 @@
if [ -z "$XMLBEANS_LIB" ]; then . `dirname $0`/_setlib; fi
-cp=$XMLBEANS_LIB/xbean.jar:$XMLBEANS_LIB/xmlbeans-qname.jar:$XMLBEANS_LIB/jsr173_1.0_api.jar
+cp=$XMLBEANS_LIB/*
case "`uname`" in
CYGWIN*)
Modified: xmlbeans/trunk/src/shell/validate.cmd
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/shell/validate.cmd?rev=1867490&r1=1867489&r2=1867490&view=diff
==============================================================================
--- xmlbeans/trunk/src/shell/validate.cmd (original)
+++ xmlbeans/trunk/src/shell/validate.cmd Tue Sep 24 19:35:12 2019
@@ -24,8 +24,7 @@ setlocal
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%\*
set cp=%cp%;%XMLBEANS_LIB%\jsr173_1.0_api.jar
java -classpath "%cp%" org.apache.xmlbeans.impl.tool.InstanceValidator %*
Modified: xmlbeans/trunk/src/shell/xpretty
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/shell/xpretty?rev=1867490&r1=1867489&r2=1867490&view=diff
==============================================================================
--- xmlbeans/trunk/src/shell/xpretty (original)
+++ xmlbeans/trunk/src/shell/xpretty Tue Sep 24 19:35:12 2019
@@ -19,7 +19,7 @@
if [ -z "$XMLBEANS_LIB" ]; then . `dirname $0`/_setlib; fi
-cp=$XMLBEANS_LIB/xbean.jar:$XMLBEANS_LIB/xmlbeans-qname.jar:$XMLBEANS_LIB/jsr173_1.0_api.jar
+cp=$XMLBEANS_LIB/*
case "`uname`" in
CYGWIN*)
Modified: xmlbeans/trunk/src/shell/xpretty.cmd
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/shell/xpretty.cmd?rev=1867490&r1=1867489&r2=1867490&view=diff
==============================================================================
--- xmlbeans/trunk/src/shell/xpretty.cmd (original)
+++ xmlbeans/trunk/src/shell/xpretty.cmd Tue Sep 24 19:35:12 2019
@@ -22,6 +22,6 @@ setlocal
if "%XMLBEANS_LIB%" EQU "" call "%~dp0_setlib"
set cp=
-set cp=%cp%;%XMLBEANS_LIB%\xbean.jar;%XMLBEANS_LIB%\xmlbeans-qname.jar;%XMLBEANS_LIB%\jsr173_1.0_api.jar
+set cp=%cp%;%XMLBEANS_LIB%\*;%XMLBEANS_LIB%\jsr173_1.0_api.jar
java -classpath "%cp%" org.apache.xmlbeans.impl.tool.PrettyPrinter %*
Modified: xmlbeans/trunk/src/shell/xsd2inst
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/shell/xsd2inst?rev=1867490&r1=1867489&r2=1867490&view=diff
==============================================================================
--- xmlbeans/trunk/src/shell/xsd2inst (original)
+++ xmlbeans/trunk/src/shell/xsd2inst Tue Sep 24 19:35:12 2019
@@ -19,7 +19,7 @@
if [ -z "$XMLBEANS_LIB" ]; then . `dirname $0`/_setlib; fi
-cp=$XMLBEANS_LIB/xbean.jar:$XMLBEANS_LIB/xmlbeans-qname.jar:$XMLBEANS_LIB/jsr173_1.0_api.jar
+cp=$XMLBEANS_LIB/*
case "`uname`" in
CYGWIN*)
Modified: xmlbeans/trunk/src/shell/xsd2inst.cmd
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/shell/xsd2inst.cmd?rev=1867490&r1=1867489&r2=1867490&view=diff
==============================================================================
--- xmlbeans/trunk/src/shell/xsd2inst.cmd (original)
+++ xmlbeans/trunk/src/shell/xsd2inst.cmd Tue Sep 24 19:35:12 2019
@@ -23,8 +23,7 @@ setlocal
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%\*
set cp=%cp%;%XMLBEANS_LIB%\jsr173_1.0_api.jar
java -classpath "%cp%" org.apache.xmlbeans.impl.xsd2inst.SchemaInstanceGenerator %*
Modified: xmlbeans/trunk/src/shell/xsdtree
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/shell/xsdtree?rev=1867490&r1=1867489&r2=1867490&view=diff
==============================================================================
--- xmlbeans/trunk/src/shell/xsdtree (original)
+++ xmlbeans/trunk/src/shell/xsdtree Tue Sep 24 19:35:12 2019
@@ -19,7 +19,7 @@
if [ -z "$XMLBEANS_LIB" ]; then . `dirname $0`/_setlib; fi
-cp=$XMLBEANS_LIB/xbean.jar:$XMLBEANS_LIB/xmlbeans-qname.jar:$XMLBEANS_LIB/jsr173_1.0_api.jar
+cp=$XMLBEANS_LIB/*
case "`uname`" in
CYGWIN*)
Modified: xmlbeans/trunk/src/shell/xsdtree.cmd
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/shell/xsdtree.cmd?rev=1867490&r1=1867489&r2=1867490&view=diff
==============================================================================
--- xmlbeans/trunk/src/shell/xsdtree.cmd (original)
+++ xmlbeans/trunk/src/shell/xsdtree.cmd Tue Sep 24 19:35:12 2019
@@ -22,6 +22,6 @@ setlocal
if "%XMLBEANS_LIB%" EQU "" call "%~dp0_setlib"
set cp=
-set cp=%cp%;%XMLBEANS_LIB%\xbean.jar;%XMLBEANS_LIB%\xmlbeans-qname.jar;%XMLBEANS_LIB%\jsr173_1.0_api.jar;
+set cp=%cp%;%XMLBEANS_LIB%\*;%XMLBEANS_LIB%\jsr173_1.0_api.jar;
java -classpath "%cp%" org.apache.xmlbeans.impl.tool.TypeHierarchyPrinter %*
Modified: xmlbeans/trunk/src/shell/xstc
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/shell/xstc?rev=1867490&r1=1867489&r2=1867490&view=diff
==============================================================================
--- xmlbeans/trunk/src/shell/xstc (original)
+++ xmlbeans/trunk/src/shell/xstc Tue Sep 24 19:35:12 2019
@@ -19,7 +19,7 @@
if [ -z "$XMLBEANS_LIB" ]; then . `dirname $0`/_setlib; fi
-cp=$XMLBEANS_LIB/xbean.jar:$XMLBEANS_LIB/xmlbeans-qname.jar:$XMLBEANS_LIB/jsr173_1.0_api.jar:$XMLBEANS_LIB/resolver.jar
+cp=$XMLBEANS_LIB/*:$XMLBEANS_LIB/resolver.jar
case "`uname`" in
CYGWIN*)
Modified: xmlbeans/trunk/src/shell/xstc.cmd
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/shell/xstc.cmd?rev=1867490&r1=1867489&r2=1867490&view=diff
==============================================================================
--- xmlbeans/trunk/src/shell/xstc.cmd (original)
+++ xmlbeans/trunk/src/shell/xstc.cmd Tue Sep 24 19:35:12 2019
@@ -22,8 +22,7 @@ setlocal
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%\*
set cp=%cp%;%XMLBEANS_LIB%\jsr173_1.0_api.jar
set cp=%cp%;%XMLBEANS_LIB%\resolver.jar
Modified: xmlbeans/trunk/src/xmlpublic/org/apache/xmlbeans/XmlBeans.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/xmlpublic/org/apache/xmlbeans/XmlBeans.java?rev=1867490&r1=1867489&r2=1867490&view=diff
==============================================================================
--- xmlbeans/trunk/src/xmlpublic/org/apache/xmlbeans/XmlBeans.java (original)
+++ xmlbeans/trunk/src/xmlpublic/org/apache/xmlbeans/XmlBeans.java Tue Sep 24 19:35:12 2019
@@ -167,7 +167,7 @@ public final class XmlBeans
throw causedException(
new IllegalStateException(
"Cannot load constructor for " + className +
- ": verify that xbean.jar is on the classpath" ), e );
+ ": verify that xmlbeans.jar is on the classpath" ), e );
}
}
@@ -185,7 +185,7 @@ public final class XmlBeans
throw causedException(
new IllegalStateException(
"Cannot load " + methodName +
- ": verify that xbean.jar is on the classpath" ), e );
+ ": verify that xmlbeans.jar is on the classpath" ), e );
}
}
@@ -332,7 +332,7 @@ public final class XmlBeans
}
catch (IllegalAccessException e)
{
- throw causedException(new IllegalStateException("No access to SchemaTypeLoaderImpl.getContextTypeLoader(): verify that version of xbean.jar is correct"), e);
+ throw causedException(new IllegalStateException("No access to SchemaTypeLoaderImpl.getContextTypeLoader(): verify that version of xmlbeans.jar is correct"), e);
}
catch (InvocationTargetException e)
{
@@ -355,7 +355,7 @@ public final class XmlBeans
}
catch (IllegalAccessException e)
{
- throw causedException(new IllegalStateException("No access to BuiltinSchemaTypeSystem.get(): verify that version of xbean.jar is correct"), e);
+ throw causedException(new IllegalStateException("No access to BuiltinSchemaTypeSystem.get(): verify that version of xmlbeans.jar is correct"), e);
}
catch (InvocationTargetException e)
{
@@ -379,7 +379,7 @@ public final class XmlBeans
{
throw causedException(
new IllegalStateException(
- "No access to nodeToCursor verify that version of xbean.jar is correct" ), e );
+ "No access to nodeToCursor verify that version of xmlbeans.jar is correct" ), e );
}
catch ( InvocationTargetException e )
{
@@ -403,7 +403,7 @@ public final class XmlBeans
{
throw causedException(
new IllegalStateException(
- "No access to nodeToXmlObject verify that version of xbean.jar is correct" ), e );
+ "No access to nodeToXmlObject verify that version of xmlbeans.jar is correct" ), e );
}
catch ( InvocationTargetException e )
{
@@ -427,7 +427,7 @@ public final class XmlBeans
{
throw causedException(
new IllegalStateException(
- "No access to nodeToXmlStreamReader verify that version of xbean.jar is correct" ), e );
+ "No access to nodeToXmlStreamReader verify that version of xmlbeans.jar is correct" ), e );
}
catch ( InvocationTargetException e )
{
@@ -451,7 +451,7 @@ public final class XmlBeans
{
throw causedException(
new IllegalStateException(
- "No access to streamToNode verify that version of xbean.jar is correct" ), e );
+ "No access to streamToNode verify that version of xmlbeans.jar is correct" ), e );
}
catch ( InvocationTargetException e )
{
@@ -513,7 +513,7 @@ public final class XmlBeans
}
catch (IllegalAccessException e)
{
- throw causedException(new IllegalStateException("No access to SchemaTypeLoaderImpl.forSchemaXml(): verify that version of xbean.jar is correct"), e);
+ throw causedException(new IllegalStateException("No access to SchemaTypeLoaderImpl.forSchemaXml(): verify that version of xmlbeans.jar is correct"), e);
}
catch (InvocationTargetException e)
{
@@ -672,7 +672,7 @@ public final class XmlBeans
}
catch (IllegalAccessException e)
{
- throw new IllegalStateException("No access to SchemaTypeLoaderImpl.forSchemaXml(): verify that version of xbean.jar is correct");
+ throw new IllegalStateException("No access to SchemaTypeLoaderImpl.forSchemaXml(): verify that version of xmlbeans.jar is correct");
}
catch (InvocationTargetException e)
{
@@ -697,7 +697,7 @@ public final class XmlBeans
}
catch (IllegalAccessException e)
{
- throw causedException(new IllegalStateException("No access to SchemaTypeLoaderImpl: verify that version of xbean.jar is correct"), e);
+ throw causedException(new IllegalStateException("No access to SchemaTypeLoaderImpl: verify that version of xmlbeans.jar is correct"), e);
}
catch (InvocationTargetException e)
{
@@ -720,7 +720,7 @@ public final class XmlBeans
}
catch (IllegalAccessException e)
{
- throw causedException(new IllegalStateException("No access to SchemaTypeLoaderImpl: verify that version of xbean.jar is correct"), e);
+ throw causedException(new IllegalStateException("No access to SchemaTypeLoaderImpl: verify that version of xmlbeans.jar is correct"), e);
}
catch (InvocationTargetException e)
{
@@ -745,7 +745,7 @@ public final class XmlBeans
}
catch (IllegalAccessException e)
{
- throw causedException(new IllegalStateException("No access to SchemaTypeLoaderImpl: verify that version of xbean.jar is correct"), e);
+ throw causedException(new IllegalStateException("No access to SchemaTypeLoaderImpl: verify that version of xmlbeans.jar is correct"), e);
}
catch (InvocationTargetException e)
{
@@ -779,7 +779,7 @@ public final class XmlBeans
throw new RuntimeException("SchemaTypeSystem is null for field " +
TYPE_SYSTEM_FIELD + " on class with name " + stsName +
"." + HOLDER_CLASS_NAME +
- ". Please verify the version of xbean.jar is correct.");
+ ". Please verify the version of xmlbeans.jar is correct.");
}
return sts;
}
@@ -793,19 +793,19 @@ public final class XmlBeans
{
throw causedException(new RuntimeException("Cannot find field " +
TYPE_SYSTEM_FIELD + " on class " + stsName + "." + HOLDER_CLASS_NAME +
- ". Please verify the version of xbean.jar is correct."), e);
+ ". Please verify the version of xmlbeans.jar is correct."), e);
}
catch (IllegalAccessException e)
{
throw causedException(new RuntimeException("Field " +
TYPE_SYSTEM_FIELD + " on class " + stsName + "." + HOLDER_CLASS_NAME +
- "is not accessible. Please verify the version of xbean.jar is correct."), e);
+ "is not accessible. Please verify the version of xmlbeans.jar is correct."), e);
}
}
/**
* Returns a new ResourceLoader for a search path where each component of
- * the path is either a directory or a compiled xbean jar.
+ * the path is either a directory or a compiled xmlbeans jar.
*/
public static ResourceLoader resourceLoaderForPath(File[] path)
{
@@ -815,7 +815,7 @@ public final class XmlBeans
}
catch (IllegalAccessException e)
{
- throw causedException(new IllegalStateException("No access to SchemaTypeLoaderImpl: verify that version of xbean.jar is correct"), e);
+ throw causedException(new IllegalStateException("No access to SchemaTypeLoaderImpl: verify that version of xmlbeans.jar is correct"), e);
}
catch (InstantiationException e)
{
@@ -862,7 +862,7 @@ public final class XmlBeans
}
catch (IllegalAccessException e)
{
- throw causedException(new IllegalStateException("No access to SchemaTypeLoaderImpl.getContextTypeLoader(): verify that version of xbean.jar is correct"), e);
+ throw causedException(new IllegalStateException("No access to SchemaTypeLoaderImpl.getContextTypeLoader(): verify that version of xmlbeans.jar is correct"), e);
}
catch (InvocationTargetException e)
{
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org