[vassalengine-svn-trunk] [vassalengine-svn] SF.net SVN: vassalengine: [2895] VASSAL-src/trunk
Brought to you by:
rodneykinney,
uckelman
From: <uck...@us...> - 2008-01-27 21:28:58
|
Revision: 2895 http://vassalengine.svn.sourceforge.net/vassalengine/?rev=2895&view=rev Author: uckelman Date: 2008-01-27 13:21:26 -0800 (Sun, 27 Jan 2008) Log Message: ----------- Merged uckelman-caching 2733:HEAD, everything outside of src. This merge consists of: * Various build aparatus in dist/. * Upgrade to Batik 1.7. * Added a transparent background to images/camera.gif. * Added a Makefile for building outside of Eclipse. Modified Paths: -------------- VASSAL-src/trunk/doc/ReferenceManual/images/Board.png VASSAL-src/trunk/doc/ReferenceManual/images/Board2.png VASSAL-src/trunk/images/camera.gif VASSAL-src/trunk/lib/batik-awt-util.jar VASSAL-src/trunk/lib/batik-bridge.jar VASSAL-src/trunk/lib/batik-css.jar VASSAL-src/trunk/lib/batik-dom.jar VASSAL-src/trunk/lib/batik-ext.jar VASSAL-src/trunk/lib/batik-extension.jar VASSAL-src/trunk/lib/batik-gui-util.jar VASSAL-src/trunk/lib/batik-gvt.jar VASSAL-src/trunk/lib/batik-parser.jar VASSAL-src/trunk/lib/batik-script.jar VASSAL-src/trunk/lib/batik-svg-dom.jar VASSAL-src/trunk/lib/batik-svggen.jar VASSAL-src/trunk/lib/batik-swing.jar VASSAL-src/trunk/lib/batik-transcoder.jar VASSAL-src/trunk/lib/batik-util.jar VASSAL-src/trunk/lib/batik-xml.jar VASSAL-src/trunk/lib/js.jar VASSAL-src/trunk/lib/licenses/LICENSE.dom-documentation.txt VASSAL-src/trunk/lib/licenses/LICENSE.dom-software.txt VASSAL-src/trunk/lib/licenses/LICENSE.js.txt VASSAL-src/trunk/lib/licenses/LICENSE.pdf-transcoder.txt VASSAL-src/trunk/lib/licenses/LICENSE.sax.txt VASSAL-src/trunk/lib/licenses/LICENSE.xerces_2_5_0.txt VASSAL-src/trunk/lib/licenses/README.js.txt VASSAL-src/trunk/lib/licenses/README.pdf-transcoder.txt VASSAL-src/trunk/lib/licenses/README.xerces_2_5_0.txt VASSAL-src/trunk/lib/pdf-transcoder.jar VASSAL-src/trunk/lib/xml-apis.jar Added Paths: ----------- VASSAL-src/trunk/Makefile VASSAL-src/trunk/dist/ VASSAL-src/trunk/dist/VASSAL.bat VASSAL-src/trunk/dist/VASSAL.exe VASSAL-src/trunk/dist/VASSAL.sh VASSAL-src/trunk/dist/Vengine.mf VASSAL-src/trunk/dist/ant/ VASSAL-src/trunk/dist/ant/WriteProperties.java VASSAL-src/trunk/dist/ant/WriteZipContents.java VASSAL-src/trunk/dist/ant/build.xml VASSAL-src/trunk/dist/docsInfo VASSAL-src/trunk/dist/launch.xml VASSAL-src/trunk/dist/v.jsmooth VASSAL-src/trunk/images/roller.gif VASSAL-src/trunk/lib/batik-anim.jar VASSAL-src/trunk/lib/batik-codec.jar VASSAL-src/trunk/lib/licenses/LICENSE.xalan-2.6.0.txt VASSAL-src/trunk/lib/licenses/README.xalan-2.6.0.txt VASSAL-src/trunk/lib/licenses/README.xml-apis-ext.txt VASSAL-src/trunk/lib/licenses/README.xml-apis.txt VASSAL-src/trunk/lib/xalan-2.6.0.jar VASSAL-src/trunk/lib/xml-apis-ext.jar Removed Paths: ------------- VASSAL-src/trunk/dist/VASSAL.bat VASSAL-src/trunk/dist/VASSAL.exe VASSAL-src/trunk/dist/VASSAL.sh VASSAL-src/trunk/dist/Vengine.mf VASSAL-src/trunk/dist/ant/ VASSAL-src/trunk/dist/ant/WriteProperties.java VASSAL-src/trunk/dist/ant/WriteZipContents.java VASSAL-src/trunk/dist/ant/build.xml VASSAL-src/trunk/dist/docsInfo VASSAL-src/trunk/dist/launch.xml VASSAL-src/trunk/dist/v.jsmooth VASSAL-src/trunk/misc/ Copied: VASSAL-src/trunk/Makefile (from rev 2894, VASSAL-src/branches/uckelman-caching/Makefile) =================================================================== --- VASSAL-src/trunk/Makefile (rev 0) +++ VASSAL-src/trunk/Makefile 2008-01-27 21:21:26 UTC (rev 2895) @@ -0,0 +1,82 @@ +SRCDIR:=src +LIBDIR:=lib +CLASSDIR:=classes +TMPDIR:=tmp +JDOCDIR:=javadoc +DOCDIR:=doc +DISTDIR:=dist + +VERSION:=3.1.0-svn$(shell svnversion | perl -pe 's/(\d+:)?(\d+[MS]?)/$$2/; s/(\d+)M/$$1+1/e') + +CLASSPATH:=$(CLASSDIR):$(LIBDIR)/* + +JAVAPATH:=/usr/lib/jvm/java-1.6.0-sun + +JC:=$(JAVAPATH)/bin/javac +JCFLAGS:=-d $(CLASSDIR) -source 5 -Xlint -classpath $(CLASSPATH) \ + -sourcepath $(SRCDIR) + +JAR:=$(JAVAPATH)/bin/jar +JDOC:=$(JAVAPATH)/bin/javadoc + +SOURCES:=$(shell find $(SRCDIR) -name '*.java' | sed "s/^$(SRCDIR)\///") +CLASSES:=$(SOURCES:.java=.class) +JARS:=Vengine.jar docs.jar + +vpath %.class $(shell find $(CLASSDIR) -type d) +vpath %.java $(shell find $(SRCDIR) -type d -name .svn -prune -o -print) +vpath %.jar $(LIBDIR) + +all: $(CLASSDIR) $(CLASSES) i18n + +$(CLASSDIR): + mkdir -p $(CLASSDIR) + +%.class: %.java + $(JC) $(JCFLAGS) $< + +i18n: $(CLASSDIR) + for i in `cd $(SRCDIR) && find VASSAL -name '*.properties'`; do cp $(SRCDIR)/$$i $(CLASSDIR)/$$i; done + +#fast: +# $(JC) $(JCFLAGS) $(shell find $(SRCDIR) -name '*.java') + +#show: +# echo $(patsubst %,-C $(TMPDIR)/doc %,$(wildcard $(TMPDIR)/doc/*)) + +Vengine.jar: all + $(JAR) cvfm $(LIBDIR)/$@ dist/Vengine.mf images/* -C $(CLASSDIR) . + +docs.jar: + mkdir -p $(TMPDIR) + svn export $(DOCDIR) $(TMPDIR)/doc + find $(TMPDIR)/doc -type f | sed "s/^$(TMPDIR)\/doc\///" >$(TMPDIR)/doc/docsList + cp dist/docsInfo $(TMPDIR)/doc + $(JAR) cvf $(LIBDIR)/$@ -C $(TMPDIR)/doc . + +version: + sed -ri 's/VERSION = ".*"/VERSION = "$(VERSION)"/' $(SRCDIR)/VASSAL/Info.java + +#installer: +# $(JAR) cevf VASSAL/launch/install/InstallWizard InstallVASSAL.jar -C $(CLASSDIR) VASSAL/launch/ VASSAL/chat/HttpRequestWrapper* + +release: version all $(JARS) + mkdir -p $(TMPDIR)/VASSAL-$(VERSION) $(TMPDIR)/VASSAL-$(VERSION)/ext + svn export $(LIBDIR) $(TMPDIR)/VASSAL-$(VERSION)/lib + cp $(LIBDIR)/Vengine.jar $(LIBDIR)/docs.jar $(TMPDIR)/VASSAL-$(VERSION)/lib + cp dist/VASSAL.sh dist/VASSAL.bat dist/VASSAL.exe $(TMPDIR)/VASSAL-$(VERSION) + cd $(TMPDIR) ; zip -9rv VASSAL-$(VERSION).zip VASSAL-$(VERSION) ; cd .. + +clean-release: + $(RM) -r $(TMPDIR)/* $(LIBDIR)/Vengine.jar $(LIBDIR)/docs.jar + +javadoc: + $(JDOC) -d $(JDOCDIR) -link http://java.sun.com/javase/6/docs/api -sourcepath $(SRCDIR) -subpackages $(shell echo $(notdir $(wildcard src/*)) | tr ' ' ':') + +clean-javadoc: + $(RM) -r $(JDOCDIR) + +clean: clean-release + $(RM) -r $(CLASSDIR)/* + +.PHONY: all clean release clean-release i18n javadoc clean-javadoc version Copied: VASSAL-src/trunk/dist (from rev 2894, VASSAL-src/branches/uckelman-caching/dist) Deleted: VASSAL-src/trunk/dist/VASSAL.bat =================================================================== --- VASSAL-src/branches/uckelman-caching/dist/VASSAL.bat 2008-01-27 20:23:19 UTC (rev 2894) +++ VASSAL-src/trunk/dist/VASSAL.bat 2008-01-27 21:21:26 UTC (rev 2895) @@ -1,4 +0,0 @@ -REM Execute this file to launch VASSAL on Windows - -start javaw -client -cp lib/Vengine.jar VASSAL.launch.Launcher %* - Copied: VASSAL-src/trunk/dist/VASSAL.bat (from rev 2894, VASSAL-src/branches/uckelman-caching/dist/VASSAL.bat) =================================================================== --- VASSAL-src/trunk/dist/VASSAL.bat (rev 0) +++ VASSAL-src/trunk/dist/VASSAL.bat 2008-01-27 21:21:26 UTC (rev 2895) @@ -0,0 +1,4 @@ +REM Execute this file to launch VASSAL on Windows + +start javaw -client -cp lib/Vengine.jar VASSAL.launch.Launcher %* + Deleted: VASSAL-src/trunk/dist/VASSAL.exe =================================================================== (Binary files differ) Copied: VASSAL-src/trunk/dist/VASSAL.exe (from rev 2894, VASSAL-src/branches/uckelman-caching/dist/VASSAL.exe) =================================================================== (Binary files differ) Deleted: VASSAL-src/trunk/dist/VASSAL.sh =================================================================== --- VASSAL-src/branches/uckelman-caching/dist/VASSAL.sh 2008-01-27 20:23:19 UTC (rev 2894) +++ VASSAL-src/trunk/dist/VASSAL.sh 2008-01-27 21:21:26 UTC (rev 2895) @@ -1,4 +0,0 @@ -#!/bin/sh - -# Execute this file to launch VASSAL on MacOS or Linux -cd `dirname "$0"` && java -classpath lib/Vengine.jar VASSAL.launch.Launcher "$@" Copied: VASSAL-src/trunk/dist/VASSAL.sh (from rev 2894, VASSAL-src/branches/uckelman-caching/dist/VASSAL.sh) =================================================================== --- VASSAL-src/trunk/dist/VASSAL.sh (rev 0) +++ VASSAL-src/trunk/dist/VASSAL.sh 2008-01-27 21:21:26 UTC (rev 2895) @@ -0,0 +1,4 @@ +#!/bin/sh + +# Execute this file to launch VASSAL on MacOS or Linux +cd `dirname "$0"` && java -classpath lib/Vengine.jar VASSAL.launch.Launcher "$@" Deleted: VASSAL-src/trunk/dist/Vengine.mf =================================================================== --- VASSAL-src/branches/uckelman-caching/dist/Vengine.mf 2008-01-27 20:23:19 UTC (rev 2894) +++ VASSAL-src/trunk/dist/Vengine.mf 2008-01-27 21:21:26 UTC (rev 2895) @@ -1,28 +0,0 @@ -Main-Class: VASSAL.launch.Main -Class-Path: batik-awt-util.jar - batik-bridge.jar - batik-css.jar - batik-dom.jar - batik-extension.jar - batik-ext.jar - batik-gui-util.jar - batik-gvt.jar - batik-parser.jar - batik-script.jar - batik-svg-dom.jar - batik-svggen.jar - batik-swing.jar - batik-transcoder.jar - batik-util.jar - batik-xml.jar - BrowserLauncher2-10.jar - docs.jar - js.jar - pdf-transcoder.jar - smack.jar - smackx-debug.jar - smackx.jar - swing-worker-1.1.jar - wizard.jar - xerces_2_5_0.jar - xml-apis.jar Copied: VASSAL-src/trunk/dist/Vengine.mf (from rev 2894, VASSAL-src/branches/uckelman-caching/dist/Vengine.mf) =================================================================== --- VASSAL-src/trunk/dist/Vengine.mf (rev 0) +++ VASSAL-src/trunk/dist/Vengine.mf 2008-01-27 21:21:26 UTC (rev 2895) @@ -0,0 +1,28 @@ +Main-Class: VASSAL.launch.Main +Class-Path: batik-awt-util.jar + batik-bridge.jar + batik-css.jar + batik-dom.jar + batik-extension.jar + batik-ext.jar + batik-gui-util.jar + batik-gvt.jar + batik-parser.jar + batik-script.jar + batik-svg-dom.jar + batik-svggen.jar + batik-swing.jar + batik-transcoder.jar + batik-util.jar + batik-xml.jar + BrowserLauncher2-10.jar + docs.jar + js.jar + pdf-transcoder.jar + smack.jar + smackx-debug.jar + smackx.jar + swing-worker-1.1.jar + wizard.jar + xerces_2_5_0.jar + xml-apis.jar Copied: VASSAL-src/trunk/dist/ant (from rev 2894, VASSAL-src/branches/uckelman-caching/dist/ant) Deleted: VASSAL-src/trunk/dist/ant/WriteProperties.java =================================================================== --- VASSAL-src/branches/uckelman-caching/dist/ant/WriteProperties.java 2008-01-27 20:23:19 UTC (rev 2894) +++ VASSAL-src/trunk/dist/ant/WriteProperties.java 2008-01-27 21:21:26 UTC (rev 2895) @@ -1,59 +0,0 @@ -/* - * $Id: WriteProperties.java,v 1.1 2004-02-13 04:57:13 rkinney Exp $ - * - * Copyright (c) 2004 by Rodney Kinney - * All rights reserved - */ -package org.vassalengine.ant; - -import org.apache.tools.ant.BuildException; - -import java.util.Properties; -import java.io.IOException; -import java.io.FileOutputStream; - -/** - * Writes a list of properties to a destination file - */ -public class WriteProperties extends org.apache.tools.ant.Task { - private Properties props = new Properties(); - private String destFile; - - public void execute() throws BuildException { - try { - props.store(new FileOutputStream(destFile), null); - } - catch (IOException e) { - throw new BuildException(e); - } - } - - public void setDestFile(String file) { - destFile = file; - } - - public void addConfiguredProperty(Property p) { - props.setProperty(p.getName(), p.getValue()); - } - - public static class Property { - private String name; - private String value; - - public String getName() { - return name; - } - - public String getValue() { - return value; - } - - public void setName(String name) { - this.name = name; - } - - public void setValue(String value) { - this.value = value; - } - } -} Copied: VASSAL-src/trunk/dist/ant/WriteProperties.java (from rev 2894, VASSAL-src/branches/uckelman-caching/dist/ant/WriteProperties.java) =================================================================== --- VASSAL-src/trunk/dist/ant/WriteProperties.java (rev 0) +++ VASSAL-src/trunk/dist/ant/WriteProperties.java 2008-01-27 21:21:26 UTC (rev 2895) @@ -0,0 +1,59 @@ +/* + * $Id: WriteProperties.java,v 1.1 2004-02-13 04:57:13 rkinney Exp $ + * + * Copyright (c) 2004 by Rodney Kinney + * All rights reserved + */ +package org.vassalengine.ant; + +import org.apache.tools.ant.BuildException; + +import java.util.Properties; +import java.io.IOException; +import java.io.FileOutputStream; + +/** + * Writes a list of properties to a destination file + */ +public class WriteProperties extends org.apache.tools.ant.Task { + private Properties props = new Properties(); + private String destFile; + + public void execute() throws BuildException { + try { + props.store(new FileOutputStream(destFile), null); + } + catch (IOException e) { + throw new BuildException(e); + } + } + + public void setDestFile(String file) { + destFile = file; + } + + public void addConfiguredProperty(Property p) { + props.setProperty(p.getName(), p.getValue()); + } + + public static class Property { + private String name; + private String value; + + public String getName() { + return name; + } + + public String getValue() { + return value; + } + + public void setName(String name) { + this.name = name; + } + + public void setValue(String value) { + this.value = value; + } + } +} Deleted: VASSAL-src/trunk/dist/ant/WriteZipContents.java =================================================================== --- VASSAL-src/branches/uckelman-caching/dist/ant/WriteZipContents.java 2008-01-27 20:23:19 UTC (rev 2894) +++ VASSAL-src/trunk/dist/ant/WriteZipContents.java 2008-01-27 21:21:26 UTC (rev 2895) @@ -1,45 +0,0 @@ -/* - * $Id: WriteZipContents.java,v 1.1 2004-02-13 04:57:13 rkinney Exp $ - * - * Copyright (c) 2004 by Rodney Kinney - * All rights reserved - */ -package org.vassalengine.ant; - -import org.apache.tools.ant.Task; -import org.apache.tools.ant.BuildException; - -import java.util.zip.ZipInputStream; -import java.util.zip.ZipEntry; -import java.io.*; - -/** - * Writes a list of entries in a zip file to a destination file - */ -public class WriteZipContents extends Task { - private String zipFile; - private String destination; - public void setZipFile(String s) { - zipFile = s; - } - - public void setDestFile(String s) { - destination = s; - } - - public void execute() throws BuildException { - try { - PrintWriter w = new PrintWriter(new FileWriter(destination)); - ZipInputStream zis = new ZipInputStream(new FileInputStream(zipFile)); - for (ZipEntry entry = zis.getNextEntry(); entry != null;entry = zis.getNextEntry()) { - if (!entry.isDirectory()) { - w.println(entry.getName()); - } - } - w.close(); - } - catch (IOException e) { - throw new BuildException(e); - } - } -} Copied: VASSAL-src/trunk/dist/ant/WriteZipContents.java (from rev 2894, VASSAL-src/branches/uckelman-caching/dist/ant/WriteZipContents.java) =================================================================== --- VASSAL-src/trunk/dist/ant/WriteZipContents.java (rev 0) +++ VASSAL-src/trunk/dist/ant/WriteZipContents.java 2008-01-27 21:21:26 UTC (rev 2895) @@ -0,0 +1,45 @@ +/* + * $Id: WriteZipContents.java,v 1.1 2004-02-13 04:57:13 rkinney Exp $ + * + * Copyright (c) 2004 by Rodney Kinney + * All rights reserved + */ +package org.vassalengine.ant; + +import org.apache.tools.ant.Task; +import org.apache.tools.ant.BuildException; + +import java.util.zip.ZipInputStream; +import java.util.zip.ZipEntry; +import java.io.*; + +/** + * Writes a list of entries in a zip file to a destination file + */ +public class WriteZipContents extends Task { + private String zipFile; + private String destination; + public void setZipFile(String s) { + zipFile = s; + } + + public void setDestFile(String s) { + destination = s; + } + + public void execute() throws BuildException { + try { + PrintWriter w = new PrintWriter(new FileWriter(destination)); + ZipInputStream zis = new ZipInputStream(new FileInputStream(zipFile)); + for (ZipEntry entry = zis.getNextEntry(); entry != null;entry = zis.getNextEntry()) { + if (!entry.isDirectory()) { + w.println(entry.getName()); + } + } + w.close(); + } + catch (IOException e) { + throw new BuildException(e); + } + } +} Deleted: VASSAL-src/trunk/dist/ant/build.xml =================================================================== --- VASSAL-src/branches/uckelman-caching/dist/ant/build.xml 2008-01-27 20:23:19 UTC (rev 2894) +++ VASSAL-src/trunk/dist/ant/build.xml 2008-01-27 21:21:26 UTC (rev 2895) @@ -1,233 +0,0 @@ -<project name="VASSAL" default="no-op" basedir="/home/uckelman/projects/VASSAL/uckelman-caching"> - <property name="VassalVersion" value="3.0.15-svn2704" /> - <property name="DocsVersion" value="3.0.9" /> - <property name="minorVersion" value="3.0" /> -<!-- - <taskdef name="writeProperties" classname="org.vassalengine.ant.WriteProperties" /> - <taskdef name="writeZipContents" classname="org.vassalengine.ant.WriteZipContents" /> ---> - <property name="engineSrcPath" value="/home/uckelman/projects/VASSAL/uckelman-caching" /> - <property name="engineLibPath" value="/home/uckelman/projects/VASSAL/uckelman-caching/lib" /> - <property name="engineClassOutput" value="engineClasses" /> - <path id="EngineDependencies"> - <pathelement location="${engineLibPath}/cryptix32.jar" /> - <pathelement location="${engineLibPath}/smack.jar" /> - <pathelement location="${engineLibPath}/smackx.jar" /> - <pathelement location="${engineLibPath}/batik-awt-util.jar" /> - <pathelement location="${engineLibPath}/batik-bridge.jar" /> - <pathelement location="${engineLibPath}/batik-css.jar" /> - <pathelement location="${engineLibPath}/batik-dom.jar" /> - <pathelement location="${engineLibPath}/batik-ext.jar" /> - <pathelement location="${engineLibPath}/batik-extension.jar" /> - <pathelement location="${engineLibPath}/batik-gui-util.jar" /> - <pathelement location="${engineLibPath}/batik-gvt.jar" /> - <pathelement location="${engineLibPath}/batik-parser.jar" /> - <pathelement location="${engineLibPath}/batik-script.jar" /> - <pathelement location="${engineLibPath}/batik-svg-dom.jar" /> - <pathelement location="${engineLibPath}/batik-svggen.jar" /> - <pathelement location="${engineLibPath}/batik-swing.jar" /> - <pathelement location="${engineLibPath}/batik-transcoder.jar" /> - <pathelement location="${engineLibPath}/batik-util.jar" /> - <pathelement location="${engineLibPath}/batik-xml.jar" /> - <pathelement location="${engineLibPath}/js.jar" /> - <pathelement location="${engineLibPath}/pdf-transcoder.jar" /> - <pathelement location="${engineLibPath}/xerces_2_5_0.jar" /> - <pathelement location="${engineLibPath}/bml-apis.jar" /> - <pathelement location="${engineLibPath}/wizard.jar" /> - <pathelement location="${engineLibPath}/BrowserLauncher2-10.jar" /> - </path> - <path id="EngineJars"> - <path refid="EngineDependencies"/> - <pathelement location="lib/Vengine.jar" /> - </path> - <target name="no-op"> - <echo message="Do nothing"/> - <signjar keystore="keystore" jar="batik.jar" alias="vassal_ws" storepass="vassalme" /> - - </target> - <target name="clean"> - <delete dir="${engineClassOutput}" /> - </target> - <target name="engineClasses"> - <mkdir dir="${engineClassOutput}" /> - <javac srcdir="${engineSrcPath}" destdir="${engineClassOutput}" target="1.5" source="1.5" debug="true"> - <classpath refId="EngineDependencies"></classpath> - </javac> - <mkdir dir="${engineClassOutput}/VASSAL/i18n" /> - <copy todir="${engineClassOutput}/VASSAL/i18n"> - <fileset file="${engineSrcPath}/VASSAL/i18n/*.properties"/> - </copy> - </target> - <target name="engineJar_plain" depends="engineClasses"> - <mkdir dir="${engineClassOutput}/images" /> - <copy todir="${engineClassOutput}/images"> - <fileset dir="${engineSrcPath}/images" /> - </copy> - <jar basedir="${engineClassOutput}" destfile="lib/Vengine.jar" /> - </target> - <target name="engineJar" depends="engineJar_plain"> -<!-- - <signjar keystore="keystore" jar="lib/Vengine.jar" alias="vassal_ws" storepass="vassalme" /> ---> - <copy file="lib/Vengine.jar" tofile="Vengine__V${VassalVersion}.jar" overwrite="false" failonerror="true" /> - </target> -<!-- - <target name="docsJar" depends="docs"> - <delete dir="componentInstall" /> - <mkdir dir="componentInstall" /> - <writeZipContents zipFile="${basedir}/docs.zip" destFile="${basedir}/componentInstall/docsList" /> - <writeProperties destFile="${basedir}/componentInstall/docsInfo"> ---> -<!-- - <property name="prompt" value="New Documentation has been downloaded. Install now?" /> - <property name="initialPrompt" value="Select a directory to install the VASSAL documentation" /> - <property name="installDirKey" value="docsDirectory" /> ---> -<!-- - <property name="checksumKey" value="docsChecksum-${minorVersion}" /> - <property name="installDir" value="${minorVersion}/docs" /> - <property name="required" value="README.html" /> - <property name="extractList" value="/docsList" /> - <property name="checksum" value="${DocsVersion}" /> - </writeProperties> - <unzip src="docs.zip" dest="componentInstall" /> - <jar basedir="componentInstall" destfile="lib/docs.jar" /> - <signjar keystore="keystore" jar="lib/docs.jar" alias="vassal_ws" storepass="vassalme" /> - </target> ---> - <target name="javadoc"> - <delete dir="api" /> - <mkdir dir="api" /> - <javadoc packagenames="VASSAL.*" sourcepath="${engineSrcPath}" destdir="${basedir}/api"> - </javadoc> - </target> - <target name="release" depends="javadoc"> - <zip destfile="VASSAL-${VassalVersion}.zip"> - <zipfileset dir="api" prefix="javadoc" /> - <zipfileset dir="${engineSrcPath}" prefix="src"> - <include name="**/*.java" /> - </zipfileset> - <zipfileset dir="${engineSrcPath}"> - <include name="images/*" /> - <include name="**/*.txt" /> - </zipfileset> - </zip> -<!-- - <ftp server="upload.sourceforge.net" userid="anonymous" password="rkinney" remotedir="incoming" binary="true"> - <fileset dir="${basedir}"> - <include name="VASSAL-${VassalVersion}.zip" /> - </fileset> - </ftp> ---> - </target> - <target name="libraryRelease"> - <delete file="VASSAL-libraries-${VassalVersion}.zip" /> - <zip destfile="VASSAL-libraries-${VassalVersion}.zip"> - <zipfileset dir="."> - <include name="BinaryLicense.txt" /> - <include name="lib/cryptix32.jar" /> - <include name="lib/VASSAL.jar" /> - </zipfileset> - </zip> - <ftp server="upload.sourceforge.net" userid="anonymous" password="rkinney" remotedir="incoming" binary="true"> - <fileset dir="${basedir}"> - <include name="VASSAL-libraries-${VassalVersion}.zip" /> - </fileset> - </ftp> - </target> - <target name="installer" depends="engineClasses"> - <jar destFile="InstallVASSAL.jar" basedir="${engineClassOutput}" includes="VASSAL/launch/**,VASSAL/chat/HttpRequestWrapper*"> - <manifest> - <attribute name="Main-Class" value="VASSAL/launch/install/InstallWizard"/> - </manifest> - </jar> - </target> - <target name="deployInstaller" depends="installer"> - <ftp server="vassalengine.org" userid="vassal2" password="${ftpPassword}" remotedir="www" binary="true"> - <fileset dir="."> - <include name="InstallVASSAL.jar" /> - </fileset> - </ftp> - </target> -<!-- - <target name="deployJarRunner" depends="jarRunner"> - <zip destfile="VASSAL.zip"> - <zipfileset file="runVassal.jar" /> - <zipfileset dir="."> - <include name="lib/VASSAL.jar" /> - <include name="lib/Vengine.jar" /> - <include name="lib/docs.jar" /> - <include name="lib/cryptix32.jar" /> - </zipfileset> - </zip> - <ftp server="vassalengine.org" userid="vassal2" password="vassalme" remotedir="www" binary="true"> - <fileset dir="."> - <include name="VASSAL.zip" /> - </fileset> - </ftp> - </target> ---> - <target name="deployEngine" depends="engineJar"> - <ftp server="vassalengine.org" userid="vassal2" password="${ftpPassword}" remotedir="www/ws" binary="true"> - <fileset dir="${basedir}"> - <include name="Vengine__V${VassalVersion}.jar" /> - </fileset> - </ftp> - <get src="http://www.vassalengine.org/util/updateInstall?version=${minorVersion}&jar=Vengine&jarVersion=${VassalVersion}" dest="updateVengine.out" /> - </target> - <target name="publishEngine"> - <property name="publishFile" value="Vengine.jar" /> - <property name="publishVersion" value="${VassalVersion}" /> - <antcall target="publishJar" /> - <antcall target="updateJarRunner" /> - </target> - <target name="deployAndPublishEngine" depends="deployEngine,publishEngine"/> -<!-- - <target name="deployDocs" depends="docsJar"> - <copy file="lib/docs.jar" tofile="docs__V${DocsVersion}.jar" /> - <ftp server="vassalengine.org" userid="vassal2" password="${ftpPassword}" remotedir="www/ws" binary="true"> - <fileset dir="${basedir}"> - <include name="docs__V${DocsVersion}.jar" /> - </fileset> - </ftp> - <get src="http://www.vassalengine.org/util/updateInstall?version=${minorVersion}&jar=docs&jarVersion=${DocsVersion}" dest="updateDocs.out" /> - </target> ---> - <target name="publishDocs"> - <property name="publishFile" value="docs.jar" /> - <property name="publishVersion" value="${DocsVersion}" /> - <antcall target="publishJar" /> - <antcall target="updateJarRunner" /> - </target> -<!-- - <target name="deployAndPublishDocs" depends="deployDocs,publishDocs"/> ---> - <target name="cvsBackup"> - <delete file="${cvsSrcPath}/../cvsBackup.zip" /> - <zip destfile="${cvsSrcPath}/../cvsBackup.zip"> - <zipfileset dir="${cvsSrcPath}/cvsroot" prefix="cvsroot" /> - </zip> - <ftp server="vassalengine.org" userid="vassal2" password="${ftpPassword}" remotedir="transfer" binary="true"> - <fileset dir="${cvsSrcPath}/.."> - <include name="cvsBackup.zip" /> - </fileset> - </ftp> - </target> -<!-- - <target name="deployServlets" depends="webJar"> - <ftp server="vassalengine.org" userid="vassal2" password="${ftpPassword}" remotedir="www/WEB-INF/lib" binary="true"> - <fileset dir="${basedir}"> - <include name="Vweb.jar" /> - </fileset> - </ftp> - </target> ---> - <target name="publishJar"> - <get src="http://www.vassalengine.org/util/publishJar?file=${publishFile}&version=${publishVersion}" dest="publish.out" /> - <get src="http://www.vasl.org/build/updateJar.php?file=${publishFile}" dest="updateJarVasl.out" /> - </target> - <target name="updateJarRunner"> - <get src="http://www.vassalengine.org/util/updateJarRunner" dest="updateJarRunner.out" /> - <get src="http://www.vasl.org/build/updateInstaller.php" dest="updateInstallerVasl.out" /> - </target> -</project> Copied: VASSAL-src/trunk/dist/ant/build.xml (from rev 2894, VASSAL-src/branches/uckelman-caching/dist/ant/build.xml) =================================================================== --- VASSAL-src/trunk/dist/ant/build.xml (rev 0) +++ VASSAL-src/trunk/dist/ant/build.xml 2008-01-27 21:21:26 UTC (rev 2895) @@ -0,0 +1,233 @@ +<project name="VASSAL" default="no-op" basedir="/home/uckelman/projects/VASSAL/uckelman-caching"> + <property name="VassalVersion" value="3.0.15-svn2704" /> + <property name="DocsVersion" value="3.0.9" /> + <property name="minorVersion" value="3.0" /> +<!-- + <taskdef name="writeProperties" classname="org.vassalengine.ant.WriteProperties" /> + <taskdef name="writeZipContents" classname="org.vassalengine.ant.WriteZipContents" /> +--> + <property name="engineSrcPath" value="/home/uckelman/projects/VASSAL/uckelman-caching" /> + <property name="engineLibPath" value="/home/uckelman/projects/VASSAL/uckelman-caching/lib" /> + <property name="engineClassOutput" value="engineClasses" /> + <path id="EngineDependencies"> + <pathelement location="${engineLibPath}/cryptix32.jar" /> + <pathelement location="${engineLibPath}/smack.jar" /> + <pathelement location="${engineLibPath}/smackx.jar" /> + <pathelement location="${engineLibPath}/batik-awt-util.jar" /> + <pathelement location="${engineLibPath}/batik-bridge.jar" /> + <pathelement location="${engineLibPath}/batik-css.jar" /> + <pathelement location="${engineLibPath}/batik-dom.jar" /> + <pathelement location="${engineLibPath}/batik-ext.jar" /> + <pathelement location="${engineLibPath}/batik-extension.jar" /> + <pathelement location="${engineLibPath}/batik-gui-util.jar" /> + <pathelement location="${engineLibPath}/batik-gvt.jar" /> + <pathelement location="${engineLibPath}/batik-parser.jar" /> + <pathelement location="${engineLibPath}/batik-script.jar" /> + <pathelement location="${engineLibPath}/batik-svg-dom.jar" /> + <pathelement location="${engineLibPath}/batik-svggen.jar" /> + <pathelement location="${engineLibPath}/batik-swing.jar" /> + <pathelement location="${engineLibPath}/batik-transcoder.jar" /> + <pathelement location="${engineLibPath}/batik-util.jar" /> + <pathelement location="${engineLibPath}/batik-xml.jar" /> + <pathelement location="${engineLibPath}/js.jar" /> + <pathelement location="${engineLibPath}/pdf-transcoder.jar" /> + <pathelement location="${engineLibPath}/xerces_2_5_0.jar" /> + <pathelement location="${engineLibPath}/bml-apis.jar" /> + <pathelement location="${engineLibPath}/wizard.jar" /> + <pathelement location="${engineLibPath}/BrowserLauncher2-10.jar" /> + </path> + <path id="EngineJars"> + <path refid="EngineDependencies"/> + <pathelement location="lib/Vengine.jar" /> + </path> + <target name="no-op"> + <echo message="Do nothing"/> + <signjar keystore="keystore" jar="batik.jar" alias="vassal_ws" storepass="vassalme" /> + + </target> + <target name="clean"> + <delete dir="${engineClassOutput}" /> + </target> + <target name="engineClasses"> + <mkdir dir="${engineClassOutput}" /> + <javac srcdir="${engineSrcPath}" destdir="${engineClassOutput}" target="1.5" source="1.5" debug="true"> + <classpath refId="EngineDependencies"></classpath> + </javac> + <mkdir dir="${engineClassOutput}/VASSAL/i18n" /> + <copy todir="${engineClassOutput}/VASSAL/i18n"> + <fileset file="${engineSrcPath}/VASSAL/i18n/*.properties"/> + </copy> + </target> + <target name="engineJar_plain" depends="engineClasses"> + <mkdir dir="${engineClassOutput}/images" /> + <copy todir="${engineClassOutput}/images"> + <fileset dir="${engineSrcPath}/images" /> + </copy> + <jar basedir="${engineClassOutput}" destfile="lib/Vengine.jar" /> + </target> + <target name="engineJar" depends="engineJar_plain"> +<!-- + <signjar keystore="keystore" jar="lib/Vengine.jar" alias="vassal_ws" storepass="vassalme" /> +--> + <copy file="lib/Vengine.jar" tofile="Vengine__V${VassalVersion}.jar" overwrite="false" failonerror="true" /> + </target> +<!-- + <target name="docsJar" depends="docs"> + <delete dir="componentInstall" /> + <mkdir dir="componentInstall" /> + <writeZipContents zipFile="${basedir}/docs.zip" destFile="${basedir}/componentInstall/docsList" /> + <writeProperties destFile="${basedir}/componentInstall/docsInfo"> +--> +<!-- + <property name="prompt" value="New Documentation has been downloaded. Install now?" /> + <property name="initialPrompt" value="Select a directory to install the VASSAL documentation" /> + <property name="installDirKey" value="docsDirectory" /> +--> +<!-- + <property name="checksumKey" value="docsChecksum-${minorVersion}" /> + <property name="installDir" value="${minorVersion}/docs" /> + <property name="required" value="README.html" /> + <property name="extractList" value="/docsList" /> + <property name="checksum" value="${DocsVersion}" /> + </writeProperties> + <unzip src="docs.zip" dest="componentInstall" /> + <jar basedir="componentInstall" destfile="lib/docs.jar" /> + <signjar keystore="keystore" jar="lib/docs.jar" alias="vassal_ws" storepass="vassalme" /> + </target> +--> + <target name="javadoc"> + <delete dir="api" /> + <mkdir dir="api" /> + <javadoc packagenames="VASSAL.*" sourcepath="${engineSrcPath}" destdir="${basedir}/api"> + </javadoc> + </target> + <target name="release" depends="javadoc"> + <zip destfile="VASSAL-${VassalVersion}.zip"> + <zipfileset dir="api" prefix="javadoc" /> + <zipfileset dir="${engineSrcPath}" prefix="src"> + <include name="**/*.java" /> + </zipfileset> + <zipfileset dir="${engineSrcPath}"> + <include name="images/*" /> + <include name="**/*.txt" /> + </zipfileset> + </zip> +<!-- + <ftp server="upload.sourceforge.net" userid="anonymous" password="rkinney" remotedir="incoming" binary="true"> + <fileset dir="${basedir}"> + <include name="VASSAL-${VassalVersion}.zip" /> + </fileset> + </ftp> +--> + </target> + <target name="libraryRelease"> + <delete file="VASSAL-libraries-${VassalVersion}.zip" /> + <zip destfile="VASSAL-libraries-${VassalVersion}.zip"> + <zipfileset dir="."> + <include name="BinaryLicense.txt" /> + <include name="lib/cryptix32.jar" /> + <include name="lib/VASSAL.jar" /> + </zipfileset> + </zip> + <ftp server="upload.sourceforge.net" userid="anonymous" password="rkinney" remotedir="incoming" binary="true"> + <fileset dir="${basedir}"> + <include name="VASSAL-libraries-${VassalVersion}.zip" /> + </fileset> + </ftp> + </target> + <target name="installer" depends="engineClasses"> + <jar destFile="InstallVASSAL.jar" basedir="${engineClassOutput}" includes="VASSAL/launch/**,VASSAL/chat/HttpRequestWrapper*"> + <manifest> + <attribute name="Main-Class" value="VASSAL/launch/install/InstallWizard"/> + </manifest> + </jar> + </target> + <target name="deployInstaller" depends="installer"> + <ftp server="vassalengine.org" userid="vassal2" password="${ftpPassword}" remotedir="www" binary="true"> + <fileset dir="."> + <include name="InstallVASSAL.jar" /> + </fileset> + </ftp> + </target> +<!-- + <target name="deployJarRunner" depends="jarRunner"> + <zip destfile="VASSAL.zip"> + <zipfileset file="runVassal.jar" /> + <zipfileset dir="."> + <include name="lib/VASSAL.jar" /> + <include name="lib/Vengine.jar" /> + <include name="lib/docs.jar" /> + <include name="lib/cryptix32.jar" /> + </zipfileset> + </zip> + <ftp server="vassalengine.org" userid="vassal2" password="vassalme" remotedir="www" binary="true"> + <fileset dir="."> + <include name="VASSAL.zip" /> + </fileset> + </ftp> + </target> +--> + <target name="deployEngine" depends="engineJar"> + <ftp server="vassalengine.org" userid="vassal2" password="${ftpPassword}" remotedir="www/ws" binary="true"> + <fileset dir="${basedir}"> + <include name="Vengine__V${VassalVersion}.jar" /> + </fileset> + </ftp> + <get src="http://www.vassalengine.org/util/updateInstall?version=${minorVersion}&jar=Vengine&jarVersion=${VassalVersion}" dest="updateVengine.out" /> + </target> + <target name="publishEngine"> + <property name="publishFile" value="Vengine.jar" /> + <property name="publishVersion" value="${VassalVersion}" /> + <antcall target="publishJar" /> + <antcall target="updateJarRunner" /> + </target> + <target name="deployAndPublishEngine" depends="deployEngine,publishEngine"/> +<!-- + <target name="deployDocs" depends="docsJar"> + <copy file="lib/docs.jar" tofile="docs__V${DocsVersion}.jar" /> + <ftp server="vassalengine.org" userid="vassal2" password="${ftpPassword}" remotedir="www/ws" binary="true"> + <fileset dir="${basedir}"> + <include name="docs__V${DocsVersion}.jar" /> + </fileset> + </ftp> + <get src="http://www.vassalengine.org/util/updateInstall?version=${minorVersion}&jar=docs&jarVersion=${DocsVersion}" dest="updateDocs.out" /> + </target> +--> + <target name="publishDocs"> + <property name="publishFile" value="docs.jar" /> + <property name="publishVersion" value="${DocsVersion}" /> + <antcall target="publishJar" /> + <antcall target="updateJarRunner" /> + </target> +<!-- + <target name="deployAndPublishDocs" depends="deployDocs,publishDocs"/> +--> + <target name="cvsBackup"> + <delete file="${cvsSrcPath}/../cvsBackup.zip" /> + <zip destfile="${cvsSrcPath}/../cvsBackup.zip"> + <zipfileset dir="${cvsSrcPath}/cvsroot" prefix="cvsroot" /> + </zip> + <ftp server="vassalengine.org" userid="vassal2" password="${ftpPassword}" remotedir="transfer" binary="true"> + <fileset dir="${cvsSrcPath}/.."> + <include name="cvsBackup.zip" /> + </fileset> + </ftp> + </target> +<!-- + <target name="deployServlets" depends="webJar"> + <ftp server="vassalengine.org" userid="vassal2" password="${ftpPassword}" remotedir="www/WEB-INF/lib" binary="true"> + <fileset dir="${basedir}"> + <include name="Vweb.jar" /> + </fileset> + </ftp> + </target> +--> + <target name="publishJar"> + <get src="http://www.vassalengine.org/util/publishJar?file=${publishFile}&version=${publishVersion}" dest="publish.out" /> + <get src="http://www.vasl.org/build/updateJar.php?file=${publishFile}" dest="updateJarVasl.out" /> + </target> + <target name="updateJarRunner"> + <get src="http://www.vassalengine.org/util/updateJarRunner" dest="updateJarRunner.out" /> + <get src="http://www.vasl.org/build/updateInstaller.php" dest="updateInstallerVasl.out" /> + </target> +</project> Deleted: VASSAL-src/trunk/dist/docsInfo =================================================================== --- VASSAL-src/branches/uckelman-caching/dist/docsInfo 2008-01-27 20:23:19 UTC (rev 2894) +++ VASSAL-src/trunk/dist/docsInfo 2008-01-27 21:21:26 UTC (rev 2895) @@ -1,8 +0,0 @@ -extractList=/docsList -checksumKey=docsChecksum-3.0 -checksum=3.0.9 -initialPrompt=Select a directory to install the VASSAL documentation -installDir=3.0/docs -installDirKey=docsDirectory -prompt=New Documentation has been downloaded. Install now? -required=README.html Copied: VASSAL-src/trunk/dist/docsInfo (from rev 2894, VASSAL-src/branches/uckelman-caching/dist/docsInfo) =================================================================== --- VASSAL-src/trunk/dist/docsInfo (rev 0) +++ VASSAL-src/trunk/dist/docsInfo 2008-01-27 21:21:26 UTC (rev 2895) @@ -0,0 +1,8 @@ +extractList=/docsList +checksumKey=docsChecksum-3.0 +checksum=3.0.9 +initialPrompt=Select a directory to install the VASSAL documentation +installDir=3.0/docs +installDirKey=docsDirectory +prompt=New Documentation has been downloaded. Install now? +required=README.html Deleted: VASSAL-src/trunk/dist/launch.xml =================================================================== --- VASSAL-src/branches/uckelman-caching/dist/launch.xml 2008-01-27 20:23:19 UTC (rev 2894) +++ VASSAL-src/trunk/dist/launch.xml 2008-01-27 21:21:26 UTC (rev 2895) @@ -1,7 +0,0 @@ -<project name="VASSAL" default="update"> - <target name="update"> - <get src="http://www.vasl.org/vassal/lib/Vengine.jar" dest="Vengine.jar"/> - <get src="http://www.vasl.org/vassal/lib/VASSAL.jar" dest="VASSAL.jar"/> - <get src="http://www.vasl.org/vassal/lib/docs.jar" dest="docs.jar"/> - </target> -</project> \ No newline at end of file Copied: VASSAL-src/trunk/dist/launch.xml (from rev 2894, VASSAL-src/branches/uckelman-caching/dist/launch.xml) =================================================================== --- VASSAL-src/trunk/dist/launch.xml (rev 0) +++ VASSAL-src/trunk/dist/launch.xml 2008-01-27 21:21:26 UTC (rev 2895) @@ -0,0 +1,7 @@ +<project name="VASSAL" default="update"> + <target name="update"> + <get src="http://www.vasl.org/vassal/lib/Vengine.jar" dest="Vengine.jar"/> + <get src="http://www.vasl.org/vassal/lib/VASSAL.jar" dest="VASSAL.jar"/> + <get src="http://www.vasl.org/vassal/lib/docs.jar" dest="docs.jar"/> + </target> +</project> \ No newline at end of file Deleted: VASSAL-src/trunk/dist/v.jsmooth =================================================================== --- VASSAL-src/branches/uckelman-caching/dist/v.jsmooth 2008-01-27 20:23:19 UTC (rev 2894) +++ VASSAL-src/trunk/dist/v.jsmooth 2008-01-27 21:21:26 UTC (rev 2895) @@ -1,44 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> -<jsmoothproject> -<JVMSearchPath>registry</JVMSearchPath> -<JVMSearchPath>javahome</JVMSearchPath> -<JVMSearchPath>jrepath</JVMSearchPath> -<JVMSearchPath>jdkpath</JVMSearchPath> -<JVMSearchPath>exepath</JVMSearchPath> -<JVMSearchPath>jview</JVMSearchPath> -<arguments>-extract /docsInfo</arguments> -<classPath>lib\Vengine.jar</classPath> -<currentDirectory>${EXECUTABLEPATH}</currentDirectory> -<embeddedJar>false</embeddedJar> -<executableName>VASSAL.exe</executableName> -<initialMemoryHeap>268435456</initialMemoryHeap> -<mainClassName>VASSAL.launch.Main</mainClassName> -<maximumMemoryHeap>536870912</maximumMemoryHeap> -<maximumVersion></maximumVersion> -<minimumVersion>1.5.0</minimumVersion> -<skeletonName>Autodownload Wrapper</skeletonName> -<skeletonProperties> -<key>Message</key> -<value>Java has not been found on your computer. Do you want to download it?</value> -</skeletonProperties> -<skeletonProperties> -<key>DownloadURL</key> -<value>http://java.sun.com/update/1.6.0/jinstall-6-windows-i586.cab</value> -</skeletonProperties> -<skeletonProperties> -<key>SingleProcess</key> -<value>0</value> -</skeletonProperties> -<skeletonProperties> -<key>SingleInstance</key> -<value>0</value> -</skeletonProperties> -<skeletonProperties> -<key>JniSmooth</key> -<value>0</value> -</skeletonProperties> -<skeletonProperties> -<key>Debug</key> -<value>0</value> -</skeletonProperties> -</jsmoothproject> Copied: VASSAL-src/trunk/dist/v.jsmooth (from rev 2894, VASSAL-src/branches/uckelman-caching/dist/v.jsmooth) =================================================================== --- VASSAL-src/trunk/dist/v.jsmooth (rev 0) +++ VASSAL-src/trunk/dist/v.jsmooth 2008-01-27 21:21:26 UTC (rev 2895) @@ -0,0 +1,44 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> +<jsmoothproject> +<JVMSearchPath>registry</JVMSearchPath> +<JVMSearchPath>javahome</JVMSearchPath> +<JVMSearchPath>jrepath</JVMSearchPath> +<JVMSearchPath>jdkpath</JVMSearchPath> +<JVMSearchPath>exepath</JVMSearchPath> +<JVMSearchPath>jview</JVMSearchPath> +<arguments>-extract /docsInfo</arguments> +<classPath>lib\Vengine.jar</classPath> +<currentDirectory>${EXECUTABLEPATH}</currentDirectory> +<embeddedJar>false</embeddedJar> +<executableName>VASSAL.exe</executableName> +<initialMemoryHeap>268435456</initialMemoryHeap> +<mainClassName>VASSAL.launch.Main</mainClassName> +<maximumMemoryHeap>536870912</maximumMemoryHeap> +<maximumVersion></maximumVersion> +<minimumVersion>1.5.0</minimumVersion> +<skeletonName>Autodownload Wrapper</skeletonName> +<skeletonProperties> +<key>Message</key> +<value>Java has not been found on your computer. Do you want to download it?</value> +</skeletonProperties> +<skeletonProperties> +<key>DownloadURL</key> +<value>http://java.sun.com/update/1.6.0/jinstall-6-windows-i586.cab</value> +</skeletonProperties> +<skeletonProperties> +<key>SingleProcess</key> +<value>0</value> +</skeletonProperties> +<skeletonProperties> +<key>SingleInstance</key> +<value>0</value> +</skeletonProperties> +<skeletonProperties> +<key>JniSmooth</key> +<value>0</value> +</skeletonProperties> +<skeletonProperties> +<key>Debug</key> +<value>0</value> +</skeletonProperties> +</jsmoothproject> Modified: VASSAL-src/trunk/doc/ReferenceManual/images/Board.png =================================================================== (Binary files differ) Modified: VASSAL-src/trunk/doc/ReferenceManual/images/Board2.png =================================================================== (Binary files differ) Modified: VASSAL-src/trunk/images/camera.gif =================================================================== (Binary files differ) Copied: VASSAL-src/trunk/images/roller.gif (from rev 2894, VASSAL-src/branches/uckelman-caching/images/roller.gif) =================================================================== (Binary files differ) Copied: VASSAL-src/trunk/lib/batik-anim.jar (from rev 2894, VASSAL-src/branches/uckelman-caching/lib/batik-anim.jar) =================================================================== (Binary files differ) Modified: VASSAL-src/trunk/lib/batik-awt-util.jar =================================================================== (Binary files differ) Modified: VASSAL-src/trunk/lib/batik-bridge.jar =================================================================== (Binary files differ) Copied: VASSAL-src/trunk/lib/batik-codec.jar (from rev 2894, VASSAL-src/branches/uckelman-caching/lib/batik-codec.jar) =================================================================== (Binary files differ) Modified: VASSAL-src/trunk/lib/batik-css.jar =================================================================== (Binary files differ) Modified: VASSAL-src/trunk/lib/batik-dom.jar =================================================================== (Binary files differ) Modified: VASSAL-src/trunk/lib/batik-ext.jar =================================================================== (Binary files differ) Modified: VASSAL-src/trunk/lib/batik-extension.jar =================================================================== (Binary files differ) Modified: VASSAL-src/trunk/lib/batik-gui-util.jar =================================================================== (Binary files differ) Modified: VASSAL-src/trunk/lib/batik-gvt.jar =================================================================== (Binary files differ) Modified: VASSAL-src/trunk/lib/batik-parser.jar =================================================================== (Binary files differ) Modified: VASSAL-src/trunk/lib/batik-script.jar =================================================================== (Binary files differ) Modified: VASSAL-src/trunk/lib/batik-svg-dom.jar =================================================================== (Binary files differ) Modified: VASSAL-src/trunk/lib/batik-svggen.jar =================================================================== (Binary files differ) Modified: VASSAL-src/trunk/lib/batik-swing.jar =================================================================== (Binary files differ) Modified: VASSAL-src/trunk/lib/batik-transcoder.jar =================================================================== (Binary files differ) Modified: VASSAL-src/trunk/lib/batik-util.jar =================================================================== (Binary files differ) Modified: VASSAL-src/trunk/lib/batik-xml.jar =================================================================== (Binary files differ) Modified: VASSAL-src/trunk/lib/js.jar =================================================================== (Binary files differ) Modified: VASSAL-src/trunk/lib/licenses/LICENSE.dom-documentation.txt =================================================================== --- VASSAL-src/trunk/lib/licenses/LICENSE.dom-documentation.txt 2008-01-27 20:23:19 UTC (rev 2894) +++ VASSAL-src/trunk/lib/licenses/LICENSE.dom-documentation.txt 2008-01-27 21:21:26 UTC (rev 2895) @@ -1,4 +1,4 @@ -xml-commons/java/external/LICENSE.dom-documentation.txt $Id: LICENSE.dom-documentation.txt,v 1.1 2002/12/09 16:15:21 vhardy Exp $ +xml-commons/java/external/LICENSE.dom-documentation.txt $Id: LICENSE.dom-documentation.txt 201084 2002-12-09 16:15:21Z vhardy $ This license came from: http://www.w3.org/Consortium/Legal/copyright-documents-19990405 Modified: VASSAL-src/trunk/lib/licenses/LICENSE.dom-software.txt =================================================================== --- VASSAL-src/trunk/lib/licenses/LICENSE.dom-software.txt 2008-01-27 20:23:19 UTC (rev 2894) +++ VASSAL-src/trunk/lib/licenses/LICENSE.dom-software.txt 2008-01-27 21:21:26 UTC (rev 2895) @@ -1,4 +1,4 @@ -xml-commons/java/external/LICENSE.dom-software.txt $Id: LICENSE.dom-software.txt,v 1.1 2002/12/09 16:15:21 vhardy Exp $ +xml-commons/java/external/LICENSE.dom-software.txt $Id: LICENSE.dom-software.txt 201084 2002-12-09 16:15:21Z vhardy $ This license came from: http://www.w3.org/Consortium/Legal/copyright-software-19980720 @@ -71,4 +71,4 @@ directed to sit...@w3.... webmaster -(last updated $Date: 2002/12/09 16:15:21 $) \ No newline at end of file +(last updated $Date: 2002-12-10 03:15:21 +1100 (Tue, 10 Dec 2002) $) \ No newline at end of file Modified: VASSAL-src/trunk/lib/licenses/LICENSE.js.txt =================================================================== --- VASSAL-src/trunk/lib/licenses/LICENSE.js.txt 2008-01-27 20:23:19 UTC (rev 2894) +++ VASSAL-src/trunk/lib/licenses/LICENSE.js.txt 2008-01-27 21:21:26 UTC (rev 2895) @@ -1,113 +1,80 @@ +This distribution includes a binary distribution of Mozilla Rhino 1.6 release 5 +plus one patch. -This distribution includes the Mozilla Rhino 1.5 release 4.1 binary -distribution without code modifications. -You can also get that distribution from the following URL: -ftp://ftp.mozilla.org/pub/js/ -Source code for Rhino is available on Mozilla web site: -http://www.mozilla.org/rhino -Rhino is licensed under the NPL (Netscape Public License) which -is duplicated below. +You can get the unpatched 1.6R5 release of Rhino from the following URL: -============================================================================== + ftp://ftp.mozilla.org/pub/mozilla.org/js/rhino1_6R5.zip -AMENDMENTS +To obtain the source code for the 1.6R5 release of Rhino, issue the following +commands: - The Netscape Public License Version 1.1 ("NPL") consists of the - Mozilla Public License Version 1.1 with the following Amendments, - including Exhibit A-Netscape Public License. Files identified with - "Exhibit A-Netscape Public License" are governed by the Netscape - Public License Version 1.1. + cvs -d :pserver:ano...@cv...:/cvsroot \ + co -D2006-11-20 mozilla/js/rhino - Additional Terms applicable to the Netscape Public License. - I. Effect. - These additional terms described in this Netscape Public - License -- Amendments shall apply to the Mozilla Communicator - client code and to all Covered Code under this License. +The patch is available here: - II. "Netscape's Branded Code" means Covered Code that Netscape - distributes and/or permits others to distribute under one or more - trademark(s) which are controlled by Netscape but which are not - licensed for use under this License. + https://bugzilla.mozilla.org/attachment.cgi?id=288467 - III. Netscape and logo. - This License does not grant any rights to use the trademarks - "Netscape", the "Netscape N and horizon" logo or the "Netscape - lighthouse" logo, "Netcenter", "Gecko", "Java" or "JavaScript", - "Smart Browsing" even if such marks are included in the Original - Code or Modifications. +which is attached to this bug: - IV. Inability to Comply Due to Contractual Obligation. - Prior to licensing the Original Code under this License, Netscape - has licensed third party code for use in Netscape's Branded Code. - To the extent that Netscape is limited contractually from making - such third party code available under this License, Netscape may - choose to reintegrate such code into Covered Code without being - required to distribute such code in Source Code form, even if - such code would otherwise be considered "Modifications" under - this License. + https://bugzilla.mozilla.org/show_bug.cgi?id=367627 - V. Use of Modifications and Covered Code by Initial Developer. - V.1. In General. - The obligations of Section 3 apply to Netscape, except to - the extent specified in this Amendment, Section V.2 and V.3. +Rhino is licensed under both the MPL (Mozilla Public License) 1.1 and the +GPL (GNU General Public License) 2.0, which are duplicated below. - V.2. Other Products. - Netscape may include Covered Code in products other than the - Netscape's Branded Code which are released by Netscape - during the two (2) years following the release date of the - Original Code, without such additional products becoming - subject to the terms of this License, and may license such - additional products on different terms from those contained - in this License. +The Rhino jar also includes four classes: + org.mozilla.javascript.tools.debugger.downloaded.AbstractCellEditor.java + org.mozilla.javascript.tools.debugger.downloaded.JTreeTable.java + org.mozilla.javascript.tools.debugger.downloaded.TreeTableModel.java + org.mozilla.javascript.tools.debugger.downloaded.TreeTableModelAdapter.java +Which come from: + http://java.sun.com/products/jfc/tsc/articles/treetable2 - V.3. Alternative Licensing. - Netscape may license the Source Code of Netscape's Branded - Code, including Modifications incorporated therein, without - such Netscape Branded Code becoming subject to the terms of - this License, and may license such Netscape Branded Code on - different terms from those contained in this License. +Under the following license: - VI. Litigation. - Notwithstanding the limitations of Section 11 above, the - provisions regarding litigation in Section 11(a), (b) and (c) of - the License shall apply to all disputes relating to this License. +Code sample +License +Copyright 1994-2006 Sun Microsystems, Inc. All Rights Reserved. - EXHIBIT A-Netscape Public License. +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + - "The contents of this file are subject to the Netscape Public - License Version 1.1 (the "License"); you may not use this file - except in compliance with the License. You may obtain a copy of - the License at http://www.mozilla.org/NPL/ + * Redistribution of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. - Software distributed under the License is distributed on an "AS - IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or - implied. See the License for the specific language governing - rights and limitations under the License. + * Redistribution in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in + the documentation and/or other materials provided with the + distribution. - The Original Code is Mozilla Communicator client code, released - March 31, 1998. + +Neither the name of Sun Microsystems, Inc. or the names of +contributors may be used to endorse or promote products derived from +this software without specific prior written permission. + +This software is provided "AS IS," without a warranty of any kind. ALL +EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES, +INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A +PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN +MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR +ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR +DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR +ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR +DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE +DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY, +ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF +SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + +You acknowledge that this software is not designed, licensed or +intended for use in the design, construction, operation or maintenance +of any nuclear facility. - The Initial Developer of the Original Code is Netscape - Communications Corporation. Portions created by Netscape are - Copyright (C) 1998-1999 Netscape Communications Corporation. All - Rights Reserved. - Contributor(s): ______________________________________. - Alternatively, the contents of this file may be used under the - terms of the _____ license (the "[___] License"), in which case - the provisions of [______] License are applicable instead of - those above. If you wish to allow use of your version of this - file only under the terms of the [____] License and not to allow - others to use your version of this file under the NPL, indicate - your decision by deleting the provisions above and replace them - with the notice and other provisions required by the [___] - License. If you do not delete the provisions above, a recipient - may use your version of this file under either the NPL or the - [___] License." +============================================================================== - ---------------------------------------------------------------------- - MOZILLA PUBLIC LICENSE Version 1.1 @@ -578,7 +545,346 @@ use the text of this Exhibit A rather than the text found in the Original Code Source Code for Your Modifications.] - ============================================================================== + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, di... [truncated message content] |