svn commit: r520231 - in /xml/xindice/trunk: ./ bin/ java/lib/ legal/ lib/ lib/endorsed/ tools/jetty/lib/
[email protected] Tue, 20 Mar 2007 02:33:11 -0000
Newsgroups
gmane.text.xml.xindice.devel
Message-ID
<[email protected] >
Author: vgritsenko
Date: Mon Mar 19 19:33:09 2007
New Revision: 520231
URL: http://svn.apache.org/viewvc?view=rev&rev=520231
Log:
restructuring the repository with the goal of simplifying sh/bat scripts and unifying
release packages (work not complete yet...)
Added:
xml/xindice/trunk/legal/
xml/xindice/trunk/legal/ant.LICENSE
- copied unchanged from r520195, xml/xindice/trunk/java/lib/ant.LICENSE
xml/xindice/trunk/legal/commons-logging.LICENSE
- copied unchanged from r520195, xml/xindice/trunk/java/lib/commons-logging.LICENSE
xml/xindice/trunk/legal/jetty.LICENSE
- copied unchanged from r520195, xml/xindice/trunk/tools/jetty/lib/jetty.LICENSE
xml/xindice/trunk/legal/junit-addons.LICENSE
- copied unchanged from r520195, xml/xindice/trunk/java/lib/junit-addons.LICENSE
xml/xindice/trunk/legal/junit.LICENSE
- copied unchanged from r520195, xml/xindice/trunk/java/lib/junit.LICENSE
xml/xindice/trunk/legal/junitperf.LICENSE
- copied unchanged from r520195, xml/xindice/trunk/java/lib/junitperf.LICENSE
xml/xindice/trunk/legal/servlet.LICENSE
- copied unchanged from r520195, xml/xindice/trunk/java/lib/servlet.LICENSE
xml/xindice/trunk/legal/xalan.LICENSE
- copied unchanged from r520195, xml/xindice/trunk/java/lib/xalan.LICENSE
xml/xindice/trunk/legal/xerces.LICENSE
- copied unchanged from r520195, xml/xindice/trunk/java/lib/xerces.LICENSE
xml/xindice/trunk/legal/xml-apis.LICENSE
- copied unchanged from r520195, xml/xindice/trunk/java/lib/xml-apis.LICENSE
xml/xindice/trunk/legal/xmldb-sdk.LICENSE
- copied unchanged from r520195, xml/xindice/trunk/java/lib/xmldb-sdk.LICENSE
xml/xindice/trunk/legal/xmldb-xupdate.LICENSE
- copied unchanged from r520195, xml/xindice/trunk/java/lib/xmldb-xupdate.LICENSE
xml/xindice/trunk/legal/xmldb.LICENSE
- copied unchanged from r520195, xml/xindice/trunk/java/lib/xmldb.LICENSE
xml/xindice/trunk/legal/xmlrpc.LICENSE
- copied unchanged from r520195, xml/xindice/trunk/java/lib/xmlrpc.LICENSE
xml/xindice/trunk/legal/xmlunit.LICENSE
- copied unchanged from r520195, xml/xindice/trunk/java/lib/xmlunit.LICENSE
xml/xindice/trunk/lib/
xml/xindice/trunk/lib/commons-logging-1.0.3.jar
- copied unchanged from r520195, xml/xindice/trunk/java/lib/commons-logging-1.0.3.jar
xml/xindice/trunk/lib/endorsed/
xml/xindice/trunk/lib/endorsed/xalan-2.5.2.jar
- copied unchanged from r520195, xml/xindice/trunk/java/lib/xalan-2.5.2.jar
xml/xindice/trunk/lib/endorsed/xerces-2.6.0.jar
- copied unchanged from r520195, xml/xindice/trunk/java/lib/xerces-2.6.0.jar
xml/xindice/trunk/lib/endorsed/xml-apis.jar
- copied unchanged from r520195, xml/xindice/trunk/java/lib/xml-apis.jar
xml/xindice/trunk/lib/servlet-2.3.jar
- copied unchanged from r520195, xml/xindice/trunk/java/lib/servlet-2.3.jar
xml/xindice/trunk/lib/xmldb-api-20030701.jar
- copied unchanged from r520195, xml/xindice/trunk/java/lib/xmldb-api-20030701.jar
xml/xindice/trunk/lib/xmldb-api-sdk-20030701.jar
- copied unchanged from r520195, xml/xindice/trunk/java/lib/xmldb-api-sdk-20030701.jar
xml/xindice/trunk/lib/xmldb-common-20030701.jar
- copied unchanged from r520195, xml/xindice/trunk/java/lib/xmldb-common-20030701.jar
xml/xindice/trunk/lib/xmldb-xupdate-20040205.jar
- copied unchanged from r520195, xml/xindice/trunk/java/lib/xmldb-xupdate-20040205.jar
xml/xindice/trunk/lib/xmlrpc-1.1.jar
- copied unchanged from r520195, xml/xindice/trunk/java/lib/xmlrpc-1.1.jar
Removed:
xml/xindice/trunk/java/lib/
xml/xindice/trunk/tools/jetty/lib/jetty.LICENSE
Modified:
xml/xindice/trunk/NOTICE
xml/xindice/trunk/bin/xindice
xml/xindice/trunk/build.bat
xml/xindice/trunk/build.properties
xml/xindice/trunk/build.sh
xml/xindice/trunk/build.xml
xml/xindice/trunk/xindice.bat
xml/xindice/trunk/xindice.sh
Modified: xml/xindice/trunk/NOTICE
URL: http://svn.apache.org/viewvc/xml/xindice/trunk/NOTICE?view=diff&rev=520231&r1=520230&r2=520231
==============================================================================
--- xml/xindice/trunk/NOTICE (original)
+++ xml/xindice/trunk/NOTICE Mon Mar 19 19:33:09 2007
@@ -3,7 +3,7 @@
The Apache Software Foundation (http://www.apache.org/).
This product includes software developed by the XML:DB
-Initiative (http://www.xmldb.org)
+Initiative (http://xmldb-org.sourceforge.net/).
This software was originally based on software
copyright (c) 1999-2001, The dbXML Group, L.L.C.,
Modified: xml/xindice/trunk/bin/xindice
URL: http://svn.apache.org/viewvc/xml/xindice/trunk/bin/xindice?view=diff&rev=520231&r1=520230&r2=520231
==============================================================================
--- xml/xindice/trunk/bin/xindice (original)
+++ xml/xindice/trunk/bin/xindice Mon Mar 19 19:33:09 2007
@@ -29,7 +29,7 @@
CYGWIN*) cygwin=true ;;
Darwin*) darwin=true
if [ -z "$JAVA_HOME" ] ; then
- JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Home
+ JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Home
fi
;;
esac
@@ -56,8 +56,8 @@
# ----- Set Classpath ----------------------------------------------------------
-CP=$XINDICE_HOME/classes
-for i in `ls $XINDICE_HOME/java/lib/*.jar` ; do CP=$CP:$i ; done
+CP=
+for i in `ls $XINDICE_HOME/lib/*.jar` ; do CP=$CP:$i ; done
for i in `ls $XINDICE_HOME/dist/xindice*.jar` ; do CP=$CP:$i ; done
Modified: xml/xindice/trunk/build.bat
URL: http://svn.apache.org/viewvc/xml/xindice/trunk/build.bat?view=diff&rev=520231&r1=520230&r2=520231
==============================================================================
--- xml/xindice/trunk/build.bat (original)
+++ xml/xindice/trunk/build.bat Mon Mar 19 19:33:09 2007
@@ -20,17 +20,10 @@
:: build.bat - Win32 Build Script for Apache Xindice
:: ----------------------------------------------------------------------------
-:: ----- Create endorsed lib for the Java -------------------------------------
-if not exist "build" mkdir build
-if not exist "build\endorsed" mkdir build\endorsed
-if not exist "build\endorsed\xerces*.jar" copy java\lib\xerces*.jar build\endorsed
-if not exist "build\endorsed\xalan*.jar" copy java\lib\xalan*.jar build\endorsed
-if not exist "build\endorsed\xml-api*.jar" copy java\lib\xml-api*.jar build\endorsed
-
:: ----- Java 1.3 support
-if not exist "tools\lib\xerces*.jar" copy java\lib\xerces*.jar tools\lib
-if not exist "tools\lib\xalan*.jar" copy java\lib\xalan*.jar tools\lib
-if not exist "tools\lib\xml-api*.jar" copy java\lib\xml-api*.jar tools\lib
+if not exist "tools\lib\xerces*.jar" copy java\lib\endorsed\xerces*.jar tools\lib
+if not exist "tools\lib\xalan*.jar" copy java\lib\endorsed\xalan*.jar tools\lib
+if not exist "tools\lib\xml-api*.jar" copy java\lib\endorsed\xml-api*.jar tools\lib
:: ----- Verify and Set Required Environment Variables ------------------------
@@ -52,7 +45,7 @@
:: ----- Set endorsed library path to be used by Ant
set OLD_ANT_OPTS=%ANT_OPTS%
-call %ANT_HOME%\bin\ant -Djava.endorsed.dirs=build\endorsed -logger org.apache.tools.ant.NoBannerLogger %1 %2 %3 %4 %5 %6 %7 %8 %9
+call %ANT_HOME%\bin\ant -Djava.endorsed.dirs=lib\endorsed -logger org.apache.tools.ant.NoBannerLogger %1 %2 %3 %4 %5 %6 %7 %8 %9
:: ----- Restore ANT_OPTS
set ANT_OPTS=%OLD_ANT_OPTS%
Modified: xml/xindice/trunk/build.properties
URL: http://svn.apache.org/viewvc/xml/xindice/trunk/build.properties?view=diff&rev=520231&r1=520230&r2=520231
==============================================================================
--- xml/xindice/trunk/build.properties (original)
+++ xml/xindice/trunk/build.properties Mon Mar 19 19:33:09 2007
@@ -97,8 +97,8 @@
config.dir=config
tools.dir=tools
bin.dir=bin
+jar.dir=lib
root.dir=java
-jar.dir=${root.dir}/lib
src.dir=${root.dir}/src
dom.src.dir=${root.dir}/dom3
test.src.dir=${root.dir}/tests/src
Modified: xml/xindice/trunk/build.sh
URL: http://svn.apache.org/viewvc/xml/xindice/trunk/build.sh?view=diff&rev=520231&r1=520230&r2=520231
==============================================================================
--- xml/xindice/trunk/build.sh (original)
+++ xml/xindice/trunk/build.sh Mon Mar 19 19:33:09 2007
@@ -21,22 +21,6 @@
echo "Apache Xindice Build System"
echo "---------------------------"
-if [ ! -d build ]
-then
- mkdir build
-fi
-if [ ! -d build/endorsed ]
-then
- mkdir build/endorsed
-fi
-cp java/lib/xalan*.jar build/endorsed
-cp java/lib/xerces*.jar build/endorsed
-cp java/lib/xml-api*.jar build/endorsed
-
-cp java/lib/xalan*.jar tools/lib
-cp java/lib/xerces*.jar tools/lib
-cp java/lib/xml-api*.jar tools/lib
-
chmod u+x ./tools/bin/antRun
chmod u+x ./tools/bin/ant
@@ -44,7 +28,7 @@
CP=$CLASSPATH; export CP
unset CLASSPATH
-ANT_OPTS="-Djava.endorsed.dirs=build/endorsed -Djava.awt.headless=true"; export ANT_OPTS
+ANT_OPTS="-Djava.endorsed.dirs=lib/endorsed -Djava.awt.headless=true"; export ANT_OPTS
`pwd`/tools/bin/ant -logger org.apache.tools.ant.NoBannerLogger $@
Modified: xml/xindice/trunk/build.xml
URL: http://svn.apache.org/viewvc/xml/xindice/trunk/build.xml?view=diff&rev=520231&r1=520230&r2=520231
==============================================================================
--- xml/xindice/trunk/build.xml (original)
+++ xml/xindice/trunk/build.xml Mon Mar 19 19:33:09 2007
@@ -52,14 +52,15 @@
<!--
- Build definitions
-->
- <fileset dir="${jar.dir}" id="core.jars">
+ <fileset id="core.jars" dir="${jar.dir}">
+ <include name="endorsed/*.jar"/>
<include name="*.jar"/>
<exclude name="servlet*.jar"/>
</fileset>
- <fileset dir="${jar.dir}" id="servlet.jars">
+ <fileset id="servlet.jars" dir="${jar.dir}">
<include name="servlet*.jar"/>
</fileset>
- <fileset dir="${tools.dir}/lib" id="tools.jars">
+ <fileset id="tools.jars" dir="${tools.dir}/lib">
<include name="*.jar"/>
</fileset>
@@ -78,6 +79,7 @@
<target name="init">
<tstamp/>
<filter token="VERSION" value="${project.version}"/>
+ <echo message="Building with Java ${java.version}"/>
</target>
<!--
@@ -134,7 +136,7 @@
<target name="test-unit" depends="compile-test">
<junit fork="yes" printsummary="yes" haltonfailure="no">
- <jvmarg value="-Djava.endorsed.dirs=${basedir}/build/endorsed"/>
+ <jvmarg value="-Djava.endorsed.dirs=${basedir}/lib/endorsed"/>
<jvmarg value="-Dxindice.home=${basedir}"/>
<jvmarg value="-Dxindice.db.home=${basedir}/build/test-unit"/>
<jvmarg value="-Dxindice.configuration=${basedir}/config/system.xml"/>
@@ -162,7 +164,7 @@
<target name="test-integration-embed" depends="compile-test">
<junit fork="yes" printsummary="yes" haltonfailure="no">
- <jvmarg value="-Djava.endorsed.dirs=${basedir}/build/endorsed"/>
+ <jvmarg value="-Djava.endorsed.dirs=${basedir}/lib/endorsed"/>
<jvmarg value="-Dxindice.home=${basedir}"/>
<jvmarg value="-Dxindice.db.home=${basedir}/build/test-embed"/>
<jvmarg value="-Dxindice.configuration=${basedir}/config/system.xml"/>
@@ -183,7 +185,7 @@
<target name="test-integration-uncompressed" depends="compile-test">
<junit fork="yes" printsummary="yes" haltonfailure="no">
- <jvmarg value="-Djava.endorsed.dirs=${basedir}/build/endorsed"/>
+ <jvmarg value="-Djava.endorsed.dirs=${basedir}/lib/endorsed"/>
<jvmarg value="-Dxindice.home=${basedir}"/>
<jvmarg value="-Dxindice.db.home=${basedir}/build/test-uncompressed"/>
<jvmarg value="-Dxindice.configuration=${basedir}/config/system.xml"/>
@@ -208,7 +210,7 @@
<echo message="XML-RPC service location='${test.xmlrpc.service-location}'"/>
<junit fork="yes" printsummary="yes" haltonfailure="no">
- <jvmarg value="-Djava.endorsed.dirs=${basedir}/build/endorsed"/>
+ <jvmarg value="-Djava.endorsed.dirs=${basedir}/lib/endorsed"/>
<jvmarg value="-Dxindice.home=${basedir}"/>
<jvmarg value="-Dtest.xmlrpc.hostport=${test.xmlrpc.hostport}"/>
<jvmarg value="-Dtest.xmlrpc.service-location=${test.xmlrpc.service-location}"/>
@@ -247,23 +249,35 @@
<delete dir="${test.build.dir}"/>
</target>
+
<!--
- Build the Xindice archives (jar and war)
-->
<target name="jar" depends="compile">
<mkdir dir="${dist.dir}"/>
- <jar jarfile="${dist.dir}/${project.filename}-${project.version}.jar" basedir="${src.build.dir}">
+ <jar jarfile="${dist.dir}/${project.filename}-${project.version}.jar"
+ basedir="${src.build.dir}">
<manifest>
<attribute name="Built-By" value="${user.name}"/>
+ <attribute name="Xindice-Version" value="${project.version}"/>
<section name="org/apache/xindice">
<attribute name="Sealed" value="false"/>
+ <attribute name="Extension-name" value="org.apache.xindice"/>
+ <attribute name="Specification-Title" value="Apache Xindice"/>
+ <attribute name="Specification-Version" value="${project.version}"/>
+ <attribute name="Specification-Vendor" value="Apache Software Foundation"/>
+ <attribute name="Implementation-Title" value="Apache Xindice"/>
+ <attribute name="Implementation-Version" value="${project.version}"/>
+ <attribute name="Implementation-Vendor" value="Apache Software Foundation"/>
</section>
</manifest>
+ <metainf dir="." includes="LICENSE,NOTICE"/>
</jar>
<jar jarfile="${dist.dir}/${project.filename}-dom-${project.version}.jar" basedir="${dom.build.dir}">
<manifest>
<attribute name="Built-By" value="${user.name}"/>
</manifest>
+ <metainf dir="." includes="LICENSE,NOTICE"/>
</jar>
</target>
<target name="jar-clean">
@@ -271,6 +285,7 @@
<delete file="${dist.dir}/${project.filename}-dom-${project.version}.jar"/>
</target>
+
<target name="war" depends="jar">
<mkdir dir="${dist.dir}"/>
<mkdir dir="${build.dir}/war-bin"/>
@@ -278,11 +293,14 @@
<copy file="${bin.dir}/xindice.war.bat" toFile="${build.dir}/war-bin/xindice.bat" filtering="on"/>
<copy file="${bin.dir}/xindice.war.sh" toFile="${build.dir}/war-bin/xindice" filtering="on"/>
<copy file="${bin.dir}/lcp.bat" toFile="${build.dir}/war-bin/lcp.bat" filtering="on"/>
- <war destfile="${dist.dir}/${project.filename}-${project.version}.war" update="false" webxml="config/web.xml">
+
+ <war destfile="${dist.dir}/${project.filename}-${project.version}.war"
+ update="false" webxml="config/web.xml">
<webinf dir="${config.dir}">
<include name="system.xml"/>
</webinf>
<webinf dir=".">
+ <!-- TODO include name="${config.dir}/system.xml"/ -->
<include name="${config.dir}/commands.xml"/>
</webinf>
<webinf dir="${build.dir}/war-bin">
@@ -293,10 +311,9 @@
<lib file="${dist.dir}/${project.filename}-dom-${project.version}.jar"/>
<manifest>
<attribute name="Built-By" value="${user.name}"/>
- <section name="org/apache/xindice">
- <attribute name="Sealed" value="false"/>
- </section>
+ <attribute name="Xindice-Version" value="${project.version}"/>
</manifest>
+ <metainf dir="." includes="LICENSE,NOTICE"/>
</war>
</target>
<target name="war-clean">
@@ -304,6 +321,7 @@
<delete file="${dist.dir}/${project.filename}-${project.version}.xml"/>
</target>
+
<target name="tomcat-deploy" depends="war" description="Deploys the Xindice webapp into the Tomcat installation">
<copy file="${dist.dir}/${project.filename}-${project.version}.xml"
tofile="${tomcat.home}/webapps/${webapp.name}.xml"/>
@@ -424,60 +442,53 @@
<copy file="${bin.dir}/lcp.bat" toFile="${build.dir}/jar-bin/lcp.bat" filtering="on"/>
<zip destfile="${dist.dir}/xml-xindice-${project.version}-jar.zip">
- <zipfileset dir="." includes="LICENSE,README,NOTICE" prefix="xindice-${project.version}"/>
- <zipfileset dir="${dist.dir}" includes="xindice-${project.version}.jar,xindice-dom-${project.version}.jar" prefix="xindice-${project.version}"/>
- <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="web.xml,xindice.xml,vm.cfg" prefix="xindice-${project.version}/config"/>
-
- <zipfileset dir="${build.dir}/site" excludes="api/index.html" prefix="xindice-${project.version}/docs"/>
- <zipfileset dir="${api.dir}" prefix="xindice-${project.version}/docs/api"/>
+ <zipfileset dir="."
+ prefix="xindice-${project.version}"
+ includes="LICENSE,README,NOTICE,legal"/>
+ <zipfileset dir="${dist.dir}"
+ prefix="xindice-${project.version}"
+ includes="xindice-${project.version}.jar,xindice-dom-${project.version}.jar"/>
+ <zipfileset dir="${build.dir}/jar-bin"
+ prefix="xindice-${project.version}/${bin.dir}"/>
+ <zipfileset dir="${jar.dir}"
+ prefix="xindice-${project.version}/lib"/>
+ <zipfileset dir="${config.dir}"
+ prefix="xindice-${project.version}/config"
+ excludes="web.xml,xindice.xml,vm.cfg"/>
+ <zipfileset dir="${build.dir}/site"
+ prefix="xindice-${project.version}/docs"
+ excludes="api/index.html"/>
+ <zipfileset dir="${api.dir}"
+ prefix="xindice-${project.version}/docs/api"/>
</zip>
<tar destfile="${build.dir}/xml-xindice-${project.version}-jar.tar">
<tarfileset dir="."
prefix="xindice-${project.version}"
- preserveLeadingSlashes="true">
- <include name="LICENSE"/>
- <include name="README"/>
- <include name="NOTICE"/>
- </tarfileset>
+ preserveLeadingSlashes="true"
+ includes="LICENSE,README,NOTICE,legal"/>
<tarfileset dir="${dist.dir}"
prefix="xindice-${project.version}"
- preserveLeadingSlashes="true">
- <include name="xindice-${project.version}.jar"/>
- </tarfileset>
+ preserveLeadingSlashes="true"
+ includes="xindice-${project.version}.jar,xindice-dom-${project.version}.jar"/>
<tarfileset dir="${build.dir}/jar-bin"
mode="755"
prefix="xindice-${project.version}/${bin.dir}"
- preserveLeadingSlashes="true">
- <include name="*"/>
- </tarfileset>
+ preserveLeadingSlashes="true"/>
<tarfileset dir="${config.dir}"
prefix="xindice-${project.version}/${config.dir}"
- preserveLeadingSlashes="true">
- <exclude name="web.xml"/>
- <exclude name="xindice.xml"/>
- <exclude name="vm.cfg"/>
- </tarfileset>
+ preserveLeadingSlashes="true"
+ excludes="web.xml,xindice.xml,vm.cfg"/>
<tarfileset dir="${jar.dir}"
prefix="xindice-${project.version}/lib"
- preserveLeadingSlashes="true">
- <include name="*.jar"/>
- <include name="*.LICENSE"/>
- <exclude name="ant*.jar,junit*.jar"/>
- </tarfileset>
+ preserveLeadingSlashes="true"/>
<tarfileset dir="${build.dir}/site"
prefix="xindice-${project.version}/docs"
- preserveLeadingSlashes="true">
- <include name="**"/>
- <exclude name="api/index.html"/>
- </tarfileset>
+ preserveLeadingSlashes="true"
+ excludes="api/index.html"/>
<tarfileset dir="${api.dir}"
prefix="xindice-${project.version}/docs/api"
- preserveLeadingSlashes="true">
- <include name="**"/>
- </tarfileset>
+ preserveLeadingSlashes="true"/>
</tar>
<gzip src="${build.dir}/xml-xindice-${project.version}-jar.tar"
@@ -489,37 +500,35 @@
-->
<target name="release-war">
<zip destfile="${dist.dir}/xml-xindice-${project.version}-war.zip">
- <zipfileset dir="." includes="LICENSE,README,NOTICE" 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"/>
+ <zipfileset dir="."
+ prefix="xindice-${project.version}"
+ includes="LICENSE,README,NOTICE,legal"/>
+ <zipfileset dir="${dist.dir}"
+ prefix="xindice-${project.version}"
+ includes="xindice-${project.version}.xml,xindice-${project.version}.war"/>
+ <zipfileset dir="${build.dir}/site"
+ prefix="xindice-${project.version}/docs"
+ excludes="api/index.html"/>
+ <zipfileset dir="${api.dir}"
+ prefix="xindice-${project.version}/docs/api"/>
</zip>
<tar destfile="${build.dir}/xml-xindice-${project.version}-war.tar">
<tarfileset dir="."
prefix="xindice-${project.version}"
- preserveLeadingSlashes="true">
- <include name="LICENSE"/>
- <include name="README"/>
- <include name="NOTICE"/>
- </tarfileset>
+ preserveLeadingSlashes="true"
+ includes="LICENSE,README,NOTICE,legal"/>
<tarfileset dir="${dist.dir}"
prefix="xindice-${project.version}"
- preserveLeadingSlashes="true">
- <include name="xindice-${project.version}.xml"/>
- <include name="xindice-${project.version}.war"/>
- </tarfileset>
+ preserveLeadingSlashes="true"
+ includes="xindice-${project.version}.xml,xindice-${project.version}.war"/>
<tarfileset dir="${build.dir}/site"
prefix="xindice-${project.version}/docs"
- preserveLeadingSlashes="true">
- <include name="**"/>
- <exclude name="api/index.html"/>
- </tarfileset>
+ preserveLeadingSlashes="true"
+ excludes="api/index.html"/>
<tarfileset dir="${api.dir}"
prefix="xindice-${project.version}/docs/api"
- preserveLeadingSlashes="true">
- <include name="**"/>
- </tarfileset>
+ preserveLeadingSlashes="true"/>
</tar>
<gzip src="${build.dir}/xml-xindice-${project.version}-war.tar"
@@ -531,61 +540,59 @@
-->
<target name="release-src">
<zip destfile="${dist.dir}/xml-xindice-${project.version}-src.zip">
- <zipfileset dir="." includes="LICENSE,README,NOTICE,build.*" prefix="xindice-${project.version}"/>
- <zipfileset dir="${bin.dir}" prefix="xindice-${project.version}/${bin.dir}"/>
- <zipfileset dir="${jar.dir}" prefix="xindice-${project.version}/${jar.dir}"/>
- <zipfileset dir="${tools.dir}" prefix="xindice-${project.version}/${tools.dir}"/>
- <zipfileset dir="${config.dir}" prefix="xindice-${project.version}/config"/>
-
- <zipfileset dir="${root.dir}/examples" prefix="xindice-${project.version}/${root.dir}/examples"/>
- <zipfileset dir="${root.dir}/src" prefix="xindice-${project.version}/${root.dir}/src"/>
- <zipfileset dir="${root.dir}/tests" prefix="xindice-${project.version}/${root.dir}/tests"/>
- <zipfileset dir="${documentation.dir}" prefix="xindice-${project.version}/${documentation.dir}"/>
+ <zipfileset dir="."
+ prefix="xindice-${project.version}"
+ includes="LICENSE,README,NOTICE,legal,KEYS,build.*,forrest.*,status.xml,xindice.*"/>
+ <zipfileset dir="${bin.dir}"
+ prefix="xindice-${project.version}/${bin.dir}"/>
+ <zipfileset dir="${jar.dir}"
+ prefix="xindice-${project.version}/${jar.dir}"/>
+ <zipfileset dir="${tools.dir}"
+ prefix="xindice-${project.version}/${tools.dir}"/>
+ <zipfileset dir="${config.dir}"
+ prefix="xindice-${project.version}/config"/>
+
+ <zipfileset dir="${root.dir}/examples"
+ prefix="xindice-${project.version}/${root.dir}/examples"/>
+ <zipfileset dir="${root.dir}/src"
+ prefix="xindice-${project.version}/${root.dir}/src"/>
+ <zipfileset dir="${root.dir}/tests"
+ prefix="xindice-${project.version}/${root.dir}/tests"/>
+ <zipfileset dir="${documentation.dir}"
+ prefix="xindice-${project.version}/${documentation.dir}"/>
</zip>
<tar destfile="${build.dir}/xml-xindice-${project.version}-src.tar">
<tarfileset dir="."
prefix="xindice-${project.version}"
- preserveLeadingSlashes="true">
- <include name="LICENSE"/>
- <include name="README"/>
- <include name="NOTICE"/>
- <include name="build.*"/>
- </tarfileset>
+ preserveLeadingSlashes="true"
+ includes="LICENSE,README,NOTICE,legal,KEYS,build.*,forrest.*,status.xml,xindice.*"/>
<tarfileset dir="${bin.dir}"
mode="755"
prefix="xindice-${project.version}/${bin.dir}"
- preserveLeadingSlashes="true">
- </tarfileset>
+ preserveLeadingSlashes="true"/>
<tarfileset dir="${jar.dir}"
prefix="xindice-${project.version}/${jar.dir}"
- preserveLeadingSlashes="true">
- </tarfileset>
+ preserveLeadingSlashes="true"/>
<tarfileset dir="${tools.dir}"
prefix="xindice-${project.version}/${tools.dir}"
- preserveLeadingSlashes="true">
- </tarfileset>
+ preserveLeadingSlashes="true"/>
<tarfileset dir="${config.dir}"
prefix="xindice-${project.version}/${config.dir}"
- preserveLeadingSlashes="true">
- </tarfileset>
+ preserveLeadingSlashes="true"/>
<tarfileset dir="${root.dir}/examples"
prefix="xindice-${project.version}/${root.dir}/examples"
- preserveLeadingSlashes="true">
- </tarfileset>
+ preserveLeadingSlashes="true"/>
<tarfileset dir="${root.dir}/src"
prefix="xindice-${project.version}/${root.dir}/src"
- preserveLeadingSlashes="true">
- </tarfileset>
+ preserveLeadingSlashes="true"/>
<tarfileset dir="${root.dir}/tests"
prefix="xindice-${project.version}/${root.dir}/tests"
- preserveLeadingSlashes="true">
- </tarfileset>
+ preserveLeadingSlashes="true"/>
<tarfileset dir="${documentation.dir}"
prefix="xindice-${project.version}/${documentation.dir}"
- preserveLeadingSlashes="true">
- </tarfileset>
+ preserveLeadingSlashes="true"/>
</tar>
<gzip src="${build.dir}/xml-xindice-${project.version}-src.tar"
@@ -657,6 +664,7 @@
<path id="libs">
<!-- main libs -->
<fileset dir="${jar.dir}">
+ <include name="endorsed/*.jar"/>
<include name="*.jar"/>
</fileset>
<!-- tools libs -->
Modified: xml/xindice/trunk/xindice.bat
URL: http://svn.apache.org/viewvc/xml/xindice/trunk/xindice.bat?view=diff&rev=520231&r1=520230&r2=520231
==============================================================================
--- xml/xindice/trunk/xindice.bat (original)
+++ xml/xindice/trunk/xindice.bat Mon Mar 19 19:33:09 2007
@@ -117,25 +117,25 @@
echo actions:
echo start Start Xindice in new window
echo run Run Xindice in this window
-echo debug Start Xindice turning remote debugging on
+echo debug Start Xindice turning remote debugging on
goto end
:: ----- Start Servlet ---------------------------------------------------------
:doStart
-%_EXEC% %_JAVACMD% %_JAVA_OPTIONS% -classpath %LOCALCLASSPATH% -Djava.endorsed.dirs=build\endorsed -Dxindice.home="%_XINDICE_HOME%" -Dxindice.db.home="%_XINDICE_HOME%" -Dxindice.configuration="%_XINDICE_CONFIG%" -Dwebapp=%_JETTY_WEBAPP% -Dorg.xml.sax.parser=org.apache.xerces.parsers.SAXParser -Djetty.port=%_JETTY_PORT% -Djetty.admin.port=%_JETTY_ADMIN_PORT% org.mortbay.jetty.Server tools\jetty\conf\main.xml
+%_EXEC% %_JAVACMD% %_JAVA_OPTIONS% -classpath %LOCALCLASSPATH% -Djava.endorsed.dirs=lib\endorsed -Dxindice.home="%_XINDICE_HOME%" -Dxindice.db.home="%_XINDICE_HOME%" -Dxindice.configuration="%_XINDICE_CONFIG%" -Dwebapp=%_JETTY_WEBAPP% -Dorg.xml.sax.parser=org.apache.xerces.parsers.SAXParser -Djetty.port=%_JETTY_PORT% -Djetty.admin.port=%_JETTY_ADMIN_PORT% org.mortbay.jetty.Server tools\jetty\conf\main.xml
goto end
:: ----- Run Servlet -----------------------------------------------------------
:doRun
-%_JAVACMD% %_JAVA_OPTIONS% -classpath %LOCALCLASSPATH% -Djava.endorsed.dirs=build\endorsed -Dxindice.home="%_XINDICE_HOME%" -Dxindice.db.home="%_XINDICE_HOME%" -Dxindice.configuration="%_XINDICE_CONFIG%" -Dwebapp=%_JETTY_WEBAPP% -Dorg.xml.sax.parser=org.apache.xerces.parsers.SAXParser -Djetty.port=%_JETTY_PORT% -Djetty.admin.port=%_JETTY_ADMIN_PORT% org.mortbay.jetty.Server tools\jetty\conf\main.xml
+%_JAVACMD% %_JAVA_OPTIONS% -classpath %LOCALCLASSPATH% -Djava.endorsed.dirs=lib\endorsed -Dxindice.home="%_XINDICE_HOME%" -Dxindice.db.home="%_XINDICE_HOME%" -Dxindice.configuration="%_XINDICE_CONFIG%" -Dwebapp=%_JETTY_WEBAPP% -Dorg.xml.sax.parser=org.apache.xerces.parsers.SAXParser -Djetty.port=%_JETTY_PORT% -Djetty.admin.port=%_JETTY_ADMIN_PORT% org.mortbay.jetty.Server tools\jetty\conf\main.xml
goto end
:: ----- Servlet Debug ---------------------------------------------------------
:doDebug
-%_EXEC% %_JAVACMD% %_JAVA_OPTIONS% -Xdebug -Xrunjdwp:transport=dt_socket,address=%_JAVA_DEBUG_PORT%,server=y,suspend=n -classpath %LOCALCLASSPATH% -Djava.endorsed.dirs=build\endorsed -Dxindice.home="%_XINDICE_HOME%" -Dxindice.db.home="%_XINDICE_HOME%" -Dxindice.configuration="%_XINDICE_CONFIG%" -Dwebapp=%_JETTY_WEBAPP% -Dorg.xml.sax.parser=org.apache.xerces.parsers.SAXParser -Djetty.port=%_JETTY_PORT% -Djetty.admin.port=%_JETTY_ADMIN_PORT% -Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.SimpleLog -Dorg.apache.commons.logging.simplelog.defaultlog=DEBUG org.mortbay.jetty.Server tools\jetty\conf\main.xml tools\jetty\conf\admin.xml
+%_EXEC% %_JAVACMD% %_JAVA_OPTIONS% -Xdebug -Xrunjdwp:transport=dt_socket,address=%_JAVA_DEBUG_PORT%,server=y,suspend=n -classpath %LOCALCLASSPATH% -Djava.endorsed.dirs=lib\endorsed -Dxindice.home="%_XINDICE_HOME%" -Dxindice.db.home="%_XINDICE_HOME%" -Dxindice.configuration="%_XINDICE_CONFIG%" -Dwebapp=%_JETTY_WEBAPP% -Dorg.xml.sax.parser=org.apache.xerces.parsers.SAXParser -Djetty.port=%_JETTY_PORT% -Djetty.admin.port=%_JETTY_ADMIN_PORT% -Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.SimpleLog -Dorg.apache.commons.logging.simplelog.defaultlog=DEBUG org.mortbay.jetty.Server tools\jetty\conf\main.xml tools\jetty\conf\admin.xml
goto end
Modified: xml/xindice/trunk/xindice.sh
URL: http://svn.apache.org/viewvc/xml/xindice/trunk/xindice.sh?view=diff&rev=520231&r1=520230&r2=520231
==============================================================================
--- xml/xindice/trunk/xindice.sh (original)
+++ xml/xindice/trunk/xindice.sh Mon Mar 19 19:33:09 2007
@@ -60,7 +60,7 @@
CYGWIN*) cygwin=true ;;
Darwin*) darwin=true
if [ -z "$JAVA_HOME" ] ; then
- JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Home
+ JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Home
fi
;;
esac
@@ -104,17 +104,17 @@
XINDICE_PID=$XINDICE_HOME/logs/xindice.pid
if [ ! -d $XINDICE_HOME/logs ]
then
- echo
+ echo
echo Creating the logs directory under $XINDICE_HOME
echo
mkdir -p $XINDICE_HOME/logs
- fi
+ fi
fi
# ----- Set Classpath ----------------------------------------------------------
-for i in `ls $XINDICE_HOME/java/lib/*.jar` ; do CP=$CP:$i ; done
+CP=
for i in `ls $XINDICE_HOME/tools/jetty/lib/*.jar` ; do CP=$CP:$i ; done
@@ -143,30 +143,30 @@
exit 1
fi
- echo
+ echo
echo "Starting Xindice - Log files are under $XINDICE_HOME/logs"
echo
- nohup "$JAVACMD" $JAVA_OPTIONS -classpath "$CP" -Djava.endorsed.dirs=build/endorsed -Dxindice.home="$XINDICE_HOME" -Dxindice.db.home="$XINDICE_HOME" -Dwebapp="$JETTY_WEBAPP" -Dorg.xml.sax.parser=org.apache.xerces.parsers.SAXParser -Djetty.port=$JETTY_PORT -Djetty.admin.port=$JETTY_ADMIN_PORT org.mortbay.jetty.Server "$JETTY_CONFIG" >> $XINDICE_HOME/logs/xindice.out 2>&1 &
+ nohup "$JAVACMD" $JAVA_OPTIONS -classpath "$CP" -Djava.endorsed.dirs=lib/endorsed -Dxindice.home="$XINDICE_HOME" -Dxindice.db.home="$XINDICE_HOME" -Dwebapp="$JETTY_WEBAPP" -Dorg.xml.sax.parser=org.apache.xerces.parsers.SAXParser -Djetty.port=$JETTY_PORT -Djetty.admin.port=$JETTY_ADMIN_PORT org.mortbay.jetty.Server "$JETTY_CONFIG" >> $XINDICE_HOME/logs/xindice.out 2>&1 &
echo $! > $XINDICE_PID
echo "Xindice is running with PID `cat $XINDICE_PID`"
;;
debug)
- "$JAVACMD" $JAVA_OPTIONS -Xdebug -Xrunjdwp:transport=dt_socket,address=$JAVA_DEBUG_PORT,server=y,suspend=n -classpath "$CP" -Djava.endorsed.dirs=build/endorsed -Dxindice.home="$XINDICE_HOME" -Dxindice.db.home="$XINDICE_HOME" -Dwebapp="$JETTY_WEBAPP" -Dorg.xml.sax.parser=org.apache.xerces.parsers.SAXParser -Djetty.port=$JETTY_PORT -Djetty.admin.port=$JETTY_ADMIN_PORT org.mortbay.jetty.Server "$JETTY_CONFIG" "$XINDICE_HOME/tools/jetty/conf/admin.xml" >> $XINDICE_HOME/logs/xindice.out 2>&1
+ "$JAVACMD" $JAVA_OPTIONS -Xdebug -Xrunjdwp:transport=dt_socket,address=$JAVA_DEBUG_PORT,server=y,suspend=n -classpath "$CP" -Djava.endorsed.dirs=lib/endorsed -Dxindice.home="$XINDICE_HOME" -Dxindice.db.home="$XINDICE_HOME" -Dwebapp="$JETTY_WEBAPP" -Dorg.xml.sax.parser=org.apache.xerces.parsers.SAXParser -Djetty.port=$JETTY_PORT -Djetty.admin.port=$JETTY_ADMIN_PORT org.mortbay.jetty.Server "$JETTY_CONFIG" "$XINDICE_HOME/tools/jetty/conf/admin.xml" >> $XINDICE_HOME/logs/xindice.out 2>&1
;;
stop)
if [ -f $XINDICE_PID ]
then
- echo
+ echo
echo "Shutting down Xindice"
echo
kill `cat $XINDICE_PID`
rm $XINDICE_PID
else
- echo
+ echo
echo "Unable to find a running Xindice instance"
echo
fi