include slf4j jars in bin packages
git-svn-id: https://svn.apache.org/repos/asf/xmlbeans/trunk@1884605 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/build.xml b/build.xml
index ddc6a48..f60478e 100644
--- a/build.xml
+++ b/build.xml
@@ -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>
diff --git a/src/main/shell/dumpxsb b/src/main/shell/dumpxsb
index 9b60dcd..05a18bf 100755
--- a/src/main/shell/dumpxsb
+++ b/src/main/shell/dumpxsb
@@ -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`
diff --git a/src/main/shell/dumpxsb.cmd b/src/main/shell/dumpxsb.cmd
index 6d2f910..ee5993e 100644
--- a/src/main/shell/dumpxsb.cmd
+++ b/src/main/shell/dumpxsb.cmd
@@ -23,7 +23,7 @@
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 %*
diff --git a/src/main/shell/inst2xsd.cmd b/src/main/shell/inst2xsd.cmd
index da225c8..b6994c3 100644
--- a/src/main/shell/inst2xsd.cmd
+++ b/src/main/shell/inst2xsd.cmd
@@ -25,8 +25,6 @@
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 %*
diff --git a/src/main/shell/scomp.cmd b/src/main/shell/scomp.cmd
index 1681f7b..6af09aa 100644
--- a/src/main/shell/scomp.cmd
+++ b/src/main/shell/scomp.cmd
@@ -25,9 +25,7 @@
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 %*
diff --git a/src/main/shell/scopy.cmd b/src/main/shell/scopy.cmd
index 9006b51..7e1a8b5 100644
--- a/src/main/shell/scopy.cmd
+++ b/src/main/shell/scopy.cmd
@@ -24,7 +24,7 @@
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 %*
diff --git a/src/main/shell/sdownload.cmd b/src/main/shell/sdownload.cmd
index eaa1b54..6cda192 100644
--- a/src/main/shell/sdownload.cmd
+++ b/src/main/shell/sdownload.cmd
@@ -25,8 +25,6 @@
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 %*
diff --git a/src/main/shell/sfactor.cmd b/src/main/shell/sfactor.cmd
index 4d00d91..fc7f24f 100644
--- a/src/main/shell/sfactor.cmd
+++ b/src/main/shell/sfactor.cmd
@@ -24,7 +24,7 @@
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 %*
diff --git a/src/main/shell/svalidate b/src/main/shell/svalidate
index b4b60c4..3f77579 100755
--- a/src/main/shell/svalidate
+++ b/src/main/shell/svalidate
@@ -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*)
diff --git a/src/main/shell/svalidate.cmd b/src/main/shell/svalidate.cmd
index e5dde53..bb01c86 100644
--- a/src/main/shell/svalidate.cmd
+++ b/src/main/shell/svalidate.cmd
@@ -25,8 +25,6 @@
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 %*
diff --git a/src/main/shell/validate.cmd b/src/main/shell/validate.cmd
index 32efc26..7dd6042 100644
--- a/src/main/shell/validate.cmd
+++ b/src/main/shell/validate.cmd
@@ -25,7 +25,6 @@
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 %*
diff --git a/src/main/shell/xpretty.cmd b/src/main/shell/xpretty.cmd
index ec379c0..ebaac61 100644
--- a/src/main/shell/xpretty.cmd
+++ b/src/main/shell/xpretty.cmd
@@ -22,6 +22,6 @@
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 %*
diff --git a/src/main/shell/xsd2inst.cmd b/src/main/shell/xsd2inst.cmd
index 7ece129..4111dad 100644
--- a/src/main/shell/xsd2inst.cmd
+++ b/src/main/shell/xsd2inst.cmd
@@ -24,7 +24,6 @@
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 %*
diff --git a/src/main/shell/xsdtree.cmd b/src/main/shell/xsdtree.cmd
index 01cdd79..aa0581d 100644
--- a/src/main/shell/xsdtree.cmd
+++ b/src/main/shell/xsdtree.cmd
@@ -22,6 +22,6 @@
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 %*
diff --git a/src/main/shell/xstc b/src/main/shell/xstc
index 7daf0d8..65b7b62 100755
--- a/src/main/shell/xstc
+++ b/src/main/shell/xstc
@@ -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*)
diff --git a/src/main/shell/xstc.cmd b/src/main/shell/xstc.cmd
index b5ef780..17dd9ff 100644
--- a/src/main/shell/xstc.cmd
+++ b/src/main/shell/xstc.cmd
@@ -23,7 +23,5 @@
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 %*
