vgritsenko 2003/12/30 17:25:55
Modified: . build.properties build.xml status.xml xindice.bat xindice.sh java/scratchpad/ui-eclipse .classpath plugin.xml java/src/org/apache/xindice/server Xindice.java src/documentation/content/xdocs download.ehtml guide-administrator.xml Log: 1.1b, 1.1b3-dev -> 1.1b3 Revision Changes Path 1.7 +2 -2 xml-xindice/build.properties Index: build.properties =================================================================== RCS file: /home/cvs/xml-xindice/build.properties,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- build.properties 25 Dec 2003 21:09:12 -0000 1.6 +++ build.properties 31 Dec 2003 01:25:54 -0000 1.7 @@ -76,7 +76,7 @@ # Project's properties project.name=xml-xindice project.filename=xindice -project.version=1.1b3-dev +project.version=1.1b3 project.year=1999-2003 # Source directories 1.68 +2 -2 xml-xindice/build.xml Index: build.xml =================================================================== RCS file: /home/cvs/xml-xindice/build.xml,v retrieving revision 1.67 retrieving revision 1.68 diff -u -r1.67 -r1.68 --- build.xml 25 Dec 2003 22:06:48 -0000 1.67 +++ build.xml 31 Dec 2003 01:25:54 -0000 1.68 @@ -322,7 +322,7 @@ <target name="tomcat-deploy" depends="war-release" description="Deploys the Xindice webapp into the Tomcat installation"> <copy file="${dist.dir}/${project.filename}-${project.version}.xml" todir="${tomcat.home}/webapps"/> <copy file="${dist.dir}/${project.filename}-${project.version}.war" todir="${tomcat.home}/webapps"/> - <!-- TODO: Currently try to test the use of the xindice-1.1b.xml file for the + <!-- TODO: Currently try to test the use of the xindice.xml file for the Tomcat installation. <unjar src="${dist.dir}/${project.filename}-${project.version}.war" dest="${tomcat.home}/webapps/${webapp.name}" 1.21 +1 -1 xml-xindice/status.xml Index: status.xml =================================================================== RCS file: /home/cvs/xml-xindice/status.xml,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- status.xml 25 Dec 2003 19:14:05 -0000 1.20 +++ status.xml 31 Dec 2003 01:25:54 -0000 1.21 @@ -59,7 +59,7 @@ <changes> <!-- Add new releases here --> - <release version="1.1-dev" date="December 18 2003"> + <release version="1.1b3" date="December 30 2003"> <action dev="VG" type="update"> GetResource, GetDocument XML-RPC messages will return no result if resource not found. 1.10 +2 -2 xml-xindice/xindice.bat Index: xindice.bat =================================================================== RCS file: /home/cvs/xml-xindice/xindice.bat,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- xindice.bat 25 Dec 2003 19:15:01 -0000 1.9 +++ xindice.bat 31 Dec 2003 01:25:54 -0000 1.10 @@ -48,7 +48,7 @@ :gotPort if not "%JETTY_WEBAPP%" == "" goto gotWebapp -set JETTY_WEBAPP=%XINDICE_HOME%\dist\xindice-1.1b3-dev.war +set JETTY_WEBAPP=%XINDICE_HOME%\dist\xindice-1.1b3.war :gotWebapp if not "%JAVA_DEBUG_PORT%" == "" goto gotWebapp 1.8 +2 -2 xml-xindice/xindice.sh Index: xindice.sh =================================================================== RCS file: /home/cvs/xml-xindice/xindice.sh,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- xindice.sh 25 Dec 2003 19:15:01 -0000 1.7 +++ xindice.sh 31 Dec 2003 01:25:54 -0000 1.8 @@ -71,7 +71,7 @@ fi if [ "$JETTY_WEBAPP" = "" ] ; then - JETTY_WEBAPP=$XINDICE_HOME/dist/xindice-1.1b3-dev.war + JETTY_WEBAPP=$XINDICE_HOME/dist/xindice-1.1b3.war fi if [ "$JAVA_DEBUG_PORT" = "" ] ; then 1.9 +1 -1 xml-xindice/java/scratchpad/ui-eclipse/.classpath Index: .classpath =================================================================== RCS file: /home/cvs/xml-xindice/java/scratchpad/ui-eclipse/.classpath,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .classpath 13 Dec 2003 01:51:07 -0000 1.8 +++ .classpath 31 Dec 2003 01:25:54 -0000 1.9 @@ -3,7 +3,7 @@ <classpathentry kind="src" path="src/"/> <classpathentry kind="lib" path="lib/dom4j-1.4-dev-8.jar"/> <classpathentry kind="lib" path="lib/xerces-2.6.0.jar"/> - <classpathentry exported="true" kind="lib" path="lib/xindice-1.1b.jar"/> + <classpathentry exported="true" kind="lib" path="lib/xindice-1.1b3.jar"/> <classpathentry kind="lib" path="lib/xml-apis.jar"/> <classpathentry kind="lib" path="lib/xmldb-api-20021118.jar"/> <classpathentry kind="lib" path="lib/xmldb-api-sdk-20021118.jar"/> 1.10 +1 -1 xml-xindice/java/scratchpad/ui-eclipse/plugin.xml Index: plugin.xml =================================================================== RCS file: /home/cvs/xml-xindice/java/scratchpad/ui-eclipse/plugin.xml,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- plugin.xml 13 Dec 2003 01:51:07 -0000 1.9 +++ plugin.xml 31 Dec 2003 01:25:54 -0000 1.10 @@ -11,7 +11,7 @@ <library name="xindice.ui.eclipse.jar"/> <library name="lib/dom4j-1.4-dev-8.jar"/> <library name="lib/xerces-2.6.0.jar"/> - <library name="lib/xindice-1.1b.jar"> + <library name="lib/xindice-1.1b3.jar"> <export name="*"/> </library> <library name="lib/xml-apis.jar"/> 1.15 +4 -4 xml-xindice/java/src/org/apache/xindice/server/Xindice.java Index: Xindice.java =================================================================== RCS file: /home/cvs/xml-xindice/java/src/org/apache/xindice/server/Xindice.java,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- Xindice.java 11 Dec 2003 11:42:50 -0000 1.14 +++ Xindice.java 31 Dec 2003 01:25:54 -0000 1.15 @@ -89,8 +89,8 @@ public static final int MajorVersion = 1; public static final int MinorVersion = 1; public static final int SubMinorVersion = 0; - public static final String Version = "1.1b3-dev"; - public static final String Codename = "Birthday+.3"; + public static final String Version = "1.1b3"; + public static final String Codename = "Christmas"; // Copyright/Authorship Information public static final String Title = "Xindice"; 1.5 +25 -23 xml-xindice/src/documentation/content/xdocs/download.ehtml Index: download.ehtml =================================================================== RCS file: /home/cvs/xml-xindice/src/documentation/content/xdocs/download.ehtml,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- download.ehtml 20 Dec 2003 05:46:54 -0000 1.4 +++ download.ehtml 31 Dec 2003 01:25:55 -0000 1.5 @@ -67,60 +67,62 @@ <h2>Milestone Releases</h2> - <p>The version 1.1 of Xindice is in the development. First beta release is available: + <p> + The version 1.1 of Xindice is in the development. Third beta release is + available for download: </p> - <h3>Version 1.1b1 - Source</h3> + <h3>Version 1.1b3 - Source</h3> <ul> - <li><a href="[preferred]/xml/xindice/xml-xindice-1.1b1-src.tar.gz"> + <li><a href="[preferred]/xml/xindice/xml-xindice-1.1b3-src.tar.gz"> Unix archive - tar.gz</a> <!-- - [ <a href="http://www.apache.org/dist/xml/xindice/xml-xindice-1.1b1-src.tar.gz.asc">PGP</a> ] + [ <a href="http://www.apache.org/dist/xml/xindice/xml-xindice-1.1b3-src.tar.gz.asc">PGP</a> ] --> - [ <a href="http://www.apache.org/dist/xml/xindice/xml-xindice-1.1b1-src.tar.gz.md5">MD5</a> ] + [ <a href="http://www.apache.org/dist/xml/xindice/xml-xindice-1.1b3-src.tar.gz.md5">MD5</a> ] </li> - <li><a href="[preferred]/xml/xindice/xml-xindice-1.1b1-src.zip"> + <li><a href="[preferred]/xml/xindice/xml-xindice-1.1b3-src.zip"> Windows archive - zip</a> <!-- - [ <a href="http://www.apache.org/dist/xml/xindice/xml-xindice-1.1b1-src.zip.asc">PGP</a> ] + [ <a href="http://www.apache.org/dist/xml/xindice/xml-xindice-1.1b3-src.zip.asc">PGP</a> ] --> - [ <a href="http://www.apache.org/dist/xml/xindice/xml-xindice-1.1b1-src.zip.md5">MD5</a> ] + [ <a href="http://www.apache.org/dist/xml/xindice/xml-xindice-1.1b3-src.zip.md5">MD5</a> ] </li> </ul> - <h3>Version 1.1b1 - Binary (webapp)</h3> + <h3>Version 1.1b3 - Binary (webapp)</h3> <ul> - <li><a href="[preferred]/xml/xindice/xml-xindice-1.1b1-war.tar.gz"> + <li><a href="[preferred]/xml/xindice/xml-xindice-1.1b3-war.tar.gz"> Unix archive - tar.gz</a> <!-- - [ <a href="http://www.apache.org/dist/xml/xindice/xml-xindice-1.1b1-war.tar.gz.asc">PGP</a> ] + [ <a href="http://www.apache.org/dist/xml/xindice/xml-xindice-1.1b3-war.tar.gz.asc">PGP</a> ] --> - [ <a href="http://www.apache.org/dist/xml/xindice/xml-xindice-1.1b1-war.tar.gz.md5">MD5</a> ] + [ <a href="http://www.apache.org/dist/xml/xindice/xml-xindice-1.1b3-war.tar.gz.md5">MD5</a> ] </li> - <li><a href="[preferred]/xml/xindice/xml-xindice-1.1b1-war.zip"> + <li><a href="[preferred]/xml/xindice/xml-xindice-1.1b3-war.zip"> Windows archive - zip</a> <!-- - [ <a href="http://www.apache.org/dist/xml/xindice/xml-xindice-1.1b1-war.zip.asc">PGP</a> ] + [ <a href="http://www.apache.org/dist/xml/xindice/xml-xindice-1.1b3-war.zip.asc">PGP</a> ] --> - [ <a href="http://www.apache.org/dist/xml/xindice/xml-xindice-1.1b1-war.zip.md5">MD5</a> ] + [ <a href="http://www.apache.org/dist/xml/xindice/xml-xindice-1.1b3-war.zip.md5">MD5</a> ] </li> </ul> - <h3>Version 1.1b1 - Binary (jar)</h3> + <h3>Version 1.1b3 - Binary (jar)</h3> <ul> - <li><a href="[preferred]/xml/xindice/xml-xindice-1.1b1-jar.tar.gz"> + <li><a href="[preferred]/xml/xindice/xml-xindice-1.1b3-jar.tar.gz"> Unix archive - tar.gz</a> <!-- - [ <a href="http://www.apache.org/dist/xml/xindice/xml-xindice-1.1b1-jar.tar.gz.asc">PGP</a> ] + [ <a href="http://www.apache.org/dist/xml/xindice/xml-xindice-1.1b3-jar.tar.gz.asc">PGP</a> ] --> - [ <a href="http://www.apache.org/dist/xml/xindice/xml-xindice-1.1b1-jar.tar.gz.md5">MD5</a> ] + [ <a href="http://www.apache.org/dist/xml/xindice/xml-xindice-1.1b3-jar.tar.gz.md5">MD5</a> ] </li> - <li><a href="[preferred]/xml/xindice/xml-xindice-1.1b1-jar.zip"> + <li><a href="[preferred]/xml/xindice/xml-xindice-1.1b3-jar.zip"> Windows archive - zip</a> <!-- - [ <a href="http://www.apache.org/dist/xml/xindice/xml-xindice-1.1b1-jar.zip.asc">PGP</a> ] + [ <a href="http://www.apache.org/dist/xml/xindice/xml-xindice-1.1b3-jar.zip.asc">PGP</a> ] --> - [ <a href="http://www.apache.org/dist/xml/xindice/xml-xindice-1.1b1-jar.zip.md5">MD5</a> ] + [ <a href="http://www.apache.org/dist/xml/xindice/xml-xindice-1.1b3-jar.zip.md5">MD5</a> ] </li> </ul> 1.16 +4 -4 xml-xindice/src/documentation/content/xdocs/guide-administrator.xml Index: guide-administrator.xml =================================================================== RCS file: /home/cvs/xml-xindice/src/documentation/content/xdocs/guide-administrator.xml,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- guide-administrator.xml 25 Dec 2003 22:06:48 -0000 1.15 +++ guide-administrator.xml 31 Dec 2003 01:25:55 -0000 1.16 @@ -163,7 +163,7 @@ </p> <p> Installation is then straightforward: just deploy the Xindice - WAR file (<code>xindice-1.1b.war</code>) into your favourite + WAR file (<code>xindice-1.1b3.war</code>) into your favourite application server and you're ready to go. There are only two minor points to be aware of: </p> @@ -175,7 +175,7 @@ WAR file under a <code>xindice</code> context. This can be easily accomplished under Tomcat by simply renaming the WAR file to <code>xindice.war</code> or (in Tomcat 4.1.x) by - copying the file <code>dist/xindice-1.1b.xml</code> under + copying the file <code>dist/xindice-1.1b3.xml</code> under the <code>$TOMCAT_HOME/webapps</code> directory. Note that under some Tomcat versions you will need to start twice the server the first time so that Tomcat can configure itself