[jetrix-cvs] SF.net SVN: jetrix: [709] jetrix
Brought to you by:
smanux
From: <Sm...@us...> - 2006-11-03 21:30:03
|
Revision: 709 http://svn.sourceforge.net/jetrix/?rev=709&view=rev Author: Smanux Date: 2006-11-03 13:24:21 -0800 (Fri, 03 Nov 2006) Log Message: ----------- Respository restructuration Added Paths: ----------- jetrix/branches/0.1.x/build.properties.sample jetrix/branches/0.1.x/build.xml jetrix/branches/0.1.x/doc/ jetrix/branches/0.1.x/doc/changelog.txt jetrix/branches/0.1.x/jetrix.properties jetrix/branches/0.1.x/lib/ jetrix/branches/0.1.x/lib/commons-beanutils.jar jetrix/branches/0.1.x/lib/commons-collections.jar jetrix/branches/0.1.x/lib/commons-digester.jar jetrix/branches/0.1.x/lib/jasper-runtime.jar jetrix/branches/0.1.x/lib/jasper.jar jetrix/branches/0.1.x/lib/jetty.jar jetrix/branches/0.1.x/lib/servlet-light.jar jetrix/branches/0.1.x/lib/servlet.jar jetrix/branches/0.1.x/src/ jetrix/branches/0.1.x/src/admin/ jetrix/branches/0.1.x/src/bin/ jetrix/branches/0.1.x/src/etc/ jetrix/branches/0.1.x/src/java/ jetrix/branches/0.1.x/src/lang/ jetrix/branches/0.1.x/src/site/ jetrix/branches/0.1.x/src/test/ jetrix/branches/0.2.x/build.properties.sample jetrix/branches/0.2.x/build.xml jetrix/branches/0.2.x/doc/ jetrix/branches/0.2.x/doc/changelog.txt jetrix/branches/0.2.x/doc/javadoc-stylesheet.css jetrix/branches/0.2.x/doc/license.txt jetrix/branches/0.2.x/lib/ jetrix/branches/0.2.x/lib/commons-beanutils.jar jetrix/branches/0.2.x/lib/commons-collections.jar jetrix/branches/0.2.x/lib/commons-digester.jar jetrix/branches/0.2.x/lib/commons-lang-2.0-light.jar jetrix/branches/0.2.x/lib/jasper-runtime.jar jetrix/branches/0.2.x/lib/jasper.jar jetrix/branches/0.2.x/lib/jcrontab-1.4.1-light.jar jetrix/branches/0.2.x/lib/jetty.jar jetrix/branches/0.2.x/lib/servlet-light.jar jetrix/branches/0.2.x/lib/servlet.jar jetrix/branches/0.2.x/lib/systray4j-2.4.1.jar jetrix/branches/0.2.x/lib/systray4j.dll jetrix/branches/0.2.x/project.properties jetrix/branches/0.2.x/project.xml jetrix/branches/0.2.x/src/ jetrix/branches/0.2.x/src/admin/ jetrix/branches/0.2.x/src/bin/ jetrix/branches/0.2.x/src/etc/ jetrix/branches/0.2.x/src/java/ jetrix/branches/0.2.x/src/lang/ jetrix/branches/0.2.x/src/site/ jetrix/branches/0.2.x/src/test/ jetrix/tags/0.1.1/build.properties.sample jetrix/tags/0.1.1/build.xml jetrix/tags/0.1.1/doc/ jetrix/tags/0.1.1/jetrix.properties jetrix/tags/0.1.1/lib/ jetrix/tags/0.1.1/src/ jetrix/tags/0.1.2/build.properties.sample jetrix/tags/0.1.2/build.xml jetrix/tags/0.1.2/doc/ jetrix/tags/0.1.2/doc/changelog.txt jetrix/tags/0.1.2/jetrix.properties jetrix/tags/0.1.2/lib/ jetrix/tags/0.1.2/lib/commons-beanutils.jar jetrix/tags/0.1.2/lib/commons-collections.jar jetrix/tags/0.1.2/lib/commons-digester.jar jetrix/tags/0.1.2/lib/jasper-runtime.jar jetrix/tags/0.1.2/lib/jasper.jar jetrix/tags/0.1.2/lib/jetty.jar jetrix/tags/0.1.2/lib/servlet-light.jar jetrix/tags/0.1.2/lib/servlet.jar jetrix/tags/0.1.2/src/ jetrix/tags/0.1.2/src/admin/ jetrix/tags/0.1.2/src/bin/ jetrix/tags/0.1.2/src/etc/ jetrix/tags/0.1.2/src/java/ jetrix/tags/0.1.2/src/lang/ jetrix/tags/0.1.2/src/site/ jetrix/tags/0.1.2/src/test/ jetrix/tags/0.1.3/build.properties.sample jetrix/tags/0.1.3/build.xml jetrix/tags/0.1.3/doc/ jetrix/tags/0.1.3/doc/changelog.txt jetrix/tags/0.1.3/doc/checkstyle-noframes.xsl jetrix/tags/0.1.3/doc/license.txt jetrix/tags/0.1.3/jetrix.properties jetrix/tags/0.1.3/lib/ jetrix/tags/0.1.3/lib/commons-beanutils.jar jetrix/tags/0.1.3/lib/commons-collections.jar jetrix/tags/0.1.3/lib/commons-digester.jar jetrix/tags/0.1.3/lib/jasper-runtime.jar jetrix/tags/0.1.3/lib/jasper.jar jetrix/tags/0.1.3/lib/jetty.jar jetrix/tags/0.1.3/lib/servlet-light.jar jetrix/tags/0.1.3/lib/servlet.jar jetrix/tags/0.1.3/src/ jetrix/tags/0.1.3/src/admin/ jetrix/tags/0.1.3/src/bin/ jetrix/tags/0.1.3/src/etc/ jetrix/tags/0.1.3/src/java/ jetrix/tags/0.1.3/src/lang/ jetrix/tags/0.1.3/src/site/ jetrix/tags/0.1.3/src/test/ jetrix/tags/0.2.0/build.properties.sample jetrix/tags/0.2.0/build.xml jetrix/tags/0.2.0/doc/ jetrix/tags/0.2.0/lib/ jetrix/tags/0.2.0/project.properties jetrix/tags/0.2.0/project.xml jetrix/tags/0.2.0/src/ jetrix/tags/0.2.1/build.properties.sample jetrix/tags/0.2.1/build.xml jetrix/tags/0.2.1/doc/ jetrix/tags/0.2.1/doc/changelog.txt jetrix/tags/0.2.1/doc/javadoc-stylesheet.css jetrix/tags/0.2.1/doc/license.txt jetrix/tags/0.2.1/lib/ jetrix/tags/0.2.1/lib/commons-beanutils.jar jetrix/tags/0.2.1/lib/commons-collections.jar jetrix/tags/0.2.1/lib/commons-digester.jar jetrix/tags/0.2.1/lib/commons-lang-2.0-light.jar jetrix/tags/0.2.1/lib/jasper-runtime.jar jetrix/tags/0.2.1/lib/jasper.jar jetrix/tags/0.2.1/lib/jcrontab-1.4.1-light.jar jetrix/tags/0.2.1/lib/jetty.jar jetrix/tags/0.2.1/lib/servlet-light.jar jetrix/tags/0.2.1/lib/servlet.jar jetrix/tags/0.2.1/lib/systray4j-2.4.1.jar jetrix/tags/0.2.1/lib/systray4j.dll jetrix/tags/0.2.1/project.properties jetrix/tags/0.2.1/project.xml jetrix/tags/0.2.1/src/ jetrix/tags/0.2.1/src/admin/ jetrix/tags/0.2.1/src/bin/ jetrix/tags/0.2.1/src/etc/ jetrix/tags/0.2.1/src/java/ jetrix/tags/0.2.1/src/lang/ jetrix/tags/0.2.1/src/site/ jetrix/tags/0.2.1/src/test/ jetrix/tags/0.2.2/build.properties.sample jetrix/tags/0.2.2/build.xml jetrix/tags/0.2.2/doc/ jetrix/tags/0.2.2/doc/changelog.txt jetrix/tags/0.2.2/doc/javadoc-stylesheet.css jetrix/tags/0.2.2/doc/license.txt jetrix/tags/0.2.2/lib/ jetrix/tags/0.2.2/lib/commons-beanutils.jar jetrix/tags/0.2.2/lib/commons-collections.jar jetrix/tags/0.2.2/lib/commons-digester.jar jetrix/tags/0.2.2/lib/commons-lang-2.0-light.jar jetrix/tags/0.2.2/lib/jasper-runtime.jar jetrix/tags/0.2.2/lib/jasper.jar jetrix/tags/0.2.2/lib/jcrontab-1.4.1-light.jar jetrix/tags/0.2.2/lib/jetty.jar jetrix/tags/0.2.2/lib/servlet-light.jar jetrix/tags/0.2.2/lib/servlet.jar jetrix/tags/0.2.2/lib/systray4j-2.4.1.jar jetrix/tags/0.2.2/lib/systray4j.dll jetrix/tags/0.2.2/project.properties jetrix/tags/0.2.2/project.xml jetrix/tags/0.2.2/src/ jetrix/tags/0.2.2/src/admin/ jetrix/tags/0.2.2/src/bin/ jetrix/tags/0.2.2/src/etc/ jetrix/tags/0.2.2/src/java/ jetrix/tags/0.2.2/src/lang/ jetrix/tags/0.2.2/src/site/ jetrix/tags/0.2.2/src/test/ jetrix/trunk/build.xml jetrix/trunk/doc/ jetrix/trunk/lib/ jetrix/trunk/project.properties jetrix/trunk/project.xml jetrix/trunk/src/ Removed Paths: ------------- jetrix/branches/0.1.x/doc/changelog.txt jetrix/branches/0.1.x/jetrix/build.properties.sample jetrix/branches/0.1.x/jetrix/build.xml jetrix/branches/0.1.x/jetrix/doc/ jetrix/branches/0.1.x/jetrix/jetrix.properties jetrix/branches/0.1.x/jetrix/lib/ jetrix/branches/0.1.x/jetrix/src/ jetrix/branches/0.1.x/lib/commons-beanutils.jar jetrix/branches/0.1.x/lib/commons-collections.jar jetrix/branches/0.1.x/lib/commons-digester.jar jetrix/branches/0.1.x/lib/jasper-runtime.jar jetrix/branches/0.1.x/lib/jasper.jar jetrix/branches/0.1.x/lib/jetty.jar jetrix/branches/0.1.x/lib/servlet-light.jar jetrix/branches/0.1.x/lib/servlet.jar jetrix/branches/0.1.x/src/admin/ jetrix/branches/0.1.x/src/bin/ jetrix/branches/0.1.x/src/etc/ jetrix/branches/0.1.x/src/java/ jetrix/branches/0.1.x/src/lang/ jetrix/branches/0.1.x/src/site/ jetrix/branches/0.1.x/src/test/ jetrix/branches/0.2.x/doc/changelog.txt jetrix/branches/0.2.x/doc/javadoc-stylesheet.css jetrix/branches/0.2.x/doc/license.txt jetrix/branches/0.2.x/jetrix/build.properties.sample jetrix/branches/0.2.x/jetrix/build.xml jetrix/branches/0.2.x/jetrix/doc/ jetrix/branches/0.2.x/jetrix/lib/ jetrix/branches/0.2.x/jetrix/project.properties jetrix/branches/0.2.x/jetrix/project.xml jetrix/branches/0.2.x/jetrix/src/ jetrix/branches/0.2.x/lib/commons-beanutils.jar jetrix/branches/0.2.x/lib/commons-collections.jar jetrix/branches/0.2.x/lib/commons-digester.jar jetrix/branches/0.2.x/lib/commons-lang-2.0-light.jar jetrix/branches/0.2.x/lib/jasper-runtime.jar jetrix/branches/0.2.x/lib/jasper.jar jetrix/branches/0.2.x/lib/jcrontab-1.4.1-light.jar jetrix/branches/0.2.x/lib/jetty.jar jetrix/branches/0.2.x/lib/servlet-light.jar jetrix/branches/0.2.x/lib/servlet.jar jetrix/branches/0.2.x/lib/systray4j-2.4.1.jar jetrix/branches/0.2.x/lib/systray4j.dll jetrix/branches/0.2.x/src/admin/ jetrix/branches/0.2.x/src/bin/ jetrix/branches/0.2.x/src/etc/ jetrix/branches/0.2.x/src/java/ jetrix/branches/0.2.x/src/lang/ jetrix/branches/0.2.x/src/site/ jetrix/branches/0.2.x/src/test/ jetrix/tags/0.1.1/jetrix/.cvsignore jetrix/tags/0.1.1/jetrix/build.properties.sample jetrix/tags/0.1.1/jetrix/build.xml jetrix/tags/0.1.1/jetrix/doc/ jetrix/tags/0.1.1/jetrix/jetrix.properties jetrix/tags/0.1.1/jetrix/lib/ jetrix/tags/0.1.1/jetrix/src/ jetrix/tags/0.1.2/doc/changelog.txt jetrix/tags/0.1.2/jetrix/build.properties.sample jetrix/tags/0.1.2/jetrix/build.xml jetrix/tags/0.1.2/jetrix/doc/ jetrix/tags/0.1.2/jetrix/jetrix.properties jetrix/tags/0.1.2/jetrix/lib/ jetrix/tags/0.1.2/jetrix/src/ jetrix/tags/0.1.2/lib/commons-beanutils.jar jetrix/tags/0.1.2/lib/commons-collections.jar jetrix/tags/0.1.2/lib/commons-digester.jar jetrix/tags/0.1.2/lib/jasper-runtime.jar jetrix/tags/0.1.2/lib/jasper.jar jetrix/tags/0.1.2/lib/jetty.jar jetrix/tags/0.1.2/lib/servlet-light.jar jetrix/tags/0.1.2/lib/servlet.jar jetrix/tags/0.1.2/src/admin/ jetrix/tags/0.1.2/src/bin/ jetrix/tags/0.1.2/src/etc/ jetrix/tags/0.1.2/src/java/ jetrix/tags/0.1.2/src/lang/ jetrix/tags/0.1.2/src/site/ jetrix/tags/0.1.2/src/test/ jetrix/tags/0.1.3/doc/changelog.txt jetrix/tags/0.1.3/doc/checkstyle-noframes.xsl jetrix/tags/0.1.3/doc/license.txt jetrix/tags/0.1.3/jetrix/build.properties.sample jetrix/tags/0.1.3/jetrix/build.xml jetrix/tags/0.1.3/jetrix/doc/ jetrix/tags/0.1.3/jetrix/jetrix.properties jetrix/tags/0.1.3/jetrix/lib/ jetrix/tags/0.1.3/jetrix/src/ jetrix/tags/0.1.3/lib/commons-beanutils.jar jetrix/tags/0.1.3/lib/commons-collections.jar jetrix/tags/0.1.3/lib/commons-digester.jar jetrix/tags/0.1.3/lib/jasper-runtime.jar jetrix/tags/0.1.3/lib/jasper.jar jetrix/tags/0.1.3/lib/jetty.jar jetrix/tags/0.1.3/lib/servlet-light.jar jetrix/tags/0.1.3/lib/servlet.jar jetrix/tags/0.1.3/src/admin/ jetrix/tags/0.1.3/src/bin/ jetrix/tags/0.1.3/src/etc/ jetrix/tags/0.1.3/src/java/ jetrix/tags/0.1.3/src/lang/ jetrix/tags/0.1.3/src/site/ jetrix/tags/0.1.3/src/test/ jetrix/tags/0.2.0/jetrix/build.properties.sample jetrix/tags/0.2.0/jetrix/build.xml jetrix/tags/0.2.0/jetrix/doc/ jetrix/tags/0.2.0/jetrix/lib/ jetrix/tags/0.2.0/jetrix/project.properties jetrix/tags/0.2.0/jetrix/project.xml jetrix/tags/0.2.0/jetrix/src/ jetrix/tags/0.2.1/doc/changelog.txt jetrix/tags/0.2.1/doc/javadoc-stylesheet.css jetrix/tags/0.2.1/doc/license.txt jetrix/tags/0.2.1/jetrix/build.properties.sample jetrix/tags/0.2.1/jetrix/build.xml jetrix/tags/0.2.1/jetrix/doc/ jetrix/tags/0.2.1/jetrix/lib/ jetrix/tags/0.2.1/jetrix/project.properties jetrix/tags/0.2.1/jetrix/project.xml jetrix/tags/0.2.1/jetrix/src/ jetrix/tags/0.2.1/lib/commons-beanutils.jar jetrix/tags/0.2.1/lib/commons-collections.jar jetrix/tags/0.2.1/lib/commons-digester.jar jetrix/tags/0.2.1/lib/commons-lang-2.0-light.jar jetrix/tags/0.2.1/lib/jasper-runtime.jar jetrix/tags/0.2.1/lib/jasper.jar jetrix/tags/0.2.1/lib/jcrontab-1.4.1-light.jar jetrix/tags/0.2.1/lib/jetty.jar jetrix/tags/0.2.1/lib/servlet-light.jar jetrix/tags/0.2.1/lib/servlet.jar jetrix/tags/0.2.1/lib/systray4j-2.4.1.jar jetrix/tags/0.2.1/lib/systray4j.dll jetrix/tags/0.2.1/src/admin/ jetrix/tags/0.2.1/src/bin/ jetrix/tags/0.2.1/src/etc/ jetrix/tags/0.2.1/src/java/ jetrix/tags/0.2.1/src/lang/ jetrix/tags/0.2.1/src/site/ jetrix/tags/0.2.1/src/test/ jetrix/tags/0.2.2/doc/changelog.txt jetrix/tags/0.2.2/doc/javadoc-stylesheet.css jetrix/tags/0.2.2/doc/license.txt jetrix/tags/0.2.2/jetrix/build.properties.sample jetrix/tags/0.2.2/jetrix/build.xml jetrix/tags/0.2.2/jetrix/doc/ jetrix/tags/0.2.2/jetrix/lib/ jetrix/tags/0.2.2/jetrix/project.properties jetrix/tags/0.2.2/jetrix/project.xml jetrix/tags/0.2.2/jetrix/src/ jetrix/tags/0.2.2/lib/commons-beanutils.jar jetrix/tags/0.2.2/lib/commons-collections.jar jetrix/tags/0.2.2/lib/commons-digester.jar jetrix/tags/0.2.2/lib/commons-lang-2.0-light.jar jetrix/tags/0.2.2/lib/jasper-runtime.jar jetrix/tags/0.2.2/lib/jasper.jar jetrix/tags/0.2.2/lib/jcrontab-1.4.1-light.jar jetrix/tags/0.2.2/lib/jetty.jar jetrix/tags/0.2.2/lib/servlet-light.jar jetrix/tags/0.2.2/lib/servlet.jar jetrix/tags/0.2.2/lib/systray4j-2.4.1.jar jetrix/tags/0.2.2/lib/systray4j.dll jetrix/tags/0.2.2/src/admin/ jetrix/tags/0.2.2/src/bin/ jetrix/tags/0.2.2/src/etc/ jetrix/tags/0.2.2/src/java/ jetrix/tags/0.2.2/src/lang/ jetrix/tags/0.2.2/src/site/ jetrix/tags/0.2.2/src/test/ jetrix/trunk/jetrix/build.xml jetrix/trunk/jetrix/doc/ jetrix/trunk/jetrix/lib/ jetrix/trunk/jetrix/project.properties jetrix/trunk/jetrix/project.xml jetrix/trunk/jetrix/src/ Copied: jetrix/branches/0.1.x/build.properties.sample (from rev 706, jetrix/branches/0.1.x/jetrix/build.properties.sample) =================================================================== --- jetrix/branches/0.1.x/build.properties.sample (rev 0) +++ jetrix/branches/0.1.x/build.properties.sample 2006-11-03 21:24:21 UTC (rev 709) @@ -0,0 +1 @@ +build.compiler=jikes Copied: jetrix/branches/0.1.x/build.xml (from rev 706, jetrix/branches/0.1.x/jetrix/build.xml) =================================================================== --- jetrix/branches/0.1.x/build.xml (rev 0) +++ jetrix/branches/0.1.x/build.xml 2006-11-03 21:24:21 UTC (rev 709) @@ -0,0 +1,309 @@ +<?xml version="1.0" encoding="iso-8859-1"?> +<project name="Jetrix TetriNET Server" default="dist" basedir="."> + + <property name="compile.debug" value="true"/> + <property name="compile.optimize" value="false"/> + <property name="src" value="src"/> + <property name="lib" value="lib"/> + <property name="doc" value="doc"/> + <property name="build" value="build"/> + <property name="dist" value="dist"/> + <property name="deploy" value="deploy"/> + <property file="build.properties" /> + <property file="jetrix.properties" /> + <property file="password.properties" /> + + <target name="init"> + <!-- Create the time stamp --> + <tstamp> + <format property="build.time" pattern="yyyyMMddHH"/> + </tstamp> + <!-- Filters --> + <filter token="version" value="${version}"/> + <filter token="build.time" value="${build.time}"/> + <!-- Create the build directory structure used by compile --> + <mkdir dir="${build}"/> + <mkdir dir="${build}/java"/> + <mkdir dir="${build}/classes"/> + </target> + + <target name="prepare" depends="init"> + <copy todir="${build}/java" filtering="on"> + <fileset dir="${src}/java" includes="**/*.java"/> + </copy> + </target> + + <target name="compile" depends="prepare"> + <!-- Compile the java code from ${src} into ${build} --> + <javac srcdir="${build}/java" destdir="${build}/classes" debug="${compile.debug}" optimize="${compile.optimize}"> + <classpath> + <pathelement location="${lib}/commons-digester.jar"/> + <pathelement location="${lib}/commons-collections.jar"/> + <pathelement location="${lib}/jetty.jar"/> + </classpath> + </javac> + </target> + + <target name="compile.test" depends="compile" description="Compile JUnit TestCases"> + <mkdir dir="${build}/test"/> + <javac srcdir="${src}/test" destdir="${build}/test" debug="yes"> + <classpath> + <pathelement path="${build}/classes" /> + <pathelement location="${lib}/junit.jar"/> + </classpath> + </javac> + </target> + + <target name="compile.jsp" depends="compile" description="Compile the JSP pages"> + <mkdir dir="${build}/jsp"/> + <jspc destdir="${build}/jsp" verbose="1" srcdir="${src}/admin"> + <classpath> + <pathelement location="${lib}/jasper.jar"/> + <pathelement location="${ant.home}/lib/ant.jar"/> + <pathelement location="${lib}/servlet.jar"/> + </classpath> + </jspc> + <javac destdir="${build}/jsp" debug="yes"> + <classpath> + <pathelement path="${build}/classes/"/> + <pathelement location="${lib}/servlet.jar"/> + </classpath> + <src path="${build}/jsp"/> + <src path="${src}/admin/WEB-INF/classes"/> + </javac> + </target> + + <target name="jar" depends="compile.jsp"> + <!-- Create the distribution directory --> + <mkdir dir="${dist}/lib"/> + <jar jarfile="${dist}/lib/jetrix-${version}.jar"> + <manifest> + <attribute name="Implementation-Title" value="Jetrix TetriNET Server"/> + <attribute name="Implementation-Version" value="${version}"/> + <attribute name="Main-Class" value="net.jetrix.Server"/> + </manifest> + <fileset dir="${build}/classes"/> + <fileset dir="${src}/etc"> + <include name="tetrinet-server.dtd"/> + </fileset> + </jar> + + <mkdir dir="${dist}/webapp"/> + <war destfile="${dist}/webapp/jetrix-admin-${version}.war" webxml="${src}/admin/WEB-INF/web.xml"> + <fileset dir="${src}/admin"> + <exclude name="WEB-INF/web.xml"/> + <exclude name="**/*.jsp"/> + <exclude name="**/*.java"/> + </fileset> + <classes dir="${build}/jsp"> + <include name="**/*.class"/> + </classes> + </war> + </target> + + <target name="dist" depends="jar"> + + <mkdir dir="${build}/bin"/> + <copy todir="${build}/bin" filtering="on"> + <fileset dir="${src}/bin" includes="**/*"/> + </copy> + + <mkdir dir="${dist}/bin"/> + + <zip zipfile="${dist}/bin/jetrix-${version}.zip"> + <zipfileset prefix="jetrix-${version}/" dir="${src}/etc/"> + <include name="news.txt" /> + <include name="LICENSE" /> + <include name="README" /> + <include name="config.xml" /> + </zipfileset> + <zipfileset prefix="jetrix-${version}/" dir="${build}/bin/"> + <include name="jetrix.bat" /> + <include name="jetrix" /> + <include name="update.bat" /> + <include name="update" /> + </zipfileset> + <zipfileset prefix="jetrix-${version}/lib/" dir="${dist}/lib/"> + <include name="jetrix-${version}.jar" /> + </zipfileset> + <zipfileset prefix="jetrix-${version}/lib/" dir="${lib}"> + <include name="commons-digester.jar" /> + <include name="commons-collections.jar" /> + <include name="commons-beanutils.jar" /> + <include name="jetty.jar"/> + <include name="servlet-light.jar"/> + <include name="jasper-runtime.jar"/> + </zipfileset> + <zipfileset prefix="jetrix-${version}/lib/" dir="${dist}/webapp/"> + <include name="*.war" /> + </zipfileset> + <zipfileset prefix="jetrix-${version}/lang/" dir="${src}/lang/"> + <include name="*.properties" /> + </zipfileset> + <zipfileset prefix="jetrix-${version}/log/" dir="${src}/etc/log/"/> + </zip> + + <tar destfile="${dist}/bin/jetrix-${version}.tar"> + <tarfileset prefix="jetrix-${version}/" dir="${src}/etc/"> + <include name="news.txt" /> + <include name="LICENSE" /> + <include name="README" /> + <include name="config.xml" /> + </tarfileset> + <tarfileset prefix="jetrix-${version}/" dir="${build}/bin/"> + <include name="jetrix.bat" /> + <include name="update.bat" /> + </tarfileset> + <tarfileset prefix="jetrix-${version}/" dir="${build}/bin/" mode="755"> + <include name="jetrix" /> + <include name="update" /> + </tarfileset> + <tarfileset prefix="jetrix-${version}/lib/" dir="${dist}/lib/"> + <include name="jetrix-${version}.jar" /> + </tarfileset> + <tarfileset prefix="jetrix-${version}/lib/" dir="${lib}"> + <include name="commons-digester.jar" /> + <include name="commons-collections.jar" /> + <include name="commons-beanutils.jar" /> + <include name="jetty.jar"/> + <include name="servlet-light.jar"/> + <include name="jasper-runtime.jar"/> + </tarfileset> + <tarfileset prefix="jetrix-${version}/lib/" dir="${dist}/webapp/"> + <include name="*.war" /> + </tarfileset> + <tarfileset prefix="jetrix-${version}/lang/" dir="${src}/lang/"> + <include name="*.properties" /> + </tarfileset> + <tarfileset prefix="jetrix-${version}/log/" dir="${src}/etc/log/"/> + </tar> + + <gzip zipfile="${dist}/bin/jetrix-${version}.tar.gz" src="${dist}/bin/jetrix-${version}.tar"/> + <delete file="${dist}/bin/jetrix-${version}.tar"/> + + </target> + + + <target name="dist.src" description="Build source distribution"> + <!-- Create the source distribution directory --> + <mkdir dir="${dist}/src"/> + + <zip zipfile="${dist}/src/jetrix-${version}-src.zip"> + <zipfileset prefix="jetrix-${version}-src/" dir="."> + <include name="build.xml" /> + <include name="jetrix.properties" /> + </zipfileset> + <zipfileset prefix="jetrix-${version}-src/src/" dir="${src}"> + <exclude name="site/"/> + </zipfileset> + <zipfileset prefix="jetrix-${version}-src/lib/" dir="${lib}" /> + </zip> + + <tar destfile="${dist}/src/jetrix-${version}-src.tar"> + <tarfileset prefix="jetrix-${version}-src/" dir="."> + <include name="build.xml" /> + <include name="jetrix.properties" /> + </tarfileset> + <tarfileset prefix="jetrix-${version}-src/src/" dir="${src}"> + <exclude name="site/"/> + </tarfileset> + <tarfileset prefix="jetrix-${version}-src/lib/" dir="${lib}" /> + </tar> + + <gzip zipfile="${dist}/src/jetrix-${version}-src.tar.gz" src="${dist}/src/jetrix-${version}-src.tar"/> + <delete file="${dist}/src/jetrix-${version}-src.tar"/> + + </target> + + <target name="dist.all" depends="clean, dist, dist.src, doc" description="Build all distributed files"/> + + <target name="test" depends="compile.test" description="Runs testcases"> + <junit printsummary="withOutAndErr" showoutput="yes" fork="yes" dir="${src}/etc"> + <classpath> + <pathelement path="${build}/test" /> + <pathelement path="${build}/classes" /> + <pathelement path="${src}/etc" /> + <pathelement location="${lib}/commons-beanutils.jar"/> + <pathelement location="${lib}/commons-collections.jar"/> + <pathelement location="${lib}/commons-digester.jar"/> + <pathelement location="${lib}/jetty.jar"/> + </classpath> + <formatter type="xml" /> + <batchtest todir="${build}/test"> + <fileset dir="${build}/test"> + <include name="**/*Test.class" /> + </fileset> + </batchtest> + </junit> + <mkdir dir="${doc}/test"/> + <junitreport todir="${build}/test"> + <fileset dir="${build}/test"> + <include name="TEST-*.xml"/> + </fileset> + <report format="noframes" todir="${doc}/test"/> + </junitreport> + </target> + + + <target name="deploy" depends="dist"> + <delete dir="${deploy}"/> + <mkdir dir="${deploy}"/> + <unzip src="${dist}/bin/jetrix-${version}.zip" dest="${deploy}" /> + </target> + + + <target name="run" depends="deploy"> + <java dir="${deploy}/jetrix-${version}" jar="${deploy}/jetrix-${version}/lib/jetrix-${version}.jar" fork="yes"> + <sysproperty key="jetrix.debug" value="true"/> + </java> + </target> + + <target name="update" depends="deploy" description="Uploads JetriX to the patch server"> + <!-- Installing --> + <delete dir="${deploy}"/> + <mkdir dir="${deploy}"/> + <unzip src="${dist}/bin/jetrix-${version}.zip" dest="${deploy}" /> + + <!-- Checksum computation --> + <java classname="net.jetrix.patcher.UpdateList" dir="${deploy}/jetrix-${version}" classpath="${deploy}/jetrix/lib/jetrix-${version}.jar" fork="yes" /> + + <!-- Uploading to patch server --> + <ftp server="${ftp.host}" remotedir="/vsite/tetrinet/public_html/jetrix/autoupdate" userid="${ftp.login}" password="${ftp.pass}" depends="yes" verbose="yes" ignoreNoncriticalErrors="yes"> + <fileset dir="${deploy}/jetrix-${version}"/> + </ftp> + </target> + + <target name="doc"> + <mkdir dir="${doc}/api"/> + <mkdir dir="${dist}/doc"/> + <javadoc packagenames="net.jetrix.*" + sourcepath="${src}/java" + classpath="${src}/java" + destdir="${doc}/api" + author="true" + version="true" + use="false" + windowtitle="Javadoc JetriX" + doctitle="JetriX TetriNET Server" + bottom="Copyright © 2001-2003 Emmanuel Bourg. All Rights Reserved."> + <classpath> + <fileset dir="${lib}" > + <include name="*.jar" /> + </fileset> + </classpath> + <link href="http://java.sun.com/j2se/1.4.2/docs/api/"/> + <link href="http://jetty.mortbay.org/javadoc/"/> + </javadoc> + <zip zipfile="${dist}/doc/jetrix-${version}-api.zip"> + <zipfileset prefix="jetrix-${version}-api/" dir="${doc}/api"/> + </zip> + </target> + + <target name="clean"> + <!-- Delete the ${build} directory tree --> + <delete dir="${dist}"/> + <delete dir="${build}"/> + <delete dir="${deploy}"/> + </target> + +</project> Copied: jetrix/branches/0.1.x/doc (from rev 706, jetrix/branches/0.1.x/jetrix/doc) Deleted: jetrix/branches/0.1.x/doc/changelog.txt =================================================================== --- jetrix/branches/0.1.x/jetrix/doc/changelog.txt 2006-11-03 20:32:59 UTC (rev 706) +++ jetrix/branches/0.1.x/doc/changelog.txt 2006-11-03 21:24:21 UTC (rev 709) @@ -1,96 +0,0 @@ -JetriX Changelog -================ - -TODO ----- -- implement the /afk command -- zip files on the patch server -- /snoop -- /help <command name> -- check for new versions available -- ignore & friend list -- complete the tspec support -- /mute <nick> -- server advertisement on tetrinet.org and tfast.org -- /ban & /unban -- display available languages with /lang -- /lfd looking for duel - -Changes in version 0.1.2 (2003-08-03) -------------------------------------- -- new commands : /move, /goto, /petition, /tmsg, /speclist -- new game mod : 7tetris -- basic web administration console available on port 8080 (read only) -- basic tspec support -- implemented the winlists -- implemented the tetrinetx query protocol -- the connection timeout is now enabled -- implemented the ban list (hosts only) -- italian translation contributed by Claudio Gargiulo -- german translation contributed by Mario Meuser - -Changes in version 0.1.1 (2003-03-02) -------------------------------------- -- new commands : /start, /stop, /pause, /random, /reply -- "/start <n>" will run a countdown for n seconds -- the admin console can now use all /commands available to the clients -- the winner is announced at the end of the game -- any jar or class in the ./lib directory is now loaded at startup -- the number of concurrent connections from the same host can be limited (the default value is 2) -- channel access can now be restricted by access level -- channels can now be protected by a password -- the /join command now accepts channel numbers as argument - -Changes in version 0.1.0 (2002-11-16) -------------------------------------- -- added support for tetrifast clients -- new commands : /teleport, /summon, /ping and /ip -- level change is now working -- full internationalization support -- added french support -- added dutch support (contributed by Tim Van Wassenhove) -- made the colors & styles protocol independant - -Changes in version 0.0.10 (2002-09-28) --------------------------------------- -- implemented the client repository -- nickname uniqueness is now checked on logging -- incomming clients are now rejected when the server is full -- implemented the pluggable command system -- implemented the /who command -- implemented the /tell command (/msg and /cmsg are aliases) -- implemented the /op command -- implemented the /kick command -- implemented the /broadcast command -- implemented the /time command -- implemented the /motd command -- implemented the /emote command -- commands can now be invoked using their partial name (/ver, /t, etc...) -- reduced server startup time -- clients are now properly disconnected on server shutdown - -Changes in version 0.0.9 (2002-06-23) -------------------------------------- -- improved channel switching -- implemented the game pause -- the end of the game in now detected -- improved the configuration system -- implemented the channel filter system -- filter: spam blocker -- filter: game auto-start when players say "go" -- filter: special block multiplier -- added the /conf command to display the channel settings -- added server log files -- added a debug mode (run JetriX with the -Djetrix.debug=true parameter) -- now displaying a message upon player disconnection -- implemented a special block check to prevent forged messages to crash clients -- added the /version command -- added a source distribution -- added a more unix friendly .tar.gz distribution - -Changes in version 0.0.8 (2002-03-26) -------------------------------------- -- added the configuration file config.xml -- implemented multi-channel -- added the /list and /join commands - Copied: jetrix/branches/0.1.x/doc/changelog.txt (from rev 708, jetrix/branches/0.1.x/jetrix/doc/changelog.txt) =================================================================== --- jetrix/branches/0.1.x/doc/changelog.txt (rev 0) +++ jetrix/branches/0.1.x/doc/changelog.txt 2006-11-03 21:24:21 UTC (rev 709) @@ -0,0 +1,96 @@ +JetriX Changelog +================ + +TODO +---- +- implement the /afk command +- zip files on the patch server +- /snoop +- /help <command name> +- check for new versions available +- ignore & friend list +- complete the tspec support +- /mute <nick> +- server advertisement on tetrinet.org and tfast.org +- /ban & /unban +- display available languages with /lang +- /lfd looking for duel + +Changes in version 0.1.2 (2003-08-03) +------------------------------------- +- new commands : /move, /goto, /petition, /tmsg, /speclist +- new game mod : 7tetris +- basic web administration console available on port 8080 (read only) +- basic tspec support +- implemented the winlists +- implemented the tetrinetx query protocol +- the connection timeout is now enabled +- implemented the ban list (hosts only) +- italian translation contributed by Claudio Gargiulo +- german translation contributed by Mario Meuser + +Changes in version 0.1.1 (2003-03-02) +------------------------------------- +- new commands : /start, /stop, /pause, /random, /reply +- "/start <n>" will run a countdown for n seconds +- the admin console can now use all /commands available to the clients +- the winner is announced at the end of the game +- any jar or class in the ./lib directory is now loaded at startup +- the number of concurrent connections from the same host can be limited (the default value is 2) +- channel access can now be restricted by access level +- channels can now be protected by a password +- the /join command now accepts channel numbers as argument + +Changes in version 0.1.0 (2002-11-16) +------------------------------------- +- added support for tetrifast clients +- new commands : /teleport, /summon, /ping and /ip +- level change is now working +- full internationalization support +- added french support +- added dutch support (contributed by Tim Van Wassenhove) +- made the colors & styles protocol independant + +Changes in version 0.0.10 (2002-09-28) +-------------------------------------- +- implemented the client repository +- nickname uniqueness is now checked on logging +- incomming clients are now rejected when the server is full +- implemented the pluggable command system +- implemented the /who command +- implemented the /tell command (/msg and /cmsg are aliases) +- implemented the /op command +- implemented the /kick command +- implemented the /broadcast command +- implemented the /time command +- implemented the /motd command +- implemented the /emote command +- commands can now be invoked using their partial name (/ver, /t, etc...) +- reduced server startup time +- clients are now properly disconnected on server shutdown + +Changes in version 0.0.9 (2002-06-23) +------------------------------------- +- improved channel switching +- implemented the game pause +- the end of the game in now detected +- improved the configuration system +- implemented the channel filter system +- filter: spam blocker +- filter: game auto-start when players say "go" +- filter: special block multiplier +- added the /conf command to display the channel settings +- added server log files +- added a debug mode (run JetriX with the -Djetrix.debug=true parameter) +- now displaying a message upon player disconnection +- implemented a special block check to prevent forged messages to crash clients +- added the /version command +- added a source distribution +- added a more unix friendly .tar.gz distribution + +Changes in version 0.0.8 (2002-03-26) +------------------------------------- +- added the configuration file config.xml +- implemented multi-channel +- added the /list and /join commands + Deleted: jetrix/branches/0.1.x/jetrix/build.properties.sample =================================================================== --- jetrix/branches/0.1.x/jetrix/build.properties.sample 2006-11-03 20:55:44 UTC (rev 708) +++ jetrix/branches/0.1.x/jetrix/build.properties.sample 2006-11-03 21:24:21 UTC (rev 709) @@ -1 +0,0 @@ -build.compiler=jikes Deleted: jetrix/branches/0.1.x/jetrix/build.xml =================================================================== --- jetrix/branches/0.1.x/jetrix/build.xml 2006-11-03 20:55:44 UTC (rev 708) +++ jetrix/branches/0.1.x/jetrix/build.xml 2006-11-03 21:24:21 UTC (rev 709) @@ -1,309 +0,0 @@ -<?xml version="1.0" encoding="iso-8859-1"?> -<project name="Jetrix TetriNET Server" default="dist" basedir="."> - - <property name="compile.debug" value="true"/> - <property name="compile.optimize" value="false"/> - <property name="src" value="src"/> - <property name="lib" value="lib"/> - <property name="doc" value="doc"/> - <property name="build" value="build"/> - <property name="dist" value="dist"/> - <property name="deploy" value="deploy"/> - <property file="build.properties" /> - <property file="jetrix.properties" /> - <property file="password.properties" /> - - <target name="init"> - <!-- Create the time stamp --> - <tstamp> - <format property="build.time" pattern="yyyyMMddHH"/> - </tstamp> - <!-- Filters --> - <filter token="version" value="${version}"/> - <filter token="build.time" value="${build.time}"/> - <!-- Create the build directory structure used by compile --> - <mkdir dir="${build}"/> - <mkdir dir="${build}/java"/> - <mkdir dir="${build}/classes"/> - </target> - - <target name="prepare" depends="init"> - <copy todir="${build}/java" filtering="on"> - <fileset dir="${src}/java" includes="**/*.java"/> - </copy> - </target> - - <target name="compile" depends="prepare"> - <!-- Compile the java code from ${src} into ${build} --> - <javac srcdir="${build}/java" destdir="${build}/classes" debug="${compile.debug}" optimize="${compile.optimize}"> - <classpath> - <pathelement location="${lib}/commons-digester.jar"/> - <pathelement location="${lib}/commons-collections.jar"/> - <pathelement location="${lib}/jetty.jar"/> - </classpath> - </javac> - </target> - - <target name="compile.test" depends="compile" description="Compile JUnit TestCases"> - <mkdir dir="${build}/test"/> - <javac srcdir="${src}/test" destdir="${build}/test" debug="yes"> - <classpath> - <pathelement path="${build}/classes" /> - <pathelement location="${lib}/junit.jar"/> - </classpath> - </javac> - </target> - - <target name="compile.jsp" depends="compile" description="Compile the JSP pages"> - <mkdir dir="${build}/jsp"/> - <jspc destdir="${build}/jsp" verbose="1" srcdir="${src}/admin"> - <classpath> - <pathelement location="${lib}/jasper.jar"/> - <pathelement location="${ant.home}/lib/ant.jar"/> - <pathelement location="${lib}/servlet.jar"/> - </classpath> - </jspc> - <javac destdir="${build}/jsp" debug="yes"> - <classpath> - <pathelement path="${build}/classes/"/> - <pathelement location="${lib}/servlet.jar"/> - </classpath> - <src path="${build}/jsp"/> - <src path="${src}/admin/WEB-INF/classes"/> - </javac> - </target> - - <target name="jar" depends="compile.jsp"> - <!-- Create the distribution directory --> - <mkdir dir="${dist}/lib"/> - <jar jarfile="${dist}/lib/jetrix-${version}.jar"> - <manifest> - <attribute name="Implementation-Title" value="Jetrix TetriNET Server"/> - <attribute name="Implementation-Version" value="${version}"/> - <attribute name="Main-Class" value="net.jetrix.Server"/> - </manifest> - <fileset dir="${build}/classes"/> - <fileset dir="${src}/etc"> - <include name="tetrinet-server.dtd"/> - </fileset> - </jar> - - <mkdir dir="${dist}/webapp"/> - <war destfile="${dist}/webapp/jetrix-admin-${version}.war" webxml="${src}/admin/WEB-INF/web.xml"> - <fileset dir="${src}/admin"> - <exclude name="WEB-INF/web.xml"/> - <exclude name="**/*.jsp"/> - <exclude name="**/*.java"/> - </fileset> - <classes dir="${build}/jsp"> - <include name="**/*.class"/> - </classes> - </war> - </target> - - <target name="dist" depends="jar"> - - <mkdir dir="${build}/bin"/> - <copy todir="${build}/bin" filtering="on"> - <fileset dir="${src}/bin" includes="**/*"/> - </copy> - - <mkdir dir="${dist}/bin"/> - - <zip zipfile="${dist}/bin/jetrix-${version}.zip"> - <zipfileset prefix="jetrix-${version}/" dir="${src}/etc/"> - <include name="news.txt" /> - <include name="LICENSE" /> - <include name="README" /> - <include name="config.xml" /> - </zipfileset> - <zipfileset prefix="jetrix-${version}/" dir="${build}/bin/"> - <include name="jetrix.bat" /> - <include name="jetrix" /> - <include name="update.bat" /> - <include name="update" /> - </zipfileset> - <zipfileset prefix="jetrix-${version}/lib/" dir="${dist}/lib/"> - <include name="jetrix-${version}.jar" /> - </zipfileset> - <zipfileset prefix="jetrix-${version}/lib/" dir="${lib}"> - <include name="commons-digester.jar" /> - <include name="commons-collections.jar" /> - <include name="commons-beanutils.jar" /> - <include name="jetty.jar"/> - <include name="servlet-light.jar"/> - <include name="jasper-runtime.jar"/> - </zipfileset> - <zipfileset prefix="jetrix-${version}/lib/" dir="${dist}/webapp/"> - <include name="*.war" /> - </zipfileset> - <zipfileset prefix="jetrix-${version}/lang/" dir="${src}/lang/"> - <include name="*.properties" /> - </zipfileset> - <zipfileset prefix="jetrix-${version}/log/" dir="${src}/etc/log/"/> - </zip> - - <tar destfile="${dist}/bin/jetrix-${version}.tar"> - <tarfileset prefix="jetrix-${version}/" dir="${src}/etc/"> - <include name="news.txt" /> - <include name="LICENSE" /> - <include name="README" /> - <include name="config.xml" /> - </tarfileset> - <tarfileset prefix="jetrix-${version}/" dir="${build}/bin/"> - <include name="jetrix.bat" /> - <include name="update.bat" /> - </tarfileset> - <tarfileset prefix="jetrix-${version}/" dir="${build}/bin/" mode="755"> - <include name="jetrix" /> - <include name="update" /> - </tarfileset> - <tarfileset prefix="jetrix-${version}/lib/" dir="${dist}/lib/"> - <include name="jetrix-${version}.jar" /> - </tarfileset> - <tarfileset prefix="jetrix-${version}/lib/" dir="${lib}"> - <include name="commons-digester.jar" /> - <include name="commons-collections.jar" /> - <include name="commons-beanutils.jar" /> - <include name="jetty.jar"/> - <include name="servlet-light.jar"/> - <include name="jasper-runtime.jar"/> - </tarfileset> - <tarfileset prefix="jetrix-${version}/lib/" dir="${dist}/webapp/"> - <include name="*.war" /> - </tarfileset> - <tarfileset prefix="jetrix-${version}/lang/" dir="${src}/lang/"> - <include name="*.properties" /> - </tarfileset> - <tarfileset prefix="jetrix-${version}/log/" dir="${src}/etc/log/"/> - </tar> - - <gzip zipfile="${dist}/bin/jetrix-${version}.tar.gz" src="${dist}/bin/jetrix-${version}.tar"/> - <delete file="${dist}/bin/jetrix-${version}.tar"/> - - </target> - - - <target name="dist.src" description="Build source distribution"> - <!-- Create the source distribution directory --> - <mkdir dir="${dist}/src"/> - - <zip zipfile="${dist}/src/jetrix-${version}-src.zip"> - <zipfileset prefix="jetrix-${version}-src/" dir="."> - <include name="build.xml" /> - <include name="jetrix.properties" /> - </zipfileset> - <zipfileset prefix="jetrix-${version}-src/src/" dir="${src}"> - <exclude name="site/"/> - </zipfileset> - <zipfileset prefix="jetrix-${version}-src/lib/" dir="${lib}" /> - </zip> - - <tar destfile="${dist}/src/jetrix-${version}-src.tar"> - <tarfileset prefix="jetrix-${version}-src/" dir="."> - <include name="build.xml" /> - <include name="jetrix.properties" /> - </tarfileset> - <tarfileset prefix="jetrix-${version}-src/src/" dir="${src}"> - <exclude name="site/"/> - </tarfileset> - <tarfileset prefix="jetrix-${version}-src/lib/" dir="${lib}" /> - </tar> - - <gzip zipfile="${dist}/src/jetrix-${version}-src.tar.gz" src="${dist}/src/jetrix-${version}-src.tar"/> - <delete file="${dist}/src/jetrix-${version}-src.tar"/> - - </target> - - <target name="dist.all" depends="clean, dist, dist.src, doc" description="Build all distributed files"/> - - <target name="test" depends="compile.test" description="Runs testcases"> - <junit printsummary="withOutAndErr" showoutput="yes" fork="yes" dir="${src}/etc"> - <classpath> - <pathelement path="${build}/test" /> - <pathelement path="${build}/classes" /> - <pathelement path="${src}/etc" /> - <pathelement location="${lib}/commons-beanutils.jar"/> - <pathelement location="${lib}/commons-collections.jar"/> - <pathelement location="${lib}/commons-digester.jar"/> - <pathelement location="${lib}/jetty.jar"/> - </classpath> - <formatter type="xml" /> - <batchtest todir="${build}/test"> - <fileset dir="${build}/test"> - <include name="**/*Test.class" /> - </fileset> - </batchtest> - </junit> - <mkdir dir="${doc}/test"/> - <junitreport todir="${build}/test"> - <fileset dir="${build}/test"> - <include name="TEST-*.xml"/> - </fileset> - <report format="noframes" todir="${doc}/test"/> - </junitreport> - </target> - - - <target name="deploy" depends="dist"> - <delete dir="${deploy}"/> - <mkdir dir="${deploy}"/> - <unzip src="${dist}/bin/jetrix-${version}.zip" dest="${deploy}" /> - </target> - - - <target name="run" depends="deploy"> - <java dir="${deploy}/jetrix-${version}" jar="${deploy}/jetrix-${version}/lib/jetrix-${version}.jar" fork="yes"> - <sysproperty key="jetrix.debug" value="true"/> - </java> - </target> - - <target name="update" depends="deploy" description="Uploads JetriX to the patch server"> - <!-- Installing --> - <delete dir="${deploy}"/> - <mkdir dir="${deploy}"/> - <unzip src="${dist}/bin/jetrix-${version}.zip" dest="${deploy}" /> - - <!-- Checksum computation --> - <java classname="net.jetrix.patcher.UpdateList" dir="${deploy}/jetrix-${version}" classpath="${deploy}/jetrix/lib/jetrix-${version}.jar" fork="yes" /> - - <!-- Uploading to patch server --> - <ftp server="${ftp.host}" remotedir="/vsite/tetrinet/public_html/jetrix/autoupdate" userid="${ftp.login}" password="${ftp.pass}" depends="yes" verbose="yes" ignoreNoncriticalErrors="yes"> - <fileset dir="${deploy}/jetrix-${version}"/> - </ftp> - </target> - - <target name="doc"> - <mkdir dir="${doc}/api"/> - <mkdir dir="${dist}/doc"/> - <javadoc packagenames="net.jetrix.*" - sourcepath="${src}/java" - classpath="${src}/java" - destdir="${doc}/api" - author="true" - version="true" - use="false" - windowtitle="Javadoc JetriX" - doctitle="JetriX TetriNET Server" - bottom="Copyright © 2001-2003 Emmanuel Bourg. All Rights Reserved."> - <classpath> - <fileset dir="${lib}" > - <include name="*.jar" /> - </fileset> - </classpath> - <link href="http://java.sun.com/j2se/1.4.2/docs/api/"/> - <link href="http://jetty.mortbay.org/javadoc/"/> - </javadoc> - <zip zipfile="${dist}/doc/jetrix-${version}-api.zip"> - <zipfileset prefix="jetrix-${version}-api/" dir="${doc}/api"/> - </zip> - </target> - - <target name="clean"> - <!-- Delete the ${build} directory tree --> - <delete dir="${dist}"/> - <delete dir="${build}"/> - <delete dir="${deploy}"/> - </target> - -</project> Deleted: jetrix/branches/0.1.x/jetrix/jetrix.properties =================================================================== --- jetrix/branches/0.1.x/jetrix/jetrix.properties 2006-11-03 20:55:44 UTC (rev 708) +++ jetrix/branches/0.1.x/jetrix/jetrix.properties 2006-11-03 21:24:21 UTC (rev 709) @@ -1 +0,0 @@ -version=0.1.2 Copied: jetrix/branches/0.1.x/jetrix.properties (from rev 706, jetrix/branches/0.1.x/jetrix/jetrix.properties) =================================================================== --- jetrix/branches/0.1.x/jetrix.properties (rev 0) +++ jetrix/branches/0.1.x/jetrix.properties 2006-11-03 21:24:21 UTC (rev 709) @@ -0,0 +1 @@ +version=0.1.2 Copied: jetrix/branches/0.1.x/lib (from rev 706, jetrix/branches/0.1.x/jetrix/lib) Deleted: jetrix/branches/0.1.x/lib/commons-beanutils.jar =================================================================== (Binary files differ) Copied: jetrix/branches/0.1.x/lib/commons-beanutils.jar (from rev 708, jetrix/branches/0.1.x/jetrix/lib/commons-beanutils.jar) =================================================================== (Binary files differ) Deleted: jetrix/branches/0.1.x/lib/commons-collections.jar =================================================================== (Binary files differ) Copied: jetrix/branches/0.1.x/lib/commons-collections.jar (from rev 708, jetrix/branches/0.1.x/jetrix/lib/commons-collections.jar) =================================================================== (Binary files differ) Deleted: jetrix/branches/0.1.x/lib/commons-digester.jar =================================================================== (Binary files differ) Copied: jetrix/branches/0.1.x/lib/commons-digester.jar (from rev 708, jetrix/branches/0.1.x/jetrix/lib/commons-digester.jar) =================================================================== (Binary files differ) Deleted: jetrix/branches/0.1.x/lib/jasper-runtime.jar =================================================================== (Binary files differ) Copied: jetrix/branches/0.1.x/lib/jasper-runtime.jar (from rev 708, jetrix/branches/0.1.x/jetrix/lib/jasper-runtime.jar) =================================================================== (Binary files differ) Deleted: jetrix/branches/0.1.x/lib/jasper.jar =================================================================== (Binary files differ) Copied: jetrix/branches/0.1.x/lib/jasper.jar (from rev 708, jetrix/branches/0.1.x/jetrix/lib/jasper.jar) =================================================================== (Binary files differ) Deleted: jetrix/branches/0.1.x/lib/jetty.jar =================================================================== (Binary files differ) Copied: jetrix/branches/0.1.x/lib/jetty.jar (from rev 708, jetrix/branches/0.1.x/jetrix/lib/jetty.jar) =================================================================== (Binary files differ) Deleted: jetrix/branches/0.1.x/lib/servlet-light.jar =================================================================== (Binary files differ) Copied: jetrix/branches/0.1.x/lib/servlet-light.jar (from rev 708, jetrix/branches/0.1.x/jetrix/lib/servlet-light.jar) =================================================================== (Binary files differ) Deleted: jetrix/branches/0.1.x/lib/servlet.jar =================================================================== (Binary files differ) Copied: jetrix/branches/0.1.x/lib/servlet.jar (from rev 708, jetrix/branches/0.1.x/jetrix/lib/servlet.jar) =================================================================== (Binary files differ) Copied: jetrix/branches/0.1.x/src (from rev 706, jetrix/branches/0.1.x/jetrix/src) Copied: jetrix/branches/0.1.x/src/admin (from rev 708, jetrix/branches/0.1.x/jetrix/src/admin) Copied: jetrix/branches/0.1.x/src/bin (from rev 708, jetrix/branches/0.1.x/jetrix/src/bin) Copied: jetrix/branches/0.1.x/src/etc (from rev 708, jetrix/branches/0.1.x/jetrix/src/etc) Copied: jetrix/branches/0.1.x/src/java (from rev 708, jetrix/branches/0.1.x/jetrix/src/java) Copied: jetrix/branches/0.1.x/src/lang (from rev 708, jetrix/branches/0.1.x/jetrix/src/lang) Copied: jetrix/branches/0.1.x/src/site (from rev 708, jetrix/branches/0.1.x/jetrix/src/site) Copied: jetrix/branches/0.1.x/src/test (from rev 708, jetrix/branches/0.1.x/jetrix/src/test) Copied: jetrix/branches/0.2.x/build.properties.sample (from rev 706, jetrix/branches/0.2.x/jetrix/build.properties.sample) =================================================================== --- jetrix/branches/0.2.x/build.properties.sample (rev 0) +++ jetrix/branches/0.2.x/build.properties.sample 2006-11-03 21:24:21 UTC (rev 709) @@ -0,0 +1 @@ +build.compiler=jikes Copied: jetrix/branches/0.2.x/build.xml (from rev 706, jetrix/branches/0.2.x/jetrix/build.xml) =================================================================== --- jetrix/branches/0.2.x/build.xml (rev 0) +++ jetrix/branches/0.2.x/build.xml 2006-11-03 21:24:21 UTC (rev 709) @@ -0,0 +1,371 @@ +<?xml version="1.0" encoding="iso-8859-1"?> +<project name="Jetrix TetriNET Server" default="dist" basedir="."> + + <property name="compile.debug" value="true"/> + <property name="compile.optimize" value="false"/> + <property name="src" value="src"/> + <property name="lib" value="lib"/> + <property name="doc" value="doc"/> + <property name="build" value="build"/> + <property name="dist" value="dist"/> + <property name="deploy" value="deploy"/> + <property file="build.properties" /> + <property file="project.properties" /> + <property file="password.properties" /> + + <path id="classpath.main"> + <fileset dir="${lib}"> + <include name="**/*.jar"/> + <include name="**/*.zip"/> + </fileset> + </path> + + <target name="init"> + <!-- Create the time stamp --> + <tstamp> + <format property="build.time" pattern="yyyyMMddHH"/> + </tstamp> + <!-- Filters --> + <filter token="version" value="${version}"/> + <filter token="build.time" value="${build.time}"/> + <!-- Create the build directory structure used by compile --> + <mkdir dir="${build}"/> + <mkdir dir="${build}/java"/> + <mkdir dir="${build}/classes"/> + </target> + + <target name="prepare" depends="init"> + <copy todir="${build}/java" filtering="on"> + <fileset dir="${src}/java" includes="**/*.java"/> + </copy> + <fixcrlf srcdir="${build}/java" eol="lf" eof="remove" includes="**/*.java"/> + </target> + + <target name="compile" depends="prepare"> + <!-- Compile the java code from ${src} into ${build} --> + <javac srcdir="${build}/java" destdir="${build}/classes" debug="${compile.debug}" optimize="${compile.optimize}"> + <classpath> + <path refid="classpath.main"/> + </classpath> + </javac> + </target> + + <target name="compile.jsp.check" depends="compile" description="Compile the JSP pages if they aren't up to date"> + <uptodate property="compile.jsp.notRequired"> + <srcfiles dir= "${src}/admin" includes="**/*.jsp"/> + <mapper type="regexp" from="^(.*)\.jsp$$" to="../../${build}/jsp/\1_jsp.java"/> + </uptodate> + </target> + + <target name="compile.servlet" depends="compile" description="Compile the Servlets"> + <mkdir dir="${build}/jsp"/> + <javac destdir="${build}/jsp" debug="yes"> + <classpath> + <pathelement path="${build}/classes/"/> + <path refid="classpath.main"/> + </classpath> + <src path="${src}/admin/WEB-INF/classes"/> + </javac> + </target> + + <target name="compile.jsp" depends="compile, compile.jsp.check" unless="compile.jsp.notRequired" description="Compile the JSP pages"> + <mkdir dir="${build}/jsp"/> + <jspc destdir="${build}/jsp" verbose="10" srcdir="${src}/admin"> + <classpath> + <path refid="classpath.main"/> + <pathelement location="${ant.home}/lib/ant.jar"/> + </classpath> + </jspc> + <javac destdir="${build}/jsp" debug="yes"> + <classpath> + <pathelement path="${build}/classes/"/> + <path refid="classpath.main"/> + </classpath> + <src path="${build}/jsp"/> + <src path="${src}/admin/WEB-INF/classes"/> + </javac> + </target> + + <target name="jar" depends="compile.jsp, compile.servlet"> + <!-- Create the distribution directory --> + <mkdir dir="${dist}/lib"/> + + <!-- Create the main JAR --> + <jar jarfile="${dist}/lib/jetrix-${version}.jar" compress="false"> + <manifest> + <attribute name="Implementation-Title" value="Jetrix TetriNET Server"/> + <attribute name="Implementation-Version" value="${version}"/> + </manifest> + <fileset dir="${build}/classes"> + <exclude name="**/Launcher*.class"/> + </fileset> + <fileset dir="${src}/etc"> + <include name="tetrinet-server.dtd"/> + <include name="tetrinet-channels.dtd"/> + </fileset> + <fileset dir="${src}/etc/icons"> + <include name="jetrix.ico"/> + </fileset> + </jar> + + <!-- Check if the packed JAR is up to date --> + <uptodate property="jar.pack.notRequired" srcfile="${dist}/lib/jetrix-${version}.jar" targetfile="${dist}/lib/jetrix-${version}.pack"/> + + <!-- Create the Launcher JAR --> + <jar jarfile="${dist}/lib/jetrix-launcher-${version}.jar" compress="false"> + <manifest> + <attribute name="Implementation-Title" value="Jetrix Launcher"/> + <attribute name="Implementation-Version" value="${version}"/> + <attribute name="Main-Class" value="net.jetrix.Launcher"/> + </manifest> + <fileset dir="${build}/classes"> + <include name="**/Launcher*.class"/> + </fileset> + </jar> + + <!-- Create the WAR for the administration console --> + <mkdir dir="${dist}/webapp"/> + <war destfile="${dist}/webapp/jetrix-admin-${version}.war" webxml="${src}/admin/WEB-INF/web.xml" compress="false"> + <fileset dir="${src}/admin"> + <exclude name="WEB-INF/web.xml"/> + <exclude name="**/*.jsp"/> + <exclude name="**/*.java"/> + </fileset> + <classes dir="${build}/jsp"> + <include name="**/*.class"/> + </classes> + </war> + </target> + + <target name="jar.pack" depends="jar" unless="jar.pack.notRequired" description="Pack the Jetrix JAR if necessary"> + <echo message="Packing jetrix-${version}.jar"/> + <exec executable="pack200" dir="${dist}/lib"> + <arg line="-g jetrix-${version}.pack jetrix-${version}.jar"/> + </exec> + </target> + + <target name="pack" description="Pack the dependency to reduce the distribution size"> + <!-- Copy the JARs --> + <copy todir="${build}/lib"> + <fileset dir="${lib}" includes="*"/> + </copy> + + <antcall target="pack.check" inheritAll="true"><param name="library" value="commons-digester"/></antcall> + <antcall target="pack.check" inheritAll="true"><param name="library" value="commons-collections"/></antcall> + <antcall target="pack.check" inheritAll="true"><param name="library" value="commons-beanutils"/></antcall> + <antcall target="pack.check" inheritAll="true"><param name="library" value="commons-lang-2.0-light"/></antcall> + <antcall target="pack.check" inheritAll="true"><param name="library" value="jetty"/></antcall> + <antcall target="pack.check" inheritAll="true"><param name="library" value="servlet-light"/></antcall> + <antcall target="pack.check" inheritAll="true"><param name="library" value="jasper-runtime"/></antcall> + <antcall target="pack.check" inheritAll="true"><param name="library" value="jcrontab-1.4.1-light"/></antcall> + <antcall target="pack.check" inheritAll="true"><param name="library" value="systray4j-2.4.1"/></antcall> + + </target> + + <target name="pack.check"> + <!-- Check if the existing packed JARs are up to date --> + <uptodate property="pack.notRequired" srcfile="${build}/lib/${library}.jar" targetfile="${build}/lib/${library}.pack"/> + <antcall target="pack.pack" inheritAll="true"/> + </target> + + <target name="pack.pack" unless="pack.notRequired"> + <echo message="Packing ${library}.jar" /> + <exec executable="pack200" dir="${build}/lib"> + <arg line="-g -G ${library}.pack ${library}.jar"/> + </exec> + </target> + + <target name="dist" depends="jar.pack, pack"> + + <!-- Replace the tokens in the scripts --> + <mkdir dir="${build}/bin"/> + <copy todir="${build}/bin" filtering="on"> + <fileset dir="${src}/bin" includes="**/*"/> + </copy> + <fixcrlf srcdir="${build}/bin" eol="lf" eof="remove"> + <include name="jetrix"/> + <include name="update"/> + </fixcrlf> + + <!-- Create the distribution directory --> + <mkdir dir="${dist}/bin"/> + + <!-- Create the Windows distribution --> + <zip zipfile="${dist}/bin/jetrix-${version}.zip"> + <zipfileset prefix="jetrix-${version}/" dir="${src}/etc/"> + <include name="LICENSE" /> + <include name="README" /> + <include name="server.xml" /> + <include name="channels.xml" /> + </zipfileset> + <zipfileset prefix="jetrix-${version}/" dir="${build}/bin/"> + <include name="jetrix.bat" /> + <include name="update.bat" /> + </zipfileset> + <zipfileset prefix="jetrix-${version}/" dir="${build}/bin/" filemode="755"> + <include name="jetrix" /> + <include name="update" /> + </zipfileset> + <zipfileset prefix="jetrix-${version}/lib/" dir="${dist}/lib/"> + <include name="jetrix-${version}.pack" /> + <include name="jetrix-launcher-${version}.jar" /> + </zipfileset> + <zipfileset prefix="jetrix-${version}/lib/" dir="${build}/lib"> + <include name="commons-digester*.pack" /> + <include name="commons-collections*.pack" /> + <include name="commons-beanutils*.pack" /> + <i... [truncated message content] |