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 2020/12/18 10:27:36 UTC
svn commit: r1884605 - in /xmlbeans/trunk: ./ src/main/shell/
Author: fanningpj
Date: Fri Dec 18 10:27:35 2020
New Revision: 1884605
URL: http://svn.apache.org/viewvc?rev=1884605&view=rev
Log:
include slf4j jars in bin packages
Modified:
xmlbeans/trunk/build.xml
xmlbeans/trunk/src/main/shell/dumpxsb
xmlbeans/trunk/src/main/shell/dumpxsb.cmd
xmlbeans/trunk/src/main/shell/inst2xsd.cmd
xmlbeans/trunk/src/main/shell/scomp.cmd
xmlbeans/trunk/src/main/shell/scopy.cmd
xmlbeans/trunk/src/main/shell/sdownload.cmd
xmlbeans/trunk/src/main/shell/sfactor.cmd
xmlbeans/trunk/src/main/shell/svalidate
xmlbeans/trunk/src/main/shell/svalidate.cmd
xmlbeans/trunk/src/main/shell/validate.cmd
xmlbeans/trunk/src/main/shell/xpretty.cmd
xmlbeans/trunk/src/main/shell/xsd2inst.cmd
xmlbeans/trunk/src/main/shell/xsdtree.cmd
xmlbeans/trunk/src/main/shell/xstc
xmlbeans/trunk/src/main/shell/xstc.cmd
Modified: xmlbeans/trunk/build.xml
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/build.xml?rev=1884605&r1=1884604&r2=1884605&view=diff
==============================================================================
--- xmlbeans/trunk/build.xml (original)
+++ xmlbeans/trunk/build.xml Fri Dec 18 10:27:35 2020
@@ -712,6 +712,12 @@
<include name="xmlbeans-${version.base}-javadoc.jar"/>
<include name="xmlbeans-${version.base}-sources.jar"/>
</zipfileset>
+ <zipfileset dir="lib/main" prefix="${prefix}/lib">
+ <include name="slf4j-*.jar"/>
+ </zipfileset>
+ <zipfileset dir="lib/tests" prefix="${prefix}/lib">
+ <include name="slf4j-*.jar"/>
+ </zipfileset>
</zip>
<tar destfile="build/xmlbeans-bin-${version.base}-${tstamp.dist}.tgz" compression="gzip" longfile="posix">
<tarfileset dir="." includes="LICENSE.txt,NOTICE.txt" prefix="${prefix}"/>
@@ -726,6 +732,12 @@
<include name="xmlbeans-${version.base}-javadoc.jar"/>
<include name="xmlbeans-${version.base}-sources.jar"/>
</tarfileset>
+ <tarfileset dir="lib/main" prefix="${prefix}/lib">
+ <include name="slf4j-*.jar"/>
+ </tarfileset>
+ <tarfileset dir="lib/tests" prefix="${prefix}/lib">
+ <include name="slf4j-*.jar"/>
+ </tarfileset>
</tar>
</target>
Modified: xmlbeans/trunk/src/main/shell/dumpxsb
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/shell/dumpxsb?rev=1884605&r1=1884604&r2=1884605&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/shell/dumpxsb (original)
+++ xmlbeans/trunk/src/main/shell/dumpxsb Fri Dec 18 10:27:35 2020
@@ -16,7 +16,7 @@
##
#XSB file dumper
-#Prints the contents of an xsb file in human-readmble form
+#Prints the contents of an xsb file in human-readable form
echo `dirname $0`
Modified: xmlbeans/trunk/src/main/shell/dumpxsb.cmd
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/shell/dumpxsb.cmd?rev=1884605&r1=1884604&r2=1884605&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/shell/dumpxsb.cmd (original)
+++ xmlbeans/trunk/src/main/shell/dumpxsb.cmd Fri Dec 18 10:27:35 2020
@@ -23,7 +23,7 @@ setlocal
if "%XMLBEANS_LIB%" EQU "" call "%~dp0_setlib"
set cp=
-set cp=%cp%;%XMLBEANS_LIB%\*;%XMLBEANS_LIB%\jsr173_1.0_api.jar
+set cp=%cp%;%XMLBEANS_LIB%\*
java -classpath "%cp%" org.apache.xmlbeans.impl.tool.XsbDumper %*
Modified: xmlbeans/trunk/src/main/shell/inst2xsd.cmd
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/shell/inst2xsd.cmd?rev=1884605&r1=1884604&r2=1884605&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/shell/inst2xsd.cmd (original)
+++ xmlbeans/trunk/src/main/shell/inst2xsd.cmd Fri Dec 18 10:27:35 2020
@@ -25,8 +25,6 @@ if "%XMLBEANS_LIB%" EQU "" call "%~dp0_s
set cp=
set cp=%cp%;%XMLBEANS_LIB%\*
-set cp=%cp%;%XMLBEANS_LIB%\jsr173_1.0_api.jar
-set cp=%cp%;%XMLBEANS_LIB%\resolver.jar
java -classpath "%cp%" org.apache.xmlbeans.impl.inst2xsd.Inst2Xsd %*
Modified: xmlbeans/trunk/src/main/shell/scomp.cmd
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/shell/scomp.cmd?rev=1884605&r1=1884604&r2=1884605&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/shell/scomp.cmd (original)
+++ xmlbeans/trunk/src/main/shell/scomp.cmd Fri Dec 18 10:27:35 2020
@@ -25,9 +25,7 @@ if "%XMLBEANS_LIB%" EQU "" call "%~dp0_s
set cp=
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
java -classpath "%cp%" org.apache.xmlbeans.impl.tool.SchemaCompiler %*
Modified: xmlbeans/trunk/src/main/shell/scopy.cmd
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/shell/scopy.cmd?rev=1884605&r1=1884604&r2=1884605&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/shell/scopy.cmd (original)
+++ xmlbeans/trunk/src/main/shell/scopy.cmd Fri Dec 18 10:27:35 2020
@@ -24,7 +24,7 @@ setlocal
if "%XMLBEANS_LIB%" EQU "" call "%~dp0_setlib"
set cp=
-set cp=%cp%;%XMLBEANS_LIB%\*;%XMLBEANS_LIB%\jsr173_1.0_api.jar
+set cp=%cp%;%XMLBEANS_LIB%\*
java -classpath "%cp%" org.apache.xmlbeans.impl.tool.SchemaCopy %*
Modified: xmlbeans/trunk/src/main/shell/sdownload.cmd
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/shell/sdownload.cmd?rev=1884605&r1=1884604&r2=1884605&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/shell/sdownload.cmd (original)
+++ xmlbeans/trunk/src/main/shell/sdownload.cmd Fri Dec 18 10:27:35 2020
@@ -25,8 +25,6 @@ if "%XMLBEANS_LIB%" EQU "" call "%~dp0_s
set cp=
set cp=%cp%;%XMLBEANS_LIB%\*
-set cp=%cp%;%XMLBEANS_LIB%\jsr173_1.0_api.jar
-set cp=%cp%;%XMLBEANS_LIB%\resolver.jar
java -classpath "%cp%" org.apache.xmlbeans.impl.tool.SchemaResourceManager %*
Modified: xmlbeans/trunk/src/main/shell/sfactor.cmd
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/shell/sfactor.cmd?rev=1884605&r1=1884604&r2=1884605&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/shell/sfactor.cmd (original)
+++ xmlbeans/trunk/src/main/shell/sfactor.cmd Fri Dec 18 10:27:35 2020
@@ -24,7 +24,7 @@ setlocal
if "%XMLBEANS_LIB%" EQU "" call "%~dp0_setlib"
set cp=
-set cp=%cp%;%XMLBEANS_LIB%\*;%XMLBEANS_LIB%\jsr173_1.0_api.jar;%XMLBEANS_LIB%\resolver.jar;
+set cp=%cp%;%XMLBEANS_LIB%\*
java -classpath "%cp%" org.apache.xmlbeans.impl.tool.FactorImports %*
Modified: xmlbeans/trunk/src/main/shell/svalidate
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/shell/svalidate?rev=1884605&r1=1884604&r2=1884605&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/shell/svalidate (original)
+++ xmlbeans/trunk/src/main/shell/svalidate Fri Dec 18 10:27:35 2020
@@ -21,7 +21,7 @@
if [ -z "$XMLBEANS_LIB" ]; then . `dirname $0`/_setlib; fi
-cp=$XMLBEANS_LIB/*:$XMLBEANS_LIB/jsr173_1.0_ri.jar
+cp=$XMLBEANS_LIB/*
case "`uname`" in
CYGWIN*)
Modified: xmlbeans/trunk/src/main/shell/svalidate.cmd
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/shell/svalidate.cmd?rev=1884605&r1=1884604&r2=1884605&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/shell/svalidate.cmd (original)
+++ xmlbeans/trunk/src/main/shell/svalidate.cmd Fri Dec 18 10:27:35 2020
@@ -25,8 +25,6 @@ if "%XMLBEANS_LIB%" EQU "" call "%~dp0_s
set cp=
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
java -classpath "%cp%" org.apache.xmlbeans.impl.tool.StreamInstanceValidator %*
Modified: xmlbeans/trunk/src/main/shell/validate.cmd
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/shell/validate.cmd?rev=1884605&r1=1884604&r2=1884605&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/shell/validate.cmd (original)
+++ xmlbeans/trunk/src/main/shell/validate.cmd Fri Dec 18 10:27:35 2020
@@ -25,7 +25,6 @@ if "%XMLBEANS_LIB%" EQU "" call "%~dp0_s
set cp=
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/main/shell/xpretty.cmd
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/shell/xpretty.cmd?rev=1884605&r1=1884604&r2=1884605&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/shell/xpretty.cmd (original)
+++ xmlbeans/trunk/src/main/shell/xpretty.cmd Fri Dec 18 10:27:35 2020
@@ -22,6 +22,6 @@ setlocal
if "%XMLBEANS_LIB%" EQU "" call "%~dp0_setlib"
set cp=
-set cp=%cp%;%XMLBEANS_LIB%\*;%XMLBEANS_LIB%\jsr173_1.0_api.jar
+set cp=%cp%;%XMLBEANS_LIB%\*
java -classpath "%cp%" org.apache.xmlbeans.impl.tool.PrettyPrinter %*
Modified: xmlbeans/trunk/src/main/shell/xsd2inst.cmd
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/shell/xsd2inst.cmd?rev=1884605&r1=1884604&r2=1884605&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/shell/xsd2inst.cmd (original)
+++ xmlbeans/trunk/src/main/shell/xsd2inst.cmd Fri Dec 18 10:27:35 2020
@@ -24,7 +24,6 @@ if "%XMLBEANS_LIB%" EQU "" call "%~dp0_s
set cp=
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/main/shell/xsdtree.cmd
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/shell/xsdtree.cmd?rev=1884605&r1=1884604&r2=1884605&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/shell/xsdtree.cmd (original)
+++ xmlbeans/trunk/src/main/shell/xsdtree.cmd Fri Dec 18 10:27:35 2020
@@ -22,6 +22,6 @@ setlocal
if "%XMLBEANS_LIB%" EQU "" call "%~dp0_setlib"
set cp=
-set cp=%cp%;%XMLBEANS_LIB%\*;%XMLBEANS_LIB%\jsr173_1.0_api.jar;
+set cp=%cp%;%XMLBEANS_LIB%\*
java -classpath "%cp%" org.apache.xmlbeans.impl.tool.TypeHierarchyPrinter %*
Modified: xmlbeans/trunk/src/main/shell/xstc
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/shell/xstc?rev=1884605&r1=1884604&r2=1884605&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/shell/xstc (original)
+++ xmlbeans/trunk/src/main/shell/xstc Fri Dec 18 10:27:35 2020
@@ -19,7 +19,7 @@
if [ -z "$XMLBEANS_LIB" ]; then . `dirname $0`/_setlib; fi
-cp=$XMLBEANS_LIB/*:$XMLBEANS_LIB/resolver.jar
+cp=$XMLBEANS_LIB/*
case "`uname`" in
CYGWIN*)
Modified: xmlbeans/trunk/src/main/shell/xstc.cmd
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/shell/xstc.cmd?rev=1884605&r1=1884604&r2=1884605&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/shell/xstc.cmd (original)
+++ xmlbeans/trunk/src/main/shell/xstc.cmd Fri Dec 18 10:27:35 2020
@@ -23,7 +23,5 @@ if "%XMLBEANS_LIB%" EQU "" call "%~dp0_s
set cp=
set cp=%cp%;%XMLBEANS_LIB%\*
-set cp=%cp%;%XMLBEANS_LIB%\jsr173_1.0_api.jar
-set cp=%cp%;%XMLBEANS_LIB%\resolver.jar
java -classpath "%cp%" org.apache.xmlbeans.impl.tool.XSTCTester %*
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org