vgritsenko 2004/01/29 05:58:49
Modified: bin xindice.war.bat
. contributor.xml
Added: bin xindice.jar.bat xindice.jar.sh
Log:
add bin/xindice to jar release as well
Revision Changes Path
1.5 +2 -2 xml-xindice/bin/xindice.war.bat
Index: xindice.war.bat
===================================================================
RCS file: /home/cvs/xml-xindice/bin/xindice.war.bat,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xindice.war.bat 28 Jan 2004 14:27:27 -0000 1.4
+++ xindice.war.bat 29 Jan 2004 13:58:48 -0000 1.5
@@ -46,7 +46,7 @@
:: ----- Set Up The Classpath
--------------------------------------------------
-set LOCALCLASSPATH=%XINDICE_HOME%\classes
+set LOCALCLASSPATH=%_XINDICE_HOME%\classes
for %%i in (%_XINDICE_HOME%\lib\*.jar) do call %_XINDICE_HOME%\lcp.bat %%i
1.1 xml-xindice/bin/xindice.jar.bat
Index: xindice.jar.bat
===================================================================
@echo off
if not "%OS%"=="Windows_NT" goto start
@setlocal
:start
::
-----------------------------------------------------------------------------
:: Xindice Command Line Tool Win32/Win16 Script for JAR distribution
::
:: $Id: xindice.jar.bat,v 1.1 2004/01/29 13:58:48 vgritsenko Exp $
::
-----------------------------------------------------------------------------
:: ----- Verify and Set Required Environment Variables
-------------------------
if not "%JAVA_HOME%" == "" goto gotJavaHome
echo ERROR: You must set JAVA_HOME to point at your Java
echo Development Kit installation.
goto end
:gotJavaHome
set _XINDICE_HOME=%XINDICE_HOME%
if not "%_XINDICE_HOME%" == "" goto gotXindiceHome
:: ----- Use the location of this script
set _XINDICE_HOME=%~dp0..
if not exist "%_XINDICE_HOME%\dist\xindice*.jar" goto noXindiceHome
echo WARNING: The environment variable XINDICE_HOME is not set.
echo Defaulting to %_XINDICE_HOME%
goto gotXindiceHome
:noXindiceHome
echo ERROR: You must set XINDICE_HOME to point at your
echo Xindice WEB-INF directory.
goto end
:gotXindiceHome
set _XINDICE_DB_HOME=%XINDICE_DB_HOME%
if "%_XINDICE_DB_HOME%" == "" set _XINDICE_DB_HOME=%_XINDICE_HOME%
set _XINDICE_CONFIG=%XINDICE_CONFIG%
if "%_XINDICE_CONFIG%" == "" set
_XINDICE_CONFIG=%_XINDICE_HOME%\config\system.xml
set _LOGGER=%LOGGER%
if "%_LOGGER%" == "" set _LOGGER=org.apache.commons.logging.impl.SimpleLog
set _LOGLEVEL=%LOGLEVEL%
if "%_LOGLEVEL%" == "" set _LOGLEVEL=INFO
set _JAVACMD=%JAVACMD%
if "%_JAVACMD%" == "" set _JAVACMD=%JAVA_HOME%\bin\java
:: ----- Set Up The Classpath
--------------------------------------------------
set LOCALCLASSPATH=
for %%i in ("%_XINDICE_HOME%\lib\*.jar") do call "%_XINDICE_HOME%\lcp.bat" %%i
for %%i in ("%_XINDICE_HOME%\xindice*.jar") do call
"%_XINDICE_HOME%\bin\lcp.bat" %%i
:: ----- Check Command Line Arguments
------------------------------------------
:runXindice
set _CL=
:LOOP
if "%1"=="" goto DONE
set _CL=%_CL% %1
shift
goto LOOP
:DONE
:: ----- Start Command Line Tool
-----------------------------------------------
%_JAVACMD% -Xms16m -Xmx128m -Djava.endorsed.dirs=%_XINDICE_HOME%\lib
-Dxindice.home=%_XINDICE_HOME% -Dxindice.db.home=%_XINDICE_DB_HOME%
-Dxindice.configuration=%_XINDICE_CONFIG%
-Dorg.apache.commons.logging.Log=%_LOGGER%
-Dorg.apache.commons.logging.simplelog.defaultlog=%_LOGLEVEL%
-Dcmd.home=%_XINDICE_HOME% -classpath %LOCALCLASSPATH%
org.apache.xindice.tools.XMLTools %_CL%
:: ----- End
-------------------------------------------------------------------
:end
if not "%OS%"=="Windows_NT" goto win16
@endlocal
goto mainEnd
:win16
set _XINDICE_HOME=
set _XINDICE_DB_HOME=
set _XINDICE_CONFIG=
set _LOGGER=
set _LOGLEVEL=
set _JAVACMD=
set _CL=
set LOCALCLASSPATH=
:mainEnd
1.1 xml-xindice/bin/xindice.jar.sh
Index: xindice.jar.sh
===================================================================
#!/bin/sh
#
-----------------------------------------------------------------------------
# Xindice Command Line Tool Unix Shell Script for JAR distribution
#
# $Id: xindice.jar.sh,v 1.1 2004/01/29 13:58:48 vgritsenko Exp $
#
-----------------------------------------------------------------------------
# ----- OS specific support
----------------------------------------------------
cygwin=false;
darwin=false;
case "`uname`" in
CYGWIN*) cygwin=true ;;
Darwin*) darwin=true
if [ -z "$JAVA_HOME" ] ; then
JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Home
fi
;;
esac
# ----- Verify and Set Required Environment Variables
-------------------------
if [ "$JAVA_HOME" = "" ] ; then
echo You must set JAVA_HOME to point at your Java Development Kit
installation
exit 1
fi
if [ "$XINDICE_HOME" = "" ] ; then
XINDICE_HOME=`dirname $0`
echo "WARNING: The environment variable XINDICE_HOME is not set."
echo " Defaulting to $XINDICE_HOME"
fi
if [ "$XINDICE_DB_HOME" = "" ] ; then XINDICE_DB_HOME=$XINDICE_HOME ; fi
if [ "$XINDICE_CONFIG" = "" ] ; then
XINDICE_CONFIG=$XINDICE_HOME/config/system.xml ; fi
if [ "$LOGGER" = "" ] ; then LOGGER=org.apache.commons.logging.impl.SimpleLog
; fi
if [ "$LOGLEVEL" = "" ] ; then LOGLEVEL=INFO ; fi
# ----- Set Classpath
----------------------------------------------------------
CP=
for i in `ls $XINDICE_HOME/lib/*.jar` ; do CP=$CP:$i ; done
for i in `ls $XINDICE_HOME/xindice*.jar` ; do CP=$CP:$i ; done
# ----- Run Tools
--------------------------------------------------------------
JAVACMD=$JAVA_HOME/bin/java
# For Cygwin, switch paths to Windows format before running java
if $cygwin; then
CP=`cygpath --path --windows "$CP"`
XINDICE_HOME=`cygpath --path --windows "$XINDICE_HOME"`
XINDICE_DB_HOME=`cygpath --path --windows "$XINDICE_DB_HOME"`
XINDICE_CONFIG=`cygpath --path --windows "$XINDICE_CONFIG"`
fi
$JAVACMD -Xms16m -Xmx128m -Djava.endorsed.dirs="$XINDICE_HOME/lib"
-Dxindice.home="$XINDICE_HOME" -Dxindice.db.home="$XINDICE_DB_HOME"
-Dxindice.configuration="$XINDICE_CONFIG"
-Dorg.apache.commons.logging.Log="$LOGGER"
-Dorg.apache.commons.logging.simplelog.defaultlog="$LOGLEVEL"
-Dcmd.home="$XINDICE_HOME" -classpath "$CP" org.apache.xindice.tools.XMLTools $*
1.14 +9 -7 xml-xindice/contributor.xml
Index: contributor.xml
===================================================================
RCS file: /home/cvs/xml-xindice/contributor.xml,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- contributor.xml 23 Jan 2004 21:31:03 -0000 1.13
+++ contributor.xml 29 Jan 2004 13:58:49 -0000 1.14
@@ -31,10 +31,15 @@
- Build Jar Releases (zip, tar.gz)
-->
<target name="release-jar">
+ <mkdir dir="${build.dir}/jar-bin"/>
+ <copy file="${bin.dir}/xindice.jar.bat"
toFile="${build.dir}/jar-bin/xindice.bat" filtering="on"/>
+ <copy file="${bin.dir}/xindice.jar.sh"
toFile="${build.dir}/jar-bin/xindice.sh" filtering="on"/>
+ <copy file="${bin.dir}/lcp.bat"
toFile="${build.dir}/jar-bin/lcp.bat" filtering="on"/>
+
<zip destfile="${dist.dir}/xindice-${project.version}-jar.zip">
<zipfileset dir="." includes="LICENSE,README"
prefix="xindice-${project.version}"/>
<zipfileset dir="${dist.dir}"
includes="xindice-${project.version}.jar" prefix="xindice-${project.version}"/>
- <zipfileset dir="${bin.dir}" includes="lcp*,xindice*"
excludes="xindice.war*" prefix="xindice-${project.version}/${bin.dir}"/>
+ <zipfileset dir="${build.dir}/jar-bin" includes="*"
prefix="xindice-${project.version}/${bin.dir}"/>
<zipfileset dir="${jar.dir}" includes="*.jar,*.LICENSE"
excludes="ant*.jar,junit*.jar" prefix="xindice-${project.version}/lib"/>
<zipfileset dir="${config.dir}"
excludes="CVS*,web.xml,xindice.xml,vm.cfg"
prefix="xindice-${project.version}/config"/>
@@ -54,13 +59,11 @@
preserveLeadingSlashes="true">
<include name="xindice-${project.version}.jar"/>
</tarfileset>
- <tarfileset dir="${bin.dir}"
+ <tarfileset dir="${build.dir}/jar-bin"
mode="755"
prefix="xindice-${project.version}/${bin.dir}"
preserveLeadingSlashes="true">
- <include name="xindice*"/>
- <include name="lcp*"/>
- <exclude name="xindice.war*"/>
+ <include name="*"/>
</tarfileset>
<tarfileset dir="${config.dir}"
prefix="xindice-${project.version}/${config.dir}"
@@ -101,7 +104,6 @@
<zip destfile="${dist.dir}/xindice-${project.version}-war.zip">
<zipfileset dir="." includes="LICENSE,README"
prefix="xindice-${project.version}"/>
<zipfileset dir="${dist.dir}"
includes="xindice-${project.version}.xml,xindice-${project.version}.war"
prefix="xindice-${project.version}"/>
-
<zipfileset dir="${build.dir}/site" excludes="api/index.html"
prefix="xindice-${project.version}/docs"/>
<zipfileset dir="${api.dir}"
prefix="xindice-${project.version}/docs/api"/>
</zip>
