jetrix-cvs Mailing List for Jetrix TetriNET Server (Page 7)
Brought to you by:
smanux
Menu
▾
▴
jetrix-cvs — SVN commits
You can subscribe to this list here.
| 2002 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(47) |
Dec
(39) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2003 |
Jan
(11) |
Feb
(34) |
Mar
(52) |
Apr
(79) |
May
(14) |
Jun
(41) |
Jul
(19) |
Aug
(44) |
Sep
(36) |
Oct
(36) |
Nov
(6) |
Dec
(58) |
| 2004 |
Jan
(23) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(91) |
| 2005 |
Jan
(137) |
Feb
(10) |
Mar
(2) |
Apr
(41) |
May
(62) |
Jun
(9) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(10) |
Dec
|
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(2) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2008 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(39) |
Sep
(18) |
Oct
|
Nov
(9) |
Dec
|
| 2009 |
Jan
|
Feb
(27) |
Mar
(4) |
Apr
|
May
|
Jun
(2) |
Jul
|
Aug
|
Sep
(2) |
Oct
|
Nov
|
Dec
|
| 2010 |
Jan
(3) |
Feb
(14) |
Mar
(3) |
Apr
(10) |
May
(15) |
Jun
|
Jul
|
Aug
(9) |
Sep
(1) |
Oct
|
Nov
|
Dec
|
| 2011 |
Jan
|
Feb
|
Mar
|
Apr
(1) |
May
|
Jun
(1) |
Jul
|
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2012 |
Jan
|
Feb
(4) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <sm...@us...> - 2008-08-18 16:10:07
|
Revision: 725
http://jetrix.svn.sourceforge.net/jetrix/?rev=725&view=rev
Author: smanux
Date: 2008-08-18 16:10:02 +0000 (Mon, 18 Aug 2008)
Log Message:
-----------
Added Paths:
-----------
monitor/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sm...@us...> - 2008-08-18 14:27:12
|
Revision: 724
http://jetrix.svn.sourceforge.net/jetrix/?rev=724&view=rev
Author: smanux
Date: 2008-08-18 14:27:10 +0000 (Mon, 18 Aug 2008)
Log Message:
-----------
Fixed QueryAgent on systems with UTF8 as default encoding
Added a connect time out to QueryAgent
Modified Paths:
--------------
jetrix/trunk/src/java/net/jetrix/agent/QueryAgent.java
Modified: jetrix/trunk/src/java/net/jetrix/agent/QueryAgent.java
===================================================================
--- jetrix/trunk/src/java/net/jetrix/agent/QueryAgent.java 2008-08-13 15:55:33 UTC (rev 723)
+++ jetrix/trunk/src/java/net/jetrix/agent/QueryAgent.java 2008-08-18 14:27:10 UTC (rev 724)
@@ -19,10 +19,13 @@
package net.jetrix.agent;
-import net.jetrix.Message;
-import net.jetrix.protocols.QueryProtocol;
-
-import java.io.*;
+import java.io.BufferedReader;
+import java.io.BufferedWriter;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.OutputStreamWriter;
+import java.io.Writer;
+import java.net.InetSocketAddress;
import java.net.Socket;
import java.util.ArrayList;
import java.util.List;
@@ -30,8 +33,13 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import net.jetrix.Message;
+import net.jetrix.protocols.QueryProtocol;
+
/**
+ * Agent performing query requests on a TetriNET server.
*
+ * @see <a href="See http://jetrix.sourceforge.net/dev-guide.php#section2-4">Query Protocol Documentation</a>
*
* @author Emmanuel Bourg
* @version $Revision$, $Date$
@@ -48,9 +56,10 @@
public void connect(String hostname) throws IOException
{
this.hostname = hostname;
- socket = new Socket(hostname, 31457);
- in = new BufferedReader(new InputStreamReader(socket.getInputStream()));
- out = new BufferedWriter(new OutputStreamWriter(socket.getOutputStream()));
+ socket = new Socket();
+ socket.connect(new InetSocketAddress(hostname, 31457), 5000);
+ in = new BufferedReader(new InputStreamReader(socket.getInputStream(), "ISO-8859-1"));
+ out = new BufferedWriter(new OutputStreamWriter(socket.getOutputStream(), "ISO-8859-1"));
socket.setSoTimeout(10000);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sm...@us...> - 2008-08-13 15:55:38
|
Revision: 723
http://jetrix.svn.sourceforge.net/jetrix/?rev=723&view=rev
Author: smanux
Date: 2008-08-13 15:55:33 +0000 (Wed, 13 Aug 2008)
Log Message:
-----------
Fixed a regression in the handling of query clients
Modified Paths:
--------------
jetrix/trunk/src/java/net/jetrix/agent/ChannelInfo.java
jetrix/trunk/src/java/net/jetrix/agent/PlayerInfo.java
jetrix/trunk/src/java/net/jetrix/agent/QueryInfo.java
jetrix/trunk/src/java/net/jetrix/clients/QueryClient.java
jetrix/trunk/src/java/net/jetrix/clients/TetrinetClient.java
Modified: jetrix/trunk/src/java/net/jetrix/agent/ChannelInfo.java
===================================================================
--- jetrix/trunk/src/java/net/jetrix/agent/ChannelInfo.java 2008-08-07 21:03:46 UTC (rev 722)
+++ jetrix/trunk/src/java/net/jetrix/agent/ChannelInfo.java 2008-08-13 15:55:33 UTC (rev 723)
@@ -76,6 +76,11 @@
this.status = status;
}
+ public boolean isPlaying()
+ {
+ return status > 1;
+ }
+
public int getPlayernum()
{
return playernum;
Modified: jetrix/trunk/src/java/net/jetrix/agent/PlayerInfo.java
===================================================================
--- jetrix/trunk/src/java/net/jetrix/agent/PlayerInfo.java 2008-08-07 21:03:46 UTC (rev 722)
+++ jetrix/trunk/src/java/net/jetrix/agent/PlayerInfo.java 2008-08-13 15:55:33 UTC (rev 723)
@@ -87,6 +87,11 @@
this.status = status;
}
+ public boolean isPlaying()
+ {
+ return status > 0;
+ }
+
public int getAuthenticationLevel()
{
return authenticationLevel;
Modified: jetrix/trunk/src/java/net/jetrix/agent/QueryInfo.java
===================================================================
--- jetrix/trunk/src/java/net/jetrix/agent/QueryInfo.java 2008-08-07 21:03:46 UTC (rev 722)
+++ jetrix/trunk/src/java/net/jetrix/agent/QueryInfo.java 2008-08-13 15:55:33 UTC (rev 723)
@@ -75,10 +75,11 @@
*/
public List getPlayers(String channel)
{
+ // todo
return players;
}
- public List getChannels()
+ public List<ChannelInfo> getChannels()
{
return channels;
}
Modified: jetrix/trunk/src/java/net/jetrix/clients/QueryClient.java
===================================================================
--- jetrix/trunk/src/java/net/jetrix/clients/QueryClient.java 2008-08-07 21:03:46 UTC (rev 722)
+++ jetrix/trunk/src/java/net/jetrix/clients/QueryClient.java 2008-08-13 15:55:33 UTC (rev 723)
@@ -132,7 +132,7 @@
message.append(" ");
message.append(config.getMaxPlayers());
message.append(" 0 ");
- message.append(channel.getGameState().getValue() + 1);
+ message.append(channel.getGameState().getValue());
message.append(QueryProtocol.EOL);
}
}
Modified: jetrix/trunk/src/java/net/jetrix/clients/TetrinetClient.java
===================================================================
--- jetrix/trunk/src/java/net/jetrix/clients/TetrinetClient.java 2008-08-07 21:03:46 UTC (rev 722)
+++ jetrix/trunk/src/java/net/jetrix/clients/TetrinetClient.java 2008-08-13 15:55:33 UTC (rev 723)
@@ -26,7 +26,7 @@
import java.util.logging.*;
import net.jetrix.*;
-import net.jetrix.protocols.TetrinetProtocol;
+import net.jetrix.protocols.AbstractProtocol;
import net.jetrix.config.*;
import net.jetrix.messages.*;
@@ -249,7 +249,7 @@
public Message receive() throws IOException
{
// read raw message from socket
- String line = ((TetrinetProtocol) protocol).readLine(in);
+ String line = ((AbstractProtocol) protocol).readLine(in);
lastMessageTime = System.currentTimeMillis();
if (log.isLoggable(Level.FINER))
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sm...@us...> - 2008-08-07 21:03:48
|
Revision: 722
http://jetrix.svn.sourceforge.net/jetrix/?rev=722&view=rev
Author: smanux
Date: 2008-08-07 21:03:46 +0000 (Thu, 07 Aug 2008)
Log Message:
-----------
Fixed the configuration of the maven install plugin
Modified Paths:
--------------
jetrix/trunk/pom.xml
Modified: jetrix/trunk/pom.xml
===================================================================
--- jetrix/trunk/pom.xml 2008-08-07 21:01:02 UTC (rev 721)
+++ jetrix/trunk/pom.xml 2008-08-07 21:03:46 UTC (rev 722)
@@ -197,21 +197,21 @@
</plugin>
<plugin>
<artifactId>maven-install-plugin</artifactId>
- <configuration>
- <file>lib/jcrontab-1.4.1-light.jar</file>
- <groupId>jcrontab</groupId>
- <artifactId>jcrontab</artifactId>
- <version>1.4.1</version>
- <packaging>jar</packaging>
- <generatePom>true</generatePom>
- <createChecksum>true</createChecksum>
- </configuration>
<executions>
<execution>
<phase>validate</phase>
<goals>
<goal>install-file</goal>
</goals>
+ <configuration>
+ <file>lib/jcrontab-1.4.1-light.jar</file>
+ <groupId>jcrontab</groupId>
+ <artifactId>jcrontab</artifactId>
+ <version>1.4.1</version>
+ <packaging>jar</packaging>
+ <generatePom>true</generatePom>
+ <createChecksum>true</createChecksum>
+ </configuration>
</execution>
</executions>
</plugin>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sm...@us...> - 2008-08-07 21:01:06
|
Revision: 721
http://jetrix.svn.sourceforge.net/jetrix/?rev=721&view=rev
Author: smanux
Date: 2008-08-07 21:01:02 +0000 (Thu, 07 Aug 2008)
Log Message:
-----------
Changed the ping to compute the round trip time
Modified Paths:
--------------
jetrix/trunk/src/java/net/jetrix/agent/QueryAgent.java
jetrix/trunk/src/java/net/jetrix/filter/PingFilter.java
Modified: jetrix/trunk/src/java/net/jetrix/agent/QueryAgent.java
===================================================================
--- jetrix/trunk/src/java/net/jetrix/agent/QueryAgent.java 2008-08-07 09:15:16 UTC (rev 720)
+++ jetrix/trunk/src/java/net/jetrix/agent/QueryAgent.java 2008-08-07 21:01:02 UTC (rev 721)
@@ -215,13 +215,13 @@
}
/**
- * Return the ping time to the server in milliseconds.
+ * Return the round trip time to the server in milliseconds.
*/
- public long getPing() throws IOException
+ public int getPing() throws IOException
{
long time = System.currentTimeMillis();
getVersion();
- return (System.currentTimeMillis() - time) / 2;
+ return (int) (System.currentTimeMillis() - time);
}
}
Modified: jetrix/trunk/src/java/net/jetrix/filter/PingFilter.java
===================================================================
--- jetrix/trunk/src/java/net/jetrix/filter/PingFilter.java 2008-08-07 09:15:16 UTC (rev 720)
+++ jetrix/trunk/src/java/net/jetrix/filter/PingFilter.java 2008-08-07 21:01:02 UTC (rev 721)
@@ -44,7 +44,7 @@
if ("true".equals((user.getProperty("command.ping"))))
{
- long delay = (System.currentTimeMillis() - ((Long) user.getProperty("command.ping.time")).longValue()) >> 1;
+ long delay = (System.currentTimeMillis() - ((Long) user.getProperty("command.ping.time")).longValue());
client.send(new PlineMessage("command.ping.message", delay));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sm...@us...> - 2008-08-07 09:15:19
|
Revision: 720
http://jetrix.svn.sourceforge.net/jetrix/?rev=720&view=rev
Author: smanux
Date: 2008-08-07 09:15:16 +0000 (Thu, 07 Aug 2008)
Log Message:
-----------
Added the Maven 2 project descriptor
Added Paths:
-----------
jetrix/trunk/pom.xml
Added: jetrix/trunk/pom.xml
===================================================================
--- jetrix/trunk/pom.xml (rev 0)
+++ jetrix/trunk/pom.xml 2008-08-07 09:15:16 UTC (rev 720)
@@ -0,0 +1,304 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>jetrix</groupId>
+ <artifactId>jetrix</artifactId>
+ <name>Jetrix TetriNET Server</name>
+ <version>0.3-SNAPSHOT</version>
+
+ <inceptionYear>2001</inceptionYear>
+
+ <description>
+ Jetrix is a new generation TetriNET server written in Java and
+ designed for maximum scalability, extensibility and ease of use.
+ It features a web based administration console and a simple API
+ to let developpers add custom commands or change the channels'
+ behavior with little knowledge of the server's inner functioning.
+ The ambitious goal of this project is to create the ideal plateform
+ for server side TetriNET programmers. Jetrix is open source and
+ developped under the GNU General Public License.
+ </description>
+ <url>http://jetrix.sourceforge.net</url>
+
+ <licenses>
+ <license>
+ <name>GNU General Public License v2</name>
+ <url>http://www.gnu.org/licenses/gpl-2.0.txt</url>
+ <distribution>manual</distribution>
+ </license>
+ </licenses>
+
+ <scm>
+ <connection>scm:svn:https://jetrix.svn.sourceforge.net/svnroot/jetrix/jetrix/trunk/</connection>
+ <developerConnection>scm:svn:https://jetrix.svn.sourceforge.net/svnroot/jetrix/jetrix/trunk/</developerConnection>
+ <url>http://jetrix.svn.sourceforge.net/viewvc/jetrix/jetrix/trunk</url>
+ </scm>
+
+ <mailingLists>
+ <mailingList>
+ <name>Jetrix Commits</name>
+ <subscribe>http://lists.sourceforge.net/lists/listinfo/jetrix-cvs</subscribe>
+ <unsubscribe>http://lists.sourceforge.net/lists/listinfo/jetrix-cvs</unsubscribe>
+ <archive>https://sourceforge.net/mailarchive/forum.php?forum_id=12998</archive>
+ </mailingList>
+ </mailingLists>
+
+ <developers>
+ <developer>
+ <id>smanux</id>
+ <name>Emmanuel Bourg</name>
+ <email>eb...@ap...</email>
+ <timezone>+1</timezone>
+ </developer>
+ </developers>
+
+ <contributors>
+ <contributor>
+ <name>Tim Van Wassenhove</name>
+ <roles>
+ <role>Dutch translator</role>
+ </roles>
+ </contributor>
+ <contributor>
+ <name>Mario Meuser</name>
+ <roles>
+ <role>German translator</role>
+ </roles>
+ </contributor>
+ <contributor>
+ <name>Julian Mesa Llopis</name>
+ <roles>
+ <role>Spanish translator</role>
+ </roles>
+ </contributor>
+ <contributor>
+ <name>Bryan Reynaert</name>
+ <roles>
+ <role>Spanish translator</role>
+ </roles>
+ </contributor>
+ <contributor>
+ <name>Claudio Gargiulo</name>
+ <roles>
+ <role>Italian translator</role>
+ </roles>
+ </contributor>
+ <contributor>
+ <name>Vítor Melo</name>
+ <roles>
+ <role>Portuguese translator</role>
+ </roles>
+ </contributor>
+ </contributors>
+
+ <dependencies>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>2.1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.0</version>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.1.1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-digester</groupId>
+ <artifactId>commons-digester</artifactId>
+ <version>1.5</version>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
+ <version>1.7.0</version>
+ </dependency>
+
+ <dependency>
+ <groupId>jetty</groupId>
+ <artifactId>jetty</artifactId>
+ <version>4.1-rc1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>jcrontab</groupId>
+ <artifactId>jcrontab</artifactId>
+ <version>1.4.1</version>
+ </dependency>
+
+ <!-- Needed for testing -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.2</version>
+ <scope>tests</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <sourceDirectory>src/java</sourceDirectory>
+ <testSourceDirectory>src/test</testSourceDirectory>
+
+ <testResources>
+ <testResource>
+ <directory>src/etc</directory>
+ <targetPath>/</targetPath>
+ <includes>
+ <include>*.xml</include>
+ <include>*.dtd</include>
+ </includes>
+ </testResource>
+ <testResource>
+ <directory>src/lang</directory>
+ <targetPath>/</targetPath>
+ <includes>
+ <include>*.properties</include>
+ </includes>
+ </testResource>
+ <testResource>
+ <directory>src/etc/data/puzzle</directory>
+ <targetPath>/data/puzzle</targetPath>
+ <includes>
+ <include>*.field</include>
+ <include>*.settings</include>
+ </includes>
+ </testResource>
+ </testResources>
+
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <includes>
+ <include>**/*Test.java</include>
+ </includes>
+ <excludes>
+ <exclude>**/Abstract*</exclude>
+ </excludes>
+ <testFailureIgnore>true</testFailureIgnore>
+ <skip>false</skip>
+ <workingDirectory>target/test-classes</workingDirectory>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-install-plugin</artifactId>
+ <configuration>
+ <file>lib/jcrontab-1.4.1-light.jar</file>
+ <groupId>jcrontab</groupId>
+ <artifactId>jcrontab</artifactId>
+ <version>1.4.1</version>
+ <packaging>jar</packaging>
+ <generatePom>true</generatePom>
+ <createChecksum>true</createChecksum>
+ </configuration>
+ <executions>
+ <execution>
+ <phase>validate</phase>
+ <goals>
+ <goal>install-file</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <linksource>true</linksource>
+ <links>
+ <link>http://java.sun.com/javase/6/docs/api</link>
+ <link>http://commons.apache.org/digester/apidocs</link>
+ <link>http://commons.apache.org/collections/apidocs</link>
+ <link>http://commons.apache.org/lang/apidocs</link>
+ <link>http://jetty.mortbay.org/javadoc</link>
+ </links>
+ <quiet>true</quiet>
+ </configuration>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>javadoc</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
+ <plugin>
+ <artifactId>maven-pmd-plugin</artifactId>
+ <configuration>
+ <targetJdk>1.5</targetJdk>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>project-team</report>
+ <report>dependencies</report>
+ <report>license</report>
+ <report>scm</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ <version>2.0</version>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>jxr-maven-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>cobertura-maven-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>taglist-maven-plugin</artifactId>
+ <version>2.0</version>
+ <configuration>
+ <tags>
+ <tag>todo</tag>
+ </tags>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-changelog-plugin</artifactId>
+ <configuration>
+ <range>365</range>
+ </configuration>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>changelog</report>
+ <report>file-activity</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
+ </plugins>
+ </reporting>
+
+</project>
Property changes on: jetrix/trunk/pom.xml
___________________________________________________________________
Added: svn:keywords
+ Date Author Id Revision HeadURL
Added: svn:eol-style
+ native
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sm...@us...> - 2008-08-06 22:19:14
|
Revision: 719
http://jetrix.svn.sourceforge.net/jetrix/?rev=719&view=rev
Author: smanux
Date: 2008-08-06 22:19:12 +0000 (Wed, 06 Aug 2008)
Log Message:
-----------
Changed the /version command to display the Java version instead of the JVM version
Modified Paths:
--------------
jetrix/trunk/src/java/net/jetrix/commands/VersionCommand.java
Modified: jetrix/trunk/src/java/net/jetrix/commands/VersionCommand.java
===================================================================
--- jetrix/trunk/src/java/net/jetrix/commands/VersionCommand.java 2008-08-06 22:18:15 UTC (rev 718)
+++ jetrix/trunk/src/java/net/jetrix/commands/VersionCommand.java 2008-08-06 22:19:12 UTC (rev 719)
@@ -19,7 +19,6 @@
package net.jetrix.commands;
-import java.util.*;
import net.jetrix.*;
import net.jetrix.config.*;
import net.jetrix.messages.*;
@@ -43,7 +42,7 @@
String version1 = "<darkBlue><b>Jetrix/" + ServerConfig.VERSION + " (build:@build.time@)";
String version2 = "<purple>VM<darkBlue>: " + System.getProperty("java.vm.name")
- + " " + System.getProperty("java.vm.version")
+ + " " + System.getProperty("java.version")
+ " " + System.getProperty("java.vm.info");
String version3 = "<purple>OS<darkBlue>: " + System.getProperty("os.name")
+ " " + System.getProperty("os.version")
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sm...@us...> - 2008-08-06 22:18:18
|
Revision: 718
http://jetrix.svn.sourceforge.net/jetrix/?rev=718&view=rev
Author: smanux
Date: 2008-08-06 22:18:15 +0000 (Wed, 06 Aug 2008)
Log Message:
-----------
Changed the ConsoleClient to use the new Console class in Java 6
Modified Paths:
--------------
jetrix/trunk/src/java/net/jetrix/clients/ConsoleClient.java
Modified: jetrix/trunk/src/java/net/jetrix/clients/ConsoleClient.java
===================================================================
--- jetrix/trunk/src/java/net/jetrix/clients/ConsoleClient.java 2008-08-06 17:26:24 UTC (rev 717)
+++ jetrix/trunk/src/java/net/jetrix/clients/ConsoleClient.java 2008-08-06 22:18:15 UTC (rev 718)
@@ -36,7 +36,7 @@
*/
public class ConsoleClient implements Client
{
- private BufferedReader in = new BufferedReader(new InputStreamReader(System.in));
+ private Console console = System.console();
private ServerConfig conf;
private Protocol protocol;
private User user;
@@ -62,6 +62,12 @@
public void run()
{
+ if (console == null)
+ {
+ log.info("Console interface unavailable");
+ return;
+ }
+
while (conf.isRunning() && !closed)
{
try
@@ -88,19 +94,25 @@
public void send(Message message)
{
String msg = protocol.translate(message, user.getLocale());
- if (msg != null) System.out.println(msg);
+ if (msg != null)
+ {
+ console.writer().println(msg);
+ }
}
public Message receive() throws IOException
{
- String line = in.readLine();
+ String line = console.readLine();
if (line == null)
{
closed = true;
}
Message message = protocol.getMessage(line);
- if (message != null) message.setSource(this);
+ if (message != null)
+ {
+ message.setSource(this);
+ }
return message;
}
@@ -125,7 +137,8 @@
return false;
}
- public boolean supportsAutoJoin() {
+ public boolean supportsAutoJoin()
+ {
return true;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sm...@us...> - 2008-08-06 17:26:27
|
Revision: 717
http://jetrix.svn.sourceforge.net/jetrix/?rev=717&view=rev
Author: smanux
Date: 2008-08-06 17:26:24 +0000 (Wed, 06 Aug 2008)
Log Message:
-----------
Renamed the datasource element in server.xml
Fixed the file generated by ServerConfig
Modified Paths:
--------------
jetrix/trunk/src/etc/server.xml
jetrix/trunk/src/etc/tetrinet-server.dtd
jetrix/trunk/src/java/net/jetrix/config/ServerConfig.java
jetrix/trunk/src/java/net/jetrix/config/ServerRuleSet.java
Modified: jetrix/trunk/src/etc/server.xml
===================================================================
--- jetrix/trunk/src/etc/server.xml 2008-08-06 14:39:20 UTC (rev 716)
+++ jetrix/trunk/src/etc/server.xml 2008-08-06 17:26:24 UTC (rev 717)
@@ -105,7 +105,7 @@
</ban>
<!-- Database connection parameters -->
- <data-source>
+ <datasource>
<!-- The class of the JDBC driver used -->
<driver>com.mysql.jdbc.Driver</driver>
@@ -117,6 +117,6 @@
<!-- The password of the user -->
<password>jetrixpass</password>
- </data-source>
+ </datasource>
</tetrinet-server>
Modified: jetrix/trunk/src/etc/tetrinet-server.dtd
===================================================================
--- jetrix/trunk/src/etc/tetrinet-server.dtd 2008-08-06 14:39:20 UTC (rev 716)
+++ jetrix/trunk/src/etc/tetrinet-server.dtd 2008-08-06 17:26:24 UTC (rev 717)
@@ -23,7 +23,7 @@
<!ELEMENT tetrinet-server (name?, language?, timeout?, max-channels?,
max-players?, max-connections?, op-password, admin-password, access-log,
- error-log, listeners, services?, commands, ban?, data-source?)>
+ error-log, listeners, services?, commands, ban?, datasource?)>
<!ATTLIST tetrinet-server host CDATA #IMPLIED>
<!ELEMENT name (#PCDATA)>
@@ -67,7 +67,7 @@
<!ELEMENT nick (#PCDATA)>
<!ELEMENT team (#PCDATA)>
-<!ELEMENT data-source (driver, url, username, password?)>
+<!ELEMENT datasource (driver, url, username, password?)>
<!ELEMENT driver (#PCDATA)>
<!ELEMENT url (#PCDATA)>
<!ELEMENT username (#PCDATA)>
Modified: jetrix/trunk/src/java/net/jetrix/config/ServerConfig.java
===================================================================
--- jetrix/trunk/src/java/net/jetrix/config/ServerConfig.java 2008-08-06 14:39:20 UTC (rev 716)
+++ jetrix/trunk/src/java/net/jetrix/config/ServerConfig.java 2008-08-06 17:26:24 UTC (rev 717)
@@ -286,7 +286,7 @@
out.println();
out.println(" <!-- The password of the user -->");
out.println(" <password>" + dataSourcePassword + "</password>");
- out.println(" <datasource>");
+ out.println(" </datasource>");
out.println();
out.println("</tetrinet-server>");
Modified: jetrix/trunk/src/java/net/jetrix/config/ServerRuleSet.java
===================================================================
--- jetrix/trunk/src/java/net/jetrix/config/ServerRuleSet.java 2008-08-06 14:39:20 UTC (rev 716)
+++ jetrix/trunk/src/java/net/jetrix/config/ServerRuleSet.java 2008-08-06 17:26:24 UTC (rev 717)
@@ -74,10 +74,10 @@
digester.addCallMethod("tetrinet-server/ban/host", "addBannedHost", 0);
// datasource
- digester.addCallMethod("*/data-source/driver", "setDataSourceDriver", 0);
- digester.addCallMethod("*/data-source/url", "setDataSourceURL", 0);
- digester.addCallMethod("*/data-source/username", "setDataSourceUsername", 0);
- digester.addCallMethod("*/data-source/password", "setDataSourcePassword", 0);
+ digester.addCallMethod("*/datasource/driver", "setDataSourceDriver", 0);
+ digester.addCallMethod("*/datasource/url", "setDataSourceURL", 0);
+ digester.addCallMethod("*/datasource/username", "setDataSourceUsername", 0);
+ digester.addCallMethod("*/datasource/password", "setDataSourcePassword", 0);
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sm...@us...> - 2008-08-06 14:39:24
|
Revision: 716
http://jetrix.svn.sourceforge.net/jetrix/?rev=716&view=rev
Author: smanux
Date: 2008-08-06 14:39:20 +0000 (Wed, 06 Aug 2008)
Log Message:
-----------
Updated the Maven build
Modified Paths:
--------------
jetrix/trunk/project.properties
jetrix/trunk/project.xml
Property Changed:
----------------
jetrix/trunk/
Property changes on: jetrix/trunk
___________________________________________________________________
Modified: svn:ignore
- build
deploy
dist
+ build
deploy
dist
target
*.log
Modified: jetrix/trunk/project.properties
===================================================================
--- jetrix/trunk/project.properties 2008-08-06 13:02:32 UTC (rev 715)
+++ jetrix/trunk/project.properties 2008-08-06 14:39:20 UTC (rev 716)
@@ -18,3 +18,5 @@
maven.compile.target = 1.5
maven.clover.license.path=src/etc/clover.license
+
+maven.repo.remote=http://repo1.maven.org/maven/
Modified: jetrix/trunk/project.xml
===================================================================
--- jetrix/trunk/project.xml 2008-08-06 13:02:32 UTC (rev 715)
+++ jetrix/trunk/project.xml 2008-08-06 14:39:20 UTC (rev 716)
@@ -32,8 +32,9 @@
<siteDirectory>/home/groups/j/je/jetrix/htdocs/docs/</siteDirectory>
<repository>
- <connection>scm:cvs:pserver:ano...@cv...:/cvsroot/jetrix:jetrix</connection>
- <url>http://cvs.sourceforge.net/viewcvs.py/jetrix/jetrix/</url>
+ <connection>scm:svn:https://jetrix.svn.sourceforge.net/svnroot/jetrix/jetrix/trunk/</connection>
+ <developerConnection>scm:svn:https://jetrix.svn.sourceforge.net/svnroot/jetrix/jetrix/trunk/</developerConnection>
+ <url>http://jetrix.svn.sourceforge.net/viewvc/jetrix/</url>
</repository>
<versions>
@@ -61,7 +62,7 @@
<mailingLists>
<mailingList>
- <name>Jetrix CVS List</name>
+ <name>Jetrix Commits</name>
<subscribe>http://lists.sourceforge.net/lists/listinfo/jetrix-cvs</subscribe>
<unsubscribe>http://lists.sourceforge.net/lists/listinfo/jetrix-cvs</unsubscribe>
<archive>https://sourceforge.net/mailarchive/forum.php?forum_id=12998</archive>
@@ -147,7 +148,7 @@
<dependency>
<id>commons-beanutils</id>
- <version>1.7-dev</version>
+ <version>1.7.0</version>
</dependency>
<dependency>
@@ -213,7 +214,7 @@
<report>maven-javadoc-plugin</report>
<!--<report>maven-jxr-plugin</report>-->
<report>maven-junit-report-plugin</report>
- <report>maven-clover-plugin</report>
+ <!--<report>maven-clover-plugin</report>-->
<!--<report>maven-checkstyle-plugin</report>-->
<report>maven-pmd-plugin</report>
<report>maven-simian-plugin</report>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sm...@us...> - 2008-08-06 13:02:34
|
Revision: 715
http://jetrix.svn.sourceforge.net/jetrix/?rev=715&view=rev
Author: smanux
Date: 2008-08-06 13:02:32 +0000 (Wed, 06 Aug 2008)
Log Message:
-----------
Updated the ignored directories
Property Changed:
----------------
jetrix/trunk/
Property changes on: jetrix/trunk
___________________________________________________________________
Added: svn:ignore
+ build
deploy
dist
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sm...@us...> - 2008-08-06 13:01:19
|
Revision: 714
http://jetrix.svn.sourceforge.net/jetrix/?rev=714&view=rev
Author: smanux
Date: 2008-08-06 13:01:16 +0000 (Wed, 06 Aug 2008)
Log Message:
-----------
First attempt at creating a Debian package
Modified Paths:
--------------
jetrix/trunk/build.xml
Added Paths:
-----------
jetrix/trunk/lib/jdeb-0.7-SNAPSHOT.jar
jetrix/trunk/src/etc/control/
jetrix/trunk/src/etc/control/control
jetrix/trunk/src/etc/control/postinst
jetrix/trunk/src/etc/control/preinst
Modified: jetrix/trunk/build.xml
===================================================================
--- jetrix/trunk/build.xml 2008-08-06 11:40:15 UTC (rev 713)
+++ jetrix/trunk/build.xml 2008-08-06 13:01:16 UTC (rev 714)
@@ -261,8 +261,24 @@
</target>
- <target name="dist.win" depends="deploy" description="Build the windows installer">
+ <target name="dist.linux" depends="dist" description="Build the Linux installer">
+ <mkdir dir="${build}/control"/>
+ <copy todir="${build}/control" filtering="true" >
+ <fileset dir="${src}/etc/control"/>
+ </copy>
+
+ <taskdef name="deb" classname="org.vafer.jdeb.ant.DebAntTask" classpath="lib/jdeb-0.7-SNAPSHOT.jar"/>
+ <deb destfile="${dist}/bin/jetrix-${version}.deb" control="${build}/control" compression="bzip2">
+ <data src="${dist}/bin/jetrix-${version}.tar.bz2">
+ <mapper type="prefix" strip="1" prefix="/usr/share/jetrix"/>
+ <exclude name="*.bat"/>
+ </data>
+ </deb>
+ </target>
+
+ <target name="dist.win" depends="deploy" description="Build the Windows installer">
+
<!-- Build the windows executable file jetrix.exe -->
<mkdir dir="${build}/bin"/>
<copy todir="${build}/bin" filtering="true">
@@ -316,7 +332,7 @@
</target>
- <target name="dist.all" depends="clean, dist, dist.src, dist.win" description="Build all distributed files"/>
+ <target name="dist.all" depends="clean, dist, dist.src, dist.win, dist.linux" description="Build all distributed files"/>
<target name="deploy" depends="dist">
<delete dir="${deploy}"/>
Property changes on: jetrix/trunk/lib/jdeb-0.7-SNAPSHOT.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: jetrix/trunk/src/etc/control/control
===================================================================
--- jetrix/trunk/src/etc/control/control (rev 0)
+++ jetrix/trunk/src/etc/control/control 2008-08-06 13:01:16 UTC (rev 714)
@@ -0,0 +1,9 @@
+Package: jetrix
+Version: @version@
+Section: games
+Priority: optional
+Architecture: all
+Depends: sun-java6-jre
+Maintainer: Emmanuel Bourg <sm...@lf...>
+Homepage: http://jetrix.sourceforge.net
+Description: Jetrix TetriNET Server
Added: jetrix/trunk/src/etc/control/postinst
===================================================================
--- jetrix/trunk/src/etc/control/postinst (rev 0)
+++ jetrix/trunk/src/etc/control/postinst 2008-08-06 13:01:16 UTC (rev 714)
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+# TODO Move the log directory and create a symlink
Added: jetrix/trunk/src/etc/control/preinst
===================================================================
--- jetrix/trunk/src/etc/control/preinst (rev 0)
+++ jetrix/trunk/src/etc/control/preinst 2008-08-06 13:01:16 UTC (rev 714)
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+# Create the installation directory
+mkdir -p /usr/share/jetrix
+chmod a+w /usr/share/jetrix
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sm...@us...> - 2008-08-06 11:40:21
|
Revision: 713
http://jetrix.svn.sourceforge.net/jetrix/?rev=713&view=rev
Author: smanux
Date: 2008-08-06 11:40:15 +0000 (Wed, 06 Aug 2008)
Log Message:
-----------
Changed the links to CVS with links to SVN
Modified Paths:
--------------
jetrix/trunk/src/site/menu.inc.php
Modified: jetrix/trunk/src/site/menu.inc.php
===================================================================
--- jetrix/trunk/src/site/menu.inc.php 2007-08-26 10:36:06 UTC (rev 712)
+++ jetrix/trunk/src/site/menu.inc.php 2008-08-06 11:40:15 UTC (rev 713)
@@ -12,7 +12,7 @@
<h1>Download</h1>
<ul>
<li><a href="http://sourceforge.net/project/showfiles.php?group_id=52188">Binaries</a></li>
- <li><a href="http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/jetrix/">Source Code</a></li>
+ <li><a href="http://jetrix.svn.sourceforge.net/viewvc/jetrix/">Source Code</a></li>
<li><a href="http://tetrinet.fr/jetrix/nightly/jetrix-@version@.tar.bz2">Nightly Build</a></li>
</ul>
@@ -26,12 +26,12 @@
<h1>Project</h1>
<ul>
- <li><a href="http://sourceforge.net/cvs/?group_id=52188">CVS Repository</a></li>
+ <li><a href="http://sourceforge.net/svn/?group_id=52188">SVN Repository</a></li>
<li><a href="http://sourceforge.net/forum/forum.php?forum_id=172941">Forum</a></li>
<li><a href="http://sourceforge.net/tracker/?group_id=52188&atid=466002">Bugs</a></li>
<li><a href="http://sourceforge.net/tracker/?group_id=52188&atid=466005">Feature Requests</a></li>
<li><a href="changelog.php">Changelog</a></li>
- <li><a href="docs/statcvs/commit_log.html">CVS Commits</a></li>
+ <li><a href="docs/statcvs/commit_log.html">Commits</a></li>
<li><a href="docs/team-list.html">Contributors</a></li>
</ul>
</div>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Sm...@us...> - 2007-08-27 15:35:31
|
Revision: 711
http://jetrix.svn.sourceforge.net/jetrix/?rev=711&view=rev
Author: Smanux
Date: 2007-08-25 16:18:04 -0700 (Sat, 25 Aug 2007)
Log Message:
-----------
Moved to Java 6
Removed the dependency on JDIC
Modified Paths:
--------------
jetrix/trunk/build.xml
jetrix/trunk/doc/changelog.txt
jetrix/trunk/project.properties
jetrix/trunk/project.xml
jetrix/trunk/src/java/net/jetrix/SystrayManager.java
jetrix/trunk/src/java/net/jetrix/services/VersionService.java
Removed Paths:
-------------
jetrix/trunk/lib/jdic-tray-0.9.jar
jetrix/trunk/lib/jdic-tray-win-0.9.jar
jetrix/trunk/lib/tray.dll
Modified: jetrix/trunk/build.xml
===================================================================
--- jetrix/trunk/build.xml 2006-11-03 21:38:39 UTC (rev 710)
+++ jetrix/trunk/build.xml 2007-08-25 23:18:04 UTC (rev 711)
@@ -155,8 +155,6 @@
<antcall target="pack.lib" inheritAll="true"><param name="library" value="servlet-light"/></antcall>
<antcall target="pack.lib" inheritAll="true"><param name="library" value="jasper-runtime"/></antcall>
<antcall target="pack.lib" inheritAll="true"><param name="library" value="jcrontab-1.4.1-light"/></antcall>
- <antcall target="pack.lib" inheritAll="true"><param name="library" value="jdic-tray-0.9"/></antcall>
- <antcall target="pack.lib" inheritAll="true"><param name="library" value="jdic-tray-win-0.9"/></antcall>
</target>
<target name="pack.lib" description="Pack the library specified by the ${library} property">
@@ -207,8 +205,6 @@
<include name="servlet-light*.pack"/>
<include name="jasper-runtime*.pack"/>
<include name="jcrontab*.pack"/>
- <include name="jdic*.pack" />
- <include name="tray.dll" />
</zipfileset>
<zipfileset prefix="jetrix-${version}/lib/" dir="${dist}/webapp/">
<include name="*.war.pack" />
@@ -248,8 +244,6 @@
<include name="servlet-light*.pack"/>
<include name="jasper-runtime*.pack"/>
<include name="jcrontab*.pack"/>
- <include name="jdic*.pack" />
- <exclude name="jdic-tray-win*.pack" />
</tarfileset>
<tarfileset prefix="jetrix-${version}/lib/" dir="${dist}/webapp/">
<include name="*.war.pack" />
Modified: jetrix/trunk/doc/changelog.txt
===================================================================
--- jetrix/trunk/doc/changelog.txt 2006-11-03 21:38:39 UTC (rev 710)
+++ jetrix/trunk/doc/changelog.txt 2007-08-25 23:18:04 UTC (rev 711)
@@ -12,6 +12,7 @@
- The number of players and spectators currently online is now displayed on logging in
Admin visible changes
+- Jetrix now requires Java 6
- Fixed a bug preventing the modification of the access level of a command when the "access-level" attribute was set on the <command> element
- Added a visibility parameter on channels, it's now possible to have an invisible channel on the /list result
- Channels can now be created from the administration console
@@ -20,6 +21,7 @@
Developer visible changes
- added a readLine(Reader) method in the Protocol interface
- Renamed Client.receiveMessage() into Client.receive()
+- removed the dependency on JDIC
Changes in version 0.2.1 (2005-02-18)
Deleted: jetrix/trunk/lib/jdic-tray-0.9.jar
===================================================================
(Binary files differ)
Deleted: jetrix/trunk/lib/jdic-tray-win-0.9.jar
===================================================================
(Binary files differ)
Deleted: jetrix/trunk/lib/tray.dll
===================================================================
(Binary files differ)
Modified: jetrix/trunk/project.properties
===================================================================
--- jetrix/trunk/project.properties 2006-11-03 21:38:39 UTC (rev 710)
+++ jetrix/trunk/project.properties 2007-08-25 23:18:04 UTC (rev 711)
@@ -9,8 +9,6 @@
maven.jar.override=on
maven.jar.jcrontab=lib/jcrontab-1.4.1-light.jar
-maven.jar.jdic-tray=lib/jdic-tray-0.9.jar
-maven.jar.jdic-tray-win=lib/jdic-tray-win-0.9.jar
maven.javadoc.use=false
maven.javadoc.links=http://java.sun.com/j2se/1.5/docs/api/, http://jetty.mortbay.org/javadoc/, http://jakarta.apache.org/commons/digester/apidocs/, http://jakarta.apache.org/commons/collections/apidocs/, http://jakarta.apache.org/commons/lang/apidocs/
Modified: jetrix/trunk/project.xml
===================================================================
--- jetrix/trunk/project.xml 2006-11-03 21:38:39 UTC (rev 710)
+++ jetrix/trunk/project.xml 2007-08-25 23:18:04 UTC (rev 711)
@@ -160,16 +160,6 @@
<version>1.4.1</version>
</dependency>
- <dependency>
- <id>jdic-tray</id>
- <version>0.9</version>
- </dependency>
-
- <dependency>
- <id>jdic-tray-win</id>
- <version>0.9</version>
- </dependency>
-
<!-- Needed for testing -->
<dependency>
<id>junit</id>
Modified: jetrix/trunk/src/java/net/jetrix/SystrayManager.java
===================================================================
--- jetrix/trunk/src/java/net/jetrix/SystrayManager.java 2006-11-03 21:38:39 UTC (rev 710)
+++ jetrix/trunk/src/java/net/jetrix/SystrayManager.java 2007-08-25 23:18:04 UTC (rev 711)
@@ -19,21 +19,23 @@
package net.jetrix;
-import net.jetrix.config.ServerConfig;
-import net.jetrix.listeners.HttpListener;
-import org.jdesktop.jdic.tray.SystemTray;
-import org.jdesktop.jdic.tray.TrayIcon;
-
-import javax.swing.*;
-import javax.swing.event.PopupMenuListener;
-import javax.swing.event.PopupMenuEvent;
-import java.awt.*;
+import java.awt.AWTException;
+import java.awt.Font;
+import java.awt.Image;
+import java.awt.MenuItem;
+import java.awt.PopupMenu;
+import java.awt.SystemTray;
+import java.awt.TrayIcon;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.io.IOException;
import java.util.logging.Level;
import java.util.logging.Logger;
+import javax.swing.ImageIcon;
+import net.jetrix.config.ServerConfig;
+import net.jetrix.listeners.HttpListener;
+
/**
* Manages the system trayIcon (windows only).
*
@@ -54,11 +56,11 @@
{
if (trayIcon == null)
{
- SystemTray tray = null;
+ SystemTray tray;
try
{
- tray = SystemTray.getDefaultSystemTray();
+ tray = SystemTray.getSystemTray();
}
catch (Throwable t)
{
@@ -66,23 +68,12 @@
return;
}
- // adjust the look & feel
- System.setProperty("javax.swing.adjustPopupLocationToFit", "false");
- try
- {
- UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
- }
- catch (Exception e)
- {
- log.log(Level.WARNING, e.getMessage(), e);
- }
-
// build the menu items
- JMenuItem itemAdmin = new JMenuItem("Administration");
- Font font = itemAdmin.getFont();
- itemAdmin.setFont(new Font(font.getName(), Font.BOLD, font.getSize()));
+ Font font = new Font(Font.DIALOG, Font.PLAIN, 11);
+ MenuItem itemAdmin = new MenuItem("Administration");
+ itemAdmin.setFont(font.deriveFont(Font.BOLD));
itemAdmin.addActionListener(new ActionListener()
{
public void actionPerformed(ActionEvent e)
@@ -91,13 +82,13 @@
}
});
- JMenuItem itemLink = new JMenuItem("Jetrix Website");
+ MenuItem itemLink = new MenuItem("Jetrix Website");
itemLink.addActionListener(new OpenURLActionListener("http://jetrix.sourceforge.net"));
- JMenuItem itemSupport = new JMenuItem("Technical Support");
+ MenuItem itemSupport = new MenuItem("Technical Support");
itemSupport.addActionListener(new OpenURLActionListener("http://sourceforge.net/forum/forum.php?forum_id=172941"));
- JMenuItem itemExit = new JMenuItem("Stop & Exit");
+ MenuItem itemExit = new MenuItem("Stop & Exit");
itemExit.addActionListener(new ActionListener()
{
public void actionPerformed(ActionEvent e)
@@ -107,36 +98,20 @@
});
// build the menu
- final JPopupMenu menu = new JPopupMenu();
+ final PopupMenu menu = new PopupMenu();
menu.add(itemAdmin);
menu.add(itemLink);
menu.add(itemSupport);
menu.addSeparator();
menu.add(itemExit);
+
+ menu.setFont(font);
- menu.addPopupMenuListener(new PopupMenuListener()
- {
- public void popupMenuWillBecomeVisible(PopupMenuEvent e)
- {
- // un arm the items
- MenuElement[] elements = menu.getSubElements();
- for (MenuElement element : elements)
- {
- JMenuItem item = (JMenuItem) element;
- item.setArmed(false);
- }
- }
-
- public void popupMenuWillBecomeInvisible(PopupMenuEvent e) { }
-
- public void popupMenuCanceled(PopupMenuEvent e) { }
- });
-
// build the trayIcon icon
- ImageIcon icon = new ImageIcon(Thread.currentThread().getContextClassLoader().getResource("jetrix-16x16.png"));
+ Image icon = new ImageIcon(Thread.currentThread().getContextClassLoader().getResource("jetrix-16x16.png")).getImage();
trayIcon = new TrayIcon(icon, TITLE, menu);
- trayIcon.setIconAutoSize(true);
+ trayIcon.setImageAutoSize(true);
trayIcon.addActionListener(new ActionListener()
{
private long timestamp;
@@ -154,7 +129,11 @@
});
// display the trayIcon icon
- tray.addTrayIcon(trayIcon);
+ try {
+ tray.add(trayIcon);
+ } catch (AWTException e) {
+ log.log(Level.WARNING, "Unable to display the tray", e);
+ }
}
}
@@ -165,7 +144,7 @@
{
if (trayIcon != null)
{
- SystemTray.getDefaultSystemTray().removeTrayIcon(trayIcon);
+ SystemTray.getSystemTray().remove(trayIcon);
trayIcon = null;
}
}
@@ -174,10 +153,10 @@
* Display a baloon message on the trayIcon icon.
*
* @param message the message to display
- * @param type the type of the message (0: info, 1: error, 2: warning, 3: none)
+ * @param type the type of the message
* @since 0.3
*/
- public static void notify(String message, int type)
+ public static void notify(String message, TrayIcon.MessageType type)
{
if (trayIcon != null)
{
Modified: jetrix/trunk/src/java/net/jetrix/services/VersionService.java
===================================================================
--- jetrix/trunk/src/java/net/jetrix/services/VersionService.java 2006-11-03 21:38:39 UTC (rev 710)
+++ jetrix/trunk/src/java/net/jetrix/services/VersionService.java 2007-08-25 23:18:04 UTC (rev 711)
@@ -19,13 +19,17 @@
package net.jetrix.services;
+import java.awt.TrayIcon;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.util.logging.Level;
+
+import net.jetrix.SystrayManager;
import net.jetrix.config.ServerConfig;
-import net.jetrix.SystrayManager;
-import java.net.*;
-import java.io.*;
-import java.util.logging.*;
-
/**
* Service checking the availability of a new release.
*
@@ -58,7 +62,7 @@
{
String message = "A new version is available (" + VersionService.getLatestVersion() + "), download it on http://jetrix.sf.net now!";
log.warning(message);
- SystrayManager.notify(message, 0);
+ SystrayManager.notify(message, TrayIcon.MessageType.INFO);
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Sm...@us...> - 2007-08-26 11:12:50
|
Revision: 712
http://jetrix.svn.sourceforge.net/jetrix/?rev=712&view=rev
Author: Smanux
Date: 2007-08-26 03:36:06 -0700 (Sun, 26 Aug 2007)
Log Message:
-----------
Fixed jetrix.bat and update.bat when the JAVA_HOME path contains a space character
Fixed the build to include the data directory in the distribution
Modified Paths:
--------------
jetrix/trunk/build.xml
jetrix/trunk/src/bin/jetrix.bat
jetrix/trunk/src/bin/update.bat
Modified: jetrix/trunk/build.xml
===================================================================
--- jetrix/trunk/build.xml 2007-08-25 23:18:04 UTC (rev 711)
+++ jetrix/trunk/build.xml 2007-08-26 10:36:06 UTC (rev 712)
@@ -183,6 +183,7 @@
<include name="README" />
<include name="server.xml" />
<include name="channels.xml" />
+ <include name="data/**" />
</zipfileset>
<zipfileset prefix="jetrix-${version}/" dir="${build}/bin/">
<include name="jetrix.bat" />
@@ -222,6 +223,7 @@
<include name="README" />
<include name="server.xml" />
<include name="channels.xml" />
+ <include name="data/**" />
</tarfileset>
<tarfileset prefix="jetrix-${version}/" dir="${build}/bin/">
<include name="jetrix.bat" />
@@ -325,7 +327,6 @@
<target name="run" depends="deploy">
<java dir="${deploy}/jetrix-${version}" jar="${deploy}/jetrix-${version}/lib/jetrix-launcher-${version}.jar" fork="true">
<sysproperty key="jetrix.debug" value="true"/>
- <sysproperty key="java.library.path" value="lib"/>
</java>
</target>
Modified: jetrix/trunk/src/bin/jetrix.bat
===================================================================
--- jetrix/trunk/src/bin/jetrix.bat 2007-08-25 23:18:04 UTC (rev 711)
+++ jetrix/trunk/src/bin/jetrix.bat 2007-08-26 10:36:06 UTC (rev 712)
@@ -2,7 +2,7 @@
SETLOCAL
-IF NOT JAVA_HOME == "" SET JAVA_EXE=%JAVA_HOME%\bin\java
+IF NOT JAVA_HOME == "" SET JAVA_EXE="%JAVA_HOME%\bin\java"
IF JAVA_HOME == "" SET JAVA_EXE=java
%JAVA_EXE% -Djava.library.path=lib -jar lib/jetrix-launcher-@version@.jar
Modified: jetrix/trunk/src/bin/update.bat
===================================================================
--- jetrix/trunk/src/bin/update.bat 2007-08-25 23:18:04 UTC (rev 711)
+++ jetrix/trunk/src/bin/update.bat 2007-08-26 10:36:06 UTC (rev 712)
@@ -2,7 +2,7 @@
SETLOCAL
-IF NOT JAVA_HOME == "" SET JAVA_EXE=%JAVA_HOME%\bin\java
+IF NOT JAVA_HOME == "" SET JAVA_EXE="%JAVA_HOME%\bin\java"
IF JAVA_HOME == "" SET JAVA_EXE=java
%JAVA_EXE% -cp lib/jetrix-@version@.jar net.jetrix.tools.patcher.JetrixUpdate
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Sm...@us...> - 2006-11-03 21:39:00
|
Revision: 710
http://svn.sourceforge.net/jetrix/?rev=710&view=rev
Author: Smanux
Date: 2006-11-03 13:38:39 -0800 (Fri, 03 Nov 2006)
Log Message:
-----------
Respository restructuration
Removed Paths:
-------------
jetrix/branches/0.1.x/jetrix/
jetrix/branches/0.2.x/jetrix/
jetrix/tags/0.1.0/.cvsignore
jetrix/tags/0.1.0/jetrix/
jetrix/tags/0.1.1/jetrix/
jetrix/tags/0.1.2/jetrix/
jetrix/tags/0.1.3/jetrix/
jetrix/tags/0.2.0/jetrix/
jetrix/tags/0.2.1/jetrix/
jetrix/tags/0.2.2/jetrix/
jetrix/trunk/jetrix/
Deleted: jetrix/tags/0.1.0/.cvsignore
===================================================================
--- jetrix/tags/0.1.0/.cvsignore 2006-11-03 21:24:21 UTC (rev 709)
+++ jetrix/tags/0.1.0/.cvsignore 2006-11-03 21:38:39 UTC (rev 710)
@@ -1,4 +0,0 @@
-build
-dist
-deploy
-password.properties
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
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] |
|
From: <Sm...@us...> - 2006-11-03 20:56:13
|
Revision: 708
http://svn.sourceforge.net/jetrix/?rev=708&view=rev
Author: Smanux
Date: 2006-11-03 12:55:44 -0800 (Fri, 03 Nov 2006)
Log Message:
-----------
Removed .cvsignore files
Removed Paths:
-------------
jetrix/branches/0.1.x/jetrix/.cvsignore
jetrix/branches/0.2.x/jetrix/.cvsignore
jetrix/tags/0.1.2/jetrix/.cvsignore
jetrix/tags/0.1.3/jetrix/.cvsignore
jetrix/tags/0.2.0/jetrix/.cvsignore
jetrix/tags/0.2.1/jetrix/.cvsignore
jetrix/tags/0.2.2/jetrix/.cvsignore
jetrix/trunk/jetrix/.cvsignore
Deleted: jetrix/branches/0.1.x/jetrix/.cvsignore
===================================================================
--- jetrix/branches/0.1.x/jetrix/.cvsignore 2006-11-03 20:50:36 UTC (rev 707)
+++ jetrix/branches/0.1.x/jetrix/.cvsignore 2006-11-03 20:55:44 UTC (rev 708)
@@ -1,5 +0,0 @@
-build
-dist
-deploy
-password.properties
-build.properties
Deleted: jetrix/branches/0.2.x/jetrix/.cvsignore
===================================================================
--- jetrix/branches/0.2.x/jetrix/.cvsignore 2006-11-03 20:50:36 UTC (rev 707)
+++ jetrix/branches/0.2.x/jetrix/.cvsignore 2006-11-03 20:55:44 UTC (rev 708)
@@ -1,5 +0,0 @@
-build
-dist
-deploy
-password.properties
-build.properties
Deleted: jetrix/tags/0.1.2/jetrix/.cvsignore
===================================================================
--- jetrix/tags/0.1.2/jetrix/.cvsignore 2006-11-03 20:50:36 UTC (rev 707)
+++ jetrix/tags/0.1.2/jetrix/.cvsignore 2006-11-03 20:55:44 UTC (rev 708)
@@ -1,5 +0,0 @@
-build
-dist
-deploy
-password.properties
-build.properties
Deleted: jetrix/tags/0.1.3/jetrix/.cvsignore
===================================================================
--- jetrix/tags/0.1.3/jetrix/.cvsignore 2006-11-03 20:50:36 UTC (rev 707)
+++ jetrix/tags/0.1.3/jetrix/.cvsignore 2006-11-03 20:55:44 UTC (rev 708)
@@ -1,5 +0,0 @@
-build
-dist
-deploy
-password.properties
-build.properties
Deleted: jetrix/tags/0.2.0/jetrix/.cvsignore
===================================================================
--- jetrix/tags/0.2.0/jetrix/.cvsignore 2006-11-03 20:50:36 UTC (rev 707)
+++ jetrix/tags/0.2.0/jetrix/.cvsignore 2006-11-03 20:55:44 UTC (rev 708)
@@ -1,5 +0,0 @@
-build
-dist
-deploy
-password.properties
-build.properties
Deleted: jetrix/tags/0.2.1/jetrix/.cvsignore
===================================================================
--- jetrix/tags/0.2.1/jetrix/.cvsignore 2006-11-03 20:50:36 UTC (rev 707)
+++ jetrix/tags/0.2.1/jetrix/.cvsignore 2006-11-03 20:55:44 UTC (rev 708)
@@ -1,5 +0,0 @@
-build
-dist
-deploy
-password.properties
-build.properties
Deleted: jetrix/tags/0.2.2/jetrix/.cvsignore
===================================================================
--- jetrix/tags/0.2.2/jetrix/.cvsignore 2006-11-03 20:50:36 UTC (rev 707)
+++ jetrix/tags/0.2.2/jetrix/.cvsignore 2006-11-03 20:55:44 UTC (rev 708)
@@ -1,5 +0,0 @@
-build
-dist
-deploy
-password.properties
-build.properties
Deleted: jetrix/trunk/jetrix/.cvsignore
===================================================================
--- jetrix/trunk/jetrix/.cvsignore 2006-11-03 20:50:36 UTC (rev 707)
+++ jetrix/trunk/jetrix/.cvsignore 2006-11-03 20:55:44 UTC (rev 708)
@@ -1,5 +0,0 @@
-build
-dist
-deploy
-password.properties
-build.properties
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Sm...@us...> - 2006-11-03 20:50:58
|
Revision: 707
http://svn.sourceforge.net/jetrix/?rev=707&view=rev
Author: Smanux
Date: 2006-11-03 12:50:36 -0800 (Fri, 03 Nov 2006)
Log Message:
-----------
Respository restructuration
Added Paths:
-----------
jetrix/tags/0.1.0/.cvsignore
jetrix/tags/0.1.0/build.xml
jetrix/tags/0.1.0/doc/
jetrix/tags/0.1.0/jetrix.properties
jetrix/tags/0.1.0/lib/
jetrix/tags/0.1.0/src/
Removed Paths:
-------------
jetrix/tags/0.1.0/jetrix/.cvsignore
jetrix/tags/0.1.0/jetrix/build.xml
jetrix/tags/0.1.0/jetrix/doc/
jetrix/tags/0.1.0/jetrix/jetrix.properties
jetrix/tags/0.1.0/jetrix/lib/
jetrix/tags/0.1.0/jetrix/src/
Copied: jetrix/tags/0.1.0/.cvsignore (from rev 706, jetrix/tags/0.1.0/jetrix/.cvsignore)
===================================================================
--- jetrix/tags/0.1.0/.cvsignore (rev 0)
+++ jetrix/tags/0.1.0/.cvsignore 2006-11-03 20:50:36 UTC (rev 707)
@@ -0,0 +1,4 @@
+build
+dist
+deploy
+password.properties
\ No newline at end of file
Copied: jetrix/tags/0.1.0/build.xml (from rev 706, jetrix/tags/0.1.0/jetrix/build.xml)
===================================================================
--- jetrix/tags/0.1.0/build.xml (rev 0)
+++ jetrix/tags/0.1.0/build.xml 2006-11-03 20:50:36 UTC (rev 707)
@@ -0,0 +1,254 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<project name="Jetrix TetriNET Server" default="dist" basedir=".">
+
+ <property name="build.compiler" value="jikes"/>
+ <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="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"/>
+ </classpath>
+ </javac>
+ </target>
+
+
+ <target name="compile.test" depends="compile" description="Compile JUnit TestCases">
+ <javac srcdir="${src}/test" destdir="${build}/classes" debug="yes">
+ <classpath>
+ <pathelement path="${build}/classes" />
+ <pathelement location="${lib}/junit.jar"/>
+ </classpath>
+ </javac>
+ </target>
+
+
+ <target name="dist" depends="compile">
+ <!-- Create the distribution directory -->
+ <mkdir dir="${dist}/lib"/>
+ <mkdir dir="${dist}/bin"/>
+
+ <jar jarfile="${dist}/lib/jetrix.jar">
+ <manifest>
+ <attribute name="Implementation-Title" value="Jetrix TetriNET Server"/>
+ <attribute name="Implementation-Version" value="${version}"/>
+ <attribute name="Main-Class" value="net.jetrix.Server"/>
+ <attribute name="Class-Path" value=".. commons-collections.jar commons-beanutils.jar commons-digester.jar"/>
+ </manifest>
+ <fileset dir="${build}/classes" excludes="**/*Test.class"/>
+ <fileset dir="${src}/etc">
+ <include name="tetrinet-server.dtd"/>
+ </fileset>
+ </jar>
+
+ <zip zipfile="${dist}/bin/jetrix-${version}.zip">
+ <zipfileset prefix="jetrix/" dir="${src}/etc/">
+ <include name="news.txt" />
+ <include name="LICENSE" />
+ <include name="README" />
+ <include name="config.xml" />
+ <include name="jetrix.bat" />
+ <include name="jetrix" />
+ <include name="update.bat" />
+ <include name="update" />
+ </zipfileset>
+ <zipfileset prefix="jetrix/lib/" dir="${dist}/lib/">
+ <include name="jetrix.jar" />
+ </zipfileset>
+ <zipfileset prefix="jetrix/lib/" dir="${lib}">
+ <include name="commons-digester.jar" />
+ <include name="commons-collections.jar" />
+ <include name="commons-beanutils.jar" />
+ </zipfileset>
+ <zipfileset prefix="jetrix/lang/" dir="${src}/lang/">
+ <include name="*.properties" />
+ </zipfileset>
+ <zipfileset prefix="jetrix/log/" dir="${src}/etc/log/"/>
+ </zip>
+
+ <tar destfile="${dist}/bin/jetrix-${version}.tar">
+ <tarfileset prefix="jetrix/" dir="${src}/etc/">
+ <include name="news.txt" />
+ <include name="LICENSE" />
+ <include name="README" />
+ <include name="config.xml" />
+ <include name="jetrix.bat" />
+ <include name="update.bat" />
+ </tarfileset>
+ <tarfileset prefix="jetrix/" dir="${src}/etc/" mode="755">
+ <include name="jetrix" />
+ <include name="update" />
+ </tarfileset>
+ <tarfileset prefix="jetrix/lib/" dir="${dist}/lib/">
+ <include name="jetrix.jar" />
+ </tarfileset>
+ <tarfileset prefix="jetrix/lib/" dir="${lib}">
+ <include name="commons-digester.jar" />
+ <include name="commons-collections.jar" />
+ <include name="commons-beanutils.jar" />
+ </tarfileset>
+ <tarfileset prefix="jetrix/lang/" dir="${src}/lang/">
+ <include name="*.properties" />
+ </tarfileset>
+ <tarfileset prefix="jetrix/log/" dir="${src}/etc/log/"/>
+ </tar>
+
+ <gzip zipfile="${dist}/bin/jetrix-${version}.tar.gz" src="${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-src/" dir=".">
+ <include name="build.xml" />
+ <include name="jetrix.properties" />
+ </zipfileset>
+ <zipfileset prefix="jetrix-src/src/" dir="${src}">
+ <exclude name="site/"/>
+ </zipfileset>
+ <zipfileset prefix="jetrix-src/lib/" dir="${lib}" />
+ </zip>
+
+ <tar destfile="${dist}/src/jetrix-${version}-src.tar">
+ <tarfileset prefix="jetrix-src/" dir=".">
+ <include name="build.xml" />
+ <include name="jetrix.properties" />
+ </tarfileset>
+ <tarfileset prefix="jetrix-src/src/" dir="${src}">
+ <exclude name="site/"/>
+ </tarfileset>
+ <tarfileset prefix="jetrix-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="test" depends="compile.test" description="Runs testcases">
+ <junit printsummary="yes" fork="yes" dir="${src}/etc">
+ <classpath>
+ <pathelement path="${build}/classes" />
+ <pathelement location="${lib}/commons-digester.jar"/>
+ <pathelement location="${lib}/commons-collections.jar"/>
+ </classpath>
+ <formatter type="xml" />
+ <batchtest>
+ <fileset dir="${build}/classes">
+ <include name="**/*Test.class" />
+ </fileset>
+ </batchtest>
+ </junit>
+ <junitreport>
+ <fileset dir=".">
+ <include name="TEST-*.xml"/>
+ </fileset>
+ <report format="noframes"/>
+ </junitreport>
+ <delete>
+ <fileset dir="." includes="TEST*"/>
+ </delete>
+ </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" jar="${deploy}/jetrix/lib/jetrix.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" classpath="${deploy}/jetrix/lib/jetrix.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"/>
+ </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-2002 Emmanuel Bourg. All Rights Reserved.">
+ <classpath>
+ <fileset dir="${lib}" >
+ <include name="*.jar" />
+ </fileset>
+ </classpath>
+ <link href="http://java.sun.com/j2se/1.4.1/docs/api/"/>
+ <link href="http://jakarta.apache.org/commons/digester/api"/>
+ </javadoc>
+ <zip zipfile="${dist}/doc/api.zip">
+ <zipfileset dir="${doc}" includes="api/**"/>
+ </zip>
+ </target>
+
+
+ <target name="clean">
+ <!-- Delete the ${build} directory tree -->
+ <delete dir="${dist}"/>
+ <delete dir="${build}"/>
+ <delete dir="${deploy}"/>
+ </target>
+
+</project>
Copied: jetrix/tags/0.1.0/doc (from rev 706, jetrix/tags/0.1.0/jetrix/doc)
Deleted: jetrix/tags/0.1.0/jetrix/.cvsignore
===================================================================
--- jetrix/tags/0.1.0/jetrix/.cvsignore 2006-11-03 20:32:59 UTC (rev 706)
+++ jetrix/tags/0.1.0/jetrix/.cvsignore 2006-11-03 20:50:36 UTC (rev 707)
@@ -1,4 +0,0 @@
-build
-dist
-deploy
-password.properties
\ No newline at end of file
Deleted: jetrix/tags/0.1.0/jetrix/build.xml
===================================================================
--- jetrix/tags/0.1.0/jetrix/build.xml 2006-11-03 20:32:59 UTC (rev 706)
+++ jetrix/tags/0.1.0/jetrix/build.xml 2006-11-03 20:50:36 UTC (rev 707)
@@ -1,254 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<project name="Jetrix TetriNET Server" default="dist" basedir=".">
-
- <property name="build.compiler" value="jikes"/>
- <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="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"/>
- </classpath>
- </javac>
- </target>
-
-
- <target name="compile.test" depends="compile" description="Compile JUnit TestCases">
- <javac srcdir="${src}/test" destdir="${build}/classes" debug="yes">
- <classpath>
- <pathelement path="${build}/classes" />
- <pathelement location="${lib}/junit.jar"/>
- </classpath>
- </javac>
- </target>
-
-
- <target name="dist" depends="compile">
- <!-- Create the distribution directory -->
- <mkdir dir="${dist}/lib"/>
- <mkdir dir="${dist}/bin"/>
-
- <jar jarfile="${dist}/lib/jetrix.jar">
- <manifest>
- <attribute name="Implementation-Title" value="Jetrix TetriNET Server"/>
- <attribute name="Implementation-Version" value="${version}"/>
- <attribute name="Main-Class" value="net.jetrix.Server"/>
- <attribute name="Class-Path" value=".. commons-collections.jar commons-beanutils.jar commons-digester.jar"/>
- </manifest>
- <fileset dir="${build}/classes" excludes="**/*Test.class"/>
- <fileset dir="${src}/etc">
- <include name="tetrinet-server.dtd"/>
- </fileset>
- </jar>
-
- <zip zipfile="${dist}/bin/jetrix-${version}.zip">
- <zipfileset prefix="jetrix/" dir="${src}/etc/">
- <include name="news.txt" />
- <include name="LICENSE" />
- <include name="README" />
- <include name="config.xml" />
- <include name="jetrix.bat" />
- <include name="jetrix" />
- <include name="update.bat" />
- <include name="update" />
- </zipfileset>
- <zipfileset prefix="jetrix/lib/" dir="${dist}/lib/">
- <include name="jetrix.jar" />
- </zipfileset>
- <zipfileset prefix="jetrix/lib/" dir="${lib}">
- <include name="commons-digester.jar" />
- <include name="commons-collections.jar" />
- <include name="commons-beanutils.jar" />
- </zipfileset>
- <zipfileset prefix="jetrix/lang/" dir="${src}/lang/">
- <include name="*.properties" />
- </zipfileset>
- <zipfileset prefix="jetrix/log/" dir="${src}/etc/log/"/>
- </zip>
-
- <tar destfile="${dist}/bin/jetrix-${version}.tar">
- <tarfileset prefix="jetrix/" dir="${src}/etc/">
- <include name="news.txt" />
- <include name="LICENSE" />
- <include name="README" />
- <include name="config.xml" />
- <include name="jetrix.bat" />
- <include name="update.bat" />
- </tarfileset>
- <tarfileset prefix="jetrix/" dir="${src}/etc/" mode="755">
- <include name="jetrix" />
- <include name="update" />
- </tarfileset>
- <tarfileset prefix="jetrix/lib/" dir="${dist}/lib/">
- <include name="jetrix.jar" />
- </tarfileset>
- <tarfileset prefix="jetrix/lib/" dir="${lib}">
- <include name="commons-digester.jar" />
- <include name="commons-collections.jar" />
- <include name="commons-beanutils.jar" />
- </tarfileset>
- <tarfileset prefix="jetrix/lang/" dir="${src}/lang/">
- <include name="*.properties" />
- </tarfileset>
- <tarfileset prefix="jetrix/log/" dir="${src}/etc/log/"/>
- </tar>
-
- <gzip zipfile="${dist}/bin/jetrix-${version}.tar.gz" src="${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-src/" dir=".">
- <include name="build.xml" />
- <include name="jetrix.properties" />
- </zipfileset>
- <zipfileset prefix="jetrix-src/src/" dir="${src}">
- <exclude name="site/"/>
- </zipfileset>
- <zipfileset prefix="jetrix-src/lib/" dir="${lib}" />
- </zip>
-
- <tar destfile="${dist}/src/jetrix-${version}-src.tar">
- <tarfileset prefix="jetrix-src/" dir=".">
- <include name="build.xml" />
- <include name="jetrix.properties" />
- </tarfileset>
- <tarfileset prefix="jetrix-src/src/" dir="${src}">
- <exclude name="site/"/>
- </tarfileset>
- <tarfileset prefix="jetrix-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="test" depends="compile.test" description="Runs testcases">
- <junit printsummary="yes" fork="yes" dir="${src}/etc">
- <classpath>
- <pathelement path="${build}/classes" />
- <pathelement location="${lib}/commons-digester.jar"/>
- <pathelement location="${lib}/commons-collections.jar"/>
- </classpath>
- <formatter type="xml" />
- <batchtest>
- <fileset dir="${build}/classes">
- <include name="**/*Test.class" />
- </fileset>
- </batchtest>
- </junit>
- <junitreport>
- <fileset dir=".">
- <include name="TEST-*.xml"/>
- </fileset>
- <report format="noframes"/>
- </junitreport>
- <delete>
- <fileset dir="." includes="TEST*"/>
- </delete>
- </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" jar="${deploy}/jetrix/lib/jetrix.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" classpath="${deploy}/jetrix/lib/jetrix.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"/>
- </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-2002 Emmanuel Bourg. All Rights Reserved.">
- <classpath>
- <fileset dir="${lib}" >
- <include name="*.jar" />
- </fileset>
- </classpath>
- <link href="http://java.sun.com/j2se/1.4.1/docs/api/"/>
- <link href="http://jakarta.apache.org/commons/digester/api"/>
- </javadoc>
- <zip zipfile="${dist}/doc/api.zip">
- <zipfileset dir="${doc}" includes="api/**"/>
- </zip>
- </target>
-
-
- <target name="clean">
- <!-- Delete the ${build} directory tree -->
- <delete dir="${dist}"/>
- <delete dir="${build}"/>
- <delete dir="${deploy}"/>
- </target>
-
-</project>
Deleted: jetrix/tags/0.1.0/jetrix/jetrix.properties
===================================================================
--- jetrix/tags/0.1.0/jetrix/jetrix.properties 2006-11-03 20:32:59 UTC (rev 706)
+++ jetrix/tags/0.1.0/jetrix/jetrix.properties 2006-11-03 20:50:36 UTC (rev 707)
@@ -1 +0,0 @@
-version=0.1.0
\ No newline at end of file
Copied: jetrix/tags/0.1.0/jetrix.properties (from rev 706, jetrix/tags/0.1.0/jetrix/jetrix.properties)
===================================================================
--- jetrix/tags/0.1.0/jetrix.properties (rev 0)
+++ jetrix/tags/0.1.0/jetrix.properties 2006-11-03 20:50:36 UTC (rev 707)
@@ -0,0 +1 @@
+version=0.1.0
\ No newline at end of file
Copied: jetrix/tags/0.1.0/lib (from rev 706, jetrix/tags/0.1.0/jetrix/lib)
Copied: jetrix/tags/0.1.0/src (from rev 706, jetrix/tags/0.1.0/jetrix/src)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Sm...@us...> - 2006-11-03 20:33:12
|
Revision: 706
http://svn.sourceforge.net/jetrix/?rev=706&view=rev
Author: Smanux
Date: 2006-11-03 12:32:59 -0800 (Fri, 03 Nov 2006)
Log Message:
-----------
Repository restructuration
Added Paths:
-----------
jetrix/branches/
Removed Paths:
-------------
branches/
Copied: jetrix/branches (from rev 705, branches)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Sm...@us...> - 2006-11-03 20:25:59
|
Revision: 705
http://svn.sourceforge.net/jetrix/?rev=705&view=rev
Author: Smanux
Date: 2006-11-03 12:25:49 -0800 (Fri, 03 Nov 2006)
Log Message:
-----------
Respository restructuration
Added Paths:
-----------
jetrix/trunk/
Removed Paths:
-------------
trunk/
Copied: jetrix/trunk (from rev 704, trunk)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Sm...@us...> - 2006-11-03 17:59:39
|
Revision: 704
http://svn.sourceforge.net/jetrix/?rev=704&view=rev
Author: Smanux
Date: 2006-11-03 09:59:27 -0800 (Fri, 03 Nov 2006)
Log Message:
-----------
Respository restructuration
Added Paths:
-----------
jetrix/tags/
Removed Paths:
-------------
tags/
Copied: jetrix/tags (from rev 703, tags)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Sm...@us...> - 2006-11-03 17:39:50
|
Revision: 703
http://svn.sourceforge.net/jetrix/?rev=703&view=rev
Author: Smanux
Date: 2006-11-03 09:39:14 -0800 (Fri, 03 Nov 2006)
Log Message:
-----------
Respository restructuration
Added Paths:
-----------
branches/0.1.x/
branches/0.1.x/jetrix/
branches/0.2.x/
jetrix/
tags/0.1.1/
tags/0.1.1/jetrix/
tags/0.1.2/
tags/0.1.2/jetrix/
tags/0.1.3/
tags/0.1.3/jetrix/
tags/0.2.0/
tags/0.2.0/jetrix/
tags/0.2.1/
tags/0.2.1/jetrix/
tags/0.2.2/
webspec/
webspec/branches/
webspec/tags/
webspec/trunk/
Removed Paths:
-------------
branches/0.1.x/jetrix/
branches/jetrix_0_1_2-branch/
branches/jetrix_0_2_branch/
tags/0.1.1/jetrix/
tags/0.1.2/jetrix/
tags/0.1.3/jetrix/
tags/0.2.0/jetrix/
tags/0.2.1/jetrix/
tags/jetrix_0_1_1/
tags/jetrix_0_1_2/
tags/jetrix_0_1_3/
tags/jetrix_0_2/
tags/jetrix_0_2_1/
tags/jetrix_0_2_2/
Copied: branches/0.1.x (from rev 700, branches/jetrix_0_1_2-branch)
Copied: branches/0.1.x/jetrix (from rev 702, branches/jetrix_0_1_2-branch/jetrix)
Copied: branches/0.2.x (from rev 702, branches/jetrix_0_2_branch)
Copied: tags/0.1.1 (from rev 700, tags/jetrix_0_1_1)
Copied: tags/0.1.1/jetrix (from rev 702, tags/jetrix_0_1_1/jetrix)
Copied: tags/0.1.2 (from rev 700, tags/jetrix_0_1_2)
Copied: tags/0.1.2/jetrix (from rev 702, tags/jetrix_0_1_2/jetrix)
Copied: tags/0.1.3 (from rev 700, tags/jetrix_0_1_3)
Copied: tags/0.1.3/jetrix (from rev 702, tags/jetrix_0_1_3/jetrix)
Copied: tags/0.2.0 (from rev 700, tags/jetrix_0_2)
Copied: tags/0.2.0/jetrix (from rev 702, tags/jetrix_0_2/jetrix)
Copied: tags/0.2.1 (from rev 700, tags/jetrix_0_2_1)
Copied: tags/0.2.1/jetrix (from rev 702, tags/jetrix_0_2_1/jetrix)
Copied: tags/0.2.2 (from rev 702, tags/jetrix_0_2_2)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Sm...@us...> - 2006-11-03 17:24:55
|
Revision: 702
http://svn.sourceforge.net/jetrix/?rev=702&view=rev
Author: Smanux
Date: 2006-11-03 09:23:55 -0800 (Fri, 03 Nov 2006)
Log Message:
-----------
Respository restructuration
Added Paths:
-----------
tags/0.1.0/
Removed Paths:
-------------
tags/jetrix_0_1_0/
Copied: tags/0.1.0 (from rev 700, tags/jetrix_0_1_0)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Sm...@us...> - 2006-11-03 17:22:40
|
Revision: 701
http://svn.sourceforge.net/jetrix/?rev=701&view=rev
Author: Smanux
Date: 2006-11-03 09:21:36 -0800 (Fri, 03 Nov 2006)
Log Message:
-----------
Repository cleanup after the migration to Subversion
Removed Paths:
-------------
branches/avendor/
tags/arelease/
trunk/CVSROOT/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
